From e902c54399b03ed835004ba9d47d02932d80877c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 3 Apr 2019 11:59:57 +0200 Subject: [PATCH] Switch to `derive(Encode, Decode)` for `Call` (#2178) * Add some tests * More tests * Switch to `derive(Encode, Decode)` for `Call` * Update lock files * Simplify the macro cases --- substrate/Cargo.lock | 134 +++---- substrate/core/test-runtime/wasm/Cargo.lock | 44 +-- .../node-template/runtime/wasm/Cargo.lock | 60 +-- substrate/node/runtime/wasm/Cargo.lock | 78 ++-- substrate/srml/support/Cargo.toml | 2 +- substrate/srml/support/src/dispatch.rs | 354 ++++++++---------- 6 files changed, 319 insertions(+), 353 deletions(-) diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 87a1b7510f..1b57cd34bb 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -758,8 +758,8 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -798,7 +798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "fork-tree" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1077,7 +1077,7 @@ name = "impl-codec" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1883,7 +1883,7 @@ dependencies = [ "node-executor 1.0.0", "node-primitives 1.0.0", "node-runtime 1.0.0", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1909,7 +1909,7 @@ version = "1.0.0" dependencies = [ "node-primitives 1.0.0", "node-runtime 1.0.0", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "srml-balances 1.0.0", @@ -1936,7 +1936,7 @@ dependencies = [ name = "node-primitives" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1953,7 +1953,7 @@ dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "node-primitives 1.0.0", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1996,7 +1996,7 @@ dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "node-template-runtime 1.0.0", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "substrate-basic-authorship 1.0.0", @@ -2018,7 +2018,7 @@ dependencies = [ name = "node-template-runtime" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2156,17 +2156,17 @@ source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7 [[package]] name = "parity-codec" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-codec-derive" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2674,8 +2674,8 @@ dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3014,7 +3014,7 @@ dependencies = [ "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -3030,7 +3030,7 @@ dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3044,7 +3044,7 @@ name = "sr-sandbox" version = "1.0.0" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -3064,7 +3064,7 @@ name = "sr-version" version = "1.0.0" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -3076,7 +3076,7 @@ name = "srml-assets" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3092,7 +3092,7 @@ version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3113,7 +3113,7 @@ name = "srml-balances" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3130,7 +3130,7 @@ name = "srml-consensus" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3148,7 +3148,7 @@ version = "1.0.0" dependencies = [ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)", "pwasm-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3171,7 +3171,7 @@ name = "srml-council" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3189,7 +3189,7 @@ name = "srml-democracy" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3207,7 +3207,7 @@ name = "srml-example" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3222,7 +3222,7 @@ name = "srml-executive" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3240,7 +3240,7 @@ version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3257,7 +3257,7 @@ dependencies = [ name = "srml-grandpa" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3277,7 +3277,7 @@ name = "srml-indices" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ref_thread_local 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3294,7 +3294,7 @@ dependencies = [ name = "srml-metadata" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", @@ -3307,7 +3307,7 @@ version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3325,7 +3325,7 @@ name = "srml-staking" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3346,7 +3346,7 @@ name = "srml-sudo" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3364,7 +3364,7 @@ dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3412,7 +3412,7 @@ dependencies = [ name = "srml-support-test" version = "0.1.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3426,7 +3426,7 @@ name = "srml-system" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3442,7 +3442,7 @@ name = "srml-timestamp" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3458,7 +3458,7 @@ name = "srml-treasury" version = "1.0.0" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3613,7 +3613,7 @@ name = "substrate-basic-authorship" version = "1.0.0" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", "substrate-consensus-aura-primitives 1.0.0", @@ -3683,7 +3683,7 @@ dependencies = [ "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-api-macros 1.0.0", "sr-primitives 1.0.0", @@ -3711,7 +3711,7 @@ dependencies = [ "kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", @@ -3733,7 +3733,7 @@ dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -3772,7 +3772,7 @@ dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", @@ -3787,7 +3787,7 @@ dependencies = [ name = "substrate-consensus-authorities" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -3806,7 +3806,7 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-version 1.0.0", "substrate-inherents 1.0.0", @@ -3823,7 +3823,7 @@ dependencies = [ "exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rhododendron 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -3851,7 +3851,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3876,7 +3876,7 @@ dependencies = [ "fork-tree 1.0.0", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -3898,7 +3898,7 @@ dependencies = [ name = "substrate-finality-grandpa-primitives" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", "substrate-client 1.0.0", @@ -3909,7 +3909,7 @@ dependencies = [ name = "substrate-inherents" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -3956,7 +3956,7 @@ dependencies = [ "linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4005,7 +4005,7 @@ dependencies = [ "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", "substrate-consensus-common 1.0.0", @@ -4062,7 +4062,7 @@ dependencies = [ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4094,7 +4094,7 @@ dependencies = [ "jsonrpc-derive 10.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-pubsub 10.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4145,7 +4145,7 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4194,7 +4194,7 @@ version = "1.0.0" dependencies = [ "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 1.0.0", ] @@ -4207,7 +4207,7 @@ dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-panic-handler 1.0.0", "substrate-primitives 1.0.0", @@ -4238,7 +4238,7 @@ name = "substrate-test-client" version = "1.0.0" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", "substrate-client-db 1.0.0", @@ -4258,7 +4258,7 @@ dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -4289,7 +4289,7 @@ dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4305,7 +4305,7 @@ dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "substrate-client 1.0.0", @@ -4324,7 +4324,7 @@ dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", "trie-bench 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4704,7 +4704,7 @@ dependencies = [ "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hasher 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-standardmap 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5303,8 +5303,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" -"checksum parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0333b2a2973e75c3b4a9bc2a7b28dceacb56e3949907b4ce113ff3a53bcc6713" -"checksum parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be90eb3f1b4c02a478ccee3e0e64e5152692e7871c7258d2aa8e356359325aa7" +"checksum parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2edd80cdaf3b9c7b7f524299586bb4eae43cc5eb20c7b41aa0cd741200000e38" +"checksum parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00a486fd383382ddcb2de928364b1f82571c1e48274fc43b7667a4738ee4056c" "checksum parity-crypto 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b9db194dfbcfe3b398d63d765437a5c7232d59906e203055f0e993f6458ff1" "checksum parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61ae6944d4435d41f4d0f12108c5cbb9207cbb14bc8f2b4984c6e930dc9c8e41" "checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076" diff --git a/substrate/core/test-runtime/wasm/Cargo.lock b/substrate/core/test-runtime/wasm/Cargo.lock index 1a5d2ee24a..7df0a26524 100644 --- a/substrate/core/test-runtime/wasm/Cargo.lock +++ b/substrate/core/test-runtime/wasm/Cargo.lock @@ -723,7 +723,7 @@ name = "impl-codec" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1349,17 +1349,17 @@ source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7 [[package]] name = "parity-codec" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-codec-derive" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2028,7 +2028,7 @@ dependencies = [ "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -2044,7 +2044,7 @@ dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2064,7 +2064,7 @@ name = "sr-version" version = "1.0.0" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2075,7 +2075,7 @@ dependencies = [ name = "srml-executive" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -2088,7 +2088,7 @@ dependencies = [ name = "srml-metadata" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", @@ -2102,7 +2102,7 @@ dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2150,7 +2150,7 @@ name = "srml-system" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2267,7 +2267,7 @@ dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-api-macros 1.0.0", "sr-primitives 1.0.0", @@ -2295,7 +2295,7 @@ dependencies = [ name = "substrate-consensus-authorities" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2314,7 +2314,7 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-version 1.0.0", "substrate-inherents 1.0.0", @@ -2331,7 +2331,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2350,7 +2350,7 @@ dependencies = [ name = "substrate-inherents" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2395,7 +2395,7 @@ dependencies = [ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2429,7 +2429,7 @@ dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-panic-handler 1.0.0", "substrate-primitives 1.0.0", @@ -2463,7 +2463,7 @@ dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2496,7 +2496,7 @@ version = "1.0.0" dependencies = [ "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3144,8 +3144,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" -"checksum parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0333b2a2973e75c3b4a9bc2a7b28dceacb56e3949907b4ce113ff3a53bcc6713" -"checksum parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be90eb3f1b4c02a478ccee3e0e64e5152692e7871c7258d2aa8e356359325aa7" +"checksum parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2edd80cdaf3b9c7b7f524299586bb4eae43cc5eb20c7b41aa0cd741200000e38" +"checksum parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00a486fd383382ddcb2de928364b1f82571c1e48274fc43b7667a4738ee4056c" "checksum parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61ae6944d4435d41f4d0f12108c5cbb9207cbb14bc8f2b4984c6e930dc9c8e41" "checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076" "checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc" diff --git a/substrate/node-template/runtime/wasm/Cargo.lock b/substrate/node-template/runtime/wasm/Cargo.lock index 77eaa911e3..9d6c917b15 100644 --- a/substrate/node-template/runtime/wasm/Cargo.lock +++ b/substrate/node-template/runtime/wasm/Cargo.lock @@ -723,7 +723,7 @@ name = "impl-codec" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1261,7 +1261,7 @@ dependencies = [ name = "node-template-runtime" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1384,17 +1384,17 @@ source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7 [[package]] name = "parity-codec" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-codec-derive" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2063,7 +2063,7 @@ dependencies = [ "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -2079,7 +2079,7 @@ dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2099,7 +2099,7 @@ name = "sr-version" version = "1.0.0" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2111,7 +2111,7 @@ name = "srml-aura" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2128,7 +2128,7 @@ name = "srml-balances" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2143,7 +2143,7 @@ name = "srml-consensus" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2158,7 +2158,7 @@ dependencies = [ name = "srml-executive" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -2172,7 +2172,7 @@ name = "srml-indices" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2188,7 +2188,7 @@ dependencies = [ name = "srml-metadata" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", @@ -2200,7 +2200,7 @@ name = "srml-session" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2216,7 +2216,7 @@ name = "srml-staking" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2234,7 +2234,7 @@ name = "srml-sudo" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2250,7 +2250,7 @@ dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2298,7 +2298,7 @@ name = "srml-system" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2314,7 +2314,7 @@ name = "srml-timestamp" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2429,7 +2429,7 @@ dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-api-macros 1.0.0", "sr-primitives 1.0.0", @@ -2457,7 +2457,7 @@ dependencies = [ name = "substrate-consensus-authorities" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2476,7 +2476,7 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-version 1.0.0", "substrate-inherents 1.0.0", @@ -2493,7 +2493,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2512,7 +2512,7 @@ dependencies = [ name = "substrate-inherents" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2557,7 +2557,7 @@ dependencies = [ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2591,7 +2591,7 @@ dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-panic-handler 1.0.0", "substrate-primitives 1.0.0", @@ -2623,7 +2623,7 @@ version = "1.0.0" dependencies = [ "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3271,8 +3271,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" -"checksum parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0333b2a2973e75c3b4a9bc2a7b28dceacb56e3949907b4ce113ff3a53bcc6713" -"checksum parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be90eb3f1b4c02a478ccee3e0e64e5152692e7871c7258d2aa8e356359325aa7" +"checksum parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2edd80cdaf3b9c7b7f524299586bb4eae43cc5eb20c7b41aa0cd741200000e38" +"checksum parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00a486fd383382ddcb2de928364b1f82571c1e48274fc43b7667a4738ee4056c" "checksum parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61ae6944d4435d41f4d0f12108c5cbb9207cbb14bc8f2b4984c6e930dc9c8e41" "checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076" "checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc" diff --git a/substrate/node/runtime/wasm/Cargo.lock b/substrate/node/runtime/wasm/Cargo.lock index 7472e7e47b..83b2de5bd9 100644 --- a/substrate/node/runtime/wasm/Cargo.lock +++ b/substrate/node/runtime/wasm/Cargo.lock @@ -723,7 +723,7 @@ name = "impl-codec" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1261,7 +1261,7 @@ dependencies = [ name = "node-primitives" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -1276,7 +1276,7 @@ dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "node-primitives 1.0.0", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1407,17 +1407,17 @@ source = "git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7 [[package]] name = "parity-codec" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-codec-derive" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2096,7 +2096,7 @@ dependencies = [ "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -2112,7 +2112,7 @@ dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2124,7 +2124,7 @@ dependencies = [ name = "sr-sandbox" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "substrate-primitives 1.0.0", @@ -2143,7 +2143,7 @@ name = "sr-version" version = "1.0.0" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2155,7 +2155,7 @@ name = "srml-aura" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", "srml-session 1.0.0", @@ -2171,7 +2171,7 @@ name = "srml-balances" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2186,7 +2186,7 @@ name = "srml-consensus" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2201,7 +2201,7 @@ dependencies = [ name = "srml-contract" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)", "pwasm-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2220,7 +2220,7 @@ dependencies = [ name = "srml-council" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2237,7 +2237,7 @@ name = "srml-democracy" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2252,7 +2252,7 @@ dependencies = [ name = "srml-executive" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", @@ -2266,7 +2266,7 @@ name = "srml-finality-tracker" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2280,7 +2280,7 @@ dependencies = [ name = "srml-grandpa" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2299,7 +2299,7 @@ name = "srml-indices" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2315,7 +2315,7 @@ dependencies = [ name = "srml-metadata" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", @@ -2327,7 +2327,7 @@ name = "srml-session" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2343,7 +2343,7 @@ name = "srml-staking" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", @@ -2361,7 +2361,7 @@ name = "srml-sudo" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2377,7 +2377,7 @@ dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2425,7 +2425,7 @@ name = "srml-system" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2441,7 +2441,7 @@ name = "srml-timestamp" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2455,7 +2455,7 @@ name = "srml-treasury" version = "1.0.0" dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", @@ -2571,7 +2571,7 @@ dependencies = [ "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-api-macros 1.0.0", "sr-primitives 1.0.0", @@ -2599,7 +2599,7 @@ dependencies = [ name = "substrate-consensus-authorities" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 1.0.0", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2618,7 +2618,7 @@ dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-version 1.0.0", "substrate-inherents 1.0.0", @@ -2635,7 +2635,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2654,7 +2654,7 @@ dependencies = [ name = "substrate-finality-grandpa-primitives" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", "substrate-client 1.0.0", @@ -2665,7 +2665,7 @@ dependencies = [ name = "substrate-inherents" version = "1.0.0" dependencies = [ - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 1.0.0", "sr-std 1.0.0", @@ -2710,7 +2710,7 @@ dependencies = [ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2744,7 +2744,7 @@ dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-panic-handler 1.0.0", "substrate-primitives 1.0.0", @@ -2776,7 +2776,7 @@ version = "1.0.0" dependencies = [ "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 1.0.0", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3424,8 +3424,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" -"checksum parity-codec 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0333b2a2973e75c3b4a9bc2a7b28dceacb56e3949907b4ce113ff3a53bcc6713" -"checksum parity-codec-derive 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be90eb3f1b4c02a478ccee3e0e64e5152692e7871c7258d2aa8e356359325aa7" +"checksum parity-codec 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2edd80cdaf3b9c7b7f524299586bb4eae43cc5eb20c7b41aa0cd741200000e38" +"checksum parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00a486fd383382ddcb2de928364b1f82571c1e48274fc43b7667a4738ee4056c" "checksum parity-multiaddr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61ae6944d4435d41f4d0f12108c5cbb9207cbb14bc8f2b4984c6e930dc9c8e41" "checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076" "checksum parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc" diff --git a/substrate/srml/support/Cargo.toml b/substrate/srml/support/Cargo.toml index 4562f61e54..a126160d67 100644 --- a/substrate/srml/support/Cargo.toml +++ b/substrate/srml/support/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" hex-literal = { version = "0.1.0", optional = true } serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } -parity-codec = { version = "3.3", default-features = false, features = ["derive"] } +parity-codec = { version = "3.4", default-features = false, features = ["derive"] } srml-metadata = { path = "../metadata", default-features = false } sr-std = { path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs index 0149b53d57..845bddb2e2 100644 --- a/substrate/srml/support/src/dispatch.rs +++ b/substrate/srml/support/src/dispatch.rs @@ -615,6 +615,113 @@ macro_rules! decl_module { } }; + // Declare a `Call` variant parameter that should be encoded `compact`. + (@create_call_enum + $( #[$attr:meta] )* + $call_type:ident; + <$trait_instance:ident: $trait_name:ident$(, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?> + { $( $generated_variants:tt )* } + { $( $current_params:tt )* } + variant $fn_name:ident; + $( #[doc = $doc_attr:tt] )* + #[compact] + $type:ty; + $( $rest:tt )* + ) => { + $crate::decl_module! { + @create_call_enum + $( #[$attr] )* + $call_type; + <$trait_instance: $trait_name $(, $instance: $instantiable $(= $module_default_instance)? )?> + { $( $generated_variants )* } + { + $( $current_params )* + #[codec(compact)] + $type, + } + variant $fn_name; + $( $rest )* + } + }; + + // Declare a `Call` variant parameter. + (@create_call_enum + $( #[$attr:meta] )* + $call_type:ident; + <$trait_instance:ident: $trait_name:ident$(, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?> + { $( $generated_variants:tt )* } + { $( $current_params:tt )* } + variant $fn_name:ident; + $(#[doc = $doc_attr:tt])* + $type:ty; + $( $rest:tt )* + ) => { + $crate::decl_module! { + @create_call_enum + $( #[$attr] )* + $call_type; + <$trait_instance: $trait_name $(, $instance: $instantiable $(= $module_default_instance)? )?> + { $( $generated_variants )* } + { + $( $current_params )* + $type, + } + variant $fn_name; + $( $rest )* + } + }; + + (@create_call_enum + $( #[$attr:meta] )* + $call_type:ident; + <$trait_instance:ident: $trait_name:ident$(, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?> + { $( $generated_variants:tt )* } + { $( $current_params:tt )* } + variant $fn_name:ident; + $(#[doc = $doc_attr:tt])* + $( + variant $next_fn_name:ident; + $( $rest:tt )* + )? + ) => { + $crate::decl_module! { + @create_call_enum + $( #[$attr] )* + $call_type; + <$trait_instance: $trait_name $(, $instance: $instantiable $(= $module_default_instance)? )?> + { + $( $generated_variants )* + #[allow(non_camel_case_types)] + $(#[doc = $doc_attr])* + $fn_name ( + $( $current_params )* + ), + } + {} + $( + variant $next_fn_name; + $( $rest )* + )? + } + }; + + (@create_call_enum + $( #[$attr:meta] )* + $call_type:ident; + <$trait_instance:ident: $trait_name:ident$(, $instance:ident: $instantiable:path $(= $module_default_instance:path)?)?> + { $( $generated_variants:tt )* } + {} + ) => { + #[derive($crate::codec::Encode, $crate::codec::Decode)] + $( #[$attr] )* + pub enum $call_type<$trait_instance: $trait_name$(, $instance: $instantiable $( = $module_default_instance)?)?> { + #[doc(hidden)] + #[codec(skip)] + __PhantomItem($crate::rstd::marker::PhantomData<($trait_instance $(, $instance)?)>, $crate::dispatch::Never), + $( $generated_variants )* + } + }; + // The main macro expansion that actually renders the module code. (@imp @@ -637,17 +744,7 @@ macro_rules! decl_module { // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. #[derive(Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "std", derive(Debug))] - // FIXME: switching based on std feature is because of an issue in - // serde-derive for when we attempt to derive `Deserialize` on these types, - // in a situation where we've imported `srml_support` as another name. - #[cfg(feature = "std")] - pub struct $mod_type<$trait_instance: $trait_name $(, $instance: $instantiable $( = $module_default_instance)?)?>(::std::marker::PhantomData<($trait_instance $(, $instance)?)>); - - // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted. - #[derive(Clone, Copy, PartialEq, Eq)] - #[cfg_attr(feature = "std", derive(Debug))] - #[cfg(not(feature = "std"))] - pub struct $mod_type<$trait_instance: $trait_name $(, $instance: $instantiable $( = $module_default_instance)?)?>(::core::marker::PhantomData<($trait_instance $(, $instance)?)>); + pub struct $mod_type<$trait_instance: $trait_name $(, $instance: $instantiable $( = $module_default_instance)?)?>($crate::rstd::marker::PhantomData<($trait_instance $(, $instance)?)>); $crate::decl_module! { @impl_on_initialize @@ -692,27 +789,20 @@ macro_rules! decl_module { )* } - #[cfg(feature = "std")] - $(#[$attr])* - pub enum $call_type<$trait_instance: $trait_name$(, $instance: $instantiable $( = $module_default_instance)?)?> { - #[doc(hidden)] - __PhantomItem(::std::marker::PhantomData<($trait_instance $(, $instance)?)>, $crate::dispatch::Never), + $crate::decl_module! { + @create_call_enum + $( #[$attr] )* + $call_type; + <$trait_instance: $trait_name $(, $instance: $instantiable $(= $module_default_instance)? )?> + {} + {} $( - #[allow(non_camel_case_types)] + variant $fn_name; $(#[doc = $doc_attr])* - $fn_name ( $( $param ),* ), - )* - } - - #[cfg(not(feature = "std"))] - $(#[$attr])* - pub enum $call_type<$trait_instance: $trait_name$(, $instance: $instantiable $( = $module_default_instance)?)?> { - #[doc(hidden)] - __PhantomItem(::core::marker::PhantomData<($trait_instance $(, $instance)?)>, $crate::dispatch::Never), - $( - #[allow(non_camel_case_types)] - $(#[doc = $doc_attr])* - $fn_name ( $( $param ),* ), + $( + $(#[$codec_attr])* + $param; + )* )* } @@ -775,18 +865,6 @@ macro_rules! decl_module { } } - impl<$trait_instance: $trait_name $(, $instance: $instantiable)?> $crate::dispatch::Decode for $call_type<$trait_instance $(, $instance)?> { - fn decode(input: &mut Input) -> Option { - let _input_id = input.read_byte()?; - $crate::__impl_decode!(input; _input_id; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*) - } - } - - impl<$trait_instance: $trait_name $(, $instance: $instantiable)?> $crate::dispatch::Encode for $call_type<$trait_instance $(, $instance)?> { - fn encode_to(&self, _dest: &mut W) { - $crate::__impl_encode!(_dest; *self; 0; $call_type; $( fn $fn_name( $( $(#[$codec_attr on type $param])* $param_name ),* ); )*); - } - } impl<$trait_instance: $trait_name $(, $instance: $instantiable)?> $crate::dispatch::Dispatchable for $call_type<$trait_instance $(, $instance)?> { @@ -826,131 +904,6 @@ macro_rules! decl_module { } } -#[macro_export] -#[doc(hidden)] -macro_rules! __impl_decode { - ( - $input:expr; - $input_id:expr; - $fn_id:expr; - $call_type:ident; - fn $fn_name:ident( - $( $(#[$codec_attr:ident on type $param:ty])* $param_name:ident ),* - ); - $($rest:tt)* - ) => { - { - if $input_id == ($fn_id) { - $( - $crate::__impl_decode!(@decode - $(#[$codec_attr on type $param])* - $param_name; - $input; - ); - )* - return Some($call_type:: $fn_name( $( $param_name ),* )); - } - - $crate::__impl_decode!($input; $input_id; $fn_id + 1; $call_type; $($rest)*) - } - }; - ( - $input:expr; - $input_id:expr; - $fn_id:expr; - $call_type:ident; - ) => { - None - }; - (@decode - #[compact on type $param:ty] - $param_name:ident; - $input:expr; - ) => { - let $param_name = <<$param as $crate::dispatch::HasCompact>::Type as $crate::dispatch::Decode>::decode($input)?.into(); - }; - (@decode - $param_name:ident; - $input:expr; - ) => { - let $param_name = $crate::dispatch::Decode::decode($input)?; - }; - (@decode - $(#[$codec_attr:ident on type])* - $param_name:ident; - $input:expr; - ) => { - compile_error!(concat!( - "Invalid attribute for parameter `", - stringify!($param_name), - "`, the following attributes are supported: `#[compact]`" - )) - }; -} - -#[macro_export] -#[doc(hidden)] -macro_rules! __impl_encode { - ( - $dest:expr; - $self:expr; - $fn_id:expr; - $call_type:ident; - fn $fn_name:ident( - $( $(#[$codec_attr:ident on type $param:ty])* $param_name:ident ),* - ); - $($rest:tt)* - ) => { - { - if let $call_type::$fn_name( - $( - ref $param_name - ),* - ) = $self { - $dest.push_byte(($fn_id) as u8); - $( - $crate::__impl_encode!(@encode_as - $(#[$codec_attr on type $param])* - $param_name; - $dest; - ); - )* - } - - $crate::__impl_encode!($dest; $self; $fn_id + 1; $call_type; $($rest)*) - } - }; - ( - $dest:expr; - $self:expr; - $fn_id:expr; - $call_type:ident; - ) => {{}}; - (@encode_as - #[compact on type $param:ty] - $param_name:ident; - $dest:expr; - ) => { - <<$param as $crate::dispatch::HasCompact>::Type as $crate::dispatch::EncodeAsRef<$param>>::RefType::from($param_name).encode_to($dest); - }; - (@encode_as - $param_name:ident; - $dest:expr; - ) => { - $param_name.encode_to($dest); - }; - (@encode_as - $(#[$codec_attr:ident on type $param:ty])* - $param_name:ident; - $dest:expr; - ) => { - compile_error!(concat!( - "Invalid attribute for parameter `", stringify!($param_name), - "`, the following attributes are supported: `#[compact]`" - )) - }; -} - pub trait IsSubType { fn is_aux_sub_type(&self) -> Option<&::Call>; } @@ -967,14 +920,13 @@ macro_rules! impl_outer_dispatch { } ) => { $(#[$attr])* - #[derive(Clone, PartialEq, Eq)] + #[derive(Clone, PartialEq, Eq, $crate::codec::Encode, $crate::codec::Decode)] #[cfg_attr(feature = "std", derive(Debug))] pub enum $call_type { $( $camelcase ( $crate::dispatch::CallableCallFor<$camelcase> ) ,)* } - $crate::__impl_outer_dispatch_common! { $call_type, $($camelcase,)* } impl $crate::dispatch::Dispatchable for $call_type { type Origin = $origin; type Trait = $call_type; @@ -1000,28 +952,6 @@ macro_rules! impl_outer_dispatch { } } -/// Implement a meta-dispatch module to dispatch to other dispatchers. -#[macro_export] -#[doc(hidden)] -macro_rules! __impl_outer_dispatch_common { - ( - $call_type:ident, $( $camelcase:ident, )* - ) => { - impl $crate::dispatch::Decode for $call_type { - fn decode(input: &mut I) -> Option { - let input_id = input.read_byte()?; - $crate::__impl_decode!(input; input_id; 0; $call_type; $( fn $camelcase ( outer_dispatch_param ); )*) - } - } - - impl $crate::dispatch::Encode for $call_type { - fn encode_to(&self, dest: &mut W) { - $crate::__impl_encode!(dest; *self; 0; $call_type; $( fn $camelcase( outer_dispatch_param ); )*) - } - } - } -} - /// Implement metadata for dispatch. #[macro_export] #[doc(hidden)] @@ -1166,6 +1096,7 @@ mod tests { fn aux_2(_origin, _data: i32, _data2: String) -> Result { unreachable!() } fn aux_3() -> Result { unreachable!() } fn aux_4(_data: i32) -> Result { unreachable!() } + fn aux_5(_origin, _data: i32, #[compact] _data2: u32) -> Result { unreachable!() } fn on_initialize(n: T::BlockNumber) { if n.into() == 42 { panic!("on_initialize") } } fn on_finalize(n: T::BlockNumber) { if n.into() == 42 { panic!("on_finalize") } } @@ -1219,7 +1150,21 @@ mod tests { } ]), documentation: DecodeDifferent::Encode(&[]), - } + }, + FunctionMetadata { + name: DecodeDifferent::Encode("aux_5"), + arguments: DecodeDifferent::Encode(&[ + FunctionArgumentMetadata { + name: DecodeDifferent::Encode("_data"), + ty: DecodeDifferent::Encode("i32"), + }, + FunctionArgumentMetadata { + name: DecodeDifferent::Encode("_data2"), + ty: DecodeDifferent::Encode("Compact") + } + ]), + documentation: DecodeDifferent::Encode(&[]), + }, ]; struct TraitImpl {} @@ -1237,9 +1182,30 @@ mod tests { #[test] fn compact_attr() { - let call: Call = Call::aux_1(0); + let call: Call = Call::aux_1(1); let encoded = call.encode(); - assert_eq!(encoded.len(), 2); + assert_eq!(2, encoded.len()); + assert_eq!(vec![1, 4], encoded); + + let call: Call = Call::aux_5(1, 2); + let encoded = call.encode(); + assert_eq!(6, encoded.len()); + assert_eq!(vec![5, 1, 0, 0, 0, 8], encoded); + } + + #[test] + fn encode_is_correct_and_decode_works() { + let call: Call = Call::aux_0(); + let encoded = call.encode(); + assert_eq!(vec![0], encoded); + let decoded = Call::::decode(&mut &encoded[..]).unwrap(); + assert_eq!(decoded, call); + + let call: Call = Call::aux_2(32, "hello".into()); + let encoded = call.encode(); + assert_eq!(vec![2, 32, 0, 0, 0, 20, 104, 101, 108, 108, 111], encoded); + let decoded = Call::::decode(&mut &encoded[..]).unwrap(); + assert_eq!(decoded, call); } #[test]