Merge 587d598 into c69e16d

radixdlt · Jan 19, 2024 · a568741 · a568741
2 parents c69e16d + 587d598
commit a568741
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/radix-engine-interface/src/blueprints/access_controller/invocations.rs b/radix-engine-interface/src/blueprints/access_controller/invocations.rs
@@ -26,6 +26,14 @@ pub struct AccessControllerCreateInput {
     pub address_reservation: Option<GlobalAddressReservation>,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct AccessControllerCreateManifestInput {
+    pub controlled_asset: ManifestBucket,
+    pub rule_set: RuleSet,
+    pub timed_recovery_delay_in_minutes: Option<u32>,
+    pub address_reservation: Option<ManifestAddressReservation>,
+}
+
 pub type AccessControllerCreateGlobalOutput = Global<AccessControllerObjectTypeInfo>;
 
 //================================

diff --git a/radix-engine-interface/src/blueprints/consensus_manager/invocations.rs b/radix-engine-interface/src/blueprints/consensus_manager/invocations.rs
@@ -361,38 +361,55 @@ pub struct ValidatorStakeAsOwnerInput {
     pub stake: Bucket,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct ValidatorStakeAsOwnerManifestInput {
+    pub stake: ManifestBucket,
+}
+
 pub type ValidatorStakeAsOwnerOutput = Bucket;
 
 pub const VALIDATOR_STAKE_IDENT: &str = "stake";
-
 #[derive(Debug, Eq, PartialEq, ScryptoSbor)]
 pub struct ValidatorStakeInput {
     pub stake: Bucket,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct ValidatorStakeManifestInput {
+    pub stake: ManifestBucket,
+}
+
 pub type ValidatorStakeOutput = Bucket;
 
 pub const VALIDATOR_UNSTAKE_IDENT: &str = "unstake";
-
 #[derive(Debug, Eq, PartialEq, ScryptoSbor)]
 pub struct ValidatorUnstakeInput {
     pub stake_unit_bucket: Bucket,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct ValidatorUnstakeManifestInput {
+    pub stake_unit_bucket: ManifestBucket,
+}
+
 pub type ValidatorUnstakeOutput = Bucket;
 
 pub const VALIDATOR_CLAIM_XRD_IDENT: &str = "claim_xrd";
-
 #[derive(Debug, Eq, PartialEq, ScryptoSbor)]
 pub struct ValidatorClaimXrdInput {
     pub bucket: Bucket,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct ValidatorClaimXrdManifestInput {
+    pub bucket: ManifestBucket,
+}
+
 pub type ValidatorClaimXrdOutput = Bucket;
 
 pub const VALIDATOR_UPDATE_KEY_IDENT: &str = "update_key";
 
-#[derive(Debug, Clone, Eq, PartialEq, ScryptoSbor)]
+#[derive(Debug, Clone, Eq, PartialEq, ScryptoSbor, ManifestSbor)]
 pub struct ValidatorUpdateKeyInput {
     pub key: Secp256k1PublicKey,
 }
@@ -401,7 +418,7 @@ pub type ValidatorUpdateKeyOutput = ();
 
 pub const VALIDATOR_UPDATE_FEE_IDENT: &str = "update_fee";
 
-#[derive(Debug, Clone, Eq, PartialEq, ScryptoSbor)]
+#[derive(Debug, Clone, Eq, PartialEq, ScryptoSbor, ManifestSbor)]
 pub struct ValidatorUpdateFeeInput {
     /// A fraction of the effective emission amount which gets transferred to the validator's owner.
     /// Must be within `[0.0, 1.0]`.
@@ -501,11 +518,16 @@ pub struct ValidatorLockOwnerStakeUnitsInput {
     pub stake_unit_bucket: Bucket,
 }
 
+#[derive(Debug, Eq, PartialEq, ManifestSbor)]
+pub struct ValidatorLockOwnerStakeUnitsManifestInput {
+    pub stake_unit_bucket: ManifestBucket,
+}
+
 pub type ValidatorLockOwnerStakeUnitsOutput = ();
 
 pub const VALIDATOR_START_UNLOCK_OWNER_STAKE_UNITS_IDENT: &str = "start_unlock_owner_stake_units";
 
-#[derive(Debug, Eq, PartialEq, ScryptoSbor)]
+#[derive(Debug, Eq, PartialEq, ScryptoSbor, ManifestSbor)]
 pub struct ValidatorStartUnlockOwnerStakeUnitsInput {
     pub requested_stake_unit_amount: Decimal,
 }
@@ -514,7 +536,7 @@ pub type ValidatorStartUnlockOwnerStakeUnitsOutput = ();
 
 pub const VALIDATOR_FINISH_UNLOCK_OWNER_STAKE_UNITS_IDENT: &str = "finish_unlock_owner_stake_units";
 
-#[derive(Debug, Eq, PartialEq, ScryptoSbor)]
+#[derive(Debug, Eq, PartialEq, ScryptoSbor, ManifestSbor)]
 pub struct ValidatorFinishUnlockOwnerStakeUnitsInput {}
 
 pub type ValidatorFinishUnlockOwnerStakeUnitsOutput = Bucket;