[no ci] wip

crates/system/os/factors/src/apply_security_shield/sargon_os_apply_security_shield_interaction.rs

@@ -152,19 +152,18 @@ impl OsApplySecurityShieldInteraction for SargonOS {
              .map(|e| {
                 let provisional = e.entity.get_provisional().expect("Entity should have a provisional config set since we applied shield above");
                 let derived = provisional.as_factor_instances_derived().expect("Should have derived factors");
-                TransactionManifest::apply_security_shield_for_securified_entity(
+                let manifest = TransactionManifest::apply_security_shield_for_securified_entity(
                     e.clone(),
                     derived.clone(),
                     RolesExercisableInTransactionManifestCombination::manifest_end_user_gets_to_preview()
-                ).inspect(|m| {
-                    manifests_for_entity.insert(
-                        EntityApplyingShieldAddress::AccessController(
-                            e.securified_entity_control.access_controller_address()
-                        ),
-                        m.clone()
-                    );
-                })
-                .map(UnvalidatedTransactionManifest::from).unwrap()
+                );
+                manifests_for_entity.insert(
+                    EntityApplyingShieldAddress::AccessController(
+                        e.securified_entity_control.access_controller_address()
+                    ),
+                    manifest.clone()
+                );
+                UnvalidatedTransactionManifest::from(manifest)
          }).collect_vec();
 
         // TODO: when RET PR https://github.com/radixdlt/radix-engine-toolkit/pull/132

crates/system/os/transaction/src/batch_of_transactions/apply_shields/apply_security_shield_committing.rs

@@ -55,17 +55,108 @@ impl ApplySecurityShieldCommitting for SargonOS {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[actix_rt::test]
-    async fn test() {
-        let os = SargonOS::fast_boot().await;
-        os.sign_and_enqueue_batch_of_transactions_applying_security_shield(
-            NetworkID::Mainnet,
-            IndexSet::new(),
-        )
-        .await;
-    }
-}
+// #[cfg(test)]
+// mod tests {
+//     use super::*;
+
+//     #[actix_rt::test]
+//     async fn test() {
+//         let (os, bdfs) = SargonOS::with_bdfs().await;
+
+//         let ledger = FactorSource::sample_at(1);
+//         let arculus = FactorSource::sample_at(3);
+//         let password = FactorSource::sample_at(5);
+//         let off_device_mnemonic = FactorSource::sample_at(7);
+//         os.add_factor_source(ledger).await;
+//         os.add_factor_source(arculus).await;
+//         os.add_factor_source(password).await;
+//         os.add_factor_source(off_device_mnemonic).await;
+
+//         let shield_builder = SecurityShieldBuilder::lenient();
+
+//         let shield = shield_builder
+//             .add_factor_source_to_primary_threshold(bdfs.factor_source_id())
+//             .add_factor_source_to_primary_threshold(ledger.factor_source_id())
+//             .add_factor_source_to_recovery_override(password.factor_source_id())
+//             .add_factor_source_to_recovery_override(
+//                 off_device_mnemonic.factor_source_id(),
+//             )
+//             .build()
+//             .unwrap();
+
+//         let shield_id = shield.id();
+
+//         os.add_security_structure_of_factor_source_ids(shield)
+//             .await
+//             .unwrap();
+
+//         let alice = os
+//             .create_and_save_new_mainnet_account_with_main_bdfs(
+//                 DisplayName::new("Alice").unwrap(),
+//             )
+//             .await
+//             .unwrap()
+//             .address;
+
+//         let bob = os
+//             .create_and_save_new_mainnet_account_with_main_bdfs(
+//                 DisplayName::new("Bob").unwrap(),
+//             )
+//             .await
+//             .unwrap()
+//             .address;
+
+//         let carol = os
+//             .create_and_save_new_mainnet_account_with_main_bdfs(
+//                 DisplayName::new("Bob").unwrap(),
+//             )
+//             .await
+//             .unwrap()
+//             .address;
+
+//         let manifests = os
+//             .make_interaction_for_applying_security_shield(
+//                 shield_id,
+//                 IndexSet::from_iter([alice.clone(), bob.clone()]),
+//             )
+//             .await
+//             .unwrap()
+//             .transactions
+//             .iter();
+
+//         // ============================================
+//         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//         // User reviews TXs in Radix Wallet app and
+//         // selects fee payer (optional) and slides to
+//         // sign.
+//         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//         // ============================================
+//         let manifest_and_payer_tuples =
+//             IndexSet::from_iter(
+//                 [
+//                     ManifestWithPayerByAddress::new(
+//                         manifests.next().unwrap(),
+//                         None,
+//                         Decimal::five(),
+//                     ),
+//                     ManifestWithPayerByAddress::new(
+//                         manifests.next().unwrap(),
+//                         None,
+//                         Decimal::five(),
+//                     ),
+//                 ]
+//             );
+
+//         // os.sign_and_enqueue_batch_of_transactions_applying_security_shield(
+//         //     NetworkID::Mainnet,
+//         //     IndexSet::new(),
+//         // )
+//         // .await;
+
+//         let mut committer = ApplyShieldTransactionsCommitterImpl::new(&os)?;
+
+//         committer
+//             .commit(network_id, manifest_and_payer_tuples)
+//             .await
+//     }
+// }

crates/system/os/transaction/src/batch_of_transactions/apply_shields/models/manifest_with_payer_by_address.rs

@@ -2,10 +2,21 @@ use crate::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ManifestWithPayerByAddress {
-    /// `None` is invalid if `entity_applying_shield` is a Persona.
-    /// Some(Account) if `entity_applying_shield` is an Account means "use this other account instead"
-    /// None if `entity_applying_shield` is an Account means "use the account applying the shield"
     pub payer: Option<AccountAddress>,
     pub manifest: TransactionManifest,
     pub estimated_xrd_fee: Decimal,
 }
+
+impl ManifestWithPayerByAddress {
+    pub fn new(
+        manifest: TransactionManifest,
+        payer: impl Into<Option<AccountAddress>>,
+        estimated_xrd_fee: Decimal,
+    ) -> Self {
+        Self {
+            payer: payer.into(),
+            manifest,
+            estimated_xrd_fee,
+        }
+    }
+}

crates/transaction/manifests/src/manifests_security_shield/manifests_securify_shield_securified_entity.rs

@@ -12,7 +12,7 @@ pub trait TransactionManifestSecurifySecurifiedEntity:
         security_structure_of_factor_instances:
         SecurityStructureOfFactorInstances,
         roles_combination: RolesExercisableInTransactionManifestCombination,
-    ) -> Option<TransactionManifest>;
+    ) -> TransactionManifest;
 }
 
 impl TransactionManifestSecurifySecurifiedEntity for TransactionManifest {
@@ -34,7 +34,7 @@ impl TransactionManifestSecurifySecurifiedEntity for TransactionManifest {
         security_structure_of_factor_instances:
         SecurityStructureOfFactorInstances,
         roles_combination: RolesExercisableInTransactionManifestCombination,
-    ) -> Option<Self> {
+    ) -> Self {
         let securified_entity = securified_entity.into();
         let kind = roles_combination;
         let entity_address = securified_entity.entity.address();
@@ -124,7 +124,7 @@ impl TransactionManifestSecurifySecurifiedEntity for TransactionManifest {
         // after user has selected account to pay in wallet GUI. And also call
         // `modify_manifest_add_lock_fee_against_xrd_vault_of_access_controller`
 
-        Some(manifest)
+        manifest
     }
 }
 
@@ -154,7 +154,7 @@ mod tests {
             entity_applying_shield.clone(),
             SecurityStructureOfFactorInstances::sample(),
             RolesExercisableInTransactionManifestCombination::InitiateWithPrimaryCompleteWithConfirmation,
-        ).unwrap();
+        );
 
         let expected_manifest_str =
             fixture_rtm!("update_shield_of_account_init_with_P_confirm_with_C");