diff --git a/Cargo.lock b/Cargo.lock index 2906ad4b8d2d4..7fa231b62f144 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,7 +402,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.27.1", + "object", "rustc-demangle", ] @@ -763,6 +763,27 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytecheck" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "314889ea31cda264cb7c3d6e6e5c9415a987ecb0e72c17c00d36fbb881d34abe" +dependencies = [ + "bytecheck_derive", + "ptr_meta", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a2b3b92c135dae665a6f760205b89187638e83bed17ef3e44e83c712cf30600" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "byteorder" version = "1.3.4" @@ -1036,11 +1057,11 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "cranelift-bforest" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9221545c0507dc08a62b2d8b5ffe8e17ac580b0a74d1813b496b8d70b070fbd0" +checksum = "7e6bea67967505247f54fa2c85cf4f6e0e31c4e5692c9b70e4ae58e339067333" dependencies = [ - "cranelift-entity 0.68.0", + "cranelift-entity 0.76.0", ] [[package]] @@ -1054,21 +1075,19 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9936ea608b6cd176f107037f6adbb4deac933466fc7231154f96598b2d3ab1" +checksum = "48194035d2752bdd5bdae429e3ab88676e95f52a2b1355a5d4e809f9e39b1d74" dependencies = [ - "byteorder", - "cranelift-bforest 0.68.0", - "cranelift-codegen-meta 0.68.0", - "cranelift-codegen-shared 0.68.0", - "cranelift-entity 0.68.0", - "gimli 0.22.0", + "cranelift-bforest 0.76.0", + "cranelift-codegen-meta 0.76.0", + "cranelift-codegen-shared 0.76.0", + "cranelift-entity 0.76.0", + "gimli 0.25.0", "log 0.4.14", "regalloc 0.0.31", "smallvec 1.7.0", - "target-lexicon 0.11.2", - "thiserror", + "target-lexicon 0.12.3", ] [[package]] @@ -1085,17 +1104,17 @@ dependencies = [ "log 0.4.14", "regalloc 0.0.33", "smallvec 1.7.0", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", ] [[package]] name = "cranelift-codegen-meta" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef2b2768568306540f4c8db3acce9105534d34c4a1e440529c1e702d7f8c8d7" +checksum = "976efb22fcab4f2cd6bd4e9913764616a54d895c1a23530128d04e03633c555f" dependencies = [ - "cranelift-codegen-shared 0.68.0", - "cranelift-entity 0.68.0", + "cranelift-codegen-shared 0.76.0", + "cranelift-entity 0.76.0", ] [[package]] @@ -1109,9 +1128,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6759012d6d19c4caec95793f052613e9d4113e925e7f14154defbac0f1d4c938" +checksum = "9dabb5fe66e04d4652e434195b45ae65b5c8172d520247b8f66d8df42b2b45dc" [[package]] name = "cranelift-codegen-shared" @@ -1128,6 +1147,12 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.76.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3329733e4d4b8e91c809efcaa4faee80bf66f20164e3dd16d707346bd3494799" + [[package]] name = "cranelift-entity" version = "0.80.0" @@ -1139,14 +1164,14 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.68.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608bb7656c554d0a4cf8f50c7a10b857e80306f6ff829ad6d468a7e2323c8d8" +checksum = "279afcc0d3e651b773f94837c3d581177b348c8d69e928104b2e9fccb226f921" dependencies = [ - "cranelift-codegen 0.68.0", + "cranelift-codegen 0.76.0", "log 0.4.14", "smallvec 1.7.0", - "target-lexicon 0.11.2", + "target-lexicon 0.12.3", ] [[package]] @@ -1158,7 +1183,7 @@ dependencies = [ "cranelift-codegen 0.80.0", "log 0.4.14", "smallvec 1.7.0", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", ] [[package]] @@ -1169,7 +1194,7 @@ checksum = "166028ca0343a6ee7bddac0e70084e142b23f99c701bd6f6ea9123afac1a7a46" dependencies = [ "cranelift-codegen 0.80.0", "libc", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", ] [[package]] @@ -2446,9 +2471,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.22.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" dependencies = [ "fallible-iterator", "indexmap", @@ -2567,6 +2592,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "heck" version = "0.3.2" @@ -3312,16 +3346,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - [[package]] name = "libloading" version = "0.7.0" @@ -3967,6 +3991,27 @@ dependencies = [ "value-bag", ] +[[package]] +name = "loupe" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" +dependencies = [ + "indexmap", + "loupe-derive", + "rustversion", +] + +[[package]] +name = "loupe-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "lru" version = "0.6.6" @@ -4551,16 +4596,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" -dependencies = [ - "crc32fast", - "indexmap", -] - [[package]] name = "object" version = "0.27.1" @@ -6416,6 +6451,26 @@ dependencies = [ "cc", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -6833,6 +6888,18 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "region" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +dependencies = [ + "bitflags", + "libc", + "mach", + "winapi 0.3.9", +] + [[package]] name = "remote-externalities" version = "0.10.0-dev" @@ -6861,6 +6928,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" +dependencies = [ + "bytecheck", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -6892,6 +6968,31 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rkyv" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e3791595bf1ee951356964271bea7dafd1e1730e8be812f44a31afc38fa7bba" +dependencies = [ + "bytecheck", + "hashbrown 0.12.0", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca655472e721430bfb5c995a5602278e089c329cde96a0a53e1f711e3ba39c55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "rocksdb" version = "0.17.0" @@ -8297,6 +8398,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "secrecy" version = "0.8.0" @@ -9872,9 +9979,9 @@ checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95" [[package]] name = "target-lexicon" -version = "0.12.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ae3b39281e4b14b8123bdbaddd472b7dfe215e444181f2f9d2443c2444f834" +checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1" [[package]] name = "tempfile" @@ -10208,6 +10315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", + "log 0.4.14", "pin-project-lite 0.2.6", "tracing-attributes", "tracing-core", @@ -10801,23 +10909,24 @@ dependencies = [ [[package]] name = "wasmer" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70cfae554988d904d64ca17ab0e7cd652ee5c8a0807094819c1ea93eb9d6866" +checksum = "7f52e455a01d0fac439cd7a96ba9b519bdc84e923a5b96034054697ebb17cd75" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "indexmap", + "loupe", "more-asserts", - "target-lexicon 0.11.2", + "target-lexicon 0.12.3", "thiserror", - "wasmer-compiler", + "wasmer-compiler 2.1.1", "wasmer-compiler-cranelift", "wasmer-derive", "wasmer-engine", - "wasmer-engine-jit", - "wasmer-engine-native", - "wasmer-types", - "wasmer-vm", + "wasmer-engine-dylib", + "wasmer-engine-universal", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", "wat", "winapi 0.3.9", ] @@ -10834,28 +10943,49 @@ dependencies = [ "smallvec 1.7.0", "target-lexicon 0.11.2", "thiserror", - "wasmer-types", - "wasmer-vm", + "wasmer-types 1.0.2", + "wasmer-vm 1.0.2", "wasmparser 0.65.0", ] +[[package]] +name = "wasmer-compiler" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c51cc589772c5f90bd329244c2416976d6cb2ee00d59429aaa8f421d9fe447" +dependencies = [ + "enumset", + "loupe", + "rkyv", + "serde", + "serde_bytes", + "smallvec 1.7.0", + "target-lexicon 0.12.3", + "thiserror", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", + "wasmparser 0.78.2", +] + [[package]] name = "wasmer-compiler-cranelift" -version = "1.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb9395f094e1d81534f4c5e330ed4cdb424e8df870d29ad585620284f5fddb" +checksum = "09691e3e323b4e1128d2127f60f9cd988b66ce49afc8184b071c2b5ab16793f2" dependencies = [ - "cranelift-codegen 0.68.0", - "cranelift-frontend 0.68.0", - "gimli 0.22.0", + "cranelift-codegen 0.76.0", + "cranelift-entity 0.76.0", + "cranelift-frontend 0.76.0", + "gimli 0.25.0", + "loupe", "more-asserts", "rayon", - "serde", "smallvec 1.7.0", + "target-lexicon 0.12.3", "tracing", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", + "wasmer-compiler 2.1.1", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", ] [[package]] @@ -10872,16 +11002,16 @@ dependencies = [ "rayon", "serde", "smallvec 1.7.0", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", + "wasmer-compiler 1.0.2", + "wasmer-types 1.0.2", + "wasmer-vm 1.0.2", ] [[package]] name = "wasmer-derive" -version = "1.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b86dcd2c3efdb8390728a2b56f762db07789aaa5aa872a9dc776ba3a7912ed" +checksum = "93f5cb7b09640e09f1215da95d6fb7477d2db572f064b803ff705f39ff079cc5" dependencies = [ "proc-macro-error", "proc-macro2", @@ -10891,74 +11021,78 @@ dependencies = [ [[package]] name = "wasmer-engine" -version = "1.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe4667d6bd888f26ae8062a63a9379fa697415b4b4e380f33832e8418fd71b5" +checksum = "ab20311c354fe2c12bc766417e0a1a45f399c1cd8ff262127d1dc86d0588971a" dependencies = [ "backtrace", - "bincode", + "enumset", "lazy_static", - "memmap2 0.2.1", + "loupe", + "memmap2 0.5.0", "more-asserts", "rustc-demangle", "serde", "serde_bytes", - "target-lexicon 0.11.2", + "target-lexicon 0.12.3", "thiserror", - "wasmer-compiler", - "wasmer-types", - "wasmer-vm", + "wasmer-compiler 2.1.1", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", ] [[package]] -name = "wasmer-engine-jit" -version = "1.0.2" +name = "wasmer-engine-dylib" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26770be802888011b4a3072f2a282fc2faa68aa48c71b3db6252a3937a85f3da" +checksum = "8dd5b7a74731e1dcccaf10a8ff5f72216c82f12972ce17cc81c6caa1afff75ea" dependencies = [ - "bincode", - "cfg-if 0.1.10", - "region", + "cfg-if 1.0.0", + "enumset", + "leb128", + "libloading 0.7.0", + "loupe", + "rkyv", "serde", - "serde_bytes", - "wasmer-compiler", + "tempfile", + "tracing", + "wasmer-compiler 2.1.1", "wasmer-engine", - "wasmer-types", - "wasmer-vm", - "winapi 0.3.9", + "wasmer-object", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", + "which", ] [[package]] -name = "wasmer-engine-native" -version = "1.0.2" +name = "wasmer-engine-universal" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb4083a6c69f2cd4b000b82a80717f37c6cc2e536aee3a8ffe9af3edc276a8b" +checksum = "dfeae8d5b825ad7abcf9a34e66eb11e1507b21020efe7bbf9897e3dd8d7869e2" dependencies = [ - "bincode", - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "enumset", "leb128", - "libloading 0.6.7", - "serde", - "tempfile", - "tracing", - "wasmer-compiler", + "loupe", + "region 3.0.0", + "rkyv", + "wasmer-compiler 2.1.1", "wasmer-engine", - "wasmer-object", - "wasmer-types", - "wasmer-vm", - "which", + "wasmer-types 2.1.1", + "wasmer-vm 2.1.1", + "winapi 0.3.9", ] [[package]] name = "wasmer-object" -version = "1.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf8e0c12b82ff81ebecd30d7e118be5fec871d6de885a90eeb105df0a769a7b" +checksum = "c3d4714e4f3bdc3b2157c24284417d19cd99de036da31d00ec5664712dcb72f7" dependencies = [ - "object 0.22.0", + "object", "thiserror", - "wasmer-compiler", - "wasmer-types", + "wasmer-compiler 2.1.1", + "wasmer-types 2.1.1", ] [[package]] @@ -10972,6 +11106,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "wasmer-types" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "434e1c0177da0a74ecca90b2aa7d5e86198260f07e8ba83be89feb5f0a4aeead" +dependencies = [ + "indexmap", + "loupe", + "rkyv", + "serde", + "thiserror", +] + [[package]] name = "wasmer-vm" version = "1.0.2" @@ -10985,10 +11132,32 @@ dependencies = [ "libc", "memoffset", "more-asserts", - "region", + "region 2.2.0", "serde", "thiserror", - "wasmer-types", + "wasmer-types 1.0.2", + "winapi 0.3.9", +] + +[[package]] +name = "wasmer-vm" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8f964ebba70d9f81340228b98a164782591f00239fc7f01e1b67afcf0e0156" +dependencies = [ + "backtrace", + "cc", + "cfg-if 1.0.0", + "indexmap", + "libc", + "loupe", + "memoffset", + "more-asserts", + "region 3.0.0", + "rkyv", + "serde", + "thiserror", + "wasmer-types 2.1.1", "winapi 0.3.9", ] @@ -11024,6 +11193,12 @@ version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87cc2fe6350834b4e528ba0901e7aa405d78b89dc1fa3145359eb4de0e323fcf" +[[package]] +name = "wasmparser" +version = "0.78.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" + [[package]] name = "wasmparser" version = "0.81.0" @@ -11045,14 +11220,14 @@ dependencies = [ "lazy_static", "libc", "log 0.4.14", - "object 0.27.1", + "object", "paste 1.0.6", "psm", "rayon", - "region", + "region 2.2.0", "rustc-demangle", "serde", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", "wasmparser 0.81.0", "wasmtime-cache", "wasmtime-cranelift", @@ -11097,8 +11272,8 @@ dependencies = [ "gimli 0.26.1", "log 0.4.14", "more-asserts", - "object 0.27.1", - "target-lexicon 0.12.0", + "object", + "target-lexicon 0.12.3", "thiserror", "wasmparser 0.81.0", "wasmtime-environ", @@ -11116,9 +11291,9 @@ dependencies = [ "indexmap", "log 0.4.14", "more-asserts", - "object 0.27.1", + "object", "serde", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", "thiserror", "wasmparser 0.81.0", "wasmtime-types", @@ -11135,11 +11310,11 @@ dependencies = [ "bincode", "cfg-if 1.0.0", "gimli 0.26.1", - "object 0.27.1", - "region", + "object", + "region 2.2.0", "rustix", "serde", - "target-lexicon 0.12.0", + "target-lexicon 0.12.3", "thiserror", "wasmtime-environ", "wasmtime-runtime", @@ -11164,7 +11339,7 @@ dependencies = [ "memoffset", "more-asserts", "rand 0.8.4", - "region", + "region 2.2.0", "rustix", "thiserror", "wasmtime-environ", diff --git a/client/executor/common/Cargo.toml b/client/executor/common/Cargo.toml index 8e4b11f8f8fae..f05bd8a53e7d5 100644 --- a/client/executor/common/Cargo.toml +++ b/client/executor/common/Cargo.toml @@ -26,7 +26,7 @@ sp-serializer = { version = "4.0.0-dev", path = "../../../primitives/serializer" thiserror = "1.0.30" environmental = "1.1.3" -wasmer = { version = "1.0", optional = true } +wasmer = { version = "2.0", optional = true } wasmer-compiler-singlepass = { version = "1.0", optional = true } [features]