Const role

.tarpaulin.toml

@@ -2,6 +2,7 @@
 exclude-files = [
     "crates/rules-uniffi/src/unneeded_when_moved_to_sargon.rs",
     "crates/rules-uniffi/src/error_conversion.rs",
+    "crates/rules/src/move_to_sargon.rs",
 ]
 verbose = false
 force-clean = true

.vscode/settings.json

@@ -4,6 +4,7 @@
 		"Appendable",
 		"Banksy",
 		"bdfs",
+		"fsid",
 		"Fulfillable",
 		"interactor",
 		"Interactors",

crates/rules/Cargo.toml

@@ -5,8 +5,13 @@ edition = "2021"
 
 [dependencies]
 thiserror = { workspace = true }
-sargon = { workspace = true}
+sargon = { workspace = true }
 serde = { version = "1.0.215", features = ["derive"] }
 pretty_assertions = "1.4.1"
 serde_json = { version = "1.0.133", features = ["preserve_order"] }
 assert-json-diff = "2.0.2"
+once_cell = "1.20.2"
+itertools = "0.13.0"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }

crates/rules/src/lib.rs

@@ -1,16 +1,23 @@
+#![allow(incomplete_features)]
+#![feature(generic_const_exprs)]
+
 mod matrices;
 mod move_to_sargon;
 mod roles;
 mod security_structure_of_factors;
 
 pub mod prelude {
     pub(crate) use sargon::{
-        BaseIsFactorSource, CommonError, DisplayName, FactorInstance, FactorInstances,
-        FactorSource, FactorSourceID, FactorSourceIDFromHash, FactorSourceKind, FactorSources,
-        HasSampleValues, HierarchicalDeterministicFactorInstance, Identifiable, IndexMap, IndexSet,
-        IsMaybeKeySpaceAware, KeySpace, RoleKind,
+        BIP39Passphrase, BaseIsFactorSource, CommonError, DerivationPreset, DisplayName,
+        FactorInstance, FactorInstances, FactorSource, FactorSourceID, FactorSourceIDFromHash,
+        FactorSourceKind, FactorSources, HasRoleKindObjectSafe, HasSampleValues,
+        HierarchicalDeterministicFactorInstance, Identifiable, IndexMap, IndexSet,
+        IsMaybeKeySpaceAware, IsSecurityStateAware, KeySpace, Mnemonic, MnemonicWithPassphrase,
+        RoleKind,
     };
 
+    pub(crate) use itertools::*;
+
     #[cfg(test)]
     pub(crate) use sargon::JustKV;
 

crates/rules/src/matrices/abstract_matrix_builder_or_built.rs

@@ -1,14 +1,15 @@
 use crate::prelude::*;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct AbstractMatrixBuilderOrBuilt<F, T, U> {
     #[serde(skip)]
     #[doc(hidden)]
     pub(crate) built: PhantomData<T>,
 
-    pub(crate) primary_role: AbstractRoleBuilderOrBuilt<F, U>,
-    pub(crate) recovery_role: AbstractRoleBuilderOrBuilt<F, U>,
-    pub(crate) confirmation_role: AbstractRoleBuilderOrBuilt<F, U>,
+    pub(crate) primary_role: AbstractRoleBuilderOrBuilt<{ ROLE_PRIMARY }, F, U>,
+    pub(crate) recovery_role: AbstractRoleBuilderOrBuilt<{ ROLE_RECOVERY }, F, U>,
+    pub(crate) confirmation_role: AbstractRoleBuilderOrBuilt<{ ROLE_CONFIRMATION }, F, U>,
 
     pub(crate) number_of_days_until_auto_confirm: u16,
 }
@@ -18,6 +19,20 @@ impl<F, T, U> AbstractMatrixBuilderOrBuilt<F, T, U> {
 
 pub type AbstractMatrixBuilt<F> = AbstractMatrixBuilderOrBuilt<F, (), ()>;
 
+impl<F> AbstractMatrixBuilt<F> {
+    pub fn primary(&self) -> &AbstractBuiltRoleWithFactor<{ ROLE_PRIMARY }, F> {
+        &self.primary_role
+    }
+
+    pub fn recovery(&self) -> &AbstractBuiltRoleWithFactor<{ ROLE_RECOVERY }, F> {
+        &self.recovery_role
+    }
+
+    pub fn confirmation(&self) -> &AbstractBuiltRoleWithFactor<{ ROLE_CONFIRMATION }, F> {
+        &self.confirmation_role
+    }
+}
+
 impl<F: std::cmp::Eq + std::hash::Hash> AbstractMatrixBuilt<F> {
     pub fn all_factors(&self) -> HashSet<&F> {
         let mut factors = HashSet::new();

crates/rules/src/matrices/builder/matrix_builder.rs

@@ -5,8 +5,14 @@ use crate::prelude::*;
 pub type MatrixBuilderMutateResult = Result<(), MatrixBuilderValidation>;
 pub type MatrixBuilderBuildResult = Result<MatrixOfFactorSourceIds, MatrixBuilderValidation>;
 
-pub type MatrixBuilder =
-    AbstractMatrixBuilderOrBuilt<FactorSourceID, MatrixOfFactorSourceIds, RoleWithFactorSourceIds>;
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Built;
+
+pub type MatrixBuilder = AbstractMatrixBuilderOrBuilt<
+    FactorSourceID,
+    MatrixOfFactorSourceIds,
+    Built, // this is HACKY
+>;
 
 // ==================
 // ===== PUBLIC =====
@@ -15,9 +21,9 @@ impl MatrixBuilder {
     pub fn new() -> Self {
         Self {
             built: PhantomData,
-            primary_role: RoleBuilder::primary(),
-            recovery_role: RoleBuilder::recovery(),
-            confirmation_role: RoleBuilder::confirmation(),
+            primary_role: PrimaryRoleBuilder::new(),
+            recovery_role: RecoveryRoleBuilder::new(),
+            confirmation_role: ConfirmationRoleBuilder::new(),
             number_of_days_until_auto_confirm: Self::DEFAULT_NUMBER_OF_DAYS_UNTIL_AUTO_CONFIRM,
         }
     }
@@ -53,21 +59,15 @@ impl MatrixBuilder {
         factor_source_kind: FactorSourceKind,
     ) -> RoleBuilderMutateResult {
         self.primary_role
-            .validation_for_addition_of_factor_source_of_kind_to_list(
-                factor_source_kind,
-                FactorListKind::Threshold,
-            )
+            .validation_for_addition_of_factor_source_of_kind_to_threshold(factor_source_kind)
     }
 
     pub fn validation_for_addition_of_factor_source_of_kind_to_primary_override(
         &self,
         factor_source_kind: FactorSourceKind,
     ) -> RoleBuilderMutateResult {
         self.primary_role
-            .validation_for_addition_of_factor_source_of_kind_to_list(
-                factor_source_kind,
-                FactorListKind::Override,
-            )
+            .validation_for_addition_of_factor_source_of_kind_to_override(factor_source_kind)
     }
 
     pub fn validation_for_addition_of_factor_source_to_primary_threshold_for_each(
@@ -97,10 +97,7 @@ impl MatrixBuilder {
         factor_source_kind: FactorSourceKind,
     ) -> RoleBuilderMutateResult {
         self.recovery_role
-            .validation_for_addition_of_factor_source_of_kind_to_list(
-                factor_source_kind,
-                FactorListKind::Override,
-            )
+            .validation_for_addition_of_factor_source_of_kind_to_override(factor_source_kind)
     }
 
     pub fn validation_for_addition_of_factor_source_to_recovery_override_for_each(
@@ -119,10 +116,7 @@ impl MatrixBuilder {
         factor_source_kind: FactorSourceKind,
     ) -> RoleBuilderMutateResult {
         self.confirmation_role
-            .validation_for_addition_of_factor_source_of_kind_to_list(
-                factor_source_kind,
-                FactorListKind::Override,
-            )
+            .validation_for_addition_of_factor_source_of_kind_to_override(factor_source_kind)
     }
 
     pub fn validation_for_addition_of_factor_source_to_confirmation_override_for_each(
@@ -161,7 +155,7 @@ impl MatrixBuilder {
         factor_source_id: FactorSourceID,
     ) -> MatrixBuilderMutateResult {
         self.primary_role
-            .add_factor_source_to_list(factor_source_id, FactorListKind::Threshold)
+            .add_factor_source_to_threshold(factor_source_id)
             .into_matrix_err(RoleKind::Primary)
     }
 
@@ -171,7 +165,7 @@ impl MatrixBuilder {
         factor_source_id: FactorSourceID,
     ) -> MatrixBuilderMutateResult {
         self.primary_role
-            .add_factor_source_to_list(factor_source_id, FactorListKind::Override)
+            .add_factor_source_to_override(factor_source_id)
             .into_matrix_err(RoleKind::Primary)
     }
 
@@ -180,7 +174,7 @@ impl MatrixBuilder {
         factor_source_id: FactorSourceID,
     ) -> MatrixBuilderMutateResult {
         self.recovery_role
-            .add_factor_source_to_list(factor_source_id, FactorListKind::Override)
+            .add_factor_source_to_override(factor_source_id)
             .into_matrix_err(RoleKind::Recovery)
     }
 
@@ -189,7 +183,7 @@ impl MatrixBuilder {
         factor_source_id: FactorSourceID,
     ) -> MatrixBuilderMutateResult {
         self.confirmation_role
-            .add_factor_source_to_list(factor_source_id, FactorListKind::Override)
+            .add_factor_source_to_override(factor_source_id)
             .into_matrix_err(RoleKind::Confirmation)
     }