diff --git a/Cargo.lock b/Cargo.lock index be38f1da365..637d2214d24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,6 +292,18 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "bounded-collections" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3888522b497857eb606bf51695988dba7096941822c1bcf676e3a929a9ae7a0" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "bumpalo" version = "3.12.0" @@ -525,9 +537,9 @@ dependencies = [ [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" dependencies = [ "serde", ] @@ -919,6 +931,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -984,6 +1007,15 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + [[package]] name = "frame-metadata" version = "15.0.0" @@ -1287,6 +1319,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" @@ -1471,6 +1506,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -1560,12 +1605,6 @@ dependencies = [ "which", ] -[[package]] -name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - [[package]] name = "io-lifetimes" version = "1.0.4" @@ -1583,7 +1622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 1.0.4", + "io-lifetimes", "rustix 0.36.7", "windows-sys 0.42.0", ] @@ -1792,15 +1831,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] name = "lock_api" @@ -1845,6 +1884,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +dependencies = [ + "rustix 0.37.3", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -2079,9 +2127,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parity-scale-codec" -version = "3.2.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ab01d0f889e957861bc65888d5ccbe82c158d0270136ba46820d43837cdf72" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -2163,6 +2211,12 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + [[package]] name = "pin-project" version = "1.0.12" @@ -2513,30 +2567,30 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", - "errno", - "io-lifetimes 0.7.5", + "errno 0.2.8", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" dependencies = [ "bitflags", - "errno", - "io-lifetimes 1.0.4", + "errno 0.3.1", + "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "linux-raw-sys 0.3.6", + "windows-sys 0.45.0", ] [[package]] @@ -2618,9 +2672,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "bitvec", "cfg-if", @@ -2632,9 +2686,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate 1.3.0", "proc-macro2", @@ -2923,7 +2977,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "parity-scale-codec", "scale-info", @@ -2936,7 +2990,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "integer-sqrt", "num-traits", @@ -2950,12 +3004,13 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", @@ -2992,7 +3047,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "blake2", "byteorder", @@ -3006,7 +3061,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "proc-macro2", "quote", @@ -3017,7 +3072,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "proc-macro2", "quote", @@ -3027,7 +3082,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "environmental", "parity-scale-codec", @@ -3038,7 +3093,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "bytes", "ed25519", @@ -3063,7 +3118,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "lazy_static", "sp-core", @@ -3074,7 +3129,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "async-trait", "futures", @@ -3090,7 +3145,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "backtrace", "lazy_static", @@ -3100,7 +3155,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "either", "hash256-std-hasher", @@ -3122,7 +3177,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -3140,7 +3195,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "Inflector", "proc-macro-crate 1.3.0", @@ -3152,7 +3207,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "hash-db", "log", @@ -3172,12 +3227,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "impl-serde", "parity-scale-codec", @@ -3190,7 +3245,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "parity-scale-codec", "sp-std", @@ -3202,7 +3257,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "ahash 0.8.3", "hash-db", @@ -3225,7 +3280,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "parity-scale-codec", "scale-info", @@ -3238,7 +3293,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -3249,8 +3304,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -3262,7 +3318,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/tidelabs/substrate?branch=tidechain-dev#129fee774a6d185d117a57fd1e81b3d0d05ad747" +source = "git+https://github.com/tidelabs/substrate?branch=tidechain#ad5399644aebc54e32a107ac37ae08e6cd1f0cfb" dependencies = [ "parity-scale-codec", "scale-info", @@ -3579,7 +3635,7 @@ dependencies = [ [[package]] name = "tidefi-primitives" version = "0.1.0" -source = "git+https://github.com/tidelabs/primitives?branch=substrate-monthly-2023-02#a9f8ca0f6b95571b68f9477967324a1d639e3908" +source = "git+https://github.com/tidelabs/primitives?branch=dev#a8b668d40f5afc262ef297aa857a1c816f2df04e" dependencies = [ "parity-scale-codec", "scale-info", @@ -3597,7 +3653,7 @@ dependencies = [ [[package]] name = "tidefi-primitives-macro" version = "0.1.0" -source = "git+https://github.com/tidelabs/primitives?branch=substrate-monthly-2023-02#a9f8ca0f6b95571b68f9477967324a1d639e3908" +source = "git+https://github.com/tidelabs/primitives?branch=dev#a8b668d40f5afc262ef297aa857a1c816f2df04e" dependencies = [ "convert_case", "proc-macro-crate 0.1.5", @@ -3840,12 +3896,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "3390c0409daaa6027d6681393316f4ccd3ff82e1590a1e4725014e3ae2bf1920" dependencies = [ "hash-db", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -3922,6 +3978,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.6" @@ -3961,6 +4023,17 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "valuable" version = "0.1.0" @@ -4136,18 +4209,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" dependencies = [ "anyhow", "bincode", @@ -4165,23 +4239,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", "cranelift-entity", @@ -4198,9 +4272,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -4211,29 +4285,39 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix 0.35.13", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" dependencies = [ "anyhow", "cc", @@ -4242,22 +4326,22 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.35.13", - "thiserror", + "rustix 0.36.7", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ "cranelift-entity", "serde", @@ -4338,32 +4422,67 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", "windows_aarch64_msvc 0.42.1", "windows_i686_gnu 0.42.1", "windows_i686_msvc 0.42.1", "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.1", "windows_x86_64_msvc 0.42.1", ] +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" @@ -4371,10 +4490,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -4383,10 +4502,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -4395,10 +4514,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -4407,10 +4526,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -4418,6 +4537,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" @@ -4425,10 +4550,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -4436,6 +4561,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "wyz" version = "0.5.1" diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index 3890f378274..5e11424f656 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -20,7 +20,7 @@ proc-macro2 = "1.0.51" proc-macro-error = "1.0.4" quote = "1.0.8" syn = "1.0.58" -scale-info = "2.0.0" +scale-info = "2.6.0" subxt-metadata = { version = "0.26.0", path = "../metadata" } jsonrpsee = { version = "0.16.0", features = ["async-client", "client-ws-transport", "http-client"] } hex = "0.4.3" @@ -28,5 +28,5 @@ tokio = { version = "1.25", features = ["macros", "rt-multi-thread"] } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } -scale-info = { version = "2.0.0", features = ["bit-vec"] } +scale-info = { version = "2.6.0", features = ["bit-vec"] } pretty_assertions = "1.0.0" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index eca3f6c396c..ce5dd89408d 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,13 +15,13 @@ description = "Command line utilities for checking metadata compatibility betwee [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" -scale-info = "2.0.0" +scale-info = "2.6.0" sp-core-hashing = { git = "https://github.com/tidelabs/substrate", branch = "tidechain" } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } criterion = "0.4" -scale-info = { version = "2.0.0", features = ["bit-vec"] } +scale-info = { version = "2.6.0", features = ["bit-vec"] } [lib] # Without this, libtest cli opts interfere with criteron benches: diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index a00ad8edbb0..b79e1b61587 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -36,7 +36,7 @@ jsonrpsee-web = ["jsonrpsee/async-wasm-client", "jsonrpsee/client-web-transport" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } -scale-info = "2.0.0" +scale-info = "2.6.0" scale-value = "0.6.0" scale-bits = "0.3" scale-decode = "0.4.0" @@ -75,7 +75,7 @@ getrandom = { version = "0.2", features = ["js"] } [dev-dependencies] bitvec = "1" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } -scale-info = { version = "2.0.0", features = ["bit-vec"] } +scale-info = { version = "2.6.0", features = ["bit-vec"] } tokio = { version = "1.25", features = ["macros", "time", "rt-multi-thread"] } sp-core = { git = "https://github.com/tidelabs/substrate", branch = "tidechain", default-features = false } sp-runtime = { git = "https://github.com/tidelabs/substrate", branch = "tidechain", default-features = false } diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index c60af485f66..f2ec4c8cbf6 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -22,7 +22,7 @@ frame-metadata = "15.0.0" futures = "0.3.26" hex = "0.4.3" regex = "1.5.0" -scale-info = { version = "2.0.0", features = ["bit-vec"] } +scale-info = { version = "2.6.0", features = ["bit-vec"] } sp-core = { git = "https://github.com/tidelabs/substrate", branch = "tidechain", default-features = false } sp-keyring = { git = "https://github.com/tidelabs/substrate", branch = "tidechain" } sp-runtime = { git = "https://github.com/tidelabs/substrate", branch = "tidechain" } diff --git a/testing/ui-tests/Cargo.toml b/testing/ui-tests/Cargo.toml index 95aaeada7ed..adf744ff74f 100644 --- a/testing/ui-tests/Cargo.toml +++ b/testing/ui-tests/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dev-dependencies] trybuild = "1.0.77" -scale-info = { version = "2.3.0", features = ["bit-vec"] } +scale-info = { version = "2.6.0", features = ["bit-vec"] } frame-metadata = "15.0.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } subxt = { path = "../../subxt" }