From 7d0c538a32cbec35fa8e197f62d9319e0502f5df Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 26 Nov 2024 19:33:24 +0300 Subject: [PATCH] Update scrypto version --- Cargo.lock | 131 +++++++++++++++++++++++++---------------------------- Cargo.toml | 24 +++++----- 2 files changed, 74 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 117c1c1d..625b338b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1075,17 +1075,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.85", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -1256,8 +1245,8 @@ dependencies = [ [[package]] name = "radix-blueprint-schema-init" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "bitflags 1.3.2", "radix-common", @@ -1267,8 +1256,8 @@ dependencies = [ [[package]] name = "radix-common" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "bech32", "blake2", @@ -1293,8 +1282,8 @@ dependencies = [ [[package]] name = "radix-common-derive" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "paste", "proc-macro2", @@ -1305,8 +1294,8 @@ dependencies = [ [[package]] name = "radix-engine" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "bitflags 1.3.2", "colored", @@ -1337,8 +1326,8 @@ dependencies = [ [[package]] name = "radix-engine-interface" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -1358,16 +1347,16 @@ dependencies = [ [[package]] name = "radix-engine-profiling" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "fixedstr", ] [[package]] name = "radix-engine-profiling-derive" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "proc-macro2", "quote", @@ -1403,8 +1392,8 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-common" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "radix-common", "radix-engine", @@ -1440,8 +1429,8 @@ dependencies = [ [[package]] name = "radix-native-sdk" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "radix-common", "radix-engine-interface", @@ -1451,8 +1440,8 @@ dependencies = [ [[package]] name = "radix-rust" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "indexmap 2.6.0", "serde", @@ -1460,8 +1449,8 @@ dependencies = [ [[package]] name = "radix-sbor-derive" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "proc-macro2", "quote", @@ -1471,8 +1460,8 @@ dependencies = [ [[package]] name = "radix-substate-store-impls" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "hex", "itertools", @@ -1484,8 +1473,8 @@ dependencies = [ [[package]] name = "radix-substate-store-interface" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "hex", "itertools", @@ -1496,8 +1485,8 @@ dependencies = [ [[package]] name = "radix-substate-store-queries" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "hex", "itertools", @@ -1513,8 +1502,8 @@ dependencies = [ [[package]] name = "radix-transaction-scenarios" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "hex", "itertools", @@ -1533,8 +1522,8 @@ dependencies = [ [[package]] name = "radix-transactions" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "annotate-snippets", "bech32", @@ -1654,8 +1643,8 @@ dependencies = [ [[package]] name = "sbor" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "const-sha1", "hex", @@ -1668,8 +1657,8 @@ dependencies = [ [[package]] name = "sbor-derive" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1678,8 +1667,8 @@ dependencies = [ [[package]] name = "sbor-derive-common" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "const-sha1", "indexmap 2.6.0", @@ -1746,8 +1735,8 @@ dependencies = [ [[package]] name = "scrypto" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "bech32", "const-sha1", @@ -1767,8 +1756,8 @@ dependencies = [ [[package]] name = "scrypto-compiler" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "cargo_toml", "fslock", @@ -1782,8 +1771,8 @@ dependencies = [ [[package]] name = "scrypto-derive" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "proc-macro2", "quote", @@ -1798,8 +1787,8 @@ dependencies = [ [[package]] name = "scrypto-test" -version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?rev=423e26abcfbb631d8e7f64ae748cab6f57151bb3#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +version = "1.3.0-rc.2" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-c284120a#c284120a4d7500a9006f1bc2e1689540747de955" dependencies = [ "ouroboros", "paste", @@ -2526,42 +2515,46 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.35.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" +checksum = "fc7a1acc721dd73e4fff2dc3796cc3efda6e008369e859a20fdbe058bddeebc3" dependencies = [ "arrayvec", "multi-stash", - "num-derive", - "num-traits", "smallvec", "spin", "wasmi_collections", "wasmi_core", + "wasmi_ir", "wasmparser-nostd", ] [[package]] name = "wasmi_collections" -version = "0.35.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" +checksum = "142fda775f9cda587681ff0ec63c7a7e5679dc95da75f3f9b7e3979ce3506a5b" dependencies = [ - "ahash", - "hashbrown 0.14.5", "string-interner", ] [[package]] name = "wasmi_core" -version = "0.35.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" +checksum = "281a49ca3c12c8efa052cb67758454fc861d80ab5a03def352e04eb08c20beb2" dependencies = [ "downcast-rs", "libm", - "num-traits", - "paste", +] + +[[package]] +name = "wasmi_ir" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbadcf529808086a74bacd3ce8aedece444a847292198a56dcde920d1fb213c" +dependencies = [ + "wasmi_core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 69ba7f31..41af8fab 100644 --- 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 = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [ +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a", features = [ "serde", ] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [ +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a", features = [ "serde", ] } -scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3" } -radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "423e26abcfbb631d8e7f64ae748cab6f57151bb3", features = [ +scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a", features = [ "serde", ] } -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" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } +radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-c284120a" } [profile.release] incremental = false