Skip to content

Commit 0cd3ff3

Browse files
committed
Merge branch 'release/rcnet-v3.1'
2 parents a07c00c + 293dd4c commit 0cd3ff3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+740
-583
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ jobs:
154154
repository: radixdlt/uniffi-bindgen-cs
155155
path: uniffi-bindgen-cs
156156
submodules: 'recursive'
157+
ref: f1a6ef67449b47028fd5c3d8e5c6d3b80ddefd2b
157158
- uses: actions/download-artifact@v3
158159
with:
159160
path: artifacts

generator/Cargo.lock

Lines changed: 61 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generator/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ edition = "2021"
55

66
[dependencies]
77
# radixdlt-scrypto dependencies.
8-
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
9-
scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
10-
scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
11-
transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
12-
transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
13-
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
14-
radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
15-
radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] }
16-
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" }
8+
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
9+
scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
10+
scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
11+
transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
12+
transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
13+
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
14+
radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
15+
radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
16+
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
1717

1818
# Core Radix Engine Toolkit and Toolkit Native Library
1919
radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false, features = ["moka"]}

generator/src/function_examples/execution.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
use radix_engine::transaction::{
1919
execute_and_commit_transaction, CostingParameters, ExecutionConfig, TransactionReceipt,
20+
VersionedTransactionReceipt,
2021
};
2122
use radix_engine::types::ResourceOrNonFungible;
2223
use radix_engine::vm::Vm;
@@ -33,8 +34,8 @@ use transaction_scenarios::scenarios::get_builder_for_every_scenario;
3334

3435
use super::traits::HasExamples;
3536

36-
impl<'f> HasExamples<'f, 65> for ExecutionAnalyze {
37-
fn example_inputs() -> [Self::Input; 65] {
37+
impl<'f> HasExamples<'f, 66> for ExecutionAnalyze {
38+
fn example_inputs() -> [Self::Input; 66] {
3839
let op1 = {
3940
let mut test_runner = TestRunnerBuilder::new().without_trace().build();
4041
let (public_key1, _, account1) = test_runner.new_account(true);
@@ -147,7 +148,8 @@ impl<'f> HasExamples<'f, 65> for ExecutionAnalyze {
147148
let instructions =
148149
to_serializable_instructions(&manifest.instructions, 0xf2).unwrap();
149150
let instructions = SerializableInstructions::Parsed(instructions);
150-
let preview_receipt = scrypto_encode(&receipt).unwrap();
151+
let preview_receipt =
152+
scrypto_encode(&VersionedTransactionReceipt::V1(receipt)).unwrap();
151153

152154
Self::Input {
153155
instructions,

0 commit comments

Comments
 (0)