Update shield builder primary role validation (#353)

* Allow multiple devices in primary role * Move threshold and override overlap validation to matrix builder * Revert unnecessary change * More tests * Release 1.1.115 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces * Revert "Release 1.1.115" This reverts commit 2b82454. * Release 1.1.117 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces
radixdlt · Jan 23, 2025 · 5766453 · 5766453
1 parent 40da3cf
commit 5766453
Show file tree

Hide file tree

Showing 77 changed files with 459 additions and 390 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/app/home-cards/Cargo.toml b/crates/app/home-cards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "home-cards"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/key-derivation-traits/Cargo.toml b/crates/app/key-derivation-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "key-derivation-traits"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect-models/Cargo.toml b/crates/app/radix-connect-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect-models"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect/Cargo.toml b/crates/app/radix-connect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 

diff --git a/crates/app/security-center/Cargo.toml b/crates/app/security-center/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "security-center"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing-traits/Cargo.toml b/crates/app/signing-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing-traits"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing/Cargo.toml b/crates/app/signing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 

diff --git a/crates/common/build-info/Cargo.toml b/crates/common/build-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "build-info"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 build = "build.rs"
 

diff --git a/crates/common/bytes/Cargo.toml b/crates/common/bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bytes"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/entity-foundation/Cargo.toml b/crates/common/entity-foundation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "entity-foundation"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/host-info/Cargo.toml b/crates/common/host-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "host-info"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/identified-vec-of/Cargo.toml b/crates/common/identified-vec-of/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "identified-vec-of"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/metadata/Cargo.toml b/crates/common/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metadata"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/network/Cargo.toml b/crates/common/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "network"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/numeric/Cargo.toml b/crates/common/numeric/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "numeric"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/short-string/Cargo.toml b/crates/common/short-string/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "short-string"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/assert-json/Cargo.toml b/crates/core/assert-json/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "assert-json"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/collections/Cargo.toml b/crates/core/collections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-collections"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/error/Cargo.toml b/crates/core/error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "error"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/has-sample-values/Cargo.toml b/crates/core/has-sample-values/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "has-sample-values"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/misc/Cargo.toml b/crates/core/misc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-misc"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/prelude/Cargo.toml b/crates/core/prelude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prelude"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/time-utils/Cargo.toml b/crates/core/time-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "time-utils"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/utils/Cargo.toml b/crates/core/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-utils"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/addresses/Cargo.toml b/crates/crypto/addresses/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "addresses"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/cap26-models/Cargo.toml b/crates/crypto/cap26-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cap26-models"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/ecc/Cargo.toml b/crates/crypto/ecc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecc"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/encryption/Cargo.toml b/crates/crypto/encryption/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encryption"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hash/Cargo.toml b/crates/crypto/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hash"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hd/Cargo.toml b/crates/crypto/hd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hierarchical-deterministic"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/factors/Cargo.toml b/crates/factors/factors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factors"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/instances-provider/Cargo.toml b/crates/factors/instances-provider/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factor-instances-provider"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/keys-collector/Cargo.toml b/crates/factors/keys-collector/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keys-collector"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/next-derivation-index-ephemeral/Cargo.toml b/crates/factors/next-derivation-index-ephemeral/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "next-derivation-index-ephemeral"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/supporting-types/Cargo.toml b/crates/factors/supporting-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factors-supporting-types"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/gateway/client-and-api/Cargo.toml b/crates/gateway/client-and-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gateway-client-and-api"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/gateway/models/Cargo.toml b/crates/gateway/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gateway-models"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 

diff --git a/crates/profile/logic/logic_SPLIT_ME/Cargo.toml b/crates/profile/logic/logic_SPLIT_ME/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-logic"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/account-for-display/Cargo.toml b/crates/profile/models/account-for-display/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "account-for-display"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/account-or-persona/Cargo.toml b/crates/profile/models/account-or-persona/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-account-or-persona"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/account/Cargo.toml b/crates/profile/models/account/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-account"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/app-preferences/Cargo.toml b/crates/profile/models/app-preferences/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-app-preferences"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/base-entity/Cargo.toml b/crates/profile/models/base-entity/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-base-entity"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/gateway/Cargo.toml b/crates/profile/models/gateway/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-gateway"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/persona-data/Cargo.toml b/crates/profile/models/persona-data/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-persona-data"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/persona/Cargo.toml b/crates/profile/models/persona/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-persona"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/profile/models/profile_SPLIT_ME/Cargo.toml b/crates/profile/models/profile_SPLIT_ME/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 

diff --git a/crates/profile/models/security-structures/Cargo.toml b/crates/profile/models/security-structures/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-security-structures"
-version = "1.1.116"
+version = "1.1.117"
 edition = "2021"
 
 [dependencies]

diff --git a/...rofile/models/security-structures/src/roles_matrices_structures/matrices/builder/error.rs b/...rofile/models/security-structures/src/roles_matrices_structures/matrices/builder/error.rs
@@ -25,6 +25,10 @@ pub enum MatrixRolesInCombinationBasicViolation {
 pub enum MatrixRolesInCombinationForeverInvalid {
     #[error("Recovery and confirmation factors overlap. No factor may be used in both the recovery and confirmation roles")]
     RecoveryAndConfirmationFactorsOverlap,
+    #[error("Primary role cannot have multiple devices")]
+    PrimaryCannotHaveMultipleDevices,
+    #[error("Threshold and override factors overlap. No factor may be used in both the threshold and override list kinds")]
+    ThresholdAndOverrideFactorsOverlap,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, thiserror::Error)]