Merge branch 'release/rcnet-v3.1'

radixdlt · Sep 5, 2023 · 0cd3ff3 · 0cd3ff3
2 parents a07c00c + 293dd4c
commit 0cd3ff3
Show file tree

Hide file tree

Showing 52 changed files with 740 additions and 583 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -154,6 +154,7 @@ jobs:
           repository: radixdlt/uniffi-bindgen-cs
           path: uniffi-bindgen-cs
           submodules: 'recursive'
+          ref: f1a6ef67449b47028fd5c3d8e5c6d3b80ddefd2b
       - uses: actions/download-artifact@v3
         with:
           path: artifacts

diff --git a/generator/Cargo.lock b/generator/Cargo.lock
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
-scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 # Core Radix Engine Toolkit and Toolkit Native Library
 radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false, features = ["moka"]}

diff --git a/generator/src/function_examples/execution.rs b/generator/src/function_examples/execution.rs
@@ -17,6 +17,7 @@
 
 use radix_engine::transaction::{
     execute_and_commit_transaction, CostingParameters, ExecutionConfig, TransactionReceipt,
+    VersionedTransactionReceipt,
 };
 use radix_engine::types::ResourceOrNonFungible;
 use radix_engine::vm::Vm;
@@ -33,8 +34,8 @@ use transaction_scenarios::scenarios::get_builder_for_every_scenario;
 
 use super::traits::HasExamples;
 
-impl<'f> HasExamples<'f, 65> for ExecutionAnalyze {
-    fn example_inputs() -> [Self::Input; 65] {
+impl<'f> HasExamples<'f, 66> for ExecutionAnalyze {
+    fn example_inputs() -> [Self::Input; 66] {
         let op1 = {
             let mut test_runner = TestRunnerBuilder::new().without_trace().build();
             let (public_key1, _, account1) = test_runner.new_account(true);
@@ -147,7 +148,8 @@ impl<'f> HasExamples<'f, 65> for ExecutionAnalyze {
                 let instructions =
                     to_serializable_instructions(&manifest.instructions, 0xf2).unwrap();
                 let instructions = SerializableInstructions::Parsed(instructions);
-                let preview_receipt = scrypto_encode(&receipt).unwrap();
+                let preview_receipt =
+                    scrypto_encode(&VersionedTransactionReceipt::V1(receipt)).unwrap();
 
                 Self::Input {
                     instructions,