Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@CyonAlexRDX
CyonAlexRDX committed Feb 10, 2025
2 parents 03c686b + a18623a commit 55fe37c
Show file tree
Hide file tree
Showing 110 changed files with 724 additions and 233 deletions.
168 changes: 84 additions & 84 deletions Cargo.lock
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions ...s/Sargon/Extensions/Swiftified/Profile+Supporting+Types/AccountOrPersona+Swiftified.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ extension AccountOrPersona: EntityBaseProtocol {
\.virtualHierarchicalDeterministicFactorInstances
)
}

public var unsecuredControllingFactorInstance: SargonUniFFI.HierarchicalDeterministicFactorInstance? {
property(
\.unsecuredControllingFactorInstance
)
}
}

extension AccountOrPersona {
Expand Down
4 changes: 4 additions & 0 deletions apple/Sources/Sargon/Extensions/Swiftified/Profile/Account/Account+Swiftified.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ extension Account: EntityBaseProtocol {
public var asGeneral: AccountOrPersona {
.account(self)
}

public var unsecuredControllingFactorInstance: SargonUniFFI.HierarchicalDeterministicFactorInstance? {
accountUnsecuredControllingFactorInstance(account: self)
}
}

extension Account {
Expand Down
4 changes: 4 additions & 0 deletions apple/Sources/Sargon/Extensions/Swiftified/Profile/Persona/Persona+Swiftified.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ extension Persona: EntityBaseProtocol {
public var asGeneral: AccountOrPersona {
.persona(self)
}

public var unsecuredControllingFactorInstance: SargonUniFFI.HierarchicalDeterministicFactorInstance? {
personaUnsecuredControllingFactorInstance(persona: self)
}
}

// MARK: - Persona + EntityProtocol
Expand Down
27 changes: 9 additions & 18 deletions apple/Sources/Sargon/Protocols/EntityProtocol.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public protocol EntityBaseProtocol: BaseBaseEntityProtocol, CustomStringConverti
var securityState: EntitySecurityState { get }
var entityKind: EntityKind { get }
var asGeneral: AccountOrPersona { get }
var unsecuredControllingFactorInstance: HierarchicalDeterministicFactorInstance? { get }

#if DEBUG
static var sampleMainnet: Self { get }
Expand Down Expand Up @@ -47,30 +48,20 @@ extension EntityBaseProtocol {
Set<HierarchicalDeterministicFactorInstance>
{
var factorInstances = Set<HierarchicalDeterministicFactorInstance>()
switch securityState {
case let .unsecured(unsecuredEntityControl):
factorInstances.insert(unsecuredEntityControl.transactionSigning)
return factorInstances
}
}

public var hasAuthenticationSigningKey: Bool {
switch securityState {
case .unsecured:
false
if let unsecuredControllingFactorInstance {
factorInstances.insert(unsecuredControllingFactorInstance)
}

return factorInstances
}

public var deviceFactorSourceID: FactorSourceIDFromHash? {
switch self.securityState {
case let .unsecured(control):
let factorSourceID = control.transactionSigning.factorSourceID
guard factorSourceID.kind == .device else {
return nil
}

return factorSourceID
guard let factorSourceId = unsecuredControllingFactorInstance?.factorSourceId, factorSourceId.kind == .device else {
return nil
}

return factorSourceId
}
}

Expand Down
12 changes: 2 additions & 10 deletions apple/Tests/Utils/EntityProtocolTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ class EntityBaseTest<SUT_: EntityBaseProtocol>: Test<SUT_> {
XCTAssertFalse(SUT.sample.isDeleted)
}

func test_hasAuthenticationSigningKey() {
eachSample { sut in
XCTAssertFalse(sut.hasAuthenticationSigningKey)
}
}

func test_deviceFactorSourceID() {
eachSample { sut in
XCTAssertTrue(
Expand All @@ -72,10 +66,8 @@ class EntityBaseTest<SUT_: EntityBaseProtocol>: Test<SUT_> {
case .ed25519: break // good
case .secp256k1: XCTFail("Wrong key kind")
}
// TODO: Handle
// case .securified(value: _):
// XCTFail("Wrong security state")
// }
case .securified(value: _):
XCTFail("Wrong security state")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/app/home-cards/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "home-cards"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/app/key-derivation-traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "key-derivation-traits"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/app/radix-connect-models/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "radix-connect-models"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/app/radix-connect/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "radix-connect"
version = "1.1.131"
version = "1.1.133"
edition = "2021"


Expand Down
2 changes: 1 addition & 1 deletion crates/app/security-center/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "security-center"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/app/signing-traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "signing-traits"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/build-info/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "build-info"
version = "1.1.131"
version = "1.1.133"
edition = "2021"
build = "build.rs"

Expand Down
2 changes: 1 addition & 1 deletion crates/common/bytes/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bytes"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/entity-foundation/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "entity-foundation"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/host-info/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "host-info"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/identified-vec-of/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "identified-vec-of"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "metadata"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/network/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "network"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/numeric/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "numeric"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/short-string/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "short-string"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/assert-json/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "assert-json"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/collections/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "core-collections"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/error/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "error"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/has-sample-values/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "has-sample-values"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/misc/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "core-misc"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/prelude/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prelude"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/time-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "time-utils"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "core-utils"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/addresses/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "addresses"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/cap26-models/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cap26-models"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/ecc/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ecc"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/encryption/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "encryption"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/hash/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hash"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/crypto/hd/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hierarchical-deterministic"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/factors/factors/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "factors"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/factors/instances-provider/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "factor-instances-provider"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/factors/keys-collector/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "keys-collector"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/factors/next-derivation-index-ephemeral/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "next-derivation-index-ephemeral"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/factors/signatures-collector/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "signatures-collector"
version = "1.1.131"
version = "1.1.133"
edition = "2021"


Expand Down
2 changes: 1 addition & 1 deletion crates/factors/supporting-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "factors-supporting-types"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/gateway/client-and-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gateway-client-and-api"
version = "1.1.131"
version = "1.1.133"
edition = "2021"

[dependencies]
Expand Down
Loading

0 comments on commit 55fe37c

Please sign in to comment.