diff --git a/Cargo.lock b/Cargo.lock index b248953eb93ca55528f03fc894509cd340258ad5..2956f668b890196025e63867a8fc7fffa0cb14bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,14 +494,14 @@ dependencies = [ "nom", "nom-supreme", "pallet-contracts-primitives", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-wasm", "platforms 2.0.0", "predicates", "pretty_assertions", "regex", "rustc_version", - "scale-info", + "scale-info 2.0.0", "semver", "serde", "serde_json", @@ -1118,8 +1118,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" dependencies = [ "cfg-if", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", ] @@ -1478,7 +1478,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.3.1", ] [[package]] @@ -1541,11 +1541,11 @@ dependencies = [ "ink_prelude", "ink_primitives", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "paste", "rand 0.8.4", "rlibc", - "scale-info", + "scale-info 1.0.0", "secp256k1", "sha2 0.10.1", "sha3", @@ -1576,7 +1576,7 @@ dependencies = [ "ink_prelude", "ink_primitives", "ink_storage", - "parity-scale-codec", + "parity-scale-codec 2.3.1", ] [[package]] @@ -1592,7 +1592,7 @@ dependencies = [ "impl-serde", "ink_lang_ir", "itertools", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "proc-macro2", "quote", "syn", @@ -1621,7 +1621,7 @@ dependencies = [ "ink_lang_codegen", "ink_lang_ir", "ink_primitives", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "proc-macro2", "syn", ] @@ -1636,7 +1636,7 @@ dependencies = [ "impl-serde", "ink_prelude", "ink_primitives", - "scale-info", + "scale-info 1.0.0", "serde", ] @@ -1657,8 +1657,8 @@ checksum = "6303fbbe30b4c6bbe01ff36cce29e37961095574260d5958017ce9346834c77e" dependencies = [ "cfg-if", "ink_prelude", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", ] [[package]] @@ -1676,8 +1676,8 @@ dependencies = [ "ink_prelude", "ink_primitives", "ink_storage_derive", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", ] [[package]] @@ -2233,8 +2233,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e22d9d2bb8e33ca590237fa5ffa9363236bb49498b6c7498a68f560d897f9095" dependencies = [ "bitflags", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", "sp-core 5.0.0", "sp-rpc", @@ -2252,10 +2252,22 @@ dependencies = [ "bitvec", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 2.3.1", "serde", ] +[[package]] +name = "parity-scale-codec" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a7f3fcf5e45fc28b84dcdab6b983e77f197ec01f325a33f404ba6855afd1070" +dependencies = [ + "arrayvec 0.7.2", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 3.0.0", +] + [[package]] name = "parity-scale-codec-derive" version = "2.3.1" @@ -2268,6 +2280,18 @@ dependencies = [ "syn", ] +[[package]] +name = "parity-scale-codec-derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6e626dc84025ff56bf1476ed0e30d10c84d7f89a475ef46ebabee1095a8fba" +dependencies = [ + "proc-macro-crate 1.1.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parity-util-mem" version = "0.10.2" @@ -2503,7 +2527,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", - "scale-info", + "scale-info 1.0.0", "uint", ] @@ -2865,11 +2889,23 @@ dependencies = [ "bitvec", "cfg-if", "derive_more", - "parity-scale-codec", - "scale-info-derive", + "parity-scale-codec 2.3.1", + "scale-info-derive 1.0.0", "serde", ] +[[package]] +name = "scale-info" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3b4d0b178e3af536f7988303bc73a0766c816de2138c08262015f8ec7be568" +dependencies = [ + "cfg-if", + "derive_more", + "parity-scale-codec 3.0.0", + "scale-info-derive 2.0.0", +] + [[package]] name = "scale-info-derive" version = "1.0.0" @@ -2882,6 +2918,18 @@ dependencies = [ "syn", ] +[[package]] +name = "scale-info-derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" +dependencies = [ + "proc-macro-crate 1.1.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "schannel" version = "0.1.19" @@ -3143,8 +3191,8 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a11468fbf1d08502f95a69388b16e927a872df556085b5be7e5c55cdd3022c" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", "sp-core 4.0.0", "sp-io 4.0.0", @@ -3157,8 +3205,8 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69c8dfffb7a15ac2c802bc9ce972b8449c8ce0a15254ae4d77a012a3a8c278d1" dependencies = [ - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", "sp-core 5.0.0", "sp-io 5.0.0", @@ -3173,8 +3221,8 @@ checksum = "aa92b9707afdaa807bcb985fcc70645ebbe6fbb2442620d61dc47e7f3553a7ae" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", "sp-debug-derive", "sp-std", @@ -3203,13 +3251,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-util-mem", "parking_lot", "primitive-types", "rand 0.7.3", "regex", - "scale-info", + "scale-info 1.0.0", "schnorrkel", "secrecy", "serde", @@ -3252,13 +3300,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-util-mem", "parking_lot", "primitive-types", "rand 0.7.3", "regex", - "scale-info", + "scale-info 1.0.0", "schnorrkel", "secrecy", "serde", @@ -3311,7 +3359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54226438dbff5ced9718b51eb44b7f38fe139c40a923a088275914519bf451d3" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "sp-std", "sp-storage 4.0.0", ] @@ -3323,7 +3371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54f0fe949490000a97f367dc2acf4d2e7d0473ec0e13ce1775d0804bb64d3c98" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "sp-std", "sp-storage 5.0.0", ] @@ -3338,7 +3386,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "sp-core 4.0.0", "sp-externalities 0.10.0", @@ -3363,7 +3411,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "sp-core 5.0.0", "sp-externalities 0.11.0", @@ -3388,7 +3436,7 @@ dependencies = [ "derive_more", "futures", "merlin", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "schnorrkel", "sp-core 4.0.0", @@ -3404,7 +3452,7 @@ dependencies = [ "async-trait", "futures", "merlin", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "schnorrkel", "sp-core 5.0.0", @@ -3444,11 +3492,11 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info", + "scale-info 1.0.0", "serde", "sp-application-crypto 4.0.0", "sp-arithmetic", @@ -3467,11 +3515,11 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-util-mem", "paste", "rand 0.7.3", - "scale-info", + "scale-info 1.0.0", "serde", "sp-application-crypto 5.0.0", "sp-arithmetic", @@ -3487,7 +3535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e0176151f1195b386ddb4e07d716713e1e29f36b65c0e6e91fe354fc2cec84d" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "primitive-types", "sp-externalities 0.10.0", "sp-runtime-interface-proc-macro", @@ -3505,7 +3553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab1f6625996742e3e5c0e6a6a2b5c0db363e2c52f4a71ea6cd6d963a10a4bdd6" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "primitive-types", "sp-externalities 0.11.0", "sp-runtime-interface-proc-macro", @@ -3538,7 +3586,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "rand 0.7.3", "smallvec", @@ -3562,7 +3610,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parking_lot", "rand 0.7.3", "smallvec", @@ -3590,7 +3638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "851e1315a935cd5a0ce1bb6e41b0d611ac2370ede860d551f9f133007487043a" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "ref-cast", "serde", "sp-debug-derive", @@ -3604,7 +3652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "838ec2a757a8e7b903684a71f649dfbd6449d91e3e5d93979fc8d2ee77d56fee" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "ref-cast", "serde", "sp-debug-derive", @@ -3617,7 +3665,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4688fceac497cee7e9b72c387fef20fa517e2bf6a3bf52a4a45dcc9391d6201" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.3.1", "sp-std", "tracing", "tracing-core", @@ -3632,8 +3680,8 @@ checksum = "feb344969de755877440fccb691860acedd565061774d289886ff9c690206cc0" dependencies = [ "hash-db", "memory-db 0.27.0", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "sp-core 4.0.0", "sp-std", "trie-db 0.22.6", @@ -3648,8 +3696,8 @@ checksum = "8a7ad44bbb93fb9af94ea9869ec13602884f7d2360c245377aed7c6c92c6834e" dependencies = [ "hash-db", "memory-db 0.28.0", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "sp-core 5.0.0", "sp-std", "trie-db 0.23.0", @@ -3663,9 +3711,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b57388721427e65bdfadf636eebf444a6f84f7a05b56af2e7c6928cf554c618" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "parity-wasm", - "scale-info", + "scale-info 1.0.0", "serde", "sp-runtime 4.0.0", "sp-std", @@ -3679,7 +3727,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fcafba97053cfa9fa366e6b30fd0d0e9d15530c4a738efaa117a4d5707d147" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.3.1", "proc-macro2", "quote", "syn", @@ -3692,7 +3740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89a5b0fe5b5bd3259e914edc35b33b6f7b4b0c803981290256e8ed75eecf1b27" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "sp-std", "wasmi", ] @@ -3705,7 +3753,7 @@ checksum = "60951479e2f26018c4c315a6f48956b9e2a3803953517bf8930e69b9a7a159df" dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "sp-std", "wasmi", ] @@ -3816,8 +3864,8 @@ dependencies = [ "jsonrpsee 0.8.0", "log", "num-traits", - "parity-scale-codec", - "scale-info", + "parity-scale-codec 2.3.1", + "scale-info 1.0.0", "serde", "serde_json", "sp-core 5.0.0", @@ -3837,12 +3885,12 @@ dependencies = [ "darling", "frame-metadata", "heck 0.3.3", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2", "quote", - "scale-info", + "scale-info 1.0.0", "syn", ] @@ -3856,12 +3904,12 @@ dependencies = [ "darling", "frame-metadata", "heck 0.3.3", - "parity-scale-codec", + "parity-scale-codec 2.3.1", "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2", "quote", - "scale-info", + "scale-info 1.0.0", "subxt-codegen", "syn", ] diff --git a/Cargo.toml b/Cargo.toml index c96da845fa811ac1c12957da4757c34390be4ff8..edc5ba4c2464f9b619ab072a70aac7ab8bf96e02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ regex = "1.5.4" async-std = { version = "1.10.0", features = ["attributes", "tokio1"] } ink_metadata = { version = "3.0.0-rc8", features = ["derive"] } ink_env = "3.0.0-rc8" -scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } sp-core = "5.0.0" sp-runtime = "5.0.0" pallet-contracts-primitives = "5.0.0"