From addf1b2db916b2b9092a600edcd3586f8f928acd Mon Sep 17 00:00:00 2001 From: sydhds Date: Fri, 8 Dec 2023 11:48:04 +0100 Subject: [PATCH] Update to wasmer 4.2.4 --- Cargo.lock | 77 ++++++++++++++++-------------------------------------- Cargo.toml | 2 +- 2 files changed, 23 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d3903432fd..7e33714662d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -175,7 +175,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "as-ffi-bindings" version = "0.2.5" -source = "git+https://github.com/massalabs/as-ffi-bindings.git?tag=v0.5.3#a8c1a60ba76908be45ba7e0af4c8e416c7f4c9d0" +source = "git+https://github.com/massalabs/as-ffi-bindings.git?tag=v0.5.4#385153ab62d1de53882ac8c11d245e03116d1e7f" dependencies = [ "anyhow", "wasmer", @@ -917,7 +917,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "massa-sc-runtime" version = "0.10.0" -source = "git+https://github.com/massalabs/massa-sc-runtime?rev=32eaf5e65972da79c0357ee9f1827bcaf7b02b94#32eaf5e65972da79c0357ee9f1827bcaf7b02b94" +source = "git+https://github.com/massalabs/massa-sc-runtime?rev=0964888658c24060b4b553cb52ed8ba5365eca01#0964888658c24060b4b553cb52ed8ba5365eca01" dependencies = [ "anyhow", "as-ffi-bindings", @@ -3454,15 +3454,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -5969,29 +5960,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-downcast" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dac026d43bcca6e7ce1c0956ba68f59edf6403e8e930a5d891be72c31a44340" -dependencies = [ - "js-sys", - "once_cell", - "wasm-bindgen", - "wasm-bindgen-downcast-macros", -] - -[[package]] -name = "wasm-bindgen-downcast-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f" -dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", -] - [[package]] name = "wasm-bindgen-futures" version = "0.4.38" @@ -6044,9 +6012,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cb1ae2956aac1fbbcf334c543c1143cdf7d5b0a5fb6c3d23a17bf37dd1f47b" +checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58" dependencies = [ "bytes", "cfg-if", @@ -6061,7 +6029,6 @@ dependencies = [ "target-lexicon", "thiserror", "wasm-bindgen", - "wasm-bindgen-downcast", "wasmer-compiler", "wasmer-compiler-cranelift", "wasmer-derive", @@ -6073,9 +6040,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fd9aeef339095798d1e04957d5657d97490b1112f145cbf08b98f6393b4a0a" +checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a" dependencies = [ "backtrace", "bytes", @@ -6101,9 +6068,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344f5f1186c122756232fe7f156cc8d2e7bf333d5a658e81e25efa3415c26d07" +checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -6120,9 +6087,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49008589f8ad8808492c230489a5633cca4c3a5f22d0797c448740bccd5a24e" +checksum = "45dc438250a91d6c0a57912714f8b3b899a0f5bb3a5f1eae5bc97858b7a006a9" dependencies = [ "byteorder", "dynasm", @@ -6139,9 +6106,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac8c1f2dc0ed3c7412a5546e468365184a461f8ce7dfe2a707b621724339f91" +checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6" dependencies = [ "proc-macro-error", "proc-macro2 1.0.69", @@ -6151,9 +6118,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dcde781a2db145acfff3873197838dc125bb2fab3e7ee3edbcf6b094eae6588" +checksum = "66d4f27f76b7b5325476c8851f34920ae562ef0de3c830fdbc4feafff6782187" dependencies = [ "wasmer", "wasmer-types", @@ -6162,9 +6129,9 @@ dependencies = [ [[package]] name = "wasmer-object" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abb265eb6c2af06d8ebe4bb260f8b74d76ed5ba25ee3e4a0c073666610304d2" +checksum = "66dc76ddf602e15266c6cc792dde7592cb3fcfe2bf55b792c51bb400d7a26c0b" dependencies = [ "object 0.28.4", "thiserror", @@ -6173,9 +6140,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a57ecbf218c0a9348d4dfbdac0f9d42d9201ae276dffb13e61ea4ff939ecce7" +checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157" dependencies = [ "bytecheck", "enum-iterator", @@ -6189,9 +6156,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "4.2.3" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c3513477bc0097250f6e34a640e2a903bb0ee57e6bb518c427f72c06ac7728" +checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d" dependencies = [ "backtrace", "cc", @@ -6206,7 +6173,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset 0.8.0", + "memoffset", "more-asserts 0.2.2", "region", "scopeguard", diff --git a/Cargo.toml b/Cargo.toml index 086df567d54..84ee57c95ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ massa_wallet = { path = "./massa-wallet" } # Massa projects dependencies massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", "rev" = "effc0418977cd64402172b7eb749a2fc7537771a" } -massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", "rev" = "32eaf5e65972da79c0357ee9f1827bcaf7b02b94" } +massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", "rev" = "0964888658c24060b4b553cb52ed8ba5365eca01" } peernet = { git = "https://github.com/massalabs/PeerNet", "branch" = "main" } # Common dependencies