From e24bdbc7e83e1fc7485dbdd3153efa2d47037057 Mon Sep 17 00:00:00 2001 From: Omar Date: Thu, 3 Aug 2023 02:14:22 +0300 Subject: [PATCH] Update Scrypto dependency --- generator/Cargo.lock | 155 ++++++++++------ generator/Cargo.toml | 14 +- radix-engine-toolkit-core/Cargo.lock | 169 ++++++++++++------ radix-engine-toolkit-core/Cargo.toml | 22 +-- .../src/instruction_visitor/core/traits.rs | 14 +- .../src/instruction_visitor/core/traverser.rs | 16 +- .../account_deposit_settings_visitor.rs | 6 +- .../general_transaction_visitor.rs | 6 +- .../simple_transfer_visitor.rs | 4 +- .../transaction_type/transfer_visitor.rs | 6 +- .../tests/manifests/resources/auth_zone.rtm | 19 +- radix-engine-toolkit-uniffi/Cargo.lock | 155 ++++++++++------ radix-engine-toolkit-uniffi/Cargo.toml | 16 +- .../src/builder/manifest_builder/builder.rs | 8 +- .../src/transaction/instruction.rs | 22 ++- .../tests/bindings/example.kts | 2 +- .../tests/bindings/example.py | 2 +- .../tests/bindings/example.swift | 2 +- radix-engine-toolkit/Cargo.lock | 151 ++++++++++------ radix-engine-toolkit/Cargo.toml | 12 +- .../src/models/transaction/instruction.rs | 22 ++- .../tests/manifests/resources/auth_zone.rtm | 19 +- uniffi-bindgen/Cargo.lock | 2 +- uniffi-bindgen/Cargo.toml | 2 +- 24 files changed, 547 insertions(+), 299 deletions(-) diff --git a/generator/Cargo.lock b/generator/Cargo.lock index 7b2c9b80..d6ad62a6 100644 --- a/generator/Cargo.lock +++ b/generator/Cargo.lock @@ -41,6 +41,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + [[package]] name = "async-stream" version = "0.3.5" @@ -950,6 +956,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + [[package]] name = "libc" version = "0.2.147" @@ -1074,8 +1086,8 @@ dependencies = [ [[package]] name = "native-sdk" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -1172,12 +1184,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "parking_lot" version = "0.12.1" @@ -1287,8 +1293,8 @@ dependencies = [ [[package]] name = "radix-engine" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "colored", @@ -1297,7 +1303,6 @@ dependencies = [ "lru", "native-sdk", "num-traits", - "parity-wasm", "paste", "radix-engine-common", "radix-engine-interface", @@ -1310,13 +1315,13 @@ dependencies = [ "utils", "wasm-instrument", "wasmi", - "wasmparser-nostd 0.100.1", + "wasmparser 0.107.0", ] [[package]] name = "radix-engine-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "blake2", @@ -1336,8 +1341,8 @@ dependencies = [ [[package]] name = "radix-engine-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1347,8 +1352,8 @@ dependencies = [ [[package]] name = "radix-engine-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -1367,15 +1372,15 @@ dependencies = [ [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "fixedstr", ] [[package]] name = "radix-engine-queries" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -1390,8 +1395,8 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -1404,8 +1409,8 @@ dependencies = [ [[package]] name = "radix-engine-stores" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -1418,7 +1423,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "indexmap 1.9.3", @@ -1440,7 +1445,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-core" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "cargo_toml", @@ -1605,7 +1610,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1778,8 +1783,8 @@ dependencies = [ [[package]] name = "sbor" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "hex", @@ -1792,8 +1797,8 @@ dependencies = [ [[package]] name = "sbor-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1801,8 +1806,8 @@ dependencies = [ [[package]] name = "sbor-derive-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "itertools", @@ -1851,8 +1856,8 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypto" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "const-sha1", @@ -1873,8 +1878,8 @@ dependencies = [ [[package]] name = "scrypto-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1888,8 +1893,8 @@ dependencies = [ [[package]] name = "scrypto-schema" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1899,8 +1904,8 @@ dependencies = [ [[package]] name = "scrypto-unit" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine", "radix-engine-interface", @@ -1934,6 +1939,12 @@ dependencies = [ "cc", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "serde" version = "1.0.171" @@ -2398,8 +2409,8 @@ dependencies = [ [[package]] name = "transaction" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "ed25519-dalek", @@ -2409,6 +2420,7 @@ dependencies = [ "radix-engine-interface", "sbor", "secp256k1", + "strum", "utils", ] @@ -2485,8 +2497,8 @@ checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "utils" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -2619,12 +2631,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] -name = "wasm-instrument" -version = "0.1.1" +name = "wasm-encoder" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" dependencies = [ - "parity-wasm", + "leb128", +] + +[[package]] +name = "wasm-instrument" +version = "0.4.0" +source = "git+https://github.com/radixdlt/wasm-instrument?branch=radix-master#22fdb4d3fca5619ada88de26d71e5608c6c18c9c" +dependencies = [ + "anyhow", + "paste", + "wasm-encoder", + "wasmparser 0.107.0", + "wasmprinter", ] [[package]] @@ -2635,7 +2659,7 @@ dependencies = [ "spin", "wasmi_arena", "wasmi_core", - "wasmparser-nostd 0.91.0", + "wasmparser-nostd", ] [[package]] @@ -2654,6 +2678,26 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap 1.9.3", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", + "semver", +] + [[package]] name = "wasmparser-nostd" version = "0.91.0" @@ -2664,12 +2708,13 @@ dependencies = [ ] [[package]] -name = "wasmparser-nostd" -version = "0.100.1" +name = "wasmprinter" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" dependencies = [ - "indexmap-nostd", + "anyhow", + "wasmparser 0.110.0", ] [[package]] diff --git a/generator/Cargo.toml b/generator/Cargo.toml index fd3a37f1..6d031737 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -5,13 +5,13 @@ edition = "2021" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features = false, features = ["lru", "std"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features= false, features = ["std", "lru"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features = false, features = ["lru", "std"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features= false, features = ["std", "lru"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } # Core Radix Engine Toolkit and Toolkit Native Library radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core" } diff --git a/radix-engine-toolkit-core/Cargo.lock b/radix-engine-toolkit-core/Cargo.lock index 6aedd026..d4a096df 100644 --- a/radix-engine-toolkit-core/Cargo.lock +++ b/radix-engine-toolkit-core/Cargo.lock @@ -11,6 +11,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + [[package]] name = "autocfg" version = "1.1.0" @@ -272,6 +278,12 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.13.2" @@ -305,6 +317,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.0.0-pre" @@ -362,6 +384,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + [[package]] name = "libc" version = "0.2.147" @@ -394,8 +422,8 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "native-sdk" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -440,12 +468,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "paste" version = "1.0.14" @@ -478,8 +500,8 @@ dependencies = [ [[package]] name = "radix-engine" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "colored", @@ -488,7 +510,6 @@ dependencies = [ "lru", "native-sdk", "num-traits", - "parity-wasm", "paste", "radix-engine-common", "radix-engine-interface", @@ -501,13 +522,13 @@ dependencies = [ "utils", "wasm-instrument", "wasmi", - "wasmparser-nostd 0.100.1", + "wasmparser 0.107.0", ] [[package]] name = "radix-engine-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "blake2", @@ -527,8 +548,8 @@ dependencies = [ [[package]] name = "radix-engine-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -538,8 +559,8 @@ dependencies = [ [[package]] name = "radix-engine-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -558,15 +579,15 @@ dependencies = [ [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "fixedstr", ] [[package]] name = "radix-engine-queries" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -581,8 +602,8 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -595,8 +616,8 @@ dependencies = [ [[package]] name = "radix-engine-stores" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -609,7 +630,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-core" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "cargo_toml", @@ -701,7 +722,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -736,8 +757,8 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "sbor" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "hex", @@ -750,8 +771,8 @@ dependencies = [ [[package]] name = "sbor-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -759,8 +780,8 @@ dependencies = [ [[package]] name = "sbor-derive-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "itertools", @@ -771,8 +792,8 @@ dependencies = [ [[package]] name = "scrypto" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "const-sha1", @@ -793,8 +814,8 @@ dependencies = [ [[package]] name = "scrypto-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -808,8 +829,8 @@ dependencies = [ [[package]] name = "scrypto-schema" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -819,8 +840,8 @@ dependencies = [ [[package]] name = "scrypto-unit" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine", "radix-engine-interface", @@ -854,6 +875,12 @@ dependencies = [ "cc", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "serde" version = "1.0.171" @@ -1006,8 +1033,8 @@ dependencies = [ [[package]] name = "transaction" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "ed25519-dalek", @@ -1017,6 +1044,7 @@ dependencies = [ "radix-engine-interface", "sbor", "secp256k1", + "strum", "utils", ] @@ -1034,8 +1062,8 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utils" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -1077,12 +1105,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] -name = "wasm-instrument" -version = "0.1.1" +name = "wasm-encoder" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" dependencies = [ - "parity-wasm", + "leb128", +] + +[[package]] +name = "wasm-instrument" +version = "0.4.0" +source = "git+https://github.com/radixdlt/wasm-instrument?branch=radix-master#22fdb4d3fca5619ada88de26d71e5608c6c18c9c" +dependencies = [ + "anyhow", + "paste", + "wasm-encoder", + "wasmparser 0.107.0", + "wasmprinter", ] [[package]] @@ -1093,7 +1133,7 @@ dependencies = [ "spin", "wasmi_arena", "wasmi_core", - "wasmparser-nostd 0.91.0", + "wasmparser-nostd", ] [[package]] @@ -1112,6 +1152,26 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap 1.9.3", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", + "semver", +] + [[package]] name = "wasmparser-nostd" version = "0.91.0" @@ -1122,12 +1182,13 @@ dependencies = [ ] [[package]] -name = "wasmparser-nostd" -version = "0.100.1" +name = "wasmprinter" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" dependencies = [ - "indexmap-nostd", + "anyhow", + "wasmparser 0.110.0", ] [[package]] diff --git a/radix-engine-toolkit-core/Cargo.toml b/radix-engine-toolkit-core/Cargo.toml index 8285656a..29a3492d 100644 --- a/radix-engine-toolkit-core/Cargo.toml +++ b/radix-engine-toolkit-core/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "radix-engine-toolkit-core" -version = "0.12.0" +version = "0.12.0-fig.1" edition = "2021" build = "build.rs" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features= false, features = ["std", "lru"] } -radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features= false, features = ["std", "lru"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features= false, features = ["std", "lru"] } +radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features= false, features = ["std", "lru"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } # Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations. bech32 = { version = "0.9.1" } @@ -32,7 +32,7 @@ regex = "1.8.4" cargo_toml = { version = "0.15.3" } [dev-dependencies] -scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features = false, features = ["lru", "std", "resource_tracker"] } +scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features = false, features = ["lru", "std", "resource_tracker"] } [lib] crate-type = ["staticlib", "cdylib", "rlib"] diff --git a/radix-engine-toolkit-core/src/instruction_visitor/core/traits.rs b/radix-engine-toolkit-core/src/instruction_visitor/core/traits.rs index b343ec3d..a8fc8e80 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/core/traits.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/core/traits.rs @@ -112,7 +112,7 @@ pub trait InstructionVisitor { } #[inline] - fn visit_clear_auth_zone(&mut self) -> Result<(), InstructionVisitorError> { + fn visit_drop_auth_zone_proofs(&mut self) -> Result<(), InstructionVisitorError> { Ok(()) } @@ -143,7 +143,17 @@ pub trait InstructionVisitor { } #[inline] - fn visit_clear_signature_proofs(&mut self) -> Result<(), InstructionVisitorError> { + fn visit_drop_named_proofs(&mut self) -> Result<(), InstructionVisitorError> { + Ok(()) + } + + #[inline] + fn visit_drop_auth_zone_signature_proofs(&mut self) -> Result<(), InstructionVisitorError> { + Ok(()) + } + + #[inline] + fn visit_drop_auth_zone_regular_proofs(&mut self) -> Result<(), InstructionVisitorError> { Ok(()) } diff --git a/radix-engine-toolkit-core/src/instruction_visitor/core/traverser.rs b/radix-engine-toolkit-core/src/instruction_visitor/core/traverser.rs index d5150a6e..87610f3e 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/core/traverser.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/core/traverser.rs @@ -80,8 +80,17 @@ pub fn traverse( InstructionV1::PushToAuthZone { proof_id } => { for_each_enabled_visitor!(visitors, visit_push_to_auth_zone(proof_id)) } - InstructionV1::ClearAuthZone => { - for_each_enabled_visitor!(visitors, visit_clear_auth_zone()) + InstructionV1::DropNamedProofs => { + for_each_enabled_visitor!(visitors, visit_drop_named_proofs()) + } + InstructionV1::DropAuthZoneProofs => { + for_each_enabled_visitor!(visitors, visit_drop_auth_zone_proofs()) + } + InstructionV1::DropAuthZoneSignatureProofs {} => { + for_each_enabled_visitor!(visitors, visit_drop_auth_zone_signature_proofs()) + } + InstructionV1::DropAuthZoneRegularProofs {} => { + for_each_enabled_visitor!(visitors, visit_drop_auth_zone_regular_proofs()) } InstructionV1::CreateProofFromAuthZoneOfAmount { @@ -108,9 +117,6 @@ pub fn traverse( visit_create_proof_from_auth_zone_of_all(resource_address) ) } - InstructionV1::ClearSignatureProofs {} => { - for_each_enabled_visitor!(visitors, visit_clear_signature_proofs()) - } InstructionV1::CreateProofFromBucketOfAmount { bucket_id, amount } => { for_each_enabled_visitor!( visitors, diff --git a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/account_deposit_settings_visitor.rs b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/account_deposit_settings_visitor.rs index 4e698182..f2eeaf81 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/account_deposit_settings_visitor.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/account_deposit_settings_visitor.rs @@ -150,11 +150,13 @@ impl InstructionVisitor for AccountDepositSettingsVisitor { | InstructionV1::AssertWorktopContainsNonFungibles { .. } | InstructionV1::PopFromAuthZone | InstructionV1::PushToAuthZone { .. } - | InstructionV1::ClearAuthZone + | InstructionV1::DropNamedProofs + | InstructionV1::DropAuthZoneProofs + | InstructionV1::DropAuthZoneRegularProofs + | InstructionV1::DropAuthZoneSignatureProofs | InstructionV1::CreateProofFromAuthZoneOfAmount { .. } | InstructionV1::CreateProofFromAuthZoneOfNonFungibles { .. } | InstructionV1::CreateProofFromAuthZoneOfAll { .. } - | InstructionV1::ClearSignatureProofs | InstructionV1::CreateProofFromBucketOfAmount { .. } | InstructionV1::CreateProofFromBucketOfNonFungibles { .. } | InstructionV1::CreateProofFromBucketOfAll { .. } diff --git a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs index e4331975..af271ba7 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs @@ -158,11 +158,13 @@ impl<'r> InstructionVisitor for GeneralTransactionTypeVisitor<'r> { | InstructionV1::AssertWorktopContainsNonFungibles { .. } | InstructionV1::PopFromAuthZone | InstructionV1::PushToAuthZone { .. } - | InstructionV1::ClearAuthZone + | InstructionV1::DropNamedProofs + | InstructionV1::DropAuthZoneProofs + | InstructionV1::DropAuthZoneRegularProofs + | InstructionV1::DropAuthZoneSignatureProofs | InstructionV1::CreateProofFromAuthZoneOfAmount { .. } | InstructionV1::CreateProofFromAuthZoneOfNonFungibles { .. } | InstructionV1::CreateProofFromAuthZoneOfAll { .. } - | InstructionV1::ClearSignatureProofs | InstructionV1::CreateProofFromBucketOfAmount { .. } | InstructionV1::CreateProofFromBucketOfNonFungibles { .. } | InstructionV1::CreateProofFromBucketOfAll { .. } diff --git a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/simple_transfer_visitor.rs b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/simple_transfer_visitor.rs index eb965473..f8cff95e 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/simple_transfer_visitor.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/simple_transfer_visitor.rs @@ -248,7 +248,7 @@ impl InstructionVisitor for SimpleTransactionTypeVisitor { } #[inline] - fn visit_clear_auth_zone(&mut self) -> Result<(), InstructionVisitorError> { + fn visit_drop_auth_zone_proofs(&mut self) -> Result<(), InstructionVisitorError> { self.illegal_instruction_encountered = true; Ok(()) } @@ -283,7 +283,7 @@ impl InstructionVisitor for SimpleTransactionTypeVisitor { } #[inline] - fn visit_clear_signature_proofs(&mut self) -> Result<(), InstructionVisitorError> { + fn visit_drop_auth_zone_signature_proofs(&mut self) -> Result<(), InstructionVisitorError> { self.illegal_instruction_encountered = true; Ok(()) } diff --git a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/transfer_visitor.rs b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/transfer_visitor.rs index 101eaa28..e15818fc 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/transfer_visitor.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/transfer_visitor.rs @@ -170,11 +170,13 @@ impl InstructionVisitor for TransferTransactionTypeVisitor { InstructionV1::CallMethod { .. } | InstructionV1::PopFromAuthZone | InstructionV1::PushToAuthZone { .. } - | InstructionV1::ClearAuthZone | InstructionV1::CreateProofFromAuthZoneOfAmount { .. } | InstructionV1::CreateProofFromAuthZoneOfNonFungibles { .. } | InstructionV1::CreateProofFromAuthZoneOfAll { .. } - | InstructionV1::ClearSignatureProofs + | InstructionV1::DropNamedProofs + | InstructionV1::DropAuthZoneProofs + | InstructionV1::DropAuthZoneRegularProofs + | InstructionV1::DropAuthZoneSignatureProofs | InstructionV1::CreateProofFromBucketOfAmount { .. } | InstructionV1::CreateProofFromBucketOfNonFungibles { .. } | InstructionV1::CreateProofFromBucketOfAll { .. } diff --git a/radix-engine-toolkit-core/tests/manifests/resources/auth_zone.rtm b/radix-engine-toolkit-core/tests/manifests/resources/auth_zone.rtm index bc7b86f6..6916e0bf 100644 --- a/radix-engine-toolkit-core/tests/manifests/resources/auth_zone.rtm +++ b/radix-engine-toolkit-core/tests/manifests/resources/auth_zone.rtm @@ -12,7 +12,7 @@ CREATE_PROOF_FROM_BUCKET_OF_ALL Bucket("some_xrd") Proof("proof1c"); CLONE_PROOF Proof("proof1c") Proof("proof1d"); DROP_PROOF Proof("proof1d"); DROP_PROOF Proof("proof1c"); -CLEAR_AUTH_ZONE; +DROP_AUTH_ZONE_PROOFS; # Create a proof from account and drop it CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cve475w0q") "create_proof_of_amount" Address("resource_sim1thvwu8dh6lk4y9mntemkvj25wllq8adq42skzufp4m8wxxuemugnez") Decimal("5.0"); @@ -24,11 +24,20 @@ CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cv CREATE_PROOF_FROM_AUTH_ZONE_OF_AMOUNT Address("resource_sim1thvwu8dh6lk4y9mntemkvj25wllq8adq42skzufp4m8wxxuemugnez") Decimal("1") Proof("proof4"); CREATE_PROOF_FROM_AUTH_ZONE_OF_NON_FUNGIBLES Address("resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha") Array(NonFungibleLocalId("#123#")) Proof("proof5"); CREATE_PROOF_FROM_AUTH_ZONE_OF_ALL Address("resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha") Proof("proof6"); -CLEAR_AUTH_ZONE; -# Drop all virtual proofs in the auth zone. -CLEAR_SIGNATURE_PROOFS; +# Drop all signature proofs in the auth zone. +DROP_AUTH_ZONE_SIGNATURE_PROOFS; -# Drop all proofs, and move resources to account +# Drop all regular proofs in the auth zone. +DROP_AUTH_ZONE_REGULAR_PROOFS; + +# Drop all proofs in the auth zone. +DROP_AUTH_ZONE_PROOFS; + +# Drop all proofs +DROP_NAMED_PROOFS; + +# Drop all proofs DROP_ALL_PROOFS; + CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cve475w0q") "deposit_batch" Expression("ENTIRE_WORKTOP"); diff --git a/radix-engine-toolkit-uniffi/Cargo.lock b/radix-engine-toolkit-uniffi/Cargo.lock index 25dd15aa..8fa39b7f 100644 --- a/radix-engine-toolkit-uniffi/Cargo.lock +++ b/radix-engine-toolkit-uniffi/Cargo.lock @@ -471,6 +471,12 @@ dependencies = [ "scroll", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.13.2" @@ -504,6 +510,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.0.0-pre" @@ -561,6 +577,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + [[package]] name = "libc" version = "0.2.147" @@ -621,8 +643,8 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "native-sdk" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -683,12 +705,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "paste" version = "1.0.14" @@ -727,8 +743,8 @@ dependencies = [ [[package]] name = "radix-engine" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "colored", @@ -737,7 +753,6 @@ dependencies = [ "lru", "native-sdk", "num-traits", - "parity-wasm", "paste", "radix-engine-common", "radix-engine-interface", @@ -750,13 +765,13 @@ dependencies = [ "utils", "wasm-instrument", "wasmi", - "wasmparser-nostd 0.100.1", + "wasmparser 0.107.0", ] [[package]] name = "radix-engine-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "blake2", @@ -776,8 +791,8 @@ dependencies = [ [[package]] name = "radix-engine-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -787,8 +802,8 @@ dependencies = [ [[package]] name = "radix-engine-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -807,15 +822,15 @@ dependencies = [ [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "fixedstr", ] [[package]] name = "radix-engine-queries" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -830,8 +845,8 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -844,8 +859,8 @@ dependencies = [ [[package]] name = "radix-engine-stores" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -858,7 +873,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-core" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "cargo_toml", @@ -878,7 +893,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-uniffi" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "hex", "paste", @@ -967,7 +982,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1002,8 +1017,8 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "sbor" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "hex", @@ -1016,8 +1031,8 @@ dependencies = [ [[package]] name = "sbor-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1025,8 +1040,8 @@ dependencies = [ [[package]] name = "sbor-derive-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "itertools", @@ -1057,8 +1072,8 @@ dependencies = [ [[package]] name = "scrypto" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "const-sha1", @@ -1079,8 +1094,8 @@ dependencies = [ [[package]] name = "scrypto-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1094,8 +1109,8 @@ dependencies = [ [[package]] name = "scrypto-schema" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1329,8 +1344,8 @@ dependencies = [ [[package]] name = "transaction" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "ed25519-dalek", @@ -1340,6 +1355,7 @@ dependencies = [ "radix-engine-interface", "sbor", "secp256k1", + "strum", "utils", ] @@ -1499,8 +1515,8 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -1519,12 +1535,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] -name = "wasm-instrument" -version = "0.1.1" +name = "wasm-encoder" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-instrument" +version = "0.4.0" +source = "git+https://github.com/radixdlt/wasm-instrument?branch=radix-master#22fdb4d3fca5619ada88de26d71e5608c6c18c9c" dependencies = [ - "parity-wasm", + "anyhow", + "paste", + "wasm-encoder", + "wasmparser 0.107.0", + "wasmprinter", ] [[package]] @@ -1535,7 +1563,7 @@ dependencies = [ "spin", "wasmi_arena", "wasmi_core", - "wasmparser-nostd 0.91.0", + "wasmparser-nostd", ] [[package]] @@ -1554,6 +1582,26 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap 1.9.3", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", + "semver", +] + [[package]] name = "wasmparser-nostd" version = "0.91.0" @@ -1564,12 +1612,13 @@ dependencies = [ ] [[package]] -name = "wasmparser-nostd" -version = "0.100.1" +name = "wasmprinter" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" dependencies = [ - "indexmap-nostd", + "anyhow", + "wasmparser 0.110.0", ] [[package]] diff --git a/radix-engine-toolkit-uniffi/Cargo.toml b/radix-engine-toolkit-uniffi/Cargo.toml index c9147276..81247ee0 100644 --- a/radix-engine-toolkit-uniffi/Cargo.toml +++ b/radix-engine-toolkit-uniffi/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "radix-engine-toolkit-uniffi" -version = "0.12.0" +version = "0.12.0-fig.1" edition = "2021" build = "build.rs" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features= false, features = ["std", "lru"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features = false, features = ["std", "lru"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features= false, features = ["std", "lru"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features = false, features = ["std", "lru"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } # Core Radix Engine Toolkit radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core" } diff --git a/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder.rs b/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder.rs index 4b4b6d2f..21cb40da 100644 --- a/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder.rs +++ b/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder.rs @@ -180,17 +180,17 @@ impl ManifestBuilder { }) } - pub fn clear_auth_zone(self: Arc) -> Result> { + pub fn drop_auth_zone_proofs(self: Arc) -> Result> { builder_arc_map(self, |builder| { - let instruction = NativeInstruction::ClearAuthZone; + let instruction = NativeInstruction::DropAuthZoneProofs; builder.instructions.push(instruction); Ok(()) }) } - pub fn clear_signature_proofs(self: Arc) -> Result> { + pub fn drop_auth_zone_signature_proofs(self: Arc) -> Result> { builder_arc_map(self, |builder| { - let instruction = NativeInstruction::ClearSignatureProofs; + let instruction = NativeInstruction::DropAuthZoneSignatureProofs; builder.instructions.push(instruction); Ok(()) }) diff --git a/radix-engine-toolkit-uniffi/src/transaction/instruction.rs b/radix-engine-toolkit-uniffi/src/transaction/instruction.rs index af9caafa..2b70aaab 100644 --- a/radix-engine-toolkit-uniffi/src/transaction/instruction.rs +++ b/radix-engine-toolkit-uniffi/src/transaction/instruction.rs @@ -57,8 +57,6 @@ pub enum Instruction { proof_id: ManifestProof, }, - ClearAuthZone, - CreateProofFromAuthZoneOfAmount { resource_address: Arc
, amount: Arc, @@ -73,7 +71,11 @@ pub enum Instruction { resource_address: Arc
, }, - ClearSignatureProofs, + DropAllProofs, + DropNamedProofs, + DropAuthZoneProofs, + DropAuthZoneRegularProofs, + DropAuthZoneSignatureProofs, CreateProofFromBucketOfAmount { bucket_id: ManifestBucket, @@ -138,8 +140,6 @@ pub enum Instruction { args: ManifestValue, }, - DropAllProofs, - AllocateGlobalAddress { package_address: Arc
, blueprint_name: String, @@ -202,8 +202,10 @@ impl Instruction { NativeInstruction::PushToAuthZone { proof_id } => Self::PushToAuthZone { proof_id: (*proof_id).into(), }, - NativeInstruction::ClearAuthZone => Self::ClearAuthZone, - NativeInstruction::ClearSignatureProofs => Self::ClearSignatureProofs, + NativeInstruction::DropNamedProofs => Self::DropNamedProofs, + NativeInstruction::DropAuthZoneProofs => Self::DropAuthZoneProofs, + NativeInstruction::DropAuthZoneRegularProofs => Self::DropAuthZoneRegularProofs, + NativeInstruction::DropAuthZoneSignatureProofs => Self::DropAuthZoneSignatureProofs, NativeInstruction::CreateProofFromAuthZoneOfAll { resource_address } => { Self::CreateProofFromAuthZoneOfAll { resource_address: Arc::new(Address::from_node_id( @@ -377,7 +379,9 @@ impl Instruction { Self::PushToAuthZone { proof_id } => NativeInstruction::PushToAuthZone { proof_id: (*proof_id).into(), }, - Self::ClearAuthZone => NativeInstruction::ClearAuthZone, + Self::DropNamedProofs => NativeInstruction::DropNamedProofs, + Self::DropAuthZoneProofs => NativeInstruction::DropAuthZoneProofs, + Self::DropAuthZoneRegularProofs => NativeInstruction::DropAuthZoneRegularProofs, Self::CreateProofFromAuthZoneOfAll { resource_address } => { NativeInstruction::CreateProofFromAuthZoneOfAll { resource_address: (*resource_address.as_ref()).try_into()?, @@ -401,7 +405,7 @@ impl Instruction { .map(TryInto::try_into) .collect::>()?, }, - Self::ClearSignatureProofs => NativeInstruction::ClearSignatureProofs, + Self::DropAuthZoneSignatureProofs => NativeInstruction::DropAuthZoneSignatureProofs, Self::CreateProofFromBucketOfAll { bucket_id } => { NativeInstruction::CreateProofFromBucketOfAll { bucket_id: (*bucket_id).into(), diff --git a/radix-engine-toolkit-uniffi/tests/bindings/example.kts b/radix-engine-toolkit-uniffi/tests/bindings/example.kts index a80397d8..65a7ba2b 100644 --- a/radix-engine-toolkit-uniffi/tests/bindings/example.kts +++ b/radix-engine-toolkit-uniffi/tests/bindings/example.kts @@ -4,4 +4,4 @@ import com.radixdlt.ret.*; val information = buildInformation(); // Assert -assert(information.version == "0.12.0"); \ No newline at end of file +assert(information.version == "0.12.0-fig.1"); \ No newline at end of file diff --git a/radix-engine-toolkit-uniffi/tests/bindings/example.py b/radix-engine-toolkit-uniffi/tests/bindings/example.py index f11a6701..f507dbcb 100644 --- a/radix-engine-toolkit-uniffi/tests/bindings/example.py +++ b/radix-engine-toolkit-uniffi/tests/bindings/example.py @@ -4,4 +4,4 @@ build_info = build_information() # Assert -assert build_info.version == "0.12.0" \ No newline at end of file +assert build_info.version == "0.12.0-fig.1" \ No newline at end of file diff --git a/radix-engine-toolkit-uniffi/tests/bindings/example.swift b/radix-engine-toolkit-uniffi/tests/bindings/example.swift index 965d6131..9a4d1185 100644 --- a/radix-engine-toolkit-uniffi/tests/bindings/example.swift +++ b/radix-engine-toolkit-uniffi/tests/bindings/example.swift @@ -6,5 +6,5 @@ do { let buildInformation = radix_engine_toolkit_uniffi.buildInformation() // Assert - assert(buildInformation.version == "0.12.0") + assert(buildInformation.version == "0.12.0-fig.1") } diff --git a/radix-engine-toolkit/Cargo.lock b/radix-engine-toolkit/Cargo.lock index 8aa652ec..052f4424 100644 --- a/radix-engine-toolkit/Cargo.lock +++ b/radix-engine-toolkit/Cargo.lock @@ -26,6 +26,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + [[package]] name = "autocfg" version = "1.1.0" @@ -541,6 +547,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + [[package]] name = "libc" version = "0.2.147" @@ -579,8 +591,8 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "native-sdk" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -631,12 +643,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "paste" version = "1.0.14" @@ -669,8 +675,8 @@ dependencies = [ [[package]] name = "radix-engine" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "colored", @@ -679,7 +685,6 @@ dependencies = [ "lru", "native-sdk", "num-traits", - "parity-wasm", "paste", "radix-engine-common", "radix-engine-interface", @@ -692,13 +697,13 @@ dependencies = [ "utils", "wasm-instrument", "wasmi", - "wasmparser-nostd 0.100.1", + "wasmparser 0.107.0", ] [[package]] name = "radix-engine-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "blake2", @@ -718,8 +723,8 @@ dependencies = [ [[package]] name = "radix-engine-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -729,8 +734,8 @@ dependencies = [ [[package]] name = "radix-engine-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -749,15 +754,15 @@ dependencies = [ [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "fixedstr", ] [[package]] name = "radix-engine-queries" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -772,8 +777,8 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -786,8 +791,8 @@ dependencies = [ [[package]] name = "radix-engine-stores" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "hex", "itertools", @@ -800,7 +805,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "indexmap 1.9.3", @@ -822,7 +827,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-core" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "bech32", "cargo_toml", @@ -913,7 +918,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -957,8 +962,8 @@ dependencies = [ [[package]] name = "sbor" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "hex", @@ -971,8 +976,8 @@ dependencies = [ [[package]] name = "sbor-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -980,8 +985,8 @@ dependencies = [ [[package]] name = "sbor-derive-common" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "const-sha1", "itertools", @@ -1017,8 +1022,8 @@ dependencies = [ [[package]] name = "scrypto" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "const-sha1", @@ -1039,8 +1044,8 @@ dependencies = [ [[package]] name = "scrypto-derive" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "proc-macro2", "quote", @@ -1054,8 +1059,8 @@ dependencies = [ [[package]] name = "scrypto-schema" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1081,6 +1086,12 @@ dependencies = [ "cc", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "serde" version = "1.0.171" @@ -1325,8 +1336,8 @@ dependencies = [ [[package]] name = "transaction" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "bech32", "ed25519-dalek", @@ -1336,6 +1347,7 @@ dependencies = [ "radix-engine-interface", "sbor", "secp256k1", + "strum", "utils", ] @@ -1375,8 +1387,8 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utils" -version = "0.11.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-0e5d82a0#0e5d82a0a0dd92dbc9756cb61746ac7afb831939" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=develop-d663d07#d663d07c4e54be4e337b13228d3f3ede2235b0ee" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -1459,12 +1471,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] -name = "wasm-instrument" -version = "0.1.1" +name = "wasm-encoder" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-instrument" +version = "0.4.0" +source = "git+https://github.com/radixdlt/wasm-instrument?branch=radix-master#22fdb4d3fca5619ada88de26d71e5608c6c18c9c" dependencies = [ - "parity-wasm", + "anyhow", + "paste", + "wasm-encoder", + "wasmparser 0.107.0", + "wasmprinter", ] [[package]] @@ -1475,7 +1499,7 @@ dependencies = [ "spin", "wasmi_arena", "wasmi_core", - "wasmparser-nostd 0.91.0", + "wasmparser-nostd", ] [[package]] @@ -1494,6 +1518,26 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap 1.9.3", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", + "semver", +] + [[package]] name = "wasmparser-nostd" version = "0.91.0" @@ -1504,12 +1548,13 @@ dependencies = [ ] [[package]] -name = "wasmparser-nostd" -version = "0.100.1" +name = "wasmprinter" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" dependencies = [ - "indexmap-nostd", + "anyhow", + "wasmparser 0.110.0", ] [[package]] diff --git a/radix-engine-toolkit/Cargo.toml b/radix-engine-toolkit/Cargo.toml index 9fd8234a..a3904bca 100644 --- a/radix-engine-toolkit/Cargo.toml +++ b/radix-engine-toolkit/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "radix-engine-toolkit" -version = "0.12.0" +version = "0.12.0-fig.1" edition = "2021" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", default-features= false, features = ["std", "lru"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-0e5d82a0", features = ["serde"] } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", default-features= false, features = ["std", "lru"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "develop-d663d07", features = ["serde"] } # Core Radix Engine Toolkit radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core" } diff --git a/radix-engine-toolkit/src/models/transaction/instruction.rs b/radix-engine-toolkit/src/models/transaction/instruction.rs index 1f9ff048..0209c09a 100644 --- a/radix-engine-toolkit/src/models/transaction/instruction.rs +++ b/radix-engine-toolkit/src/models/transaction/instruction.rs @@ -66,8 +66,6 @@ pub enum SerializableInstruction { proof_id: SerializableU32, }, - ClearAuthZone, - CreateProofFromAuthZoneOfAmount { resource_address: SerializableNodeId, amount: SerializableDecimal, @@ -82,7 +80,11 @@ pub enum SerializableInstruction { resource_address: SerializableNodeId, }, - ClearSignatureProofs, + DropAllProofs, + DropNamedProofs, + DropAuthZoneProofs, + DropAuthZoneRegularProofs, + DropAuthZoneSignatureProofs, CreateProofFromBucketOfAmount { bucket_id: SerializableU32, @@ -147,8 +149,6 @@ pub enum SerializableInstruction { args: SerializableManifestValue, }, - DropAllProofs, - AllocateGlobalAddress { package_address: SerializableNodeId, blueprint_name: String, @@ -228,7 +228,7 @@ impl SerializableInstruction { InstructionV1::PushToAuthZone { proof_id } => Self::PushToAuthZone { proof_id: SerializableU32::from(proof_id.0), }, - InstructionV1::ClearAuthZone => Self::ClearAuthZone, + InstructionV1::DropAuthZoneProofs => Self::DropAuthZoneProofs, InstructionV1::CreateProofFromAuthZoneOfAll { resource_address } => { Self::CreateProofFromAuthZoneOfAll { resource_address: SerializableNodeId::new( @@ -260,7 +260,9 @@ impl SerializableInstruction { .map(|local_id| SerializableNonFungibleLocalId::from(local_id.clone())) .collect(), }, - InstructionV1::ClearSignatureProofs => Self::ClearSignatureProofs, + InstructionV1::DropNamedProofs => Self::DropNamedProofs, + InstructionV1::DropAuthZoneRegularProofs => Self::DropAuthZoneRegularProofs, + InstructionV1::DropAuthZoneSignatureProofs => Self::DropAuthZoneSignatureProofs, InstructionV1::CreateProofFromBucketOfAll { bucket_id } => { Self::CreateProofFromBucketOfAll { bucket_id: SerializableU32::from(bucket_id.0), @@ -460,8 +462,10 @@ impl SerializableInstruction { Self::PushToAuthZone { proof_id } => InstructionV1::PushToAuthZone { proof_id: ManifestProof(**proof_id), }, - Self::ClearAuthZone => InstructionV1::ClearAuthZone, - Self::ClearSignatureProofs => InstructionV1::ClearSignatureProofs, + Self::DropNamedProofs => InstructionV1::DropNamedProofs, + Self::DropAuthZoneProofs => InstructionV1::DropAuthZoneProofs, + Self::DropAuthZoneRegularProofs => InstructionV1::DropAuthZoneRegularProofs, + Self::DropAuthZoneSignatureProofs => InstructionV1::DropAuthZoneSignatureProofs, Self::CreateProofFromAuthZoneOfAll { resource_address, .. } => InstructionV1::CreateProofFromAuthZoneOfAll { diff --git a/radix-engine-toolkit/tests/manifests/resources/auth_zone.rtm b/radix-engine-toolkit/tests/manifests/resources/auth_zone.rtm index bc7b86f6..6916e0bf 100644 --- a/radix-engine-toolkit/tests/manifests/resources/auth_zone.rtm +++ b/radix-engine-toolkit/tests/manifests/resources/auth_zone.rtm @@ -12,7 +12,7 @@ CREATE_PROOF_FROM_BUCKET_OF_ALL Bucket("some_xrd") Proof("proof1c"); CLONE_PROOF Proof("proof1c") Proof("proof1d"); DROP_PROOF Proof("proof1d"); DROP_PROOF Proof("proof1c"); -CLEAR_AUTH_ZONE; +DROP_AUTH_ZONE_PROOFS; # Create a proof from account and drop it CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cve475w0q") "create_proof_of_amount" Address("resource_sim1thvwu8dh6lk4y9mntemkvj25wllq8adq42skzufp4m8wxxuemugnez") Decimal("5.0"); @@ -24,11 +24,20 @@ CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cv CREATE_PROOF_FROM_AUTH_ZONE_OF_AMOUNT Address("resource_sim1thvwu8dh6lk4y9mntemkvj25wllq8adq42skzufp4m8wxxuemugnez") Decimal("1") Proof("proof4"); CREATE_PROOF_FROM_AUTH_ZONE_OF_NON_FUNGIBLES Address("resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha") Array(NonFungibleLocalId("#123#")) Proof("proof5"); CREATE_PROOF_FROM_AUTH_ZONE_OF_ALL Address("resource_sim1ngktvyeenvvqetnqwysevcx5fyvl6hqe36y3rkhdfdn6uzvt5366ha") Proof("proof6"); -CLEAR_AUTH_ZONE; -# Drop all virtual proofs in the auth zone. -CLEAR_SIGNATURE_PROOFS; +# Drop all signature proofs in the auth zone. +DROP_AUTH_ZONE_SIGNATURE_PROOFS; -# Drop all proofs, and move resources to account +# Drop all regular proofs in the auth zone. +DROP_AUTH_ZONE_REGULAR_PROOFS; + +# Drop all proofs in the auth zone. +DROP_AUTH_ZONE_PROOFS; + +# Drop all proofs +DROP_NAMED_PROOFS; + +# Drop all proofs DROP_ALL_PROOFS; + CALL_METHOD Address("account_sim1cyvgx33089ukm2pl97pv4max0x40ruvfy4lt60yvya744cve475w0q") "deposit_batch" Expression("ENTIRE_WORKTOP"); diff --git a/uniffi-bindgen/Cargo.lock b/uniffi-bindgen/Cargo.lock index 3ff76275..5f8b7eca 100644 --- a/uniffi-bindgen/Cargo.lock +++ b/uniffi-bindgen/Cargo.lock @@ -537,7 +537,7 @@ dependencies = [ [[package]] name = "uniffi-bindgen" -version = "0.12.0" +version = "0.12.0-fig.1" dependencies = [ "uniffi", ] diff --git a/uniffi-bindgen/Cargo.toml b/uniffi-bindgen/Cargo.toml index a2f96ec2..9bc6225b 100644 --- a/uniffi-bindgen/Cargo.toml +++ b/uniffi-bindgen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uniffi-bindgen" -version = "0.12.0" +version = "0.12.0-fig.1" edition = "2021" [dependencies]