From a532b72af65e729c5532d9eedeed5a21d571bd1e Mon Sep 17 00:00:00 2001 From: Yulong Wu Date: Fri, 15 Nov 2024 09:03:51 +0000 Subject: [PATCH] Update engine dependencies --- core-rust/Cargo.lock | 163 +++++++++++-------------------------------- core-rust/Cargo.toml | 24 +++---- 2 files changed, 54 insertions(+), 133 deletions(-) diff --git a/core-rust/Cargo.lock b/core-rust/Cargo.lock index d70dd34fdd..0c1bdabdaa 100644 --- a/core-rust/Cargo.lock +++ b/core-rust/Cargo.lock @@ -17,18 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.0.4" @@ -75,12 +63,6 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - [[package]] name = "async-trait" version = "0.1.73" @@ -942,9 +924,6 @@ name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", -] [[package]] name = "heck" @@ -1381,12 +1360,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "multi-stash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" - [[package]] name = "node-common" version = "0.1.0" @@ -1453,17 +1426,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.32", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -1764,7 +1726,7 @@ dependencies = [ [[package]] name = "radix-blueprint-schema-init" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "bitflags 1.3.2", "radix-common", @@ -1775,7 +1737,7 @@ dependencies = [ [[package]] name = "radix-common" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "bech32", "blake2", @@ -1801,7 +1763,7 @@ dependencies = [ [[package]] name = "radix-common-derive" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "paste", "proc-macro2", @@ -1813,7 +1775,7 @@ dependencies = [ [[package]] name = "radix-engine" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "bitflags 1.3.2", "colored", @@ -1833,18 +1795,18 @@ dependencies = [ "radix-substate-store-interface", "radix-transactions", "radix-wasm-instrument", + "radix-wasmi", "sbor", "strum", "syn 1.0.109", "tempfile", - "wasmi", "wasmparser 0.107.0", ] [[package]] name = "radix-engine-interface" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -1865,7 +1827,7 @@ dependencies = [ [[package]] name = "radix-engine-profiling" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "fixedstr", ] @@ -1873,7 +1835,7 @@ dependencies = [ [[package]] name = "radix-engine-profiling-derive" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "proc-macro2", "quote", @@ -1884,7 +1846,7 @@ dependencies = [ [[package]] name = "radix-engine-toolkit-common" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "radix-common", "radix-engine", @@ -1898,7 +1860,7 @@ dependencies = [ [[package]] name = "radix-native-sdk" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "radix-common", "radix-engine-interface", @@ -1909,7 +1871,7 @@ dependencies = [ [[package]] name = "radix-rust" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "indexmap 2.2.6", "serde", @@ -1918,7 +1880,7 @@ dependencies = [ [[package]] name = "radix-sbor-derive" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "proc-macro2", "quote", @@ -1929,7 +1891,7 @@ dependencies = [ [[package]] name = "radix-substate-store-impls" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "hex", "itertools", @@ -1943,7 +1905,7 @@ dependencies = [ [[package]] name = "radix-substate-store-interface" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "hex", "itertools", @@ -1955,7 +1917,7 @@ dependencies = [ [[package]] name = "radix-substate-store-queries" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "hex", "itertools", @@ -1972,7 +1934,7 @@ dependencies = [ [[package]] name = "radix-transaction-scenarios" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "hex", "itertools", @@ -1992,7 +1954,7 @@ dependencies = [ [[package]] name = "radix-transactions" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "annotate-snippets", "bech32", @@ -2020,6 +1982,24 @@ dependencies = [ "wasmprinter", ] +[[package]] +name = "radix-wasmi" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bf4a0498ed223122e726f9360e9889c2bb6eb6898069f4b6f9960b067a742d" +dependencies = [ + "radix-wasmi-arena", + "spin", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "radix-wasmi-arena" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a03d7e7816ade40c6ecedff7515198906d644527771bd8fb5a335094353a15a" + [[package]] name = "rand" version = "0.8.5" @@ -2165,7 +2145,7 @@ dependencies = [ [[package]] name = "sbor" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "const-sha1", "hex", @@ -2179,7 +2159,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -2189,7 +2169,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "1.3.0-dev" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-423e26ab#423e26abcfbb631d8e7f64ae748cab6f57151bb3" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=cuttlefish-dc0237d2#dc0237d2a44c4cf16afca88bcd1b1cd20aadd8b6" dependencies = [ "const-sha1", "indexmap 2.2.6", @@ -2523,17 +2503,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "string-interner" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "serde", -] - [[package]] name = "strsim" version = "0.10.0" @@ -3038,39 +3007,11 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasmi" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" -dependencies = [ - "arrayvec", - "multi-stash", - "num-derive", - "num-traits", - "smallvec", - "spin", - "wasmi_collections", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_collections" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" -dependencies = [ - "ahash", - "hashbrown 0.14.3", - "string-interner", -] - [[package]] name = "wasmi_core" -version = "0.35.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" +checksum = "d21fc8d8dafc2df566ebcba7d48a2df7b37386d6afa64237cdf9415c8d7d98ec" dependencies = [ "downcast-rs", "libm", @@ -3100,9 +3041,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.2" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" +checksum = "9c37f310b5a62bfd5ae7c0f1d8e6f98af16a5d6d84ba764e9c36439ec14e318b" dependencies = [ "indexmap-nostd", ] @@ -3287,26 +3228,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.32", -] - [[package]] name = "zeroize" version = "1.8.1" diff --git a/core-rust/Cargo.toml b/core-rust/Cargo.toml index 26b6fe7419..bdbf616352 100644 --- a/core-rust/Cargo.toml +++ b/core-rust/Cargo.toml @@ -26,18 +26,18 @@ resolver = "2" # Then use tag="release_name-BLAH" in the below dependencies. # ================================================================= -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab", features = ["serde"] } -radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab", features = ["serde"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } -radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab", features = ["serde"] } -radix-blueprint-schema-init = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab", features = ["serde"] } -radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-423e26ab" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2", features = ["serde"] } +radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2", features = ["serde"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } +radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2", features = ["serde"] } +radix-blueprint-schema-init = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2", features = ["serde"] } +radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "cuttlefish-dc0237d2" } itertools = { version = "=0.10.5" } jni = { version = "=0.19.0" }