Update for the latest Scrypto version

radixdlt · Nov 14, 2024 · 9f58ddf · 9f58ddf
1 parent 401d1b0
commit 9f58ddf
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,24 +15,24 @@ members = [
 # Shared dependencies that all of the crates need - for now this is just the 
 # `radixdlt-scrypto` dependencies
 [workspace.dependencies]
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6", features = [
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [
     "serde",
 ] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6", features = [
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [
     "serde",
 ] }
-scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6", features = [
+scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [
     "serde",
 ] }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
-radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "27da7a08fac63d36bd1ab209840fb014f470ebc6" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
+radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" }
 
 [profile.release]
 incremental = false

diff --git a/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v1.rs b/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v1.rs
@@ -1452,15 +1452,15 @@ builder_alias! {
         method_ident: NATIVE_ACCOUNT_DEPOSIT_BATCH_IDENT,
         instruction: CallMethod,
         args: NativeAccountDepositBatchManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch)
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch)
         }
     },
     {
         builder_method: account_try_deposit_batch_or_abort,
         method_ident: NATIVE_ACCOUNT_TRY_DEPOSIT_BATCH_OR_ABORT_IDENT,
         instruction: CallMethod,
         args: NativeAccountTryDepositBatchOrAbortManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch),
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch),
             authorized_depositor_badge: (Option<ResourceOrNonFungible> => Option<NativeManifestResourceOrNonFungible>),
         }
     },
@@ -1469,7 +1469,7 @@ builder_alias! {
         method_ident: NATIVE_ACCOUNT_TRY_DEPOSIT_BATCH_OR_REFUND_IDENT,
         instruction: CallMethod,
         args: NativeAccountTryDepositBatchOrRefundManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch),
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch),
             authorized_depositor_badge: (Option<ResourceOrNonFungible> => Option<NativeManifestResourceOrNonFungible>),
         }
     },
@@ -2043,7 +2043,7 @@ builder_alias! {
         method_ident: NATIVE_MULTI_RESOURCE_POOL_CONTRIBUTE_IDENT,
         instruction: CallMethod,
         args: NativeMultiResourcePoolContributeManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch)
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch)
         }
     },
     {

diff --git a/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v2.rs b/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v2.rs
@@ -1510,15 +1510,15 @@ builder_alias! {
         method_ident: NATIVE_ACCOUNT_DEPOSIT_BATCH_IDENT,
         instruction: CallMethod,
         args: NativeAccountDepositBatchManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch)
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch)
         }
     },
     {
         builder_method: account_try_deposit_batch_or_abort,
         method_ident: NATIVE_ACCOUNT_TRY_DEPOSIT_BATCH_OR_ABORT_IDENT,
         instruction: CallMethod,
         args: NativeAccountTryDepositBatchOrAbortManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch),
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch),
             authorized_depositor_badge: (Option<ResourceOrNonFungible> => Option<NativeManifestResourceOrNonFungible>),
         }
     },
@@ -1527,7 +1527,7 @@ builder_alias! {
         method_ident: NATIVE_ACCOUNT_TRY_DEPOSIT_BATCH_OR_REFUND_IDENT,
         instruction: CallMethod,
         args: NativeAccountTryDepositBatchOrRefundManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch),
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch),
             authorized_depositor_badge: (Option<ResourceOrNonFungible> => Option<NativeManifestResourceOrNonFungible>),
         }
     },
@@ -2101,7 +2101,7 @@ builder_alias! {
         method_ident: NATIVE_MULTI_RESOURCE_POOL_CONTRIBUTE_IDENT,
         instruction: CallMethod,
         args: NativeMultiResourcePoolContributeManifestInput {
-            buckets: (Vec<ManifestBuilderBucket> => NativeBucketBatch)
+            buckets: (Vec<ManifestBuilderBucket> => NativeManifestBucketBatch)
         }
     },
     {

diff --git a/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/traits.rs b/crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/traits.rs
@@ -407,7 +407,7 @@ impl FromWithNameRecordContext<WithdrawStrategy> for NativeWithdrawStrategy {
 }
 
 impl FromWithNameRecordContext<Vec<ManifestBuilderBucket>>
-    for NativeBucketBatch
+    for NativeManifestBucketBatch
 {
     fn from(
         item: Vec<ManifestBuilderBucket>,

diff --git a/crates/radix-engine-toolkit-uniffi/src/internal_prelude.rs b/crates/radix-engine-toolkit-uniffi/src/internal_prelude.rs
@@ -245,7 +245,7 @@ mod native {
         ManifestResourceConstraints as NativeManifestResourceConstraints,
         GeneralResourceConstraint as NativeGeneralResourceConstraint,
 
-        BucketBatch as NativeBucketBatch,
+        ManifestBucketBatch as NativeManifestBucketBatch,
 
         Epoch as NativeEpoch,
         IsHash as NativeIsHash,