Skip to content

Commit

Permalink
Merge branch 'main' into ac/payloads_to_sign_for_applying_shield_abw-…
Browse files Browse the repository at this point in the history
…4012
  • Loading branch information
Sajjon committed Jan 30, 2025
2 parents d014fee + c349ccf commit 0909f49
Show file tree
Hide file tree
Showing 122 changed files with 1,197 additions and 1,158 deletions.
168 changes: 84 additions & 84 deletions Cargo.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import Foundation
import SargonUniFFI

extension FactorSourceIDFromAddress {
public func toString() -> String {
factorSourceIdFromAddressToString(factorSourceId: self)
}

public init(jsonData: some DataProtocol) throws {
self = try newFactorSourceIDFromAddressFromJsonBytes(jsonBytes: Data(jsonData))
}

public func jsonData() -> Data {
factorSourceIDFromAddressToJsonBytes(factorSourceIDFromAddress: self)
}
}
// import Foundation
// import SargonUniFFI
//
// extension FactorSourceIDFromAddress {
// public func toString() -> String {
// factorSourceIdFromAddressToString(factorSourceId: self)
// }
//
// public init(jsonData: some DataProtocol) throws {
// self = try newFactorSourceIDFromAddressFromJsonBytes(jsonBytes: Data(jsonData))
// }
//
// public func jsonData() -> Data {
// factorSourceIDFromAddressToJsonBytes(factorSourceIDFromAddress: self)
// }
// }
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import Foundation
import SargonUniFFI

extension SecurityQuestionsNotProductionReadyFactorSource {
public init(
mnemonic: Mnemonic,
questionsAndAnswers: [SecurityNotProductionReadyQuestionAndAnswer]
) throws {
self = try newSecurityQuestionsFactorSourceByEncryptingMnemonic(
mnemonic: mnemonic,
with: questionsAndAnswers
)
}

public func decrypt(questionsAndAnswers: [SecurityNotProductionReadyQuestionAndAnswer]) throws -> Mnemonic {
try securityQuestionsFactorSourceDecrypt(factorSource: self, with: questionsAndAnswers)
}
}
// import Foundation
// import SargonUniFFI
//
// extension SecurityQuestionsNotProductionReadyFactorSource {
// public init(
// mnemonic: Mnemonic,
// questionsAndAnswers: [SecurityNotProductionReadyQuestionAndAnswer]
// ) throws {
// self = try newSecurityQuestionsFactorSourceByEncryptingMnemonic(
// mnemonic: mnemonic,
// with: questionsAndAnswers
// )
// }
//
// public func decrypt(questionsAndAnswers: [SecurityNotProductionReadyQuestionAndAnswer]) throws -> Mnemonic {
// try securityQuestionsFactorSourceDecrypt(factorSource: self, with: questionsAndAnswers)
// }
// }
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Foundation
import SargonUniFFI

extension TrustedContactFactorSource {
public init(
accountAddress: AccountAddress,
contact: TrustedContactFactorSourceContact
) {
self = newTrustedContactFactorSourceFromAddressAndContact(
accountAddress: accountAddress,
contact: contact
)
}
}
// import Foundation
// import SargonUniFFI
//
// extension TrustedContactFactorSource {
// public init(
// accountAddress: AccountAddress,
// contact: TrustedContactFactorSourceContact
// ) {
// self = newTrustedContactFactorSourceFromAddressAndContact(
// accountAddress: accountAddress,
// contact: contact
// )
// }
// }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import Foundation
import SargonUniFFI

extension WalletToDappInteractionAuthProof {
public init(signatureWithPublicKey: SignatureWithPublicKey) {
self = newWalletToDappInteractionAuthProofFromSignatureWithPublicKey(signatureWithPublicKey: signatureWithPublicKey)
}

public init(intentSignatureOfOwner: IntentSignatureOfOwner) {
self = newWalletToDappInteractionAuthProofFromIntentSignatureOfOwner(intentSignatureOfOwner: intentSignatureOfOwner)
self.init(signatureWithPublicKey: intentSignatureOfOwner.intentSignature.signatureWithPublicKey)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import SargonUniFFI

extension WalletToDappInteractionProofOfOwnership {
public init(intentSignatureOfOwner: IntentSignatureOfOwner) {
self = newWalletToDappInteractionProofOfOwnershipFromIntentSignatureOfOwner(intentSignatureOfOwner: intentSignatureOfOwner)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Foundation
import SargonUniFFI

#if DEBUG
extension EmailAddress {
public static let sample: Self = newEmailAddressSample()
public static let sampleOther: Self = newEmailAddressSampleOther()
}
#endif // DEBUG
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Foundation
import SargonUniFFI

#if DEBUG
extension FactorSourceIDFromAddress {
public static let sample: Self = newFactorSourceIdFromAddressSample()
public static let sampleOther: Self = newFactorSourceIdFromAddressSampleOther()
}
#endif // DEBUG
// import Foundation
// import SargonUniFFI
//
// #if DEBUG
// extension FactorSourceIDFromAddress {
// public static let sample: Self = newFactorSourceIdFromAddressSample()
// public static let sampleOther: Self = newFactorSourceIdFromAddressSampleOther()
// }
// #endif // DEBUG
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Foundation
import SargonUniFFI

#if DEBUG
extension SecurityQuestionsNotProductionReadyFactorSource {
public static let sample: Self = newSecurityQuestionsFactorSourceSample()
public static let sampleOther: Self = newSecurityQuestionsFactorSourceSampleOther()
}

#endif // DEBUG
// import Foundation
// import SargonUniFFI
//
// #if DEBUG
// extension SecurityQuestionsNotProductionReadyFactorSource {
// public static let sample: Self = newSecurityQuestionsFactorSourceSample()
// public static let sampleOther: Self = newSecurityQuestionsFactorSourceSampleOther()
// }
//
// #endif // DEBUG
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Foundation
import SargonUniFFI

#if DEBUG
extension TrustedContactFactorSource {
public static let sample: Self = newTrustedContactFactorSourceSample()
public static let sampleOther: Self = newTrustedContactFactorSourceSampleOther()
}
#endif // DEBUG
// import Foundation
// import SargonUniFFI
//
// #if DEBUG
// extension TrustedContactFactorSource {
// public static let sample: Self = newTrustedContactFactorSourceSample()
// public static let sampleOther: Self = newTrustedContactFactorSourceSampleOther()
// }
// #endif // DEBUG
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import Foundation
import SargonUniFFI

#if DEBUG
extension EmailAddress {
public static let sample: Self = newEmailAddressSample()
public static let sampleOther: Self = newEmailAddressSampleOther()
}
#endif // DEBUG

#if DEBUG
extension TrustedContactFactorSourceContact {
// FIXME: replace with Sargon ones
public static let sample: Self = newTrustedContactFactorSourceContactSample()
public static let sampleOther: Self = newTrustedContactFactorSourceContactSampleOther()
}

#endif // DEBUG
// import Foundation
// import SargonUniFFI
//
//
// #if DEBUG
// extension TrustedContactFactorSourceContact {
// public static let sample: Self = newTrustedContactFactorSourceContactSample()
// public static let sampleOther: Self = newTrustedContactFactorSourceContactSampleOther()
// }
//
// #endif // DEBUG
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ extension FactorSource: Identifiable {
switch self {
case let .device(value): value.id.asGeneral
case let .arculusCard(value): value.id.asGeneral
case let .securityQuestions(value): value.id.asGeneral
// case let .securityQuestions(value): value.id.asGeneral
case let .ledger(value): value.id.asGeneral
case let .offDeviceMnemonic(value): value.id.asGeneral
case let .trustedContact(value): value.id.asGeneral
// case let .trustedContact(value): value.id.asGeneral
case let .password(value): value.id.asGeneral
}
}
Expand All @@ -36,10 +36,10 @@ extension FactorSource: BaseFactorSourceProtocol {
switch self {
case let .device(value): value.factorSourceKind
case let .ledger(value): value.factorSourceKind
case let .securityQuestions(value): value.factorSourceKind
// case let .securityQuestions(value): value.factorSourceKind
case let .arculusCard(value): value.factorSourceKind
case let .offDeviceMnemonic(value): value.factorSourceKind
case let .trustedContact(value): value.factorSourceKind
// case let .trustedContact(value): value.factorSourceKind
case let .password(value): value.factorSourceKind
}
}
Expand All @@ -49,10 +49,10 @@ extension FactorSource: BaseFactorSourceProtocol {
switch self {
case let .device(value): value.common
case let .ledger(value): value.common
case let .securityQuestions(value): value.common
// case let .securityQuestions(value): value.common
case let .arculusCard(value): value.common
case let .offDeviceMnemonic(value): value.common
case let .trustedContact(value): value.common
// case let .trustedContact(value): value.common
case let .password(value): value.common
}
}
Expand All @@ -70,12 +70,12 @@ extension FactorSource: BaseFactorSourceProtocol {
case var .arculusCard(source):
source.common = newValue
self = .arculusCard(value: source)
case var .securityQuestions(source):
source.common = newValue
self = .securityQuestions(value: source)
case var .trustedContact(source):
source.common = newValue
self = .trustedContact(value: source)
// case var .securityQuestions(source):
// source.common = newValue
// self = .securityQuestions(value: source)
// case var .trustedContact(source):
// source.common = newValue
// self = .trustedContact(value: source)
case var .password(source):
source.common = newValue
self = .password(value: source)
Expand Down Expand Up @@ -120,13 +120,13 @@ extension FactorSource: BaseFactorSourceProtocol {
extract()
}

public var asSecurityQuestions: SecurityQuestionsNotProductionReadyFactorSource? {
extract()
}

public var asTrustedContact: TrustedContactFactorSource? {
extract()
}
// public var asSecurityQuestions: SecurityQuestionsNotProductionReadyFactorSource? {
// extract()
// }
//
// public var asTrustedContact: TrustedContactFactorSource? {
// extract()
// }

public var asPassword: PasswordFactorSource? {
extract()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import Foundation
import SargonUniFFI

public typealias FactorSourceIDFromAddress = FactorSourceIdFromAddress

// MARK: - FactorSourceIDFromAddress + SargonModel
extension FactorSourceIDFromAddress: SargonModel {}

// MARK: - FactorSourceIDFromAddress + SargonObjectCodable
extension FactorSourceIDFromAddress: SargonObjectCodable {}

// MARK: - FactorSourceIDFromAddress + FactorSourceIDSpecificProtocol
extension FactorSourceIDFromAddress: FactorSourceIDSpecificProtocol {
public var asGeneral: FactorSourceID {
.address(value: self)
}

public static func extract(from someFactorSourceID: some FactorSourceIDProtocol) -> Self? {
guard case let .address(id) = someFactorSourceID.asGeneral else { return nil }
return id
}
}
// import Foundation
// import SargonUniFFI
//
// public typealias FactorSourceIDFromAddress = FactorSourceIdFromAddress
//
//// MARK: - FactorSourceIDFromAddress + SargonModel
// extension FactorSourceIDFromAddress: SargonModel {}
//
//// MARK: - FactorSourceIDFromAddress + SargonObjectCodable
// extension FactorSourceIDFromAddress: SargonObjectCodable {}
//
//// MARK: - FactorSourceIDFromAddress + FactorSourceIDSpecificProtocol
// extension FactorSourceIDFromAddress: FactorSourceIDSpecificProtocol {
// public var asGeneral: FactorSourceID {
// .address(value: self)
// }
//
// public static func extract(from someFactorSourceID: some FactorSourceIDProtocol) -> Self? {
// guard case let .address(id) = someFactorSourceID.asGeneral else { return nil }
// return id
// }
// }
Loading

0 comments on commit 0909f49

Please sign in to comment.