diff --git a/Cargo.lock b/Cargo.lock index 57d1672814..3f9c6abce1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" -dependencies = [ - "gimli 0.24.0", -] - [[package]] name = "addr2line" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" dependencies = [ - "gimli 0.25.0", + "gimli", ] [[package]] @@ -53,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures", + "cpufeatures 0.2.1", "opaque-debug 0.3.0", ] @@ -73,9 +64,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.3", "once_cell", @@ -194,8 +185,8 @@ dependencies = [ "log", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "orml-unknown-tokens", "orml-xcm", "orml-xcm-support", @@ -228,8 +219,9 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-parachains", + "scale-info", "serde", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-arithmetic", "sp-block-builder", @@ -255,9 +247,9 @@ dependencies = [ [[package]] name = "asn1_der" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6e24d2cce90c53b948c46271bfb053e4bdc2db9b5d3f65e20f8cf28a1b7fc3" +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" [[package]] name = "assert_matches" @@ -382,7 +374,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.5", + "crossbeam-utils", "futures-channel", "futures-core", "futures-io", @@ -500,12 +492,12 @@ version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" dependencies = [ - "addr2line 0.16.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.26.2", + "object", "rustc-demangle", ] @@ -557,13 +549,12 @@ dependencies = [ [[package]] name = "beefy-gadget" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.17", - "hex", "log", "parity-scale-codec", "parking_lot 0.11.2", @@ -571,15 +562,14 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-gossip", + "sc-utils", "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-keystore", "sp-runtime", - "sp-utils", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -587,8 +577,8 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -601,22 +591,22 @@ dependencies = [ "parity-scale-codec", "sc-rpc", "serde", - "serde_json", "sp-core", "sp-runtime", ] [[package]] name = "beefy-merkle-tree" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" [[package]] name = "beefy-primitives" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -633,9 +623,10 @@ dependencies = [ "frame-system", "node-primitives", "num-bigint 0.4.2", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -661,10 +652,11 @@ dependencies = [ "node-primitives", "num-traits", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -682,13 +674,14 @@ dependencies = [ "impl-trait-for-tuples", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "pallet-transaction-payment", "pallet-xcm", "parity-scale-codec", - "smallvec 1.7.0", + "scale-info", + "smallvec", "sp-arithmetic", "sp-core", "sp-io", @@ -735,10 +728,11 @@ dependencies = [ "frame-support", "frame-system", "node-primitives", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-collective", "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -756,11 +750,12 @@ dependencies = [ "frame-system", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "pallet-collective", "parity-scale-codec", + "scale-info", "sp-core", ] @@ -803,10 +798,11 @@ dependencies = [ "frame-system", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -846,8 +842,8 @@ dependencies = [ "log", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "orml-unknown-tokens", "orml-xcm", "orml-xcm-support", @@ -877,7 +873,8 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", - "smallvec 1.7.0", + "scale-info", + "smallvec", "sp-api", "sp-arithmetic", "sp-block-builder", @@ -919,8 +916,8 @@ dependencies = [ "log", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-collator-selection", "pallet-collective", "pallet-democracy", @@ -935,7 +932,7 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain", "serde", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-arithmetic", "sp-block-builder", @@ -969,14 +966,15 @@ dependencies = [ "log", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "pallet-multisig", "pallet-xcm", "parity-scale-codec", "polkadot-parachain", - "smallvec 1.7.0", + "scale-info", + "smallvec", "sp-arithmetic", "sp-core", "sp-io", @@ -1023,11 +1021,12 @@ dependencies = [ "frame-system", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "pallet-collective", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1042,6 +1041,7 @@ dependencies = [ "frame-system", "pallet-balances", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1056,9 +1056,10 @@ dependencies = [ "frame-support", "frame-system", "node-primitives", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1075,10 +1076,11 @@ dependencies = [ "frame-system", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "pallet-balances", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1275,6 +1277,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "bounded-vec" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afdd1dffefe5fc66262a524b91087c43b16e478b2e3dc49eb11b0e2fd6b6ec90" +dependencies = [ + "thiserror", +] + [[package]] name = "bs58" version = "0.3.1" @@ -1348,7 +1359,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ "byteorder", - "either", "iovec", ] @@ -1404,9 +1414,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" dependencies = [ "jobserver", ] @@ -1440,21 +1450,21 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.7.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" +checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures", + "cpufeatures 0.1.5", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.8.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" +checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" dependencies = [ "aead", "chacha20", @@ -1513,7 +1523,7 @@ checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" dependencies = [ "glob", "libc", - "libloading 0.7.0", + "libloading 0.7.1", ] [[package]] @@ -1563,35 +1573,19 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpp_demangle" @@ -1602,6 +1596,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "cpufeatures" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +dependencies = [ + "libc", +] + [[package]] name = "cpufeatures" version = "0.2.1" @@ -1613,36 +1616,36 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e" +checksum = "7e6bea67967505247f54fa2c85cf4f6e0e31c4e5692c9b70e4ae58e339067333" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276" +checksum = "48194035d2752bdd5bdae429e3ab88676e95f52a2b1355a5d4e809f9e39b1d74" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.24.0", + "gimli", "log", "regalloc", "serde", - "smallvec 1.7.0", + "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821" +checksum = "976efb22fcab4f2cd6bd4e9913764616a54d895c1a23530128d04e03633c555f" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -1650,49 +1653,50 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b" +checksum = "9dabb5fe66e04d4652e434195b45ae65b5c8172d520247b8f66d8df42b2b45dc" dependencies = [ "serde", ] [[package]] name = "cranelift-entity" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c" +checksum = "3329733e4d4b8e91c809efcaa4faee80bf66f20164e3dd16d707346bd3494799" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c" +checksum = "279afcc0d3e651b773f94837c3d581177b348c8d69e928104b2e9fccb226f921" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.7.0", + "smallvec", "target-lexicon", ] [[package]] name = "cranelift-native" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c88d3dd48021ff1e37e978a00098524abd3513444ae252c08d37b310b3d2a" +checksum = "4c04d1fe6a5abb5bb0edc78baa8ef238370fb8e389cc88b6d153f7c3e9680425" dependencies = [ "cranelift-codegen", + "libc", "target-lexicon", ] [[package]] name = "cranelift-wasm" -version = "0.74.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89" +checksum = "e0d260ad44f6fd2c91f7f5097191a2a9e3edcbb36df1fb787b600dad5ea148ec" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1700,7 +1704,7 @@ dependencies = [ "itertools", "log", "serde", - "smallvec 1.7.0", + "smallvec", "thiserror", "wasmparser", ] @@ -1721,18 +1725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1742,23 +1735,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] @@ -1768,34 +1746,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils", "lazy_static", - "memoffset 0.6.4", + "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.5" @@ -1844,9 +1800,9 @@ dependencies = [ [[package]] name = "ct-logs" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8e13110a84b6315df212c045be706af261fd364791cad863285439ebba672e" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ "sct", ] @@ -1884,7 +1840,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "sc-cli", "sc-service", @@ -1894,7 +1850,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1910,7 +1866,6 @@ dependencies = [ "sp-api", "sp-consensus", "sp-core", - "sp-io", "sp-runtime", "tracing", ] @@ -1918,14 +1873,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.17", "parity-scale-codec", - "parking_lot 0.10.2", "polkadot-client", "sc-client-api", "sc-consensus", @@ -1949,32 +1903,27 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "async-trait", "dyn-clone", "futures 0.3.17", "parity-scale-codec", "polkadot-primitives", - "polkadot-runtime", "sc-client-api", "sc-consensus", "sp-api", - "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", "sp-trie", - "substrate-prometheus-endpoint", "tracing", ] [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "derive_more", "futures 0.3.17", @@ -1985,7 +1934,6 @@ dependencies = [ "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", - "polkadot-statement-table", "sc-client-api", "sp-api", "sp-blockchain", @@ -1998,7 +1946,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "futures 0.3.17", @@ -2013,7 +1961,6 @@ dependencies = [ "sc-consensus", "sp-api", "sp-consensus", - "sp-core", "sp-maybe-compressed-blob", "sp-runtime", "tracing", @@ -2022,7 +1969,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", @@ -2051,13 +1998,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "frame-executive", "frame-support", "frame-system", "pallet-aura", "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -2068,15 +2016,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", "parity-scale-codec", - "rand 0.8.4", - "rand_chacha 0.3.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -2087,7 +2034,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2099,6 +2046,7 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "polkadot-parachain", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -2115,7 +2063,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -2126,12 +2074,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -2142,15 +2091,15 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", "parity-scale-codec", - "rand 0.8.4", "rand_chacha 0.3.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -2160,7 +2109,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2172,13 +2121,12 @@ dependencies = [ "sp-runtime", "sp-std", "sp-trie", - "xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2186,6 +2134,7 @@ dependencies = [ "parity-scale-codec", "polkadot-client", "sc-client-api", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2199,7 +2148,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -2210,11 +2159,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "frame-support", - "impl-trait-for-tuples", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -2228,7 +2176,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2348,8 +2296,8 @@ dependencies = [ "log", "node-primitives", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "orml-unknown-tokens", "orml-xcm", "orml-xcm-support", @@ -2383,8 +2331,9 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-parachains", + "scale-info", "serde", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-arithmetic", "sp-block-builder", @@ -2596,9 +2545,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime 2.1.0", @@ -2685,28 +2634,6 @@ dependencies = [ "futures 0.3.17", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -2760,7 +2687,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.11.2", - "scale-info 1.0.0", + "scale-info", ] [[package]] @@ -2815,7 +2742,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", ] @@ -2833,7 +2760,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", @@ -2841,6 +2768,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", + "scale-info", "sp-api", "sp-io", "sp-runtime", @@ -2852,7 +2780,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "Inflector", "chrono", @@ -2878,11 +2806,12 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2891,11 +2820,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2905,19 +2835,20 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96616f82e069102b95a72c87de4c84d2f87ef7f0f20630e78ce3824436483110" dependencies = [ + "cfg-if 1.0.0", "parity-scale-codec", + "scale-info", "serde", - "sp-core", - "sp-std", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "bitflags", "frame-metadata", @@ -2927,8 +2858,9 @@ dependencies = [ "once_cell", "parity-scale-codec", "paste", + "scale-info", "serde", - "smallvec 1.7.0", + "smallvec", "sp-arithmetic", "sp-core", "sp-inherents", @@ -2943,7 +2875,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2955,7 +2887,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -2967,7 +2899,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro2", "quote", @@ -2977,12 +2909,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", - "impl-trait-for-tuples", "log", "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -2994,12 +2926,13 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -3008,7 +2941,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", "sp-api", @@ -3017,10 +2950,9 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", - "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -3054,12 +2986,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -3119,16 +3045,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures 0.1.31", - "num_cpus", -] - [[package]] name = "futures-executor" version = "0.3.17" @@ -3182,7 +3098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls 0.19.1", + "rustls", "webpki", ] @@ -3287,21 +3203,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - [[package]] name = "glob" version = "0.3.0" @@ -3334,44 +3244,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "fnv", - "futures 0.1.31", - "http 0.1.21", - "indexmap", - "log", - "slab", - "string", - "tokio-io", -] - -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.5", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "half" version = "1.7.1" @@ -3534,17 +3406,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "http" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes 0.4.12", - "fnv", - "itoa", -] - [[package]] name = "http" version = "0.2.5" @@ -3556,28 +3417,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "http 0.1.21", - "tokio-buf", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http 0.2.5", -] - [[package]] name = "http-body" version = "0.4.3" @@ -3585,7 +3424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ "bytes 1.1.0", - "http 0.2.5", + "http", "pin-project-lite 0.2.7", ] @@ -3595,12 +3434,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.1" @@ -3622,60 +3455,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.12.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "futures-cpupool", - "h2 0.1.26", - "http 0.1.21", - "http-body 0.1.0", - "httparse", - "iovec", - "itoa", - "log", - "net2", - "rustc_version 0.2.3", - "time", - "tokio 0.1.22", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want 0.2.0", -] - -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http 0.2.5", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa", - "pin-project 1.0.8", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want 0.3.0", -] - [[package]] name = "hyper" version = "0.14.13" @@ -3686,33 +3465,33 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http 0.2.5", - "http-body 0.4.3", + "http", + "http-body", "httparse", - "httpdate 1.0.1", + "httpdate", "itoa", "pin-project-lite 0.2.7", - "tokio 1.12.0", + "socket2 0.4.2", + "tokio", "tower-service", "tracing", - "want 0.3.0", + "want", ] [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.10", + "hyper", "log", - "rustls 0.18.1", - "rustls-native-certs 0.4.0", - "tokio 0.2.25", - "tokio-rustls 0.14.1", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", "webpki", ] @@ -3869,9 +3648,9 @@ dependencies = [ [[package]] name = "ip_network" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee15951c035f79eddbef745611ec962f63f4558f1dadf98ab723cc603487c6f" +checksum = "09b746553d2f4a1ca26fab939943ddfb217a091f34f53571620a8e3d30691303" [[package]] name = "ipconfig" @@ -3926,13 +3705,12 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7" +checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ - "failure", - "futures 0.1.31", - "hyper 0.12.36", + "derive_more", + "futures 0.3.17", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3943,11 +3721,13 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.1.31", + "futures 0.3.17", + "futures-executor", + "futures-util", "log", "serde", "serde_derive", @@ -3956,18 +3736,19 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f764902d7b891344a0acb65625f32f6f7c6db006952143bd650209fbe7d94db" +checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ + "futures 0.3.17", "jsonrpc-client-transports", ] [[package]] name = "jsonrpc-derive" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" +checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2", @@ -3977,73 +3758,80 @@ dependencies = [ [[package]] name = "jsonrpc-http-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" +checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "hyper 0.12.36", + "futures 0.3.17", + "hyper", "jsonrpc-core", "jsonrpc-server-utils", "log", "net2", - "parking_lot 0.10.2", + "parking_lot 0.11.2", "unicase", ] [[package]] name = "jsonrpc-ipc-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7" +checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" dependencies = [ + "futures 0.3.17", "jsonrpc-core", "jsonrpc-server-utils", "log", "parity-tokio-ipc", - "parking_lot 0.10.2", - "tokio-service", + "parking_lot 0.11.2", + "tower-service", ] [[package]] name = "jsonrpc-pubsub" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77" +checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ + "futures 0.3.17", "jsonrpc-core", + "lazy_static", "log", - "parking_lot 0.10.2", + "parking_lot 0.11.2", "rand 0.7.3", "serde", ] [[package]] name = "jsonrpc-server-utils" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176" +checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 0.4.12", + "bytes 1.1.0", + "futures 0.3.17", "globset", "jsonrpc-core", "lazy_static", "log", - "tokio 0.1.22", - "tokio-codec", + "tokio", + "tokio-stream", + "tokio-util", "unicase", ] [[package]] name = "jsonrpc-ws-server" -version = "15.1.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22" +checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" dependencies = [ + "futures 0.3.17", "jsonrpc-core", "jsonrpc-server-utils", "log", "parity-ws", - "parking_lot 0.10.2", + "parking_lot 0.11.2", "slab", ] @@ -4071,7 +3859,7 @@ dependencies = [ "beef", "futures-channel", "futures-util", - "hyper 0.14.13", + "hyper", "log", "serde", "serde_json", @@ -4091,14 +3879,14 @@ dependencies = [ "jsonrpsee-types", "log", "pin-project 1.0.8", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "rustls", + "rustls-native-certs", "serde", "serde_json", "soketto 0.6.0", "thiserror", - "tokio 0.2.25", - "tokio-rustls 0.15.0", + "tokio", + "tokio-rustls", "tokio-util", "url 2.2.2", ] @@ -4121,8 +3909,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -4136,6 +3924,7 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-babe", + "pallet-bags-list", "pallet-balances", "pallet-bounties", "pallet-collective", @@ -4172,9 +3961,10 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", + "scale-info", "serde", "serde_derive", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-arithmetic", "sp-authority-discovery", @@ -4214,7 +4004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" dependencies = [ "parity-util-mem", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -4230,9 +4020,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d169dbb316aa0fa185d02d847c047f1aa20e292cf1563d790c13536a2a732c8" +checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" dependencies = [ "fs-swap", "kvdb", @@ -4243,7 +4033,7 @@ dependencies = [ "parking_lot 0.11.2", "regex", "rocksdb", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -4260,9 +4050,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" [[package]] name = "libloading" @@ -4276,9 +4066,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0" dependencies = [ "cfg-if 1.0.0", "winapi 0.3.9", @@ -4325,7 +4115,7 @@ dependencies = [ "multiaddr", "parking_lot 0.11.2", "pin-project 1.0.8", - "smallvec 1.7.0", + "smallvec", "wasm-timer", ] @@ -4356,7 +4146,7 @@ dependencies = [ "ring", "rw-stream-sink", "sha2 0.9.8", - "smallvec 1.7.0", + "smallvec", "thiserror", "unsigned-varint 0.7.0", "void", @@ -4384,7 +4174,7 @@ dependencies = [ "futures 0.3.17", "libp2p-core", "log", - "smallvec 1.7.0", + "smallvec", "trust-dns-resolver", ] @@ -4403,7 +4193,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -4427,7 +4217,7 @@ dependencies = [ "rand 0.7.3", "regex", "sha2 0.9.8", - "smallvec 1.7.0", + "smallvec", "unsigned-varint 0.7.0", "wasm-timer", ] @@ -4444,7 +4234,7 @@ dependencies = [ "log", "prost", "prost-build", - "smallvec 1.7.0", + "smallvec", "wasm-timer", ] @@ -4467,7 +4257,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sha2 0.9.8", - "smallvec 1.7.0", + "smallvec", "uint", "unsigned-varint 0.7.0", "void", @@ -4490,7 +4280,7 @@ dependencies = [ "libp2p-swarm", "log", "rand 0.8.4", - "smallvec 1.7.0", + "smallvec", "socket2 0.4.2", "void", ] @@ -4509,7 +4299,7 @@ dependencies = [ "nohash-hasher", "parking_lot 0.11.2", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", "unsigned-varint 0.7.0", ] @@ -4598,7 +4388,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", "unsigned-varint 0.7.0", "void", "wasm-timer", @@ -4619,7 +4409,7 @@ dependencies = [ "lru", "minicbor", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", "unsigned-varint 0.7.0", "wasm-timer", ] @@ -4635,7 +4425,7 @@ dependencies = [ "libp2p-core", "log", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", "void", "wasm-timer", ] @@ -4762,9 +4552,9 @@ dependencies = [ "base64 0.12.3", "digest 0.9.0", "hmac-drbg 0.3.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", + "libsecp256k1-core 0.2.2", + "libsecp256k1-gen-ecmult 0.2.1", + "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3", "serde", "sha2 0.9.8", @@ -4781,15 +4571,32 @@ dependencies = [ "base64 0.12.3", "digest 0.9.0", "hmac-drbg 0.3.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", + "libsecp256k1-core 0.2.2", + "libsecp256k1-gen-ecmult 0.2.1", + "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3", "serde", "sha2 0.9.8", "typenum", ] +[[package]] +name = "libsecp256k1" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +dependencies = [ + "arrayref", + "base64 0.13.0", + "digest 0.9.0", + "libsecp256k1-core 0.3.0", + "libsecp256k1-gen-ecmult 0.3.0", + "libsecp256k1-gen-genmult 0.3.0", + "rand 0.8.4", + "serde", + "sha2 0.9.8", +] + [[package]] name = "libsecp256k1-core" version = "0.2.2" @@ -4801,13 +4608,33 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle 2.4.1", +] + [[package]] name = "libsecp256k1-gen-ecmult" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -4816,7 +4643,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -4901,6 +4737,26 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lz4" +version = "1.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "mach" version = "0.3.2" @@ -4946,12 +4802,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.4.1" @@ -4967,15 +4817,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.6.4" @@ -5025,12 +4866,14 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "derive_more", "futures 0.3.17", "futures-timer 3.0.2", + "thiserror", + "tracing", ] [[package]] @@ -5094,38 +4937,28 @@ dependencies = [ ] [[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio", - "slab", -] - -[[package]] -name = "mio-named-pipes" -version = "0.1.7" +name = "mio" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ + "libc", "log", - "mio", "miow 0.3.7", + "ntapi", "winapi 0.3.9", ] [[package]] -name = "mio-uds" -version = "0.6.8" +name = "mio-extras" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ - "iovec", - "libc", - "mio", + "lazycell", + "log", + "mio 0.6.23", + "slab", ] [[package]] @@ -5236,15 +5069,15 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" +checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" dependencies = [ "bytes 1.1.0", "futures 0.3.17", "log", "pin-project 1.0.8", - "smallvec 1.7.0", + "smallvec", "unsigned-varint 0.7.0", ] @@ -5279,11 +5112,11 @@ dependencies = [ [[package]] name = "names" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" +checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" dependencies = [ - "rand 0.3.23", + "rand 0.8.4", ] [[package]] @@ -5333,6 +5166,7 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-client-api", + "sc-executor", "sc-service", "sp-blockchain", "sp-core", @@ -5343,13 +5177,13 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.9.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "derive_more", - "log", "parity-scale-codec", "sc-cli", "sc-client-api", + "sc-executor", "sc-service", "sp-blockchain", "sp-core", @@ -5365,6 +5199,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5425,7 +5260,7 @@ dependencies = [ "log", "node-primitives", "node-rpc", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc", "polkadot-service", "sc-basic-authorship", "sc-chain-spec", @@ -5492,6 +5327,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -5576,22 +5420,14 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" -dependencies = [ - "crc32fast", - "indexmap", -] - [[package]] name = "object" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" dependencies = [ + "crc32fast", + "indexmap", "memchr", ] @@ -5631,13 +5467,14 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5647,12 +5484,13 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "frame-system", "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master)", "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5661,12 +5499,13 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5675,13 +5514,14 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master)", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5692,13 +5532,14 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5709,12 +5550,13 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "frame-system", "orml-xcm-support", "parity-scale-codec", + "scale-info", "serde", "sp-std", "xcm", @@ -5723,10 +5565,11 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5736,10 +5579,11 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5749,12 +5593,13 @@ dependencies = [ [[package]] name = "orml-xcm" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", "frame-system", "pallet-xcm", "parity-scale-codec", + "scale-info", "sp-std", "xcm", ] @@ -5762,10 +5607,10 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "frame-support", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "parity-scale-codec", "sp-runtime", "sp-std", @@ -5776,14 +5621,15 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844#37e42936c41dbdbaf0117c628c9eab0e06044844" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2#dc96605342de9971c27699561723a6de6e2614c2" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "orml-xcm-support", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5804,13 +5650,13 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", - "pallet-session", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5820,12 +5666,13 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "pallet-session", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5835,12 +5682,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -5849,7 +5697,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", @@ -5859,6 +5707,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5869,31 +5718,47 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bags-list" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] [[package]] name = "pallet-beefy" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", "parity-scale-codec", - "scale-info 0.10.0", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5901,22 +5766,22 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" -version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=polkadot-v0.9.10#9954b61657dc8899a21b4f2501ee6bd3b7a2dc23" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1 0.6.0", + "libsecp256k1 0.7.0", "log", "pallet-beefy", "pallet-mmr", "pallet-mmr-primitives", "pallet-session", "parity-scale-codec", - "scale-info 0.10.0", + "scale-info", "serde", "sp-core", "sp-io", @@ -5927,13 +5792,17 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-treasury", "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5941,7 +5810,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5950,6 +5819,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -5959,13 +5829,14 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5975,12 +5846,13 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5990,13 +5862,14 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-election-provider-support", "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6009,12 +5882,13 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -6025,12 +5899,13 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6039,7 +5914,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", @@ -6048,6 +5923,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6061,13 +5937,14 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6076,13 +5953,14 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "log", "pallet-authorship", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -6094,12 +5972,13 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -6110,13 +5989,15 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6125,7 +6006,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -6133,6 +6014,7 @@ dependencies = [ "frame-system", "pallet-mmr-primitives", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6142,7 +6024,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", @@ -6158,7 +6040,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6169,19 +6051,18 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", - "sp-rpc", "sp-runtime", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "sp-core", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6190,11 +6071,12 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6203,13 +6085,14 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "log", "pallet-balances", "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -6219,12 +6102,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "sp-core", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6233,12 +6116,13 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", + "scale-info", "sp-runtime", "sp-std", ] @@ -6246,12 +6130,12 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "enumflags2", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6260,13 +6144,14 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6275,7 +6160,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", @@ -6283,6 +6168,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6295,12 +6181,13 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", + "scale-info", "sp-runtime", "sp-std", ] @@ -6308,7 +6195,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-election-provider-support", "frame-support", @@ -6317,20 +6204,19 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "paste", + "scale-info", "serde", "sp-application-crypto", "sp-io", "sp-runtime", "sp-staking", "sp-std", - "static_assertions", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -6341,7 +6227,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "sp-arithmetic", @@ -6350,11 +6236,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6363,14 +6250,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "impl-trait-for-tuples", "log", "parity-scale-codec", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -6381,13 +6268,17 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", + "log", "pallet-treasury", "parity-scale-codec", + "scale-info", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6395,13 +6286,14 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde", - "smallvec 1.7.0", + "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -6411,7 +6303,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6428,7 +6320,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6439,7 +6331,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", @@ -6447,6 +6339,7 @@ dependencies = [ "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6455,12 +6348,13 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6470,26 +6364,29 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "enumflags2", "frame-support", "frame-system", + "log", "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] [[package]] name = "pallet-xcm" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", + "scale-info", "serde", + "sp-core", "sp-runtime", "sp-std", "xcm", @@ -6499,20 +6396,21 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.10#870b214693856e768ba482fe2d3b9a83b24e4540" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde", ] [[package]] name = "parity-db" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47" +checksum = "91b679c6acc14fac74382942e2b73bea441686a33430b951ea03b5aeb6a7f254" dependencies = [ "blake2-rfc", "crc32fast", @@ -6520,9 +6418,11 @@ dependencies = [ "hex", "libc", "log", + "lz4", "memmap2", "parking_lot 0.11.2", "rand 0.8.4", + "snap", ] [[package]] @@ -6559,20 +6459,15 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-tokio-ipc" -version = "0.4.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" +checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", + "futures 0.3.17", "libc", "log", - "mio-named-pipes", - "miow 0.3.7", "rand 0.7.3", - "tokio 0.1.22", - "tokio-named-pipes", - "tokio-uds", + "tokio", "winapi 0.3.9", ] @@ -6590,7 +6485,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.11.2", "primitive-types", - "smallvec 1.7.0", + "smallvec", "winapi 0.3.9", ] @@ -6622,15 +6517,15 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" [[package]] name = "parity-ws" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322d72dfe461b8b9e367d057ceace105379d64d5b03907d23c481ccf3fbf8aa4" +checksum = "d0ab8a461779bd022964cae2b4989fa9c99deb270bec162da2125ec03c09fcaa" dependencies = [ "byteorder", "bytes 0.4.12", "httparse", "log", - "mio", + "mio 0.6.23", "mio-extras", "rand 0.7.3", "sha-1 0.8.2", @@ -6644,17 +6539,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.2", - "rustc_version 0.2.3", -] - [[package]] name = "parking_lot" version = "0.10.2" @@ -6676,21 +6560,6 @@ dependencies = [ "parking_lot_core 0.8.5", ] -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version 0.2.3", - "smallvec 0.6.14", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.7.2" @@ -6701,7 +6570,7 @@ dependencies = [ "cloudabi", "libc", "redox_syscall 0.1.57", - "smallvec 1.7.0", + "smallvec", "winapi 0.3.9", ] @@ -6715,7 +6584,7 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.10", - "smallvec 1.7.0", + "smallvec", "winapi 0.3.9", ] @@ -6743,12 +6612,6 @@ dependencies = [ "crypto-mac 0.11.1", ] -[[package]] -name = "pdqselect" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27" - [[package]] name = "peeking_take_while" version = "0.1.2" @@ -6892,8 +6755,8 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6906,8 +6769,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6919,22 +6782,20 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "derive_more", "futures 0.3.17", "lru", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.4", - "sp-application-crypto", "sp-core", "sp-keystore", "thiserror", @@ -6943,8 +6804,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "lru", @@ -6956,14 +6817,15 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.4", + "sc-network", "thiserror", "tracing", ] [[package]] name = "polkadot-cli" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "frame-benchmarking-cli", "futures 0.3.17", @@ -6982,8 +6844,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7012,8 +6874,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "always-assert", "derive_more", @@ -7033,11 +6895,12 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "parity-scale-codec", "parity-util-mem", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7045,24 +6908,21 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "derive_more", "futures 0.3.17", "lru", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", "sc-network", "sp-application-crypto", - "sp-core", "sp-keystore", "thiserror", "tracing", @@ -7070,8 +6930,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7084,16 +6944,18 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", + "futures-timer 3.0.2", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.4", "rand_chacha 0.3.1", + "sc-network", "sp-application-crypto", "sp-core", "sp-keystore", @@ -7102,8 +6964,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "futures 0.3.17", @@ -7121,8 +6983,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "parity-scale-codec", @@ -7139,8 +7001,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -7156,11 +7018,9 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sc-client-api", "sc-keystore", "schnorrkel", "sp-application-crypto", - "sp-blockchain", "sp-consensus", "sp-consensus-slots", "sp-runtime", @@ -7169,8 +7029,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7189,8 +7049,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7207,8 +7067,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -7222,8 +7082,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "futures 0.3.17", @@ -7240,8 +7100,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -7255,8 +7115,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -7272,8 +7132,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -7291,8 +7151,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "polkadot-node-primitives", @@ -7304,8 +7164,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "futures 0.3.17", @@ -7321,8 +7181,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "futures 0.3.17", @@ -7336,8 +7196,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "always-assert", "assert_matches", @@ -7349,6 +7209,7 @@ dependencies = [ "parity-scale-codec", "pin-project 1.0.8", "polkadot-core-primitives", + "polkadot-node-subsystem-util", "polkadot-parachain", "rand 0.8.4", "sc-executor", @@ -7366,8 +7227,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "futures 0.3.17", "memory-lru", @@ -7384,8 +7245,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-std", "lazy_static", @@ -7402,24 +7263,19 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ - "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "metered-channel", - "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", "substrate-prometheus-endpoint", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "derive_more", @@ -7430,20 +7286,20 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.21.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ + "bounded-vec", "futures 0.3.17", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", - "polkadot-statement-table", "schnorrkel", "serde", "sp-application-crypto", @@ -7452,16 +7308,14 @@ dependencies = [ "sp-core", "sp-keystore", "sp-maybe-compressed-blob", - "sp-runtime", "thiserror", - "tracing", "zstd", ] [[package]] name = "polkadot-node-subsystem" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7470,20 +7324,11 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ - "async-std", - "async-trait", "derive_more", "futures 0.3.17", - "futures-timer 3.0.2", - "lazy_static", - "log", - "mick-jaeger", - "parity-scale-codec", - "parking_lot 0.11.2", - "pin-project 1.0.8", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7491,22 +7336,19 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", - "smallvec 1.7.0", - "sp-core", + "smallvec", "substrate-prometheus-endpoint", "thiserror", - "tracing", ] [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "derive_more", "futures 0.3.17", - "futures-timer 3.0.2", "itertools", "lru", "metered-channel", @@ -7515,35 +7357,31 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", - "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", "rand 0.8.4", - "sc-network", "sp-application-crypto", "sp-core", "sp-keystore", - "substrate-prometheus-endpoint", "thiserror", "tracing", ] [[package]] name = "polkadot-overseer" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ - "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "lru", + "parity-util-mem", "parking_lot 0.11.2", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-all-subsystems-gen", "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", @@ -7551,21 +7389,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "polkadot-overseer-all-subsystems-gen" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" -dependencies = [ - "assert_matches", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-overseer-gen" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "futures 0.3.17", @@ -7581,8 +7408,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -7592,14 +7419,15 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "derive_more", "frame-support", "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -7608,8 +7436,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -7618,6 +7446,7 @@ dependencies = [ "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -7633,20 +7462,18 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "thiserror", ] [[package]] name = "polkadot-rpc" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", "jsonrpc-core", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", - "parity-scale-codec", "polkadot-primitives", "sc-chain-spec", "sc-client-api", @@ -7655,7 +7482,6 @@ dependencies = [ "sc-consensus-epochs", "sc-finality-grandpa", "sc-finality-grandpa-rpc", - "sc-keystore", "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", @@ -7671,8 +7497,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7716,10 +7542,12 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", + "scale-info", "serde", "serde_derive", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -7741,20 +7569,22 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ + "beefy-primitives", "bitvec 0.20.4", + "frame-election-provider-support", "frame-support", "frame-system", "impl-trait-for-tuples", - "libsecp256k1 0.6.0", + "libsecp256k1 0.7.0", "log", "pallet-authorship", + "pallet-bags-list", "pallet-balances", "pallet-beefy-mmr", "pallet-election-provider-multi-phase", - "pallet-offences", "pallet-session", "pallet-staking", "pallet-timestamp", @@ -7765,6 +7595,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -7772,6 +7603,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-npos-elections", "sp-runtime", "sp-session", "sp-staking", @@ -7782,8 +7614,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "bitflags", "bitvec 0.20.4", @@ -7794,7 +7626,6 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship", "pallet-balances", - "pallet-offences", "pallet-session", "pallet-staking", "pallet-timestamp", @@ -7804,6 +7635,7 @@ dependencies = [ "rand 0.8.4", "rand_chacha 0.3.1", "rustc-hex", + "scale-info", "serde", "sp-api", "sp-core", @@ -7820,8 +7652,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "async-trait", "beefy-gadget", @@ -7831,6 +7663,7 @@ dependencies = [ "hex-literal 0.3.3", "kvdb", "kvdb-rocksdb", + "lru", "pallet-babe", "pallet-im-online", "pallet-mmr-primitives", @@ -7914,8 +7747,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -7935,8 +7768,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7962,7 +7795,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.1", "opaque-debug 0.3.0", "universal-hash", ] @@ -7974,16 +7807,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures", + "cpufeatures 0.2.1", "opaque-debug 0.3.0", "universal-hash", ] [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" [[package]] name = "primitive-types" @@ -7995,6 +7828,7 @@ dependencies = [ "impl-codec", "impl-rlp", "impl-serde", + "scale-info", "uint", ] @@ -8081,9 +7915,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -8198,9 +8032,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -8217,29 +8051,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -8286,21 +8097,6 @@ dependencies = [ "rand_core 0.6.3", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -8369,7 +8165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", - "crossbeam-deque 0.8.1", + "crossbeam-deque", "either", "rayon-core", ] @@ -8381,21 +8177,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", - "crossbeam-deque 0.8.1", - "crossbeam-utils 0.8.5", + "crossbeam-deque", + "crossbeam-utils", "lazy_static", "num_cpus", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.1.57" @@ -8463,7 +8250,7 @@ dependencies = [ "log", "rustc-hash", "serde", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -8507,10 +8294,9 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "env_logger 0.8.4", - "hex", + "env_logger 0.9.0", "jsonrpsee-proc-macros", "jsonrpsee-ws-client", "log", @@ -8520,6 +8306,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-version", ] [[package]] @@ -8634,8 +8421,8 @@ dependencies = [ "node-primitives", "node-service", "orml-currencies", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=37e42936c41dbdbaf0117c628c9eab0e06044844)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?rev=dc96605342de9971c27699561723a6de6e2614c2)", "orml-unknown-tokens", "orml-xcm-support", "orml-xtokens", @@ -8668,7 +8455,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-parachains", "serde", - "smallvec 1.7.0", + "smallvec", "sp-api", "sp-arithmetic", "sp-block-builder", @@ -8729,19 +8516,6 @@ dependencies = [ "semver 0.11.0", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.19.1" @@ -8755,18 +8529,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" -dependencies = [ - "openssl-probe", - "rustls 0.18.1", - "schannel", - "security-framework 1.0.0", -] - [[package]] name = "rustls-native-certs" version = "0.5.0" @@ -8774,19 +8536,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls 0.19.1", + "rustls", "schannel", - "security-framework 2.4.2", -] - -[[package]] -name = "ruzstd" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100" -dependencies = [ - "byteorder", - "twox-hash", + "security-framework", ] [[package]] @@ -8836,7 +8588,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "sp-core", @@ -8847,11 +8599,10 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", - "either", "futures 0.3.17", "futures-timer 3.0.2", "ip_network", @@ -8863,7 +8614,6 @@ dependencies = [ "rand 0.7.3", "sc-client-api", "sc-network", - "serde_json", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -8876,7 +8626,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8899,7 +8649,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8915,7 +8665,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8931,7 +8681,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8942,7 +8692,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "chrono", "fdlimit", @@ -8961,6 +8711,7 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", + "sc-utils", "serde", "serde_json", "sp-blockchain", @@ -8969,54 +8720,46 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-utils", "sp-version", "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.25", + "tokio", ] [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "derive_more", "fnv", "futures 0.3.17", "hash-db", - "kvdb", - "lazy_static", "log", "parity-scale-codec", "parking_lot 0.11.2", "sc-executor", "sc-transaction-pool-api", + "sc-utils", "sp-api", "sp-blockchain", "sp-consensus", "sp-core", "sp-database", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", - "sp-utils", - "sp-version", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "blake2-rfc", "hash-db", "kvdb", "kvdb-memorydb", @@ -9025,10 +8768,8 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.2", "sc-client-api", - "sc-executor", "sc-state-db", "sp-arithmetic", "sp-blockchain", @@ -9037,13 +8778,12 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-trie", - "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "futures 0.3.17", @@ -9052,6 +8792,7 @@ dependencies = [ "log", "parking_lot 0.11.2", "sc-client-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -9059,21 +8800,18 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", "futures 0.3.17", - "futures-timer 3.0.2", "log", "parity-scale-codec", "sc-block-builder", @@ -9090,23 +8828,20 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", - "sp-version", "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", "fork-tree", "futures 0.3.17", - "futures-timer 3.0.2", "log", "merlin", "num-bigint 0.2.6", @@ -9114,14 +8849,12 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.11.2", - "pdqselect", "rand 0.7.3", "retain_mut", "sc-client-api", "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-consensus-uncles", "sc-keystore", "sc-telemetry", "schnorrkel", @@ -9139,7 +8872,6 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-utils", "sp-version", "substrate-prometheus-endpoint", ] @@ -9147,7 +8879,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "derive_more", "futures 0.3.17", @@ -9171,7 +8903,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9184,7 +8916,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "assert_matches", "async-trait", @@ -9195,7 +8927,6 @@ dependencies = [ "jsonrpc-derive", "log", "parity-scale-codec", - "parking_lot 0.11.2", "sc-client-api", "sc-consensus", "sc-consensus-babe", @@ -9210,7 +8941,6 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keyring", "sp-keystore", "sp-runtime", "sp-timestamp", @@ -9220,19 +8950,17 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", - "impl-trait-for-tuples", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", "sp-api", - "sp-application-crypto", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -9242,14 +8970,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-trie", "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "sc-client-api", "sp-authorship", @@ -9260,14 +8987,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "derive_more", "lazy_static", "libsecp256k1 0.6.0", "log", "parity-scale-codec", - "parity-wasm 0.42.2", "parking_lot 0.11.2", "sc-executor-common", "sc-executor-wasmi", @@ -9278,7 +9003,6 @@ dependencies = [ "sp-io", "sp-panic-handler", "sp-runtime-interface", - "sp-serializer", "sp-tasks", "sp-trie", "sp-version", @@ -9289,9 +9013,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "derive_more", + "environmental", "parity-scale-codec", "pwasm-utils", "sc-allocator", @@ -9306,12 +9031,13 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", + "scoped-tls", "sp-core", "sp-runtime-interface", "sp-wasm-interface", @@ -9321,17 +9047,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "cfg-if 1.0.0", "libc", "log", "parity-scale-codec", "parity-wasm 0.42.2", - "pwasm-utils", "sc-allocator", "sc-executor-common", - "scoped-tls", "sp-core", "sp-runtime-interface", "sp-wasm-interface", @@ -9341,7 +9065,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", @@ -9350,11 +9074,9 @@ dependencies = [ "fork-tree", "futures 0.3.17", "futures-timer 3.0.2", - "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.11.2", - "pin-project 1.0.8", "rand 0.8.4", "sc-block-builder", "sc-client-api", @@ -9363,6 +9085,7 @@ dependencies = [ "sc-network", "sc-network-gossip", "sc-telemetry", + "sc-utils", "serde_json", "sp-api", "sp-application-crypto", @@ -9371,18 +9094,15 @@ dependencies = [ "sp-consensus", "sp-core", "sp-finality-grandpa", - "sp-inherents", "sp-keystore", "sp-runtime", - "sp-utils", "substrate-prometheus-endpoint", - "wasm-timer", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "derive_more", "finality-grandpa", @@ -9406,7 +9126,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -9418,36 +9138,29 @@ dependencies = [ "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", - "wasm-timer", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", - "futures 0.3.17", - "futures-util", "hex", - "merlin", "parking_lot 0.11.2", - "rand 0.7.3", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", - "subtle 2.4.1", ] [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "hash-db", - "lazy_static", "parity-scale-codec", "parking_lot 0.11.2", "sc-client-api", @@ -9463,18 +9176,16 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", - "bs58 0.4.0", "bytes 1.1.0", "cid", "derive_more", "either", - "erased-serde", "fnv", "fork-tree", "futures 0.3.17", @@ -9486,7 +9197,6 @@ dependencies = [ "linked_hash_set", "log", "lru", - "nohash-hasher", "parity-scale-codec", "parking_lot 0.11.2", "pin-project 1.0.8", @@ -9497,28 +9207,27 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-peerset", + "sc-utils", "serde", "serde_json", - "smallvec 1.7.0", + "smallvec", "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-core", "sp-finality-grandpa", "sp-runtime", - "sp-utils", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint 0.6.0", "void", - "wasm-timer", "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9529,20 +9238,19 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "tracing", - "wasm-timer", ] [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "bytes 0.5.6", + "bytes 1.1.0", "fnv", "futures 0.3.17", "futures-timer 3.0.2", "hex", - "hyper 0.13.10", + "hyper", "hyper-rustls", "log", "num_cpus", @@ -9550,33 +9258,32 @@ dependencies = [ "parking_lot 0.11.2", "rand 0.7.3", "sc-client-api", - "sc-keystore", "sc-network", + "sc-utils", "sp-api", "sp-core", "sp-offchain", "sp-runtime", - "sp-utils", "threadpool", ] [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "libp2p", "log", + "sc-utils", "serde_json", - "sp-utils", "wasm-timer", ] [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9585,7 +9292,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "hash-db", @@ -9597,11 +9304,10 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", - "sc-executor", - "sc-keystore", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", + "sc-utils", "serde_json", "sp-api", "sp-blockchain", @@ -9611,18 +9317,14 @@ dependencies = [ "sp-rpc", "sp-runtime", "sp-session", - "sp-state-machine", - "sp-tracing", - "sp-utils", "sp-version", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "derive_more", "futures 0.3.17", "jsonrpc-core", "jsonrpc-core-client", @@ -9640,41 +9342,39 @@ dependencies = [ "sp-runtime", "sp-tracing", "sp-version", + "thiserror", ] [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "futures 0.1.31", + "futures 0.3.17", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", "jsonrpc-pubsub", "jsonrpc-ws-server", "log", - "serde", "serde_json", - "sp-runtime", "substrate-prometheus-endpoint", + "tokio", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.1.31", "futures 0.3.17", "futures-timer 3.0.2", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", - "lazy_static", "log", "parity-scale-codec", "parity-util-mem", @@ -9698,6 +9398,7 @@ dependencies = [ "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", + "sc-utils", "serde", "serde_json", "sp-api", @@ -9708,7 +9409,6 @@ dependencies = [ "sp-core", "sp-externalities", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", "sp-session", @@ -9718,20 +9418,19 @@ dependencies = [ "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", - "sp-utils", "sp-version", "substrate-prometheus-endpoint", "tempfile", "thiserror", + "tokio", "tracing", "tracing-futures", - "wasm-timer", ] [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "parity-scale-codec", @@ -9740,13 +9439,12 @@ dependencies = [ "parking_lot 0.11.2", "sc-client-api", "sp-core", - "thiserror", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9768,7 +9466,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "chrono", "futures 0.3.17", @@ -9779,20 +9477,17 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "take_mut", "thiserror", - "void", "wasm-timer", ] [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "ansi_term 0.12.1", "atty", - "erased-serde", "lazy_static", "log", "once_cell", @@ -9801,31 +9496,24 @@ dependencies = [ "rustc-hash", "sc-client-api", "sc-rpc-server", - "sc-telemetry", "sc-tracing-proc-macro", "serde", - "serde_json", "sp-api", - "sp-block-builder", "sp-blockchain", "sp-core", "sp-rpc", "sp-runtime", - "sp-storage", "sp-tracing", "thiserror", "tracing", "tracing-log", "tracing-subscriber", - "wasm-bindgen", - "wasm-timer", - "web-sys", ] [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9836,9 +9524,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "derive_more", "futures 0.3.17", "intervalier", "linked-hash-map", @@ -9849,6 +9536,7 @@ dependencies = [ "retain_mut", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -9856,21 +9544,18 @@ dependencies = [ "sp-runtime", "sp-tracing", "sp-transaction-pool", - "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "derive_more", "futures 0.3.17", "log", - "parity-scale-codec", "serde", "sp-blockchain", "sp-runtime", @@ -9878,16 +9563,14 @@ dependencies = [ ] [[package]] -name = "scale-info" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b" +name = "sc-utils" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "bitvec 0.20.4", - "cfg-if 1.0.0", - "derive_more", - "parity-scale-codec", - "scale-info-derive 0.7.0", + "futures 0.3.17", + "futures-timer 3.0.2", + "lazy_static", + "prometheus", ] [[package]] @@ -9900,19 +9583,8 @@ dependencies = [ "cfg-if 1.0.0", "derive_more", "parity-scale-codec", - "scale-info-derive 1.0.0", -] - -[[package]] -name = "scale-info-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn", + "scale-info-derive", + "serde", ] [[package]] @@ -9967,6 +9639,26 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scroll" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sct" version = "0.6.1" @@ -9986,19 +9678,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "security-framework" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "core-foundation-sys 0.7.0", - "libc", - "security-framework-sys 1.0.0", -] - [[package]] name = "security-framework" version = "2.4.2" @@ -10006,20 +9685,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", - "core-foundation 0.9.1", - "core-foundation-sys 0.8.2", - "libc", - "security-framework-sys 2.4.2", -] - -[[package]] -name = "security-framework-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" -dependencies = [ - "core-foundation-sys 0.7.0", + "core-foundation", + "core-foundation-sys", "libc", + "security-framework-sys", ] [[package]] @@ -10028,7 +9697,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ - "core-foundation-sys 0.8.2", + "core-foundation-sys", "libc", ] @@ -10126,7 +9795,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpufeatures 0.2.1", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10151,7 +9820,7 @@ checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpufeatures 0.2.1", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10170,9 +9839,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -10222,9 +9891,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slog" @@ -10237,8 +9906,8 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "enumn", "parity-scale-codec", @@ -10258,18 +9927,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "0.6.14" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] -name = "smallvec" -version = "1.7.0" +name = "snap" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" @@ -10344,7 +10010,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "hash-db", "log", @@ -10361,7 +10027,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -10373,9 +10039,10 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -10385,11 +10052,12 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -10399,9 +10067,10 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10411,7 +10080,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "parity-scale-codec", @@ -10423,7 +10092,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", "sp-api", @@ -10435,7 +10104,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "log", @@ -10453,36 +10122,30 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "futures 0.3.17", "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.11.2", - "serde", - "sp-api", "sp-core", "sp-inherents", "sp-runtime", "sp-state-machine", "sp-std", - "sp-trie", - "sp-utils", "sp-version", - "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10496,11 +10159,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "merlin", "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10518,9 +10182,10 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", ] @@ -10528,7 +10193,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10540,7 +10205,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "base58", "blake2-rfc", @@ -10563,6 +10228,7 @@ dependencies = [ "primitive-types", "rand 0.7.3", "regex", + "scale-info", "schnorrkel", "secrecy", "serde", @@ -10584,7 +10250,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -10593,7 +10259,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro2", "quote", @@ -10603,7 +10269,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "environmental", "parity-scale-codec", @@ -10614,11 +10280,12 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10631,7 +10298,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10645,7 +10312,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "futures 0.3.17", "hash-db", @@ -10656,7 +10323,6 @@ dependencies = [ "sp-core", "sp-externalities", "sp-keystore", - "sp-maybe-compressed-blob", "sp-runtime-interface", "sp-state-machine", "sp-std", @@ -10670,18 +10336,18 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.20.0", ] [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "derive_more", @@ -10698,29 +10364,30 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "ruzstd", "zstd", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", "sp-npos-elections-solution-type", + "sp-runtime", "sp-std", ] [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10731,7 +10398,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "sp-api", "sp-core", @@ -10741,7 +10408,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "backtrace", ] @@ -10749,18 +10416,17 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "rustc-hash", "serde", "sp-core", - "tracing-core", ] [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "either", "hash256-std-hasher", @@ -10770,6 +10436,7 @@ dependencies = [ "parity-util-mem", "paste", "rand 0.7.3", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10781,7 +10448,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10798,7 +10465,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -10810,7 +10477,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "serde", "serde_json", @@ -10819,9 +10486,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -10832,9 +10500,10 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -10842,7 +10511,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "hash-db", "log", @@ -10850,7 +10519,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "rand 0.7.3", - "smallvec 1.7.0", + "smallvec", "sp-core", "sp-externalities", "sp-panic-handler", @@ -10865,12 +10534,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10883,7 +10552,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "log", "sp-core", @@ -10896,7 +10565,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10907,13 +10576,12 @@ dependencies = [ "sp-runtime", "sp-std", "thiserror", - "wasm-timer", ] [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "erased-serde", "log", @@ -10931,7 +10599,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "sp-api", "sp-runtime", @@ -10940,11 +10608,12 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-trait", "log", "parity-scale-codec", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -10955,37 +10624,27 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "trie-db", "trie-root", ] -[[package]] -name = "sp-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" -dependencies = [ - "futures 0.3.17", - "futures-core", - "futures-timer 3.0.2", - "lazy_static", - "prometheus", -] - [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -10996,10 +10655,9 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "parity-scale-codec", - "proc-macro-crate 1.1.0", "proc-macro2", "quote", "syn", @@ -11008,7 +10666,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11072,15 +10730,6 @@ dependencies = [ "rand 0.8.4", ] -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes 0.4.12", -] - [[package]] name = "strsim" version = "0.8.0" @@ -11117,7 +10766,16 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" dependencies = [ - "strum_macros", + "strum_macros 0.20.1", +] + +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +dependencies = [ + "strum_macros 0.21.1", ] [[package]] @@ -11133,18 +10791,15 @@ dependencies = [ ] [[package]] -name = "subkey" -version = "0.8.0" +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ - "frame-system", - "futures 0.1.31", - "hex", - "jsonrpc-core-client", - "sc-cli", - "sc-rpc", - "sp-core", - "structopt", - "tokio 0.1.22", + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -11163,7 +10818,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "platforms", ] @@ -11171,7 +10826,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -11183,7 +10838,6 @@ dependencies = [ "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde", "sp-api", "sp-block-builder", "sp-blockchain", @@ -11194,24 +10848,23 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "async-std", "derive_more", "futures-util", - "hyper 0.13.10", + "hyper", "log", "prometheus", - "tokio 0.2.25", + "tokio", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ "ansi_term 0.12.1", - "atty", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", @@ -11235,9 +10888,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.78" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4eac2e6c19f5c3abc0c229bea31ff0b9b091c7b14990e8924b92902a303a0c0" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -11257,9 +10910,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -11267,12 +10920,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - [[package]] name = "tap" version = "1.0.1" @@ -11319,18 +10966,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -11424,300 +11071,69 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "mio", - "num_cpus", - "tokio-codec", - "tokio-current-thread", - "tokio-executor", - "tokio-fs", - "tokio-io", - "tokio-reactor", - "tokio-sync", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "tokio-udp", - "tokio-uds", -] - -[[package]] -name = "tokio" -version = "0.2.25" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", + "autocfg", + "bytes 1.1.0", "libc", "memchr", - "mio", - "mio-uds", + "mio 0.7.13", "num_cpus", - "pin-project-lite 0.1.12", + "once_cell", + "pin-project-lite 0.2.7", "signal-hook-registry", - "slab", "tokio-macros", "winapi 0.3.9", ] -[[package]] -name = "tokio" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" -dependencies = [ - "autocfg", - "pin-project-lite 0.2.7", -] - -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes 0.4.12", - "either", - "futures 0.1.31", -] - -[[package]] -name = "tokio-codec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "tokio-io", -] - -[[package]] -name = "tokio-current-thread" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" -dependencies = [ - "futures 0.1.31", - "tokio-executor", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", -] - -[[package]] -name = "tokio-fs" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" -dependencies = [ - "futures 0.1.31", - "tokio-io", - "tokio-threadpool", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - [[package]] name = "tokio-macros" -version = "0.2.6" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "154794c8f499c2619acd19e839294703e9e32e7630ef5f46ea80d4ef0fbee5eb" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "tokio-named-pipes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "mio", - "mio-named-pipes", - "tokio 0.1.22", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", - "lazy_static", - "log", - "mio", - "num_cpus", - "parking_lot 0.9.0", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - [[package]] name = "tokio-rustls" -version = "0.14.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "futures-core", - "rustls 0.18.1", - "tokio 0.2.25", + "rustls", + "tokio", "webpki", ] [[package]] -name = "tokio-rustls" -version = "0.15.0" +name = "tokio-stream" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" +checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ "futures-core", - "rustls 0.19.1", - "tokio 0.2.25", - "webpki", -] - -[[package]] -name = "tokio-service" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -dependencies = [ - "futures 0.1.31", -] - -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures 0.1.31", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "mio", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-threadpool" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" -dependencies = [ - "crossbeam-deque 0.7.4", - "crossbeam-queue", - "crossbeam-utils 0.7.2", - "futures 0.1.31", - "lazy_static", - "log", - "num_cpus", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-udp" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", - "mio", - "tokio-codec", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-uds" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "libc", - "log", - "mio", - "mio-uds", - "tokio-codec", - "tokio-io", - "tokio-reactor", + "pin-project-lite 0.2.7", + "tokio", ] [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" dependencies = [ - "bytes 0.5.6", + "bytes 1.1.0", "futures-core", "futures-io", "futures-sink", "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite 0.2.7", + "tokio", ] [[package]] @@ -11737,12 +11153,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", - "log", "pin-project-lite 0.2.7", "tracing-attributes", "tracing-core", @@ -11750,9 +11165,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f915eb6abf914599c200260efced9203504c4c37380af10cdf3b7d36970650" +checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ "proc-macro2", "quote", @@ -11801,9 +11216,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd0568dbfe3baf7048b7908d2b32bca0d81cd56bec6d2a8f894b01d74f86be3" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -11813,7 +11228,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.7.0", + "smallvec", "thread_local", "tracing", "tracing-core", @@ -11831,7 +11246,7 @@ dependencies = [ "hashbrown", "log", "rustc-hex", - "smallvec 1.7.0", + "smallvec", ] [[package]] @@ -11861,7 +11276,7 @@ dependencies = [ "lazy_static", "log", "rand 0.8.4", - "smallvec 1.7.0", + "smallvec", "thiserror", "tinyvec", "url 2.2.2", @@ -11881,7 +11296,7 @@ dependencies = [ "lru-cache", "parking_lot 0.11.2", "resolv-conf", - "smallvec 1.7.0", + "smallvec", "thiserror", "trust-dns-proto", ] @@ -11895,25 +11310,24 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.10#420db18eaa1a1f5ce9ba40dd6ccb69f7b3dd9bb7" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.11#57346f6b24875f8935280dba51fa8ab0a9ba1e39" dependencies = [ - "frame-try-runtime", + "jsonrpsee-ws-client", "log", "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", - "sc-client-api", "sc-executor", "sc-service", "serde", - "sp-api", - "sp-blockchain", "sp-core", "sp-externalities", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-version", "structopt", ] @@ -11963,9 +11377,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -12114,17 +11528,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "want" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures 0.1.31", - "log", - "try-lock", -] - [[package]] name = "want" version = "0.3.0" @@ -12265,15 +11668,15 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.78.2" +version = "0.79.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" +checksum = "5b5894be15a559c85779254700e1d35f02f843b5a69152e5c82c626d9fd66c0e" [[package]] name = "wasmtime" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b310b9d20fcf59385761d1ade7a3ef06aecc380e3d3172035b919eaf7465d9f7" +checksum = "8bbb8a082a8ef50f7eeb8b82dda9709ef1e68963ea3c94e45581644dd4041835" dependencies = [ "anyhow", "backtrace", @@ -12289,7 +11692,7 @@ dependencies = [ "region", "rustc-demangle", "serde", - "smallvec 1.7.0", + "smallvec", "target-lexicon", "wasmparser", "wasmtime-cache", @@ -12302,9 +11705,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14d500d5c3dc5f5c097158feee123d64b3097f0d836a2a27dff9c761c73c843" +checksum = "d73391579ca7f24573138ef768b73b2aed5f9d542385c64979b65d60d0912399" dependencies = [ "anyhow", "base64 0.13.0", @@ -12323,9 +11726,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c525b39f062eada7db3c1298287b96dcb6e472b9f6b22501300b28d9fa7582f6" +checksum = "81c6f5ae9205382345c7cd7454932a906186836999a2161c385e38a15f52e1fe" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -12338,14 +11741,14 @@ dependencies = [ [[package]] name = "wasmtime-debug" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d2a763e7a6fc734218e0e463196762a4f409c483063d81e0e85f96343b2e0a" +checksum = "c69e08f55e12f15f50b1b533bc3626723e7224254a065de6576934c86258c9e8" dependencies = [ "anyhow", - "gimli 0.24.0", + "gimli", "more-asserts", - "object 0.24.0", + "object", "target-lexicon", "thiserror", "wasmparser", @@ -12354,15 +11757,15 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64d0c2d881c31b0d65c1f2695e022d71eb60b9fbdd336aacca28208b58eac90" +checksum = "005d93174040af37fb8625f891cd9827afdad314261f7ec4ee61ec497d6e9d3c" dependencies = [ "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", "cranelift-wasm", - "gimli 0.24.0", + "gimli", "indexmap", "log", "more-asserts", @@ -12373,11 +11776,11 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4539ea734422b7c868107e2187d7746d8affbcaa71916d72639f53757ad707" +checksum = "d0bf1dfb213a35d8f21aefae40e597fe72778a907011ffdff7affb029a02af9a" dependencies = [ - "addr2line 0.15.2", + "addr2line", "anyhow", "cfg-if 1.0.0", "cranelift-codegen", @@ -12385,10 +11788,10 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.24.0", + "gimli", "log", "more-asserts", - "object 0.24.0", + "object", "rayon", "region", "serde", @@ -12406,13 +11809,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1a8ff85246d091828e2225af521a6208ed28c997bb5c39eb697366dc2e2f2b" +checksum = "d231491878e710c68015228c9f9fc5955fe5c96dbf1485c15f7bed55b622c83c" dependencies = [ "anyhow", "more-asserts", - "object 0.24.0", + "object", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -12420,14 +11823,17 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b" +checksum = "21486cfb5255c2069666c1f116f9e949d4e35c9a494f11112fa407879e42198d" dependencies = [ "anyhow", "cfg-if 1.0.0", + "gimli", "lazy_static", "libc", + "object", + "scroll", "serde", "target-lexicon", "wasmtime-environ", @@ -12436,9 +11842,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51e57976e8a19a18a18e002c6eb12e5769554204238e47ff155fda1809ef0f7" +checksum = "d7ddfdf32e0a20d81f48be9dacd31612bc61de5a174d1356fef806d300f507de" dependencies = [ "anyhow", "backtrace", @@ -12449,7 +11855,7 @@ dependencies = [ "libc", "log", "mach", - "memoffset 0.6.4", + "memoffset", "more-asserts", "rand 0.8.4", "region", @@ -12583,9 +11989,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" dependencies = [ "curve25519-dalek 3.2.0", "rand_core 0.5.1", @@ -12594,27 +12000,29 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", + "scale-info", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "frame-support", "frame-system", - "impl-trait-for-tuples", + "log", "pallet-transaction-payment", "parity-scale-codec", "polkadot-parachain", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12626,7 +12034,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?branch=polkadot-v0.9.10#0c71745f7218ac562c45f44f7493981e35e3897d" +source = "git+https://github.com/shaunxw/xcm-simulator#4d3bb9dd4fa2cd554a9970ffff816d9346269eaa" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -12649,8 +12057,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.10" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +version = "0.9.11" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12667,7 +12075,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.10#aeea9b7bd81919e014f7621f6c4b2eb9709d918f" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.11#eb9f107e3a04687dcf80111563f2bcea7d5b15d3" dependencies = [ "proc-macro2", "quote", @@ -12684,7 +12092,7 @@ dependencies = [ "node-primitives", "parity-scale-codec", "paste", - "smallvec 1.7.0", + "smallvec", "sp-io", "sp-runtime", "sp-std", @@ -12708,7 +12116,7 @@ dependencies = [ [[package]] name = "zenlink-protocol" version = "0.4.4" -source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=aee9500130193960d832fab2b50efebcfb55abc6#aee9500130193960d832fab2b50efebcfb55abc6" +source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=89264233141bad3114d7bae6f81ab637a8827ff6#89264233141bad3114d7bae6f81ab637a8827ff6" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -12718,6 +12126,7 @@ dependencies = [ "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master)", "pallet-balances", "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -12730,7 +12139,7 @@ dependencies = [ [[package]] name = "zenlink-protocol-rpc" version = "0.4.4" -source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=aee9500130193960d832fab2b50efebcfb55abc6#aee9500130193960d832fab2b50efebcfb55abc6" +source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=89264233141bad3114d7bae6f81ab637a8827ff6#89264233141bad3114d7bae6f81ab637a8827ff6" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -12747,7 +12156,7 @@ dependencies = [ [[package]] name = "zenlink-protocol-runtime-api" version = "0.4.4" -source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=aee9500130193960d832fab2b50efebcfb55abc6#aee9500130193960d832fab2b50efebcfb55abc6" +source = "git+https://github.com/zenlinkpro/Zenlink-DEX-Module?rev=89264233141bad3114d7bae6f81ab637a8827ff6#89264233141bad3114d7bae6f81ab637a8827ff6" dependencies = [ "parity-scale-codec", "sp-api", @@ -12757,9 +12166,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.3.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" dependencies = [ "zeroize_derive", ] @@ -12778,18 +12187,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.6.1+zstd.1.4.9" +version = "0.9.0+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" +checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" +version = "4.1.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" +checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" dependencies = [ "libc", "zstd-sys", @@ -12797,9 +12206,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" +version = "1.6.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" +checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 5926c215d2..5c175b69b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] members = [ + "integration-tests", "node/cli", "node/inspect", "node/primitives", @@ -7,20 +8,18 @@ members = [ "node/service", "pallets/bancor", "pallets/bid", - "pallets/liquidity-mining", "pallets/flexible-fee", + "pallets/lightening-redeem", + "pallets/liquidity-mining", "pallets/minter-reward", + "pallets/token-issuer", "pallets/vesting", "pallets/vsbond-auction", "pallets/vtoken-mint", "pallets/vtoken-mint/rpc", - "pallets/token-issuer", - "pallets/lightening-redeem", "runtime/asgard", "runtime/bifrost", - "utils/subkey", "xcm-support", - "integration-tests", ] # The list of dependencies below (which can be both direct and indirect dependencies) are crates @@ -47,14 +46,12 @@ cranelift-codegen = { opt-level = 3 } cranelift-wasm = { opt-level = 3 } crc32fast = { opt-level = 3 } crossbeam-deque = { opt-level = 3 } -crossbeam-queue = { opt-level = 3 } crypto-mac = { opt-level = 3 } curve25519-dalek = { opt-level = 3 } ed25519-dalek = { opt-level = 3 } flate2 = { opt-level = 3 } futures-channel = { opt-level = 3 } hashbrown = { opt-level = 3 } -h2 = { opt-level = 3 } hash-db = { opt-level = 3 } hmac = { opt-level = 3 } httparse = { opt-level = 3 } @@ -89,115 +86,114 @@ panic = "unwind" incremental = true [patch.crates-io] -node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-metadata = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } -zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "aee9500130193960d832fab2b50efebcfb55abc6"} -zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "aee9500130193960d832fab2b50efebcfb55abc6" } -zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "aee9500130193960d832fab2b50efebcfb55abc6" } +zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "89264233141bad3114d7bae6f81ab637a8827ff6"} +zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "89264233141bad3114d7bae6f81ab637a8827ff6" } +zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "89264233141bad3114d7bae6f81ab637a8827ff6" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-currencies = {git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "37e42936c41dbdbaf0117c628c9eab0e06044844" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-currencies = {git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc96605342de9971c27699561723a6de6e2614c2" } diff --git a/README.md b/README.md index 9fbaff2dc1..8a4bfcb555 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ cd - ```bash git clone -n https://github.com/paritytech/polkadot.git /tmp/polkadot cd /tmp/polkadot -git checkout release-v0.9.10 +git checkout release-v0.9.11 cargo build --release cd - ``` diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index b8ff8f8ae2..7941f61eb7 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -16,69 +16,69 @@ smallvec = "1.6.1" # primitives node-primitives = { default-features = false, path = "../node/primitives" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false} -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false} +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # frame dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } # bifrost pallets bifrost-bancor= { path = "../pallets/bancor",default-features = false } @@ -112,16 +112,16 @@ zenlink-protocol-runtime-api = { version = "*", default-features = false } libsecp256k1 = "0.3.4" hex = "0.4.0" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", branch = "polkadot-v0.9.10" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator" } node-service = { path = "../node/service", features = ["with-all-runtime"] } diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 0880f8e637..c657adf7c8 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -22,37 +22,37 @@ log = "0.4.8" structopt = { version = "0.3.8", optional = true } # primitives -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } # client dependencies -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } # node-specific dependencies node-service = { path = "../service", default-features = false } node-primitives = { path = "../primitives" } # CLI-specific dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } -node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } +node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } [features] default = [ "wasmtime", "cli" ] diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index a4ad7c1381..3d6fcd8f98 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -224,16 +224,18 @@ macro_rules! construct_async_run { let runner = $cli.create_runner($cmd)?; #[cfg(feature = "with-asgard-runtime")] return runner.async_run(|$config| { - let $components = crate::service::collator::new_partial::( + let $components = crate::service::collator::new_partial::( &$config, + crate::service::collator::parachain_build_import_queue, )?; let task_manager = $components.task_manager; { $( $code )* }.map(|v| (v, task_manager)) }); #[cfg(feature = "with-bifrost-runtime")] return runner.async_run(|$config| { - let $components = crate::service::collator::new_partial::( + let $components = crate::service::collator::new_partial::( &$config, + crate::service::collator::parachain_build_import_queue, )?; let task_manager = $components.task_manager; { $( $code )* }.map(|v| (v, task_manager)) @@ -329,9 +331,9 @@ pub fn run() -> Result<()> { generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); - let task_executor = config.task_executor.clone(); + let tokio_handle = config.tokio_handle.clone(); let polkadot_config = - SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor) + SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) .map_err(|err| format!("Relay chain argument error: {}", err))?; info!("Parachain id: {:?}", id); @@ -418,7 +420,7 @@ pub fn run() -> Result<()> { let polkadot_config = SubstrateCli::create_configuration( &polkadot_cli, &polkadot_cli, - config.task_executor.clone(), + config.tokio_handle.clone(), ) .map_err(|err| format!("Relay chain argument error: {}", err))?; @@ -486,7 +488,7 @@ pub fn run() -> Result<()> { return runner.async_run(|config| { let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); let task_manager = - sc_service::TaskManager::new(config.task_executor.clone(), registry) + sc_service::TaskManager::new(config.tokio_handle.clone(), registry) .map_err(|e| { sc_cli::Error::Service(sc_service::Error::Prometheus(e)) })?; @@ -585,18 +587,10 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws_max_connections() } - fn rpc_http_threads(&self) -> Result> { - self.base.base.rpc_http_threads() - } - fn rpc_cors(&self, is_dev: bool) -> Result>> { self.base.base.rpc_cors(is_dev) } - fn telemetry_external_transport(&self) -> Result> { - self.base.base.telemetry_external_transport() - } - fn default_heap_pages(&self) -> Result> { self.base.base.default_heap_pages() } diff --git a/node/inspect/Cargo.toml b/node/inspect/Cargo.toml index a6fabf3b63..c44a9d0ded 100644 --- a/node/inspect/Cargo.toml +++ b/node/inspect/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "node-inspect" version = "0.8.0" -authors = ["Jamie "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } derive_more = "0.99" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -structopt = "0.3.8" \ No newline at end of file +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +structopt = "0.3.8" diff --git a/node/inspect/src/command.rs b/node/inspect/src/command.rs index 6525245fc2..caf13c7580 100644 --- a/node/inspect/src/command.rs +++ b/node/inspect/src/command.rs @@ -21,6 +21,7 @@ use std::str::FromStr; use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams}; +use sc_executor::NativeElseWasmExecutor; use sc_service::{new_full_client, Configuration, NativeExecutionDispatch}; use sp_runtime::traits::Block; @@ -38,7 +39,13 @@ impl InspectCmd { RA: Send + Sync + 'static, EX: NativeExecutionDispatch + 'static, { - let client = new_full_client::(&config, None)?; + let executor = NativeElseWasmExecutor::::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + ); + + let client = new_full_client::(&config, None, executor)?; let inspect = Inspector::::new(client); match &self.command { diff --git a/node/inspect/src/lib.rs b/node/inspect/src/lib.rs index da66ac14d3..7b2851c554 100644 --- a/node/inspect/src/lib.rs +++ b/node/inspect/src/lib.rs @@ -72,7 +72,7 @@ impl PrettyPrinter for DebugPrinter { fmt: &mut fmt::Formatter, extrinsic: &TBlock::Extrinsic, ) -> fmt::Result { - writeln!(fmt, " {:?}", extrinsic)?; + writeln!(fmt, " {:#?}", extrinsic)?; writeln!(fmt, " Bytes: {:?}", HexDisplay::from(&extrinsic.encode()))?; Ok(()) } @@ -269,3 +269,52 @@ impl FromStr for ExtrinsicAddres Ok(Self::Block(block, index)) } } + +#[cfg(test)] +mod tests { + use sp_core::hash::H160 as Hash; + + use super::*; + + #[test] + fn should_parse_block_strings() { + type BlockAddress = super::BlockAddress; + + let b0 = BlockAddress::from_str("3BfC20f0B9aFcAcE800D73D2191166FF16540258"); + let b1 = BlockAddress::from_str("1234"); + let b2 = BlockAddress::from_str("0"); + let b3 = BlockAddress::from_str("0x0012345f"); + + assert_eq!( + b0, + Ok(BlockAddress::Hash("3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap())) + ); + assert_eq!(b1, Ok(BlockAddress::Number(1234))); + assert_eq!(b2, Ok(BlockAddress::Number(0))); + assert_eq!(b3, Ok(BlockAddress::Bytes(vec![0, 0x12, 0x34, 0x5f]))); + } + + #[test] + fn should_parse_extrinsic_address() { + type BlockAddress = super::BlockAddress; + type ExtrinsicAddress = super::ExtrinsicAddress; + + let e0 = ExtrinsicAddress::from_str("1234"); + let b0 = ExtrinsicAddress::from_str("3BfC20f0B9aFcAcE800D73D2191166FF16540258:5"); + let b1 = ExtrinsicAddress::from_str("1234:0"); + let b2 = ExtrinsicAddress::from_str("0 0"); + let b3 = ExtrinsicAddress::from_str("0x0012345f"); + + assert_eq!(e0, Err("Extrinsic index missing: example \"5:0\"".into())); + assert_eq!( + b0, + Ok(ExtrinsicAddress::Block( + BlockAddress::Hash("3BfC20f0B9aFcAcE800D73D2191166FF16540258".parse().unwrap()), + 5 + )) + ); + assert_eq!(b1, Ok(ExtrinsicAddress::Block(BlockAddress::Number(1234), 0))); + assert_eq!(b2, Ok(ExtrinsicAddress::Block(BlockAddress::Number(0), 0))); + assert_eq!(b3, Ok(ExtrinsicAddress::Bytes(vec![0, 0x12, 0x34, 0x5f]))); + } +} diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml index 47386ac592..67da151e38 100644 --- a/node/primitives/Cargo.toml +++ b/node/primitives/Cargo.toml @@ -7,12 +7,13 @@ edition = "2018" [dependencies] bstringify = "0.1.2" codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.123", optional = true, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } zenlink-protocol = { version = "*", default-features = false } [features] @@ -21,6 +22,7 @@ std = [ "codec/std", "frame-system/std", "frame-support/std", + "scale-info/std", "serde", "sp-core/std", "sp-runtime/std", diff --git a/node/primitives/src/currency.rs b/node/primitives/src/currency.rs index 05d7614bf4..93118e03b9 100644 --- a/node/primitives/src/currency.rs +++ b/node/primitives/src/currency.rs @@ -20,6 +20,7 @@ use bstringify::bstringify; use codec::{Decode, Encode}; +use scale_info::TypeInfo; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sp_runtime::RuntimeDebug; @@ -255,7 +256,7 @@ create_currency_id! { // Bit 8 : 0 for Pokladot Ecosystem, 1 for Kusama Ecosystem // Bit 7 : Reserved // Bit 6 - 1 : The token ID - #[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord)] + #[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[repr(u8)] pub enum TokenSymbol { @@ -277,7 +278,7 @@ impl Default for TokenSymbol { } /// Currency ID, it might be extended with more variants in the future. -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[non_exhaustive] pub enum CurrencyId { diff --git a/node/primitives/src/lib.rs b/node/primitives/src/lib.rs index 3f3c153af8..f8bd7b7fad 100644 --- a/node/primitives/src/lib.rs +++ b/node/primitives/src/lib.rs @@ -129,7 +129,9 @@ pub type LeasePeriod = BlockNumber; /// Index used for the child trie pub type TrieIndex = u32; -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord)] +#[derive( + Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, scale_info::TypeInfo, +)] pub enum ExtraFeeName { SalpContribute, NoExtraFee, diff --git a/node/primitives/src/xcm.rs b/node/primitives/src/xcm.rs index 950f7c1355..7484a03229 100644 --- a/node/primitives/src/xcm.rs +++ b/node/primitives/src/xcm.rs @@ -19,10 +19,11 @@ use core::ops::{Add, Mul}; use codec::{Decode, Encode}; +use scale_info::TypeInfo; use sp_std::prelude::*; /// The type used to represent the xcmp transfer direction -#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode)] +#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] pub enum TransferOriginType { FromSelf = 0, FromRelayChain = 1, @@ -65,14 +66,14 @@ impl Mul for XcmBaseWeight { } /// represent the transact type -#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode)] +#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] pub enum ParachainTransactType { Xcm = 0, Proxy = 1, } /// represent the proxy type -#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode)] +#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] pub enum ParachainTransactProxyType { Primary = 0, Derived = 1, diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml index 1d4af964b3..9d89aef1f7 100644 --- a/node/rpc/Cargo.toml +++ b/node/rpc/Cargo.toml @@ -8,17 +8,17 @@ edition = "2018" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -jsonrpc-core = "15.1.0" +jsonrpc-core = "18.0.0" node-primitives = { path = "../primitives" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } bifrost-flexible-fee-rpc = { path = "../../pallets/flexible-fee/rpc" } bifrost-flexible-fee-rpc-runtime-api = { path = "../../pallets/flexible-fee/rpc/runtime-api" } bifrost-salp-rpc-api = { path = "../../pallets/salp/rpc" } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index acfe5fc89a..fc187d1551 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -6,62 +6,62 @@ edition = "2018" [dependencies] # Substrate Client -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10"} -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10"} -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"} +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"} +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Substrate Primitives -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } # Substrate Pallets -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } # Substrate Other -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", optional = true } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true } # Cumulus dependencies -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11" } # Polkadot dependencies -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } # External Crates hex-literal = "0.2.1" @@ -82,7 +82,7 @@ node-primitives = { path = "../primitives" } node-rpc = { path = "../rpc" } # RPC related dependencies -jsonrpc-core = "15.1.0" +jsonrpc-core = "18.0.0" # zenlink rpc zenlink-protocol-runtime-api = "*" diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 2dec600a01..fa78af1537 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -20,12 +20,13 @@ use std::sync::Arc; -use consensus_common::BlockStatus; use node_primitives::{AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce}; -use sc_client_api::{Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider}; +use sc_client_api::{AuxStore, Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider}; +use sc_executor::NativeElseWasmExecutor; use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_consensus as consensus_common; +use sp_consensus::BlockStatus; use sp_runtime::{ generic::{BlockId, SignedBlock}, traits::{BlakeTwo256, Block as BlockT}, @@ -33,16 +34,24 @@ use sp_runtime::{ }; use sp_storage::{ChildInfo, PrefixedStorageKey, StorageData, StorageKey}; +use crate::{FullBackend, FullClient}; +// pub type FullBackend = sc_service::TFullBackend; + +// pub type FullClient = sc_service::TFullClient>; + /// A set of APIs that polkadot-like runtimes must implement. pub trait RuntimeApiCollection: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + // + ParachainHost + sp_block_builder::BlockBuilder + frame_system_rpc_runtime_api::AccountNonceApi - + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi + + pallet_transaction_payment_rpc::TransactionPaymentApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi + sp_session::SessionKeys + // + sp_authority_discovery::AuthorityDiscoveryApi + cumulus_primitives_core::CollectCollationInfo where >::StateBackend: sp_api::StateBackend, @@ -53,22 +62,19 @@ impl RuntimeApiCollection for Api where Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + // + ParachainHost + sp_block_builder::BlockBuilder + frame_system_rpc_runtime_api::AccountNonceApi - + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi + + pallet_transaction_payment_rpc::TransactionPaymentApi + sp_api::Metadata + sp_offchain::OffchainWorkerApi + sp_session::SessionKeys + cumulus_primitives_core::CollectCollationInfo, + // + sp_authority_discovery::AuthorityDiscoveryApi, >::StateBackend: sp_api::StateBackend, { } -use sc_service::{TFullBackend, TFullClient}; - -type FullBackend = TFullBackend; -type FullClient = TFullClient; - /// Trait that abstracts over all available client implementations. /// /// For a concrete type there exists [`Client`]. @@ -80,6 +86,8 @@ pub trait AbstractClient: + ProvideRuntimeApi + HeaderBackend + CallApiAt + + AuxStore + + UsageProvider where Block: BlockT, Backend: BackendT, @@ -96,6 +104,8 @@ where Client: BlockchainEvents + ProvideRuntimeApi + HeaderBackend + + AuxStore + + UsageProvider + Sized + Send + Sync @@ -123,7 +133,7 @@ pub trait ExecuteWithClient { fn execute_with_client(self, client: Arc) -> Self::Output where >::StateBackend: sp_api::StateBackend, - Backend: sc_client_api::Backend, + Backend: sc_client_api::Backend + 'static, Backend::State: sp_api::StateBackend, Api: crate::RuntimeApiCollection, Client: AbstractClient + 'static; diff --git a/node/service/src/collator.rs b/node/service/src/collator.rs index 82cc2c8c01..af3bb5f044 100644 --- a/node/service/src/collator.rs +++ b/node/service/src/collator.rs @@ -36,60 +36,73 @@ use cumulus_client_service::{ use cumulus_primitives_core::ParaId; use node_primitives::PoolId; pub use node_primitives::{ - AccountId, Block, BlockNumber, Hash, Header, Nonce, ParaId as BifrostParaId, + AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce, ParaId as BifrostParaId, }; use sc_client_api::ExecutorProvider; -use sc_consensus::LongestChain; -use sc_executor::NativeExecutionDispatch; -pub use sc_executor::NativeExecutor; +use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; -use sc_transaction_pool::BasicPool; use sp_api::ConstructRuntimeApi; use sp_consensus::SlotData; -use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; +use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; -use sp_trie::PrefixedMemoryDB; use substrate_prometheus_endpoint::Registry; use zenlink_protocol_runtime_api::ZenlinkProtocolApi as ZenlinkProtocolRuntimeApi; -use crate::RuntimeApiCollection; - -/// Full backend. -type FullBackend = TFullBackend; - -/// Full client. -type FullClient = TFullClient; - -/// Maybe full select chain. -type MaybeFullSelectChain = Option>; - /// Starts a `ServiceBuilder` for a full service. /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. -pub fn new_partial( +#[allow(clippy::type_complexity)] +pub fn new_partial( config: &Configuration, + build_import_queue: BIQ, ) -> Result< PartialComponents< - FullClient, - FullBackend, - MaybeFullSelectChain, - sc_consensus::import_queue::BasicQueue>, - sc_transaction_pool::FullPool>, + TFullClient>, + TFullBackend, + (), + sc_consensus::DefaultImportQueue< + Block, + TFullClient>, + >, + sc_transaction_pool::FullPool< + Block, + TFullClient>, + >, (Option, Option), >, sc_service::Error, > where - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, - RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: NativeExecutionDispatch + 'static, + RuntimeApi: ConstructRuntimeApi>> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, + BIQ: FnOnce( + Arc>>, + &Configuration, + Option, + &TaskManager, + ) -> Result< + sc_consensus::DefaultImportQueue< + Block, + TFullClient>, + >, + sc_service::Error, + >, { let telemetry = config .telemetry_endpoints @@ -102,10 +115,17 @@ where }) .transpose()?; + let executor = sc_executor::NativeElseWasmExecutor::::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + ); + let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::( + sc_service::new_full_parts::( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, )?; let client = Arc::new(client); @@ -116,95 +136,101 @@ where telemetry }); - let registry = config.prometheus_registry(); - - let transaction_pool = BasicPool::new_full( + let transaction_pool = sc_transaction_pool::BasicPool::new_full( config.transaction_pool.clone(), config.role.is_authority().into(), - registry, + config.prometheus_registry(), task_manager.spawn_essential_handle(), client.clone(), ); - let import_queue = { - let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; - - cumulus_client_consensus_aura::import_queue::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - _, - _, - >(cumulus_client_consensus_aura::ImportQueueParams { - block_import: client.clone(), - client: client.clone(), - create_inherent_data_providers: move |_, _| async move { - let time = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *time, - slot_duration.slot_duration(), - ); - - Ok((time, slot)) - }, - registry, - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new( - client.executor().clone(), - ), - spawner: &task_manager.spawn_essential_handle(), - telemetry: telemetry.as_ref().map(|telemetry| telemetry.handle()), - })? - }; + let import_queue = build_import_queue( + client.clone(), + config, + telemetry.as_ref().map(|telemetry| telemetry.handle()), + &task_manager, + )?; - Ok(PartialComponents { + let params = PartialComponents { backend, client, import_queue, keystore_container, task_manager, transaction_pool, - select_chain: None, + select_chain: (), other: (telemetry, telemetry_worker_handle), - }) + }; + + Ok(params) } /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. #[sc_tracing::logging::prefix_logs_with("Parachain🌈")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, id: ParaId, _rpc_ext_builder: RB, + build_import_queue: BIQ, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<( + TaskManager, + Arc>>, +)> where - RB: Fn(Arc>) -> jsonrpc_core::IoHandler + RuntimeApi: ConstructRuntimeApi>> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder + + cumulus_primitives_core::CollectCollationInfo + + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + + substrate_frame_rpc_system::AccountNonceApi + + FeeRuntimeApi + + LiquidityMiningRuntimeApi + + SalpRuntimeApi + + ZenlinkProtocolRuntimeApi, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, + RB: Fn( + Arc>, + ) -> Result, sc_service::Error> + Send + 'static, - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, - RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - RuntimeApi::RuntimeApi: substrate_frame_rpc_system::AccountNonceApi, - RuntimeApi::RuntimeApi: FeeRuntimeApi, - RuntimeApi::RuntimeApi: SalpRuntimeApi, - RuntimeApi::RuntimeApi: LiquidityMiningRuntimeApi, - RuntimeApi::RuntimeApi: ZenlinkProtocolRuntimeApi, - Executor: NativeExecutionDispatch + 'static, + BIQ: FnOnce( + Arc>>, + &Configuration, + Option, + &TaskManager, + ) -> Result< + sc_consensus::DefaultImportQueue< + Block, + TFullClient>, + >, + sc_service::Error, + > + 'static, BIC: FnOnce( - Arc>, + Arc>>, Option<&Registry>, Option, &TaskManager, &polkadot_service::NewFull, - Arc>>, + Arc< + sc_transaction_pool::FullPool< + Block, + TFullClient>, + >, + >, Arc>, SyncCryptoStorePtr, bool, @@ -216,7 +242,7 @@ where let parachain_config = prepare_node_config(parachain_config); - let params = new_partial(¶chain_config)?; + let params = new_partial::(¶chain_config, build_import_queue)?; let (mut telemetry, telemetry_worker_handle) = params.other; let relay_chain_full_node = @@ -258,25 +284,16 @@ where let transaction_pool = transaction_pool.clone(); Box::new(move |deny_unsafe, _| { - let deps = node_rpc::FullDeps { + let deps = crate::rpc::FullDeps { client: client.clone(), pool: transaction_pool.clone(), deny_unsafe, }; - Ok(node_rpc::create_full(deps)) + Ok(crate::rpc::create_full(deps)) }) }; - if parachain_config.offchain_worker.enabled { - sc_service::build_offchain_workers( - ¶chain_config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), - ); - }; - sc_service::spawn_tasks(sc_service::SpawnTasksParams { on_demand: None, remote_blockchain: None, @@ -342,29 +359,108 @@ where Ok((task_manager, client)) } +/// Build the import queue for the parachain runtime. +#[allow(clippy::type_complexity)] +pub fn parachain_build_import_queue( + client: Arc>>, + config: &Configuration, + telemetry: Option, + task_manager: &TaskManager, +) -> Result< + sc_consensus::DefaultImportQueue< + Block, + TFullClient>, + >, + sc_service::Error, +> +where + RuntimeApi: ConstructRuntimeApi>> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder + + sp_consensus_aura::AuraApi, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, +{ + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + cumulus_client_consensus_aura::import_queue::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + >(cumulus_client_consensus_aura::ImportQueueParams { + block_import: client.clone(), + client: client.clone(), + create_inherent_data_providers: move |_, _| async move { + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + Ok((time, slot)) + }, + registry: config.prometheus_registry(), + can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + spawner: &task_manager.spawn_essential_handle(), + telemetry, + }) + .map_err(Into::into) +} + /// Start a normal parachain node. pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, id: ParaId, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<( + TaskManager, + Arc>>, +)> where - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, - RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - RuntimeApi::RuntimeApi: FeeRuntimeApi, - RuntimeApi::RuntimeApi: SalpRuntimeApi, - RuntimeApi::RuntimeApi: LiquidityMiningRuntimeApi, - RuntimeApi::RuntimeApi: ZenlinkProtocolRuntimeApi, - Executor: NativeExecutionDispatch + 'static, + RuntimeApi: ConstructRuntimeApi>> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder + + cumulus_primitives_core::CollectCollationInfo + + sp_consensus_aura::AuraApi + + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + + substrate_frame_rpc_system::AccountNonceApi + + FeeRuntimeApi + + LiquidityMiningRuntimeApi + + SalpRuntimeApi + + ZenlinkProtocolRuntimeApi, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, { - start_node_impl( + start_node_impl::( parachain_config, polkadot_config, id, - |_| Default::default(), + |_| Ok(Default::default()), + parachain_build_import_queue, |client, prometheus_registry, telemetry, @@ -386,11 +482,21 @@ where let relay_chain_backend = relay_chain_node.backend.clone(); let relay_chain_client = relay_chain_node.client.clone(); - Ok(build_aura_consensus::( - BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let parachain_inherent = + Ok(build_aura_consensus::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + _, + _, + _, + >(BuildAuraConsensusParams { + proposer_factory, + create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + let parachain_inherent = cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client( relay_parent, &relay_chain_client, @@ -398,38 +504,38 @@ where &validation_data, id, ); - async move { - let time = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *time, - slot_duration.slot_duration(), - ); - - let parachain_inherent = parachain_inherent.ok_or_else(|| { - Box::::from( - "Failed to create parachain inherent", - ) - })?; - Ok((time, slot, parachain_inherent)) - } - }, - block_import: client.clone(), - relay_chain_client: relay_chain_node.client.clone(), - relay_chain_backend: relay_chain_node.backend.clone(), - para_client: client, - backoff_authoring_blocks: Option::<()>::None, - sync_oracle, - keystore, - force_authoring, - slot_duration, - // We got around 500ms for proposing - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - // And a maximum of 750ms if slots are skipped - max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), - telemetry, + async move { + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from( + "Failed to create parachain inherent", + ) + })?; + Ok((time, slot, parachain_inherent)) + } }, - )) + block_import: client.clone(), + relay_chain_client: relay_chain_node.client.clone(), + relay_chain_backend: relay_chain_node.backend.clone(), + para_client: client, + backoff_authoring_blocks: Option::<()>::None, + sync_oracle, + keystore, + force_authoring, + slot_duration, + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + // And a maximum of 750ms if slots are skipped + max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), + telemetry, + })) }, ) .await diff --git a/node/service/src/dev.rs b/node/service/src/dev.rs index cffbde6e4b..e38afe4a41 100644 --- a/node/service/src/dev.rs +++ b/node/service/src/dev.rs @@ -31,12 +31,19 @@ use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, use sc_telemetry::TelemetryWorker; #[cfg(feature = "with-dev-runtime")] -native_executor_instance!( - pub DevExecutor, - dev_runtime::api::dispatch, - dev_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); +pub struct DevRuntimeExecutor; +#[cfg(feature = "with-dev-runtime")] +impl sc_executor::NativeExecutionDispatch for DevRuntimeExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option> { + dev_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + dev_runtime::native_version() + } +} pub type Block = dev_runtime::Block; pub type Executor = DevExecutor; diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 7bddf08411..3a2633c26b 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -19,32 +19,44 @@ #![warn(unused_extern_crates)] //! Service implementation. Specialized wrapper over substrate service. -pub use client::*; pub use collator::*; -use sc_executor::native_executor_instance; pub mod chain_spec; -mod client; pub mod collator; #[cfg(feature = "with-asgard-runtime")] pub use asgard_runtime; #[cfg(feature = "with-bifrost-runtime")] pub use bifrost_runtime; +use node_rpc as rpc; #[cfg(feature = "with-asgard-runtime")] -native_executor_instance!( - pub AsgardExecutor, - asgard_runtime::api::dispatch, - asgard_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); +pub struct AsgardExecutor; +#[cfg(feature = "with-asgard-runtime")] +impl sc_executor::NativeExecutionDispatch for AsgardExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option> { + asgard_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + asgard_runtime::native_version() + } +} #[cfg(feature = "with-bifrost-runtime")] -native_executor_instance!( - pub BifrostExecutor, - bifrost_runtime::api::dispatch, - bifrost_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, -); +pub struct BifrostExecutor; +#[cfg(feature = "with-bifrost-runtime")] +impl sc_executor::NativeExecutionDispatch for BifrostExecutor { + type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + + fn dispatch(method: &str, data: &[u8]) -> Option> { + bifrost_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + bifrost_runtime::native_version() + } +} #[cfg(feature = "with-dev-runtime")] pub mod dev; diff --git a/pallets/assets/src/lib.rs b/pallets/assets/src/lib.rs index eabf04c132..d2096faf89 100644 --- a/pallets/assets/src/lib.rs +++ b/pallets/assets/src/lib.rs @@ -70,7 +70,6 @@ pub mod pallet { } #[pallet::event] - #[pallet::metadata(BalanceOf = "Balance", CurrencyIdOf = "CurrencyId")] #[pallet::generate_deposit(pub(crate) fn deposit_event)] pub enum Event { /// Token issue success, \[currency_id, dest, amount\] diff --git a/pallets/bancor/Cargo.toml b/pallets/bancor/Cargo.toml index a5ff92fb54..c22d92da1d 100644 --- a/pallets/bancor/Cargo.toml +++ b/pallets/bancor/Cargo.toml @@ -8,27 +8,29 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } orml-traits = { version = "0.4.1-dev", default-features = false } orml-tokens = { version = "0.4.1-dev", default-features = false } node-primitives = { path = "../../node/primitives", default-features = false } num-bigint = { version = "0.4", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "frame-system/std", "frame-support/std", "sp-runtime/std", diff --git a/pallets/bancor/rpc/Cargo.toml b/pallets/bancor/rpc/Cargo.toml index e3c8576a8c..be7e96c81b 100644 --- a/pallets/bancor/rpc/Cargo.toml +++ b/pallets/bancor/rpc/Cargo.toml @@ -6,13 +6,13 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -jsonrpc-core = "15.1.0" -jsonrpc-core-client = "15.1.0" -jsonrpc-derive = "15.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +jsonrpc-core = "18.0.0" +jsonrpc-core-client = "18.0.0" +jsonrpc-derive = "18.0.0" +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } bifrost-bancor-runtime-api = { path = "./runtime-api" } node-primitives = { path = "../../../node/primitives", default-features = false } diff --git a/pallets/bancor/rpc/runtime-api/Cargo.toml b/pallets/bancor/rpc/runtime-api/Cargo.toml index b15a6e51f1..ab6a1327e7 100644 --- a/pallets/bancor/rpc/runtime-api/Cargo.toml +++ b/pallets/bancor/rpc/runtime-api/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } [features] default = ["std"] diff --git a/pallets/bancor/src/lib.rs b/pallets/bancor/src/lib.rs index 7fe451a6ec..6bed3f7f67 100644 --- a/pallets/bancor/src/lib.rs +++ b/pallets/bancor/src/lib.rs @@ -23,6 +23,7 @@ use frame_system::pallet_prelude::*; use node_primitives::{traits::BancorHandler, CurrencyId, CurrencyIdExt}; use num_bigint::BigUint; use orml_traits::MultiCurrency; +use scale_info::TypeInfo; use sp_arithmetic::per_things::{PerThing, Perbill, Percent}; use sp_runtime::{ traits::{CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, Saturating, Zero}, @@ -46,7 +47,7 @@ const BILLION: u128 = 1_000_000_000; // These time units are defined in number of blocks. const BLOCKS_PER_DAY: u32 = 60 / 12 * 60 * 24; -#[derive(Encode, Decode, Clone, Eq, PartialEq, Debug)] +#[derive(Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo)] pub struct BancorPool { currency_id: CurrencyId, // ksm, dot, etc. token_pool: Balance, // token supply of the pool diff --git a/pallets/bancor/src/mock.rs b/pallets/bancor/src/mock.rs index 84777e8224..22ebc2b693 100644 --- a/pallets/bancor/src/mock.rs +++ b/pallets/bancor/src/mock.rs @@ -22,7 +22,7 @@ use frame_benchmarking::whitelisted_caller; use frame_support::{ construct_runtime, parameter_types, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{GenesisBuild, Nothing, OnFinalize, OnInitialize}, }; pub use node_primitives::{Balance, CurrencyId, TokenSymbol}; use sp_core::H256; @@ -105,7 +105,7 @@ impl orml_tokens::Config for Test { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; diff --git a/pallets/bid/Cargo.toml b/pallets/bid/Cargo.toml index e5b3153894..530883a506 100644 --- a/pallets/bid/Cargo.toml +++ b/pallets/bid/Cargo.toml @@ -6,24 +6,26 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } node-primitives = { path = "../../node/primitives", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } num-traits = { version = "0.2.14", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } [dev-dependencies] orml-currencies = { version = "0.4.1-dev", default-features = false } orml-tokens = { version = "0.4.1-dev", default-features = false} -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "node-primitives/std", "frame-support/std", "frame-system/std", diff --git a/pallets/bid/src/lib.rs b/pallets/bid/src/lib.rs index db11fac589..2201bfe78a 100644 --- a/pallets/bid/src/lib.rs +++ b/pallets/bid/src/lib.rs @@ -35,6 +35,7 @@ use orml_traits::{ currency::TransferAll, MultiCurrency, MultiCurrencyExtended, MultiLockableCurrency, MultiReservableCurrency, }; +use scale_info::TypeInfo; use sp_runtime::{ traits::{AtLeast32Bit, MaybeSerializeDeserialize, Member, One, Saturating, Zero}, DispatchError, Permill, @@ -148,7 +149,7 @@ decl_error! { } /// struct for matched order in service -#[derive(Default, Clone, Eq, PartialEq, Debug, Encode, Decode)] +#[derive(Default, Clone, Eq, PartialEq, Debug, Encode, Decode, TypeInfo)] pub struct BiddingOrderUnit { /// bidder id bidder_id: AccountId, diff --git a/pallets/bid/src/mock.rs b/pallets/bid/src/mock.rs index e6f5286872..84b8f933bb 100644 --- a/pallets/bid/src/mock.rs +++ b/pallets/bid/src/mock.rs @@ -21,7 +21,7 @@ // use super::*; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, OnFinalize, OnInitialize}, + traits::{Everything, Nothing, OnFinalize, OnInitialize}, }; use node_primitives::{CurrencyId, TokenSymbol}; use sp_core::H256; @@ -124,7 +124,7 @@ impl orml_tokens::Config for Test { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); diff --git a/pallets/bridge-eos/Cargo.toml b/pallets/bridge-eos/Cargo.toml index fc91928f4c..54ee9782dc 100644 --- a/pallets/bridge-eos/Cargo.toml +++ b/pallets/bridge-eos/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-bridge-eos" version = "0.7.0" -authors = ["Jamie Deng "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] diff --git a/pallets/flexible-fee/Cargo.toml b/pallets/flexible-fee/Cargo.toml index 1c897225c4..a7a0567ca1 100644 --- a/pallets/flexible-fee/Cargo.toml +++ b/pallets/flexible-fee/Cargo.toml @@ -6,13 +6,14 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { path = "../../node/primitives", default-features = false } zenlink-protocol = { version = "*", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } @@ -21,14 +22,14 @@ impl-trait-for-tuples = "0.2.1" [dev-dependencies] orml-tokens = { version = "0.4.1-dev" } orml-currencies = { version = "0.4.1-dev" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } smallvec = "1.4.1" -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10"} +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11"} xcm-support = { path = "../../xcm-support"} bifrost-salp = { path = "../salp" } @@ -36,6 +37,7 @@ bifrost-salp = { path = "../salp" } default = ["std"] std = [ "codec/std", + "scale-info/std", "frame-support/std", "frame-system/std", "node-primitives/std", diff --git a/pallets/flexible-fee/rpc/Cargo.toml b/pallets/flexible-fee/rpc/Cargo.toml index a986c4f206..3b618e8b94 100644 --- a/pallets/flexible-fee/rpc/Cargo.toml +++ b/pallets/flexible-fee/rpc/Cargo.toml @@ -6,15 +6,15 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -jsonrpc-core = "15.1.0" -jsonrpc-core-client = "15.1.0" -jsonrpc-derive = "15.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +jsonrpc-core = "18.0.0" +jsonrpc-core-client = "18.0.0" +jsonrpc-derive = "18.0.0" +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } bifrost-flexible-fee-rpc-runtime-api = { path = "./runtime-api" } node-primitives = { path = "../../../node/primitives", default-features = false } diff --git a/pallets/flexible-fee/rpc/runtime-api/Cargo.toml b/pallets/flexible-fee/rpc/runtime-api/Cargo.toml index c22080d490..e707df92d8 100644 --- a/pallets/flexible-fee/rpc/runtime-api/Cargo.toml +++ b/pallets/flexible-fee/rpc/runtime-api/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { path = "../../../../node/primitives", default-features = false } [features] diff --git a/pallets/flexible-fee/src/mock.rs b/pallets/flexible-fee/src/mock.rs index e669f02954..854addaaf1 100644 --- a/pallets/flexible-fee/src/mock.rs +++ b/pallets/flexible-fee/src/mock.rs @@ -28,7 +28,7 @@ use frame_support::{ parameter_types, sp_runtime::{DispatchError, DispatchResult}, sp_std::marker::PhantomData, - traits::{Contains, EnsureOrigin}, + traits::{Contains, EnsureOrigin, Nothing}, weights::{ constants::ExtrinsicBaseWeight, IdentityFee, Weight, WeightToFeeCoefficients, WeightToFeePolynomial, @@ -144,11 +144,13 @@ impl WeightToFeePolynomial for WeightToFee { parameter_types! { pub const TransactionByteFee: Balance = 1; + pub const OperationalFeeMultiplier: u8 = 5; } impl pallet_transaction_payment::Config for Test { type FeeMultiplierUpdate = (); type OnChargeTransaction = FlexibleFee; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type TransactionByteFee = TransactionByteFee; type WeightToFee = IdentityFee; } @@ -183,7 +185,7 @@ impl orml_tokens::Config for Test { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; @@ -198,7 +200,7 @@ pub struct FeeNameGetter; impl NameGetter for FeeNameGetter { fn get_name(c: &Call) -> ExtraFeeName { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => ExtraFeeName::SalpContribute, + Call::Salp(bifrost_salp::Call::contribute { .. }) => ExtraFeeName::SalpContribute, _ => ExtraFeeName::NoExtraFee, } } @@ -210,7 +212,7 @@ pub struct AggregateExtraFeeFilter; impl Contains for AggregateExtraFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -220,7 +222,7 @@ pub struct ContributeFeeFilter; impl Contains for ContributeFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -287,6 +289,7 @@ impl zenlink_protocol::Config for Test { type TargetChains = (); type XcmExecutor = (); type Conversion = (); + type WeightInfo = (); } type MultiAssets = ZenlinkMultiAssets>; @@ -432,7 +435,7 @@ impl BifrostXcmExecutor for MockXcmExecutor { match result { true => Ok([0; 32]), - false => Err(XcmError::Undefined), + false => Err(XcmError::Unimplemented), } } @@ -447,7 +450,7 @@ impl BifrostXcmExecutor for MockXcmExecutor { match result { true => Ok([0; 32]), - false => Err(XcmError::Undefined), + false => Err(XcmError::Unimplemented), } } } diff --git a/pallets/flexible-fee/src/tests.rs b/pallets/flexible-fee/src/tests.rs index 332b2d7b1b..3f7b0ca01f 100644 --- a/pallets/flexible-fee/src/tests.rs +++ b/pallets/flexible-fee/src/tests.rs @@ -215,8 +215,9 @@ fn withdraw_fee_should_work() { // prepare call variable let asset_order_list_vec: Vec = vec![CURRENCY_ID_0, CURRENCY_ID_1, CURRENCY_ID_2, CURRENCY_ID_3, CURRENCY_ID_4]; - let call = - Call::FlexibleFee(crate::Call::set_user_fee_charge_order(Some(asset_order_list_vec))); + let call = Call::FlexibleFee(crate::Call::set_user_fee_charge_order { + asset_order_list_vec: Some(asset_order_list_vec), + }); // prepare info variable let extra = (); @@ -238,8 +239,9 @@ fn correct_and_deposit_fee_should_work() { // prepare call variable let asset_order_list_vec: Vec = vec![CURRENCY_ID_0, CURRENCY_ID_1, CURRENCY_ID_2, CURRENCY_ID_3, CURRENCY_ID_4]; - let call = - Call::FlexibleFee(crate::Call::set_user_fee_charge_order(Some(asset_order_list_vec))); + let call = Call::FlexibleFee(crate::Call::set_user_fee_charge_order { + asset_order_list_vec: Some(asset_order_list_vec), + }); // prepare info variable let extra = (); let xt = TestXt::new(call.clone(), Some((0u64, extra))); @@ -350,8 +352,9 @@ fn withdraw_fee_should_work_v2() { // prepare call variable let asset_order_list_vec: Vec = vec![CURRENCY_ID_0, CURRENCY_ID_1, CURRENCY_ID_2, CURRENCY_ID_3, CURRENCY_ID_4]; - let call = - Call::FlexibleFee(crate::Call::set_user_fee_charge_order(Some(asset_order_list_vec))); + let call = Call::FlexibleFee(crate::Call::set_user_fee_charge_order { + asset_order_list_vec: Some(asset_order_list_vec), + }); // prepare info variable let extra = (); @@ -388,8 +391,9 @@ fn correct_and_deposit_fee_should_work_v2() { // prepare call variable let asset_order_list_vec: Vec = vec![CURRENCY_ID_0, CURRENCY_ID_1, CURRENCY_ID_2, CURRENCY_ID_3, CURRENCY_ID_4]; - let call = - Call::FlexibleFee(crate::Call::set_user_fee_charge_order(Some(asset_order_list_vec))); + let call = Call::FlexibleFee(crate::Call::set_user_fee_charge_order { + asset_order_list_vec: Some(asset_order_list_vec), + }); // prepare info variable let extra = (); let xt = TestXt::new(call.clone(), Some((0u64, extra))); @@ -448,7 +452,7 @@ fn deduct_salp_fee_should_work() { let para_id = 2001; let value = 1_000_000_000_000; - let call = Call::Salp(bifrost_salp::Call::contribute(para_id, value)); + let call = Call::Salp(bifrost_salp::Call::contribute { index: para_id, value }); // prepare info variable let extra = (); diff --git a/pallets/lightening-redeem/Cargo.toml b/pallets/lightening-redeem/Cargo.toml index 55c391f39b..d9de78ecc9 100644 --- a/pallets/lightening-redeem/Cargo.toml +++ b/pallets/lightening-redeem/Cargo.toml @@ -8,24 +8,26 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } orml-traits = { version = "0.4.1-dev", default-features = false } orml-tokens = { version = "0.4.1-dev", default-features = false } node-primitives = { path = "../../node/primitives", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "frame-system/std", "frame-support/std", "sp-runtime/std", diff --git a/pallets/lightening-redeem/src/mock.rs b/pallets/lightening-redeem/src/mock.rs index 74f607e9c9..f86b3d9a25 100644 --- a/pallets/lightening-redeem/src/mock.rs +++ b/pallets/lightening-redeem/src/mock.rs @@ -21,7 +21,7 @@ use frame_support::{ parameter_types, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{GenesisBuild, Nothing, OnFinalize, OnInitialize}, PalletId, }; use node_primitives::{CurrencyId, TokenSymbol}; @@ -57,7 +57,7 @@ frame_support::construct_runtime!( { System: frame_system::{Pallet, Call, Config, Storage, Event}, Tokens: orml_tokens::{Pallet, Call, Storage, Config, Event}, - Council: pallet_collective::{Pallet, Call, Storage, Origin, Event, Config}, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config}, LighteningRedeem: bifrost_lightening_redeem::{Pallet, Call, Storage, Event} } ); @@ -105,7 +105,7 @@ impl orml_tokens::Config for Runtime { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); @@ -119,7 +119,8 @@ parameter_types! { pub const CouncilMaxMembers: u32 = 100; } -impl pallet_collective::Config for Runtime { +type CouncilCollective = pallet_collective::Instance1; +impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type Event = Event; type MaxMembers = CouncilMaxMembers; @@ -137,7 +138,8 @@ parameter_types! { impl bifrost_lightening_redeem::Config for Runtime { type Event = Event; type MultiCurrency = Tokens; - type ControlOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId>; + type ControlOrigin = + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; type PalletId = LighteningRedeemPalletId; type WeightInfo = (); } @@ -193,14 +195,6 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - // add ALICE, BOB, CHARLIE as the council member - pallet_collective::GenesisConfig:: { - members: vec![ALICE, BOB, CHARLIE], - phantom: Default::default(), - } - .assimilate_storage(&mut t) - .unwrap(); - t.into() } } diff --git a/pallets/liquidity-mining/Cargo.toml b/pallets/liquidity-mining/Cargo.toml index 535224da5d..bac9d46a50 100644 --- a/pallets/liquidity-mining/Cargo.toml +++ b/pallets/liquidity-mining/Cargo.toml @@ -8,16 +8,17 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } node-primitives = { path = "../../node/primitives", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } orml-tokens = "0.4.1-dev" orml-currencies = "0.4.1-dev" @@ -25,6 +26,7 @@ orml-currencies = "0.4.1-dev" default = ["std"] std = [ "codec/std", + "scale-info/std", "frame-system/std", "frame-support/std", "node-primitives/std", diff --git a/pallets/liquidity-mining/rpc/Cargo.toml b/pallets/liquidity-mining/rpc/Cargo.toml index c643f8a336..7c0318684d 100644 --- a/pallets/liquidity-mining/rpc/Cargo.toml +++ b/pallets/liquidity-mining/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -jsonrpc-core = "15.1.0" -jsonrpc-core-client = "15.1.0" -jsonrpc-derive = "15.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +jsonrpc-core = "18.0.0" +jsonrpc-core-client = "18.0.0" +jsonrpc-derive = "18.0.0" +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } node-primitives = { path = "../../../node/primitives", default-features = false } bifrost-liquidity-mining-rpc-runtime-api = { path = "./runtime-api" } \ No newline at end of file diff --git a/pallets/liquidity-mining/rpc/runtime-api/Cargo.toml b/pallets/liquidity-mining/rpc/runtime-api/Cargo.toml index 29dd16a5e1..58cadd0ff7 100644 --- a/pallets/liquidity-mining/rpc/runtime-api/Cargo.toml +++ b/pallets/liquidity-mining/rpc/runtime-api/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { path = "../../../../node/primitives", default-features = false } [features] diff --git a/pallets/liquidity-mining/src/lib.rs b/pallets/liquidity-mining/src/lib.rs index 5e57f7ad5d..06accfcbf9 100644 --- a/pallets/liquidity-mining/src/lib.rs +++ b/pallets/liquidity-mining/src/lib.rs @@ -38,6 +38,7 @@ use frame_system::pallet_prelude::*; use node_primitives::{CurrencyId, CurrencyIdExt, LeasePeriod, ParaId, TokenInfo, TokenSymbol}; use orml_traits::{MultiCurrency, MultiLockableCurrency, MultiReservableCurrency}; pub use pallet::*; +use scale_info::TypeInfo; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; @@ -49,7 +50,7 @@ pub mod weights; pub use weights::*; -#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] pub struct PoolInfo { /// Id of the liquidity-pool pool_id: PoolId, @@ -225,7 +226,7 @@ impl PoolInfo { } } -#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)] +#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug, TypeInfo)] pub enum PoolType { /// Only `LpToken` can deposit into the pool Mining, @@ -235,7 +236,7 @@ pub enum PoolType { EBFarming, } -#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)] +#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug, TypeInfo)] pub enum PoolState { UnCharged, Charged, @@ -244,7 +245,7 @@ pub enum PoolState { Dead, } -#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] pub struct DepositData { /// The amount of trading-pair deposited in the liquidity-pool deposit: BalanceOf, @@ -269,7 +270,7 @@ impl DepositData { } } -#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] pub struct RewardData { /// The total amount of token to reward total: BalanceOf, @@ -354,7 +355,7 @@ pub mod pallet { use super::*; #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: frame_system::Config + TypeInfo { type Event: From> + IsType<::Event>; /// Origin for anyone able to create/kill/force_retire the liquidity-pool. diff --git a/pallets/minter-reward/Cargo.toml b/pallets/minter-reward/Cargo.toml index aed033ac9c..b4f0153d68 100644 --- a/pallets/minter-reward/Cargo.toml +++ b/pallets/minter-reward/Cargo.toml @@ -6,27 +6,29 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } node-primitives = { path = "../../node/primitives", default-features = false } fixed = { version = "1.5.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } zenlink-protocol = { version = "*", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } [dev-dependencies] orml-tokens = "0.4.1-dev" orml-currencies = { version = "0.4.1-dev" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } bifrost-vtoken-mint = { path = "../vtoken-mint", default-features = false } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "node-primitives/std", "fixed/std", "frame-support/std", diff --git a/pallets/minter-reward/src/lib.rs b/pallets/minter-reward/src/lib.rs index 13c90b54b4..cb58a438f5 100644 --- a/pallets/minter-reward/src/lib.rs +++ b/pallets/minter-reward/src/lib.rs @@ -166,7 +166,6 @@ pub mod pallet { pub(crate) type CurrentCycle = StorageValue<_, u8, ValueQuery>; #[pallet::event] - #[pallet::metadata(BalanceOf = "Balance", CurrencyIdOf = "CurrencyId")] pub enum Event {} #[pallet::pallet] diff --git a/pallets/minter-reward/src/mock.rs b/pallets/minter-reward/src/mock.rs index f4b18e7553..713b21b3f0 100644 --- a/pallets/minter-reward/src/mock.rs +++ b/pallets/minter-reward/src/mock.rs @@ -26,7 +26,11 @@ use std::convert::TryInto; #[cfg(feature = "runtime-benchmarks")] use frame_benchmarking::whitelisted_caller; -use frame_support::{parameter_types, traits::GenesisBuild, PalletId}; +use frame_support::{ + parameter_types, + traits::{GenesisBuild, Nothing}, + PalletId, +}; use node_primitives::{CurrencyId, TokenSymbol}; use orml_traits::MultiCurrency; use sp_core::H256; @@ -143,7 +147,7 @@ impl orml_tokens::Config for Runtime { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); @@ -174,6 +178,7 @@ impl zenlink_protocol::Config for Runtime { type SelfParaId = SelfParaId; type TargetChains = (); type XcmExecutor = (); + type WeightInfo = (); } type MultiAssets = diff --git a/pallets/salp/Cargo.toml b/pallets/salp/Cargo.toml index fb0cf977ef..eb05bc002b 100644 --- a/pallets/salp/Cargo.toml +++ b/pallets/salp/Cargo.toml @@ -6,33 +6,34 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } node-primitives = { path = "../../node/primitives", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } xcm-support = { path = "../../xcm-support", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } [dev-dependencies] -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10"} +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"} smallvec = "1.6.1" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } orml-tokens = "0.4.1-dev" orml-currencies = "0.4.1-dev" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } bifrost-bancor = { path = "../../pallets/bancor" } bifrost-runtime = { path = "../../runtime/bifrost" } @@ -40,6 +41,7 @@ bifrost-runtime = { path = "../../runtime/bifrost" } default = ["std"] std = [ "codec/std", + "scale-info/std", "log/std", "node-primitives/std", "frame-support/std", diff --git a/pallets/salp/rpc/Cargo.toml b/pallets/salp/rpc/Cargo.toml index 353e2e8b0d..474fb86544 100644 --- a/pallets/salp/rpc/Cargo.toml +++ b/pallets/salp/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -jsonrpc-core = "15.1.0" -jsonrpc-core-client = "15.1.0" -jsonrpc-derive = "15.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +jsonrpc-core = "18.0.0" +jsonrpc-core-client = "18.0.0" +jsonrpc-derive = "18.0.0" +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } node-primitives = { path = "../../../node/primitives", default-features = false } bifrost-salp-rpc-runtime-api = { path = "./runtime-api" } diff --git a/pallets/salp/rpc/runtime-api/Cargo.toml b/pallets/salp/rpc/runtime-api/Cargo.toml index c26fd1d9e8..84a13e7c6b 100644 --- a/pallets/salp/rpc/runtime-api/Cargo.toml +++ b/pallets/salp/rpc/runtime-api/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { path = "../../../../node/primitives", default-features = false } [features] diff --git a/pallets/salp/src/lib.rs b/pallets/salp/src/lib.rs index 8a7a9ced47..b70e679c1d 100644 --- a/pallets/salp/src/lib.rs +++ b/pallets/salp/src/lib.rs @@ -37,6 +37,7 @@ use frame_support::{pallet_prelude::*, transactional}; use node_primitives::{ContributionStatus, TokenInfo, TokenSymbol, TrieIndex}; use orml_traits::MultiCurrency; pub use pallet::*; +use scale_info::TypeInfo; use sp_std::convert::TryFrom; use xcm_support::*; @@ -63,7 +64,7 @@ pub type AccountIdOf = ::AccountId; type BalanceOf = <::MultiCurrency as MultiCurrency>>::Balance; -#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)] +#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)] pub enum FundStatus { Ongoing, Retired, @@ -83,7 +84,7 @@ impl Default for FundStatus { /// Information on a funding effort for a pre-existing parachain. We assume that the parachain /// ID is known as it's used for the key of the storage item for which this is the value /// (`Funds`). -#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug)] +#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)] #[codec(dumb_trait_bound)] pub struct FundInfo { /// The total amount raised. diff --git a/pallets/salp/src/mock.rs b/pallets/salp/src/mock.rs index 11b48dbc2b..982cf9b16b 100644 --- a/pallets/salp/src/mock.rs +++ b/pallets/salp/src/mock.rs @@ -20,7 +20,7 @@ use bifrost_runtime::create_x2_multilocation; use frame_support::{ construct_runtime, parameter_types, - traits::{EnsureOrigin, GenesisBuild}, + traits::{EnsureOrigin, GenesisBuild, Nothing}, weights::{WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial}, PalletId, }; @@ -151,7 +151,7 @@ impl orml_tokens::Config for Test { type Amount = Amount; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; @@ -349,7 +349,7 @@ impl BifrostXcmExecutor for MockXcmExecutor { match result { true => Ok([0; 32]), - false => Err(XcmError::Undefined), + false => Err(XcmError::Unimplemented), } } @@ -364,7 +364,7 @@ impl BifrostXcmExecutor for MockXcmExecutor { match result { true => Ok([0; 32]), - false => Err(XcmError::Undefined), + false => Err(XcmError::Unimplemented), } } } diff --git a/pallets/salp/src/tests.rs b/pallets/salp/src/tests.rs index ec19f7a76f..ee014988c6 100644 --- a/pallets/salp/src/tests.rs +++ b/pallets/salp/src/tests.rs @@ -19,7 +19,7 @@ // Ensure we're `no_std` when compiling for Wasm. use frame_support::{assert_noop, assert_ok, dispatch::DispatchError, traits::BalanceStatus as BS}; -use node_primitives::{ContributionStatus, CurrencyId, TokenSymbol}; +use node_primitives::ContributionStatus; use orml_traits::{MultiCurrency, MultiReservableCurrency}; use crate::{mock::*, Error, FundStatus}; diff --git a/pallets/swap/Cargo.toml b/pallets/swap/Cargo.toml index d8b787cac2..15945ba0db 100644 --- a/pallets/swap/Cargo.toml +++ b/pallets/swap/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bifrost-swap" version = "0.8.0" -authors = ["Jamie Deng "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] diff --git a/pallets/token-issuer/Cargo.toml b/pallets/token-issuer/Cargo.toml index 0df9887c77..a18ea3d479 100644 --- a/pallets/token-issuer/Cargo.toml +++ b/pallets/token-issuer/Cargo.toml @@ -6,24 +6,26 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } node-primitives = { path = "../../node/primitives", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } orml-tokens = { version = "0.4.1-dev", default-features = false } orml-currencies = { version = "0.4.1-dev", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "node-primitives/std", "frame-support/std", "frame-system/std", diff --git a/pallets/token-issuer/src/lib.rs b/pallets/token-issuer/src/lib.rs index f12408bbdd..60fbcb8504 100644 --- a/pallets/token-issuer/src/lib.rs +++ b/pallets/token-issuer/src/lib.rs @@ -72,7 +72,6 @@ pub mod pallet { } #[pallet::event] - #[pallet::metadata(BalanceOf = "Balance")] #[pallet::generate_deposit(pub(crate) fn deposit_event)] pub enum Event { /// Successful added a new account to the issue whitelist. \[account, currency_id]\ diff --git a/pallets/token-issuer/src/mock.rs b/pallets/token-issuer/src/mock.rs index a15201328e..f62a39a91c 100644 --- a/pallets/token-issuer/src/mock.rs +++ b/pallets/token-issuer/src/mock.rs @@ -19,7 +19,10 @@ #![cfg(test)] #![allow(non_upper_case_globals)] -use frame_support::{parameter_types, traits::GenesisBuild}; +use frame_support::{ + parameter_types, + traits::{GenesisBuild, Nothing}, +}; use node_primitives::{CurrencyId, TokenSymbol}; use sp_core::{ u32_trait::{_2, _3}, @@ -57,7 +60,7 @@ frame_support::construct_runtime!( Tokens: orml_tokens::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, Currencies: orml_currencies::{Pallet, Call, Storage, Event}, - Council: pallet_collective::{Pallet, Call, Storage, Origin, Event, Config}, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config}, TokenIssuer: bifrost_token_issuer::{Pallet, Call, Storage, Event} } ); @@ -136,7 +139,7 @@ impl orml_tokens::Config for Runtime { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); @@ -150,7 +153,8 @@ parameter_types! { pub const CouncilMaxMembers: u32 = 100; } -impl pallet_collective::Config for Runtime { +type CouncilCollective = pallet_collective::Instance1; +impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type Event = Event; type MaxMembers = CouncilMaxMembers; @@ -164,7 +168,8 @@ impl pallet_collective::Config for Runtime { impl bifrost_token_issuer::Config for Runtime { type Event = Event; type MultiCurrency = Currencies; - type ControlOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId>; + type ControlOrigin = + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; type WeightInfo = (); } @@ -222,14 +227,6 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - // add ALICE, BOB, CHARLIE as the council member - pallet_collective::GenesisConfig:: { - members: vec![ALICE, BOB, CHARLIE], - phantom: Default::default(), - } - .assimilate_storage(&mut t) - .unwrap(); - t.into() } } diff --git a/pallets/vesting/Cargo.toml b/pallets/vesting/Cargo.toml index b7fcad75db..8da1145e79 100644 --- a/pallets/vesting/Cargo.toml +++ b/pallets/vesting/Cargo.toml @@ -6,21 +6,23 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } +scale-info = { version = "1.0", default-features = false, features = ["derive"] } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "sp-std/std", "sp-runtime/std", "frame-support/std", diff --git a/pallets/vesting/src/lib.rs b/pallets/vesting/src/lib.rs index 5bfa3589b9..91cfe5b4bc 100644 --- a/pallets/vesting/src/lib.rs +++ b/pallets/vesting/src/lib.rs @@ -59,6 +59,7 @@ use frame_support::{ }; use frame_system::{ensure_root, ensure_signed, pallet_prelude::*}; pub use pallet::*; +use scale_info::TypeInfo; use sp_runtime::{ traits::{ AtLeast32BitUnsigned, Convert, MaybeSerializeDeserialize, Saturating, StaticLookup, Zero, @@ -76,7 +77,7 @@ type MaxLocksOf = const VESTING_ID: LockIdentifier = *b"vesting "; /// Struct to encode the vesting schedule of an individual account. -#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)] +#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)] pub struct VestingInfo { /// Locked amount at genesis. pub locked: Balance, @@ -188,7 +189,6 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - #[pallet::metadata(T::AccountId = "AccountId", BalanceOf = "Balance")] pub enum Event { /// The amount vested has been updated. This could indicate more funds are available. The /// balance given is the amount which is left unvested (and thus locked). @@ -475,12 +475,22 @@ where Ok(()) } + // Ensure we can call `add_vesting_schedule` without error. This should always + // be called prior to `add_vesting_schedule`. + fn can_add_vesting_schedule( + _who: &T::AccountId, + _locked: BalanceOf, + _per_block: BalanceOf, + _starting_block: T::BlockNumber, + ) -> DispatchResult { + Ok(()) + } + /// Remove a vesting schedule for a given account. - fn remove_vesting_schedule(who: &T::AccountId) { + fn remove_vesting_schedule(who: &T::AccountId, _schedule_index: u32) -> DispatchResult { Vesting::::remove(who); // it can't fail, but even if somehow it did, we don't really care. - let res = Self::update_lock(who.clone()); - debug_assert!(res.is_ok()); + Self::update_lock(who.clone()) } } diff --git a/pallets/vsbond-auction/Cargo.toml b/pallets/vsbond-auction/Cargo.toml index c08dad480b..8e0b5e8614 100644 --- a/pallets/vsbond-auction/Cargo.toml +++ b/pallets/vsbond-auction/Cargo.toml @@ -8,23 +8,25 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { path = "../../node/primitives", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } [dev-dependencies] orml-tokens = { version = "0.4.1-dev" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "sp-std/std", "frame-system/std", "frame-support/std", diff --git a/pallets/vsbond-auction/src/lib.rs b/pallets/vsbond-auction/src/lib.rs index baa3093829..691866f4ff 100644 --- a/pallets/vsbond-auction/src/lib.rs +++ b/pallets/vsbond-auction/src/lib.rs @@ -37,6 +37,7 @@ use frame_system::pallet_prelude::*; use node_primitives::{CurrencyId, LeasePeriod, TokenInfo, TokenSymbol}; use orml_traits::{MultiCurrency, MultiReservableCurrency}; pub use pallet::*; +use scale_info::TypeInfo; use sp_std::{cmp::min, convert::TryFrom}; pub use weights::WeightInfo; @@ -49,7 +50,7 @@ pub mod weights; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; -#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] pub struct OrderInfo { /// The owner of the order owner: AccountIdOf, @@ -92,7 +93,7 @@ impl core::fmt::Debug for OrderInfo { } } -#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug)] +#[derive(Encode, Decode, Copy, Clone, Eq, PartialEq, Debug, TypeInfo)] pub enum OrderType { Sell, Buy, @@ -116,7 +117,7 @@ pub mod pallet { use super::*; #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: frame_system::Config + TypeInfo { type Event: From> + IsType<::Event>; /// The currency type that buyer to pay diff --git a/pallets/vsbond-auction/src/mock.rs b/pallets/vsbond-auction/src/mock.rs index 86d7cd766f..6af935a40c 100644 --- a/pallets/vsbond-auction/src/mock.rs +++ b/pallets/vsbond-auction/src/mock.rs @@ -18,7 +18,10 @@ #[cfg(feature = "runtime-benchmarks")] use frame_benchmarking::{account, whitelisted_caller}; -use frame_support::{construct_runtime, parameter_types, traits::GenesisBuild}; +use frame_support::{ + construct_runtime, parameter_types, + traits::{GenesisBuild, Nothing}, +}; use node_primitives::{Amount, Balance, CurrencyId, TokenSymbol}; use sp_core::H256; use sp_runtime::{ @@ -91,7 +94,7 @@ impl orml_tokens::Config for Test { type Amount = Amount; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; diff --git a/pallets/vtoken-mint/Cargo.toml b/pallets/vtoken-mint/Cargo.toml index cf48651a3d..45dfea634e 100644 --- a/pallets/vtoken-mint/Cargo.toml +++ b/pallets/vtoken-mint/Cargo.toml @@ -1,35 +1,37 @@ [package] name = "bifrost-vtoken-mint" version = "0.8.0" -authors = ["Jamie Deng "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } node-primitives = { path = "../../node/primitives", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } zenlink-protocol = { version = "*", default-features = false } orml-traits = { version = "0.4.1-dev", default-features = false } bifrost-minter-reward = { path = "../minter-reward", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } [dev-dependencies] orml-tokens = { version = "0.4.1-dev" } orml-currencies = { version = "0.4.1-dev" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "node-primitives/std", "frame-support/std", "frame-system/std", diff --git a/pallets/vtoken-mint/rpc/Cargo.toml b/pallets/vtoken-mint/rpc/Cargo.toml index aaf7158314..1fc058814e 100644 --- a/pallets/vtoken-mint/rpc/Cargo.toml +++ b/pallets/vtoken-mint/rpc/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "bifrost-vtoken-mint-rpc" version = "0.8.0" -authors = ["Jamie Deng "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } vtoken-mint-rpc-runtime-api = { package = "bifrost-vtoken-mint-rpc-runtime-api", path = "./runtime-api" } -jsonrpc-core = "15.1.0" -jsonrpc-core-client = "15.1.0" -jsonrpc-derive = "15.1.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +jsonrpc-core = "18.0.0" +jsonrpc-core-client = "18.0.0" +jsonrpc-derive = "18.0.0" +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } diff --git a/pallets/vtoken-mint/rpc/runtime-api/Cargo.toml b/pallets/vtoken-mint/rpc/runtime-api/Cargo.toml index 8ee23d5fca..7d372e0154 100644 --- a/pallets/vtoken-mint/rpc/runtime-api/Cargo.toml +++ b/pallets/vtoken-mint/rpc/runtime-api/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "bifrost-vtoken-mint-rpc-runtime-api" version = "0.8.0" -authors = ["Jamie Deng "] +authors = ["Liebi Technologies "] edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } [features] default = ["std"] diff --git a/pallets/vtoken-mint/src/lib.rs b/pallets/vtoken-mint/src/lib.rs index adb1ed22f4..5e1999e350 100644 --- a/pallets/vtoken-mint/src/lib.rs +++ b/pallets/vtoken-mint/src/lib.rs @@ -110,7 +110,6 @@ pub mod pallet { StorageMap<_, Blake2_128Concat, CurrencyIdOf, T::BlockNumber, ValueQuery>; #[pallet::event] - #[pallet::metadata(BalanceOf = "Balance", CurrencyIdOf = "CurrencyId")] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { Minted(T::AccountId, CurrencyIdOf, BalanceOf), diff --git a/pallets/vtoken-mint/src/mock.rs b/pallets/vtoken-mint/src/mock.rs index 17396fc0b8..c7edb8cb6d 100644 --- a/pallets/vtoken-mint/src/mock.rs +++ b/pallets/vtoken-mint/src/mock.rs @@ -28,7 +28,7 @@ use std::convert::TryInto; use frame_benchmarking::whitelisted_caller; use frame_support::{ parameter_types, - traits::{GenesisBuild, Hooks}, + traits::{GenesisBuild, Hooks, Nothing}, PalletId, }; use node_primitives::{CurrencyId, TokenSymbol}; @@ -145,7 +145,7 @@ impl orml_tokens::Config for Runtime { type Amount = i128; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); @@ -194,6 +194,7 @@ impl zenlink_protocol::Config for Runtime { type SelfParaId = (); type TargetChains = (); type XcmExecutor = (); + type WeightInfo = (); } type MultiAssets = diff --git a/runtime/asgard/Cargo.toml b/runtime/asgard/Cargo.toml index 45316b014a..b08963ca7c 100644 --- a/runtime/asgard/Cargo.toml +++ b/runtime/asgard/Cargo.toml @@ -9,6 +9,7 @@ build = "build.rs" # third-party dependencies codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] } log = { version = "0.4.14", default-features = false } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } static_assertions = "1.1.0" hex-literal = { version = "0.3.1"} @@ -16,69 +17,69 @@ smallvec = "1.6.1" # primitives node-primitives = { default-features = false, path = "../../node/primitives" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false} -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false} +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # frame dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.10" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.11" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } # bifrost pallets bifrost-bancor= { path = "../../pallets/bancor",default-features = false } @@ -111,13 +112,14 @@ zenlink-protocol = { version = "*", default-features = false } zenlink-protocol-runtime-api = { version = "*", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] with-tracing = [ "frame-executive/with-tracing" ] std = [ "codec/std", + "scale-info/std", "log/std", "frame-benchmarking/std", "frame-try-runtime/std", diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 2d900e826a..43075cb2bd 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -79,7 +79,7 @@ use bifrost_runtime_common::{ constants::parachains, xcm_impl::{ BifrostAccountIdToMultiLocation, BifrostAssetMatcher, BifrostCurrencyIdConvert, - BifrostFilteredAssets, BifrostXcmTransactFilter, + BifrostFilteredAssets, }, CouncilCollective, EnsureRootOrAllTechnicalCommittee, MoreThanHalfCouncil, SlowAdjustingFeeUpdate, TechnicalCollective, @@ -262,6 +262,7 @@ parameter_types! { pub const TransferFee: Balance = 1 * MILLIBNC; pub const CreationFee: Balance = 1 * MILLIBNC; pub const TransactionByteFee: Balance = 1 * MICROBNC; + pub const OperationalFeeMultiplier: u8 = 5; pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; } @@ -303,7 +304,17 @@ parameter_types! { /// The type used to represent the kinds of proxying allowed. #[derive( - Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen, + Copy, + Clone, + Eq, + PartialEq, + Ord, + PartialOrd, + Encode, + Decode, + RuntimeDebug, + MaxEncodedLen, + scale_info::TypeInfo, )] pub enum ProxyType { Any = 0, @@ -326,9 +337,9 @@ impl InstanceFilter for ProxyType { Call::System(..) | Call::Scheduler(..) | Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim(..)) | - Call::Indices(pallet_indices::Call::free(..)) | - Call::Indices(pallet_indices::Call::freeze(..)) | + Call::Indices(pallet_indices::Call::claim{..}) | + Call::Indices(pallet_indices::Call::free{..}) | + Call::Indices(pallet_indices::Call::freeze{..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet Call::Authorship(..) | @@ -341,8 +352,8 @@ impl InstanceFilter for ProxyType { Call::Treasury(..) | Call::Bounties(..) | Call::Tips(..) | - Call::Vesting(pallet_vesting::Call::vest(..)) | - Call::Vesting(pallet_vesting::Call::vest_other(..)) | + Call::Vesting(pallet_vesting::Call::vest{..}) | + Call::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` Call::Utility(..) | Call::Proxy(..) | @@ -357,7 +368,7 @@ impl InstanceFilter for ProxyType { Call::Tips(..) | Call::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))) + matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, } } @@ -585,6 +596,7 @@ impl pallet_democracy::Config for Runtime { // Any single technical committee member may veto a coming council proposal, however they can // only do it once and it lasts only for the cool-off period. type VetoOrigin = pallet_collective::EnsureMember; + type VoteLockingPeriod = EnactmentPeriod; // Same as EnactmentPeriod type VotingPeriod = VotingPeriod; type WeightInfo = pallet_democracy::weights::SubstrateWeight; } @@ -658,6 +670,7 @@ impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = FlexibleFee; type TransactionByteFee = TransactionByteFee; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; } @@ -750,6 +763,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { // One XCM operation is 200_000_000 weight, cross-chain transfer ~= 2x of transfer = 3_000_000_000 pub UnitWeightCost: Weight = 200_000_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -759,11 +773,7 @@ match_type! { }; } -pub type Barrier = ( - TakeWeightCredit, - AllowTopLevelPaidExecutionFrom, - BifrostXcmTransactFilter, -); +pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); pub type BifrostAssetTransactor = MultiCurrencyAdapter< Currencies, @@ -833,7 +843,9 @@ pub type Trader = ( pub struct XcmConfig; impl Config for XcmConfig { + type AssetClaims = (); // don't claim for now type AssetTransactor = BifrostAssetTransactor; + type AssetTrap = (); // don't trap for now type Barrier = Barrier; type Call = Call; type IsReserve = BifrostFilteredAssets; @@ -843,7 +855,7 @@ impl Config for XcmConfig { type ResponseHandler = (); type SubscriptionService = PolkadotXcm; type Trader = Trader; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmSender = XcmRouter; // Don't handle responses for now. } @@ -864,12 +876,16 @@ impl pallet_xcm::Config for Runtime { type ExecuteXcmOrigin = EnsureXcmOrigin; type LocationInverter = LocationInverter; type SendXcmOrigin = EnsureXcmOrigin; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; type XcmReserveTransferFilter = Everything; type XcmRouter = XcmRouter; type XcmTeleportFilter = Everything; + type Origin = Origin; + type Call = Call; + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { @@ -922,9 +938,14 @@ impl pallet_authorship::Config for Runtime { type UncleGenerations = UncleGenerations; } +parameter_types! { + pub const MaxAuthorities: u32 = 100_000; +} + impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); + type MaxAuthorities = MaxAuthorities; } parameter_types! { @@ -1026,7 +1047,7 @@ impl orml_xtokens::Config for Runtime { type LocationInverter = LocationInverter; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type BaseXcmWeight = XcmWeight; } @@ -1062,7 +1083,7 @@ pub struct FeeNameGetter; impl NameGetter for FeeNameGetter { fn get_name(c: &Call) -> ExtraFeeName { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => ExtraFeeName::SalpContribute, + Call::Salp(bifrost_salp::Call::contribute { .. }) => ExtraFeeName::SalpContribute, _ => ExtraFeeName::NoExtraFee, } } @@ -1074,7 +1095,7 @@ pub struct AggregateExtraFeeFilter; impl Contains for AggregateExtraFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -1084,7 +1105,7 @@ pub struct ContributeFeeFilter; impl Contains for ContributeFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -1323,7 +1344,8 @@ impl zenlink_protocol::Config for Runtime { type PalletId = ZenlinkPalletId; type SelfParaId = SelfParaId; type TargetChains = ZenlinkRegistedParaChains; - type XcmExecutor = XcmExecutor; + type XcmExecutor = (); + type WeightInfo = (); } type MultiAssets = ZenlinkMultiAssets>; @@ -1559,8 +1581,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Nonce { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Index { System::account_nonce(account) } } @@ -1569,18 +1591,23 @@ impl_runtime_apis! { Block, Balance, > for Runtime { - fn query_info(uxt: ::Extrinsic, len: u32) -> pallet_transaction_payment::RuntimeDispatchInfo { + fn query_info( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo { TransactionPayment::query_info(uxt, len) } - - fn query_fee_details(uxt: ::Extrinsic, len: u32) -> pallet_transaction_payment_rpc_runtime_api::FeeDetails { + fn query_fee_details( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } } impl sp_api::Metadata for Runtime { fn metadata() -> OpaqueMetadata { - Runtime::metadata().into() + OpaqueMetadata::new(Runtime::metadata().into()) } } @@ -1614,7 +1641,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities() + Aura::authorities().into_inner() } } diff --git a/runtime/bifrost/Cargo.toml b/runtime/bifrost/Cargo.toml index e247897d1e..76f9ec1fa5 100644 --- a/runtime/bifrost/Cargo.toml +++ b/runtime/bifrost/Cargo.toml @@ -13,70 +13,71 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = ] } hex-literal = { version = "0.3.1" } log = { version = "0.4.14", default-features = false } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } smallvec = "1.6.1" static_assertions = "1.1.0" # primitives node-primitives = { default-features = false, path = "../../node/primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # frame dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } # Polkadot dependencies -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } # Bifrost bifrost-flexible-fee = { path = "../../pallets/flexible-fee", default-features = false } @@ -104,12 +105,13 @@ zenlink-protocol = { version = "*", default-features = false } zenlink-protocol-runtime-api = { version = "*", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] std = [ "codec/std", + "scale-info/std", "log/std", "frame-executive/std", "frame-try-runtime/std", diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs index 09411ae2c6..a3c60a3a5b 100644 --- a/runtime/bifrost/src/lib.rs +++ b/runtime/bifrost/src/lib.rs @@ -72,7 +72,7 @@ use bifrost_runtime_common::{ constants::parachains, xcm_impl::{ BifrostAccountIdToMultiLocation, BifrostAssetMatcher, BifrostCurrencyIdConvert, - BifrostFilteredAssets, BifrostXcmTransactFilter, + BifrostFilteredAssets, }, CouncilCollective, EnsureRootOrAllTechnicalCommittee, MoreThanHalfCouncil, SlowAdjustingFeeUpdate, TechnicalCollective, @@ -187,26 +187,26 @@ impl Contains for CallFilter { // call banned // ZLK transfer - Call::Currencies(orml_currencies::Call::transfer( - _, - CurrencyId::Token(TokenSymbol::ZLK), - _, - )) => false, - Call::Tokens(orml_tokens::Call::transfer( - _, - CurrencyId::Token(TokenSymbol::ZLK), - _, - )) => false, - Call::Tokens(orml_tokens::Call::transfer_all( - _, - CurrencyId::Token(TokenSymbol::ZLK), - _, - )) => false, - Call::Tokens(orml_tokens::Call::transfer_keep_alive( - _, - CurrencyId::Token(TokenSymbol::ZLK), - _, - )) => false, + Call::Currencies(orml_currencies::Call::transfer { + dest: _, + currency_id: CurrencyId::Token(TokenSymbol::ZLK), + amount: _, + }) => false, + Call::Tokens(orml_tokens::Call::transfer { + dest: _, + currency_id: CurrencyId::Token(TokenSymbol::ZLK), + amount: _, + }) => false, + Call::Tokens(orml_tokens::Call::transfer_all { + dest: _, + currency_id: CurrencyId::Token(TokenSymbol::ZLK), + keep_alive: _, + }) => false, + Call::Tokens(orml_tokens::Call::transfer_keep_alive { + dest: _, + currency_id: CurrencyId::Token(TokenSymbol::ZLK), + amount: _, + }) => false, Call::PhragmenElection(_) => false, _ => true, @@ -284,6 +284,7 @@ parameter_types! { pub const TransferFee: Balance = 1 * MILLIBNC; pub const CreationFee: Balance = 1 * MILLIBNC; pub const TransactionByteFee: Balance = 1 * MICROBNC; + pub const OperationalFeeMultiplier: u8 = 5; pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; } @@ -509,6 +510,7 @@ impl pallet_democracy::Config for Runtime { // Any single technical committee member may veto a coming council proposal, however they can // only do it once and it lasts only for the cool-off period. type VetoOrigin = pallet_collective::EnsureMember; + type VoteLockingPeriod = EnactmentPeriod; // Same as EnactmentPeriod type VotingPeriod = VotingPeriod; type WeightInfo = pallet_democracy::weights::SubstrateWeight; } @@ -582,6 +584,7 @@ impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = FlexibleFee; type TransactionByteFee = TransactionByteFee; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; } @@ -669,6 +672,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { // One XCM operation is 200_000_000 weight, cross-chain transfer ~= 2x of transfer = 3_000_000_000 pub UnitWeightCost: Weight = 200_000_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -758,7 +762,9 @@ pub fn create_x2_parachain_multilocation(index: u16) -> MultiLocation { pub struct XcmConfig; impl Config for XcmConfig { + type AssetClaims = (); // don't claim for now type AssetTransactor = BifrostAssetTransactor; + type AssetTrap = (); // don't trap for now type Barrier = Barrier; type Call = Call; type IsReserve = BifrostFilteredAssets; @@ -768,7 +774,7 @@ impl Config for XcmConfig { type ResponseHandler = (); type SubscriptionService = PolkadotXcm; type Trader = Trader; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmSender = XcmRouter; // Don't handle responses for now. } @@ -789,12 +795,16 @@ impl pallet_xcm::Config for Runtime { type ExecuteXcmOrigin = EnsureXcmOrigin; type LocationInverter = LocationInverter; type SendXcmOrigin = EnsureXcmOrigin; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmReserveTransferFilter = Everything; type XcmRouter = XcmRouter; type XcmTeleportFilter = Everything; + type Origin = Origin; + type Call = Call; + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { @@ -847,9 +857,14 @@ impl pallet_authorship::Config for Runtime { type UncleGenerations = UncleGenerations; } +parameter_types! { + pub const MaxAuthorities: u32 = 100_000; +} + impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); + type MaxAuthorities = MaxAuthorities; } parameter_types! { @@ -952,7 +967,7 @@ impl orml_xtokens::Config for Runtime { type LocationInverter = LocationInverter; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type BaseXcmWeight = XcmWeight; } @@ -976,7 +991,7 @@ pub struct FeeNameGetter; impl NameGetter for FeeNameGetter { fn get_name(c: &Call) -> ExtraFeeName { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => ExtraFeeName::SalpContribute, + Call::Salp(bifrost_salp::Call::contribute { .. }) => ExtraFeeName::SalpContribute, _ => ExtraFeeName::NoExtraFee, } } @@ -988,7 +1003,7 @@ pub struct AggregateExtraFeeFilter; impl Contains for AggregateExtraFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -998,7 +1013,7 @@ pub struct ContributeFeeFilter; impl Contains for ContributeFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -1188,7 +1203,8 @@ impl zenlink_protocol::Config for Runtime { type PalletId = ZenlinkPalletId; type SelfParaId = SelfParaId; type TargetChains = ZenlinkRegistedParaChains; - type XcmExecutor = XcmExecutor; + type XcmExecutor = (); + type WeightInfo = (); } type MultiAssets = ZenlinkMultiAssets>; @@ -1427,18 +1443,23 @@ impl_runtime_apis! { Block, Balance, > for Runtime { - fn query_info(uxt: ::Extrinsic, len: u32) -> pallet_transaction_payment::RuntimeDispatchInfo { + fn query_info( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo { TransactionPayment::query_info(uxt, len) } - - fn query_fee_details(uxt: ::Extrinsic, len: u32) -> pallet_transaction_payment_rpc_runtime_api::FeeDetails { + fn query_fee_details( + uxt: ::Extrinsic, + len: u32, + ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } } impl sp_api::Metadata for Runtime { fn metadata() -> OpaqueMetadata { - Runtime::metadata().into() + OpaqueMetadata::new(Runtime::metadata().into()) } } @@ -1472,7 +1493,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities() + Aura::authorities().into_inner() } } diff --git a/runtime/bifrost/src/weights/pallet_balances.rs b/runtime/bifrost/src/weights/pallet_balances.rs index 082f8bad67..1df173a892 100644 --- a/runtime/bifrost/src/weights/pallet_balances.rs +++ b/runtime/bifrost/src/weights/pallet_balances.rs @@ -75,4 +75,8 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + + fn force_unreserve() -> Weight { + (100_000_000 as Weight) + } } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 837fc71a0f..aadbef94e9 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,50 +15,50 @@ smallvec = "1.6.1" # primitives node-primitives = { default-features = false, path = "../../node/primitives" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false} -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false} +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # frame dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Cumulus dependencies -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } # orml orml-currencies = { version = "0.4.1-dev", default-features = false } diff --git a/runtime/common/src/xcm_impl.rs b/runtime/common/src/xcm_impl.rs index e665ec4a91..1e55202b1c 100644 --- a/runtime/common/src/xcm_impl.rs +++ b/runtime/common/src/xcm_impl.rs @@ -20,8 +20,7 @@ use codec::{Decode, Encode}; pub use cumulus_primitives_core::ParaId; use frame_support::{ sp_runtime::traits::{CheckedConversion, Convert}, - traits::{Contains, Get}, - weights::Weight, + traits::Get, }; use node_primitives::{AccountId, CurrencyId, TokenSymbol}; use orml_traits::location::Reserve; @@ -29,7 +28,7 @@ use polkadot_parachain::primitives::Sibling; use sp_std::{convert::TryFrom, marker::PhantomData}; use xcm::latest::prelude::*; use xcm_builder::{AccountId32Aliases, NativeAsset, ParentIsDefault, SiblingParachainConvertsVia}; -use xcm_executor::traits::{FilterAssetLocation, MatchesFungible, ShouldExecute}; +use xcm_executor::traits::{FilterAssetLocation, MatchesFungible}; use crate::constants::parachains; @@ -64,24 +63,6 @@ pub type BifrostLocationConvert = ( AccountId32Aliases, ); -/// Bifrost Xcm Transact Filter -pub struct BifrostXcmTransactFilter(PhantomData); - -impl> ShouldExecute for BifrostXcmTransactFilter { - fn should_execute( - _origin: &MultiLocation, - _top_level: bool, - message: &Xcm, - _shallow_weight: Weight, - _weight_credit: &mut Weight, - ) -> Result<(), ()> { - match message { - Xcm::Transact { origin_type: _, require_weight_at_most: _, call: _ } => Ok(()), - _ => Err(()), - } - } -} - /// Bifrost Filtered Assets pub struct BifrostFilterAsset; diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 90289f2939..4456ba7956 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -8,6 +8,7 @@ build = "build.rs" [dependencies] # third-party dependencies codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } serde = { version = "1.0.124", optional = true } static_assertions = "1.1.0" @@ -16,69 +17,69 @@ smallvec = "1.6.1" # primitives node-primitives = { default-features = false, path = "../../node/primitives" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false} -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false} +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # frame dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.10", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot",branch = "release-v0.9.11", default-features = false } # bifrost pallets bifrost-bancor= { path = "../../pallets/bancor",default-features = false } @@ -107,13 +108,14 @@ zenlink-protocol = { version = "*", default-features = false } zenlink-protocol-runtime-api = { version = "*", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" } [features] default = ["std"] with-tracing = [ "frame-executive/with-tracing" ] std = [ "codec/std", + "scale-info/std", "log/std", "frame-benchmarking/std", "frame-try-runtime/std", diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 0110bae84d..9a524e3f33 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -31,7 +31,7 @@ use core::convert::TryInto; // A few exports that help ease life for downstream crates. pub use frame_support::{ construct_runtime, match_type, parameter_types, - traits::{Contains, Everything, InstanceFilter, IsInVec, LockIdentifier, Randomness}, + traits::{Contains, Everything, InstanceFilter, IsInVec, LockIdentifier, Nothing, Randomness}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, DispatchClass, IdentityFee, Weight, @@ -86,7 +86,7 @@ use bifrost_runtime_common::{ constants::parachains, xcm_impl::{ BifrostAccountIdToMultiLocation, BifrostAssetMatcher, BifrostCurrencyIdConvert, - BifrostFilteredAssets, BifrostXcmTransactFilter, + BifrostFilteredAssets, }, CouncilCollective, EnsureRootOrAllTechnicalCommittee, MoreThanHalfCouncil, SlowAdjustingFeeUpdate, @@ -252,6 +252,7 @@ parameter_types! { pub const TransferFee: u128 = 1 * MILLIBNC; pub const CreationFee: u128 = 1 * MILLIBNC; pub const TransactionByteFee: u128 = 1 * MICROBNC; + pub const OperationalFeeMultiplier: u8 = 5; pub const MaxLocks: u32 = 50; pub const MaxReserves: u32 = 50; } @@ -293,7 +294,17 @@ parameter_types! { /// The type used to represent the kinds of proxying allowed. #[derive( - Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen, + Copy, + Clone, + Eq, + PartialEq, + Ord, + PartialOrd, + Encode, + Decode, + RuntimeDebug, + MaxEncodedLen, + scale_info::TypeInfo, )] pub enum ProxyType { Any = 0, @@ -316,9 +327,9 @@ impl InstanceFilter for ProxyType { Call::System(..) | Call::Scheduler(..) | Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim(..)) | - Call::Indices(pallet_indices::Call::free(..)) | - Call::Indices(pallet_indices::Call::freeze(..)) | + Call::Indices(pallet_indices::Call::claim{..}) | + Call::Indices(pallet_indices::Call::free{..}) | + Call::Indices(pallet_indices::Call::freeze{..}) | Call::Democracy(..) | Call::Council(..) | Call::TechnicalCommittee(..) | @@ -327,8 +338,8 @@ impl InstanceFilter for ProxyType { Call::Treasury(..) | Call::Bounties(..) | Call::Tips(..) | - Call::Vesting(pallet_vesting::Call::vest(..)) | - Call::Vesting(pallet_vesting::Call::vest_other(..)) | + Call::Vesting(pallet_vesting::Call::vest{..}) | + Call::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` Call::Utility(..) | Call::Proxy(..) | @@ -343,7 +354,7 @@ impl InstanceFilter for ProxyType { Call::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))) + matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, } } @@ -575,6 +586,7 @@ impl pallet_democracy::Config for Runtime { // only do it once and it lasts only for the cool-off period. type VetoOrigin = pallet_collective::EnsureMember; type VotingPeriod = VotingPeriod; + type VoteLockingPeriod = EnactmentPeriod; // Same as EnactmentPeriod type WeightInfo = pallet_democracy::weights::SubstrateWeight; } @@ -647,6 +659,7 @@ impl pallet_tips::Config for Runtime { impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OnChargeTransaction = FlexibleFee; + type OperationalFeeMultiplier = OperationalFeeMultiplier; type TransactionByteFee = TransactionByteFee; type WeightToFee = IdentityFee; } @@ -740,6 +753,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { // One XCM operation is 200_000_000 weight, cross-chain transfer ~= 2x of transfer = 3_000_000_000 pub UnitWeightCost: Weight = 200_000_000; + pub const MaxInstructions: u32 = 100; } match_type! { @@ -749,11 +763,7 @@ match_type! { }; } -pub type Barrier = ( - TakeWeightCredit, - AllowTopLevelPaidExecutionFrom, - BifrostXcmTransactFilter, -); +pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom); pub type BifrostAssetTransactor = MultiCurrencyAdapter< Currencies, @@ -823,7 +833,9 @@ pub type Trader = ( pub struct XcmConfig; impl Config for XcmConfig { + type AssetClaims = (); // don't claim for now type AssetTransactor = BifrostAssetTransactor; + type AssetTrap = (); // don't trap for now type Barrier = Barrier; type Call = Call; type IsReserve = BifrostFilteredAssets; @@ -833,7 +845,7 @@ impl Config for XcmConfig { type ResponseHandler = (); type SubscriptionService = PolkadotXcm; type Trader = Trader; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmSender = XcmRouter; // Don't handle responses for now. } @@ -854,12 +866,16 @@ impl pallet_xcm::Config for Runtime { type ExecuteXcmOrigin = EnsureXcmOrigin; type LocationInverter = LocationInverter; type SendXcmOrigin = EnsureXcmOrigin; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmExecuteFilter = Everything; type XcmExecutor = XcmExecutor; type XcmReserveTransferFilter = Everything; type XcmRouter = XcmRouter; type XcmTeleportFilter = Everything; + type Origin = Origin; + type Call = Call; + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { @@ -880,9 +896,14 @@ impl cumulus_pallet_dmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; } +parameter_types! { + pub const MaxAuthorities: u32 = 100_000; +} + impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); + type MaxAuthorities = MaxAuthorities; } impl pallet_grandpa::Config for Runtime { @@ -899,6 +920,8 @@ impl pallet_grandpa::Config for Runtime { GrandpaId, )>>::IdentificationTuple; + type MaxAuthorities = MaxAuthorities; + type HandleEquivocation = (); type WeightInfo = (); @@ -945,7 +968,7 @@ impl orml_tokens::Config for Runtime { type Amount = Amount; type Balance = Balance; type CurrencyId = CurrencyId; - type DustRemovalWhitelist = (); + type DustRemovalWhitelist = Nothing; type Event = Event; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; @@ -960,7 +983,7 @@ pub struct FeeNameGetter; impl NameGetter for FeeNameGetter { fn get_name(c: &Call) -> ExtraFeeName { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => ExtraFeeName::SalpContribute, + Call::Salp(bifrost_salp::Call::contribute { .. }) => ExtraFeeName::SalpContribute, _ => ExtraFeeName::NoExtraFee, } } @@ -972,7 +995,7 @@ pub struct AggregateExtraFeeFilter; impl Contains for AggregateExtraFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -982,7 +1005,7 @@ pub struct ContributeFeeFilter; impl Contains for ContributeFeeFilter { fn contains(c: &Call) -> bool { match *c { - Call::Salp(bifrost_salp::Call::contribute(..)) => true, + Call::Salp(bifrost_salp::Call::contribute { .. }) => true, _ => false, } } @@ -1208,7 +1231,8 @@ impl zenlink_protocol::Config for Runtime { type PalletId = ZenlinkPalletId; type SelfParaId = SelfParaId; type TargetChains = ZenlinkRegistedParaChains; - type XcmExecutor = XcmExecutor; + type XcmExecutor = (); + type WeightInfo = (); } type MultiAssets = ZenlinkMultiAssets>; @@ -1318,7 +1342,7 @@ impl orml_xtokens::Config for Runtime { type LocationInverter = LocationInverter; type SelfLocation = SelfLocation; type XcmExecutor = XcmExecutor; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type BaseXcmWeight = XcmWeight; } @@ -1506,7 +1530,7 @@ impl_runtime_apis! { impl sp_api::Metadata for Runtime { fn metadata() -> OpaqueMetadata { - Runtime::metadata().into() + OpaqueMetadata::new(Runtime::metadata().into()) } } @@ -1570,7 +1594,7 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities() + Aura::authorities().into_inner() } } diff --git a/utils/subkey/Cargo.toml b/utils/subkey/Cargo.toml deleted file mode 100644 index 2f6b4545ab..0000000000 --- a/utils/subkey/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "subkey" -version = "0.8.0" -authors = ["Edwin Wang "] -edition = "2018" - -[[bin]] -path = "src/main.rs" -name = "subkey" - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] - -[dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -futures = "0.1.29" -hex = "0.4.2" -jsonrpc-core-client = { version = "15.1", features = ["http"] } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10" } -structopt = "0.3.14" -tokio = "0.1.22" - -[features] -bench = [] diff --git a/utils/subkey/README.adoc b/utils/subkey/README.adoc deleted file mode 100644 index 5ce0d2d324..0000000000 --- a/utils/subkey/README.adoc +++ /dev/null @@ -1,83 +0,0 @@ -= Subkey - -Subkey is a commandline utility included with Substrate that generates or restores Substrate keys. - -`subkey` will use the http://wiki.polkadot.network/en/latest/polkadot/learn/cryptography/#keypairs-and-signing[sr25519] cryptography by default. If you need to use the older ed25519 cryptography to generate or restore your key pass the `--ed25519` flag to any of the commands. - -== Usage - -=== Generate a random account - -```bash -subkey generate -``` - -Will output a mnemonic phrase and give you the seed, public key, and address of a new account. DO NOT SHARE your mnemonic or seed with ANYONE it will give them access to your funds. If someone is making a transfer to you they will only need your **Address**. - -=== Inspecting a key - -You can inspect a given URI (mnemonic, seed, public key, or address) and recover the public key and the address. - -```bash -subkey inspect - -OUTPUT: - Public key (hex): 0x461edcf1ba99e43f50dec4bdeb3d1a2cf521ad7c3cd0eeee5cd3314e50fd424c - Address (SS58): 5DeeNqcAcaHDSed2HYnqMDK7JHcvxZ5QUE9EKmjc5snvU6wF -``` - -=== Signing - -`subkey` expects a message to come in on STDIN, one way to sign a message would look like this: - -```bash -echo -n | subkey sign --suri - -OUTPUT: -a69da4a6ccbf81dbbbfad235fa12cf8528c18012b991ae89214de8d20d29c1280576ced6eb38b7406d1b7e03231df6dd4a5257546ddad13259356e1c3adfb509 -``` - -=== Verifying a signature - -```bash -echo -n | subkey verify
- -OUTPUT: -Signature verifies correctly. -``` - -=== Using the vanity generator - -You can use the included vanity generator to find a seed that provides an address which includes the desired pattern. Be warned, depending on your hardware this may take a while. - -```bash -subkey vanity 1337 -``` - -=== Signing a transaction - -Sign a transaction from an encoded `Call`. - -```bash -subkey sign-transaction \ - --call \ - --nonce 0 \ - --suri \ - --password \ - --prior-block-hash -``` - -Will output a signed and encoded `UncheckedMortalCompactExtrinsic` as hex. - -=== Inspecting a module ID - -```bash -subkey module-id "py/trsry" --network kusama - -OUTPUT: -Public Key URI `F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29` is account: - Network ID/version: kusama - Public key (hex): 0x6d6f646c70792f74727372790000000000000000000000000000000000000000 - Account ID: 0x6d6f646c70792f74727372790000000000000000000000000000000000000000 - SS58 Address: F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29 -``` \ No newline at end of file diff --git a/utils/subkey/src/lib.rs b/utils/subkey/src/lib.rs deleted file mode 100644 index a7f237e2be..0000000000 --- a/utils/subkey/src/lib.rs +++ /dev/null @@ -1,128 +0,0 @@ -// This file is part of Bifrost. - -// Copyright (C) 2019-2021 Liebi Technologies (UK) Ltd. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -use sc_cli::{ - Error, GenerateCmd, GenerateNodeKeyCmd, InspectKeyCmd, InspectNodeKeyCmd, SignCmd, VanityCmd, - VerifyCmd, -}; -use structopt::StructOpt; - -mod offchain_rpc; - -#[derive(Debug, StructOpt)] -#[structopt( - name = "subkey", - author = "Parity Team ", - about = "Utility for generating and restoring with Substrate keys" -)] -pub enum Subkey { - /// Generate a random node libp2p key, save it to file or print it to stdout - /// and print its peer ID to stderr. - GenerateNodeKey(GenerateNodeKeyCmd), - - /// Generate a random account - Generate(GenerateCmd), - - /// Gets a public key and a SS58 address from the provided Secret URI - Inspect(InspectKeyCmd), - - /// Print the peer ID corresponding to the node key in the given file - InspectNodeKey(InspectNodeKeyCmd), - - /// Sign a message, with a given (secret) key. - Sign(SignCmd), - - /// Generate a seed that provides a vanity address. - Vanity(VanityCmd), - - /// Verify a signature for a message, provided on STDIN, with a given (public or secret) key. - Verify(VerifyCmd), - - /// Get localstorage - #[structopt(name = "localstorage-get")] - GetLocalStorage(offchain_storage::GetLocalStorageCmd), - - /// Set localstorage - #[structopt(name = "localstorage-set")] - SetLocalStorage(offchain_storage::SetLocalStorageCmd), -} - -/// Run the subkey command, given the apropriate runtime. -pub fn run() -> Result<(), Error> { - match Subkey::from_args() { - Subkey::GenerateNodeKey(cmd) => cmd.run(), - Subkey::Generate(cmd) => cmd.run(), - Subkey::Inspect(cmd) => cmd.run(), - Subkey::InspectNodeKey(cmd) => cmd.run(), - Subkey::Vanity(cmd) => cmd.run(), - Subkey::Verify(cmd) => cmd.run(), - Subkey::Sign(cmd) => cmd.run(), - Subkey::GetLocalStorage(cmd) => cmd.run(), - Subkey::SetLocalStorage(cmd) => cmd.run(), - } -} - -pub mod offchain_storage { - use sp_core::{offchain::StorageKind, Bytes}; - use structopt::StructOpt; - - use crate::offchain_rpc; - - /// The `localstorage-get` command - #[derive(Debug, StructOpt)] - #[structopt(name = "localstorage-get", about = "Get local storage from current node itself.")] - pub struct GetLocalStorageCmd { - #[structopt(long)] - key: String, - #[structopt(default_value = "http://localhost:9933")] - url: String, - } - - impl GetLocalStorageCmd { - pub fn run(&self) -> Result<(), sc_cli::Error> { - let prefix = StorageKind::PERSISTENT; - let key = Bytes(Vec::from(self.key.clone())); - - offchain_rpc::get_offchain_storage(&self.url, prefix, key); - Ok(()) - } - } - - /// The `localstorage-set` command - #[derive(Debug, StructOpt)] - #[structopt(name = "localstorage-set", about = "Set local storage for current node itself.")] - pub struct SetLocalStorageCmd { - #[structopt(long)] - key: String, - #[structopt(long)] - value: String, - #[structopt(default_value = "http://localhost:9933")] - url: String, - } - - impl SetLocalStorageCmd { - pub fn run(&self) -> Result<(), sc_cli::Error> { - let prefix = StorageKind::PERSISTENT; - let key = Bytes(Vec::from(self.key.clone())); - let value = Bytes(Vec::from(self.value.clone())); - - offchain_rpc::set_offchain_storage(&self.url, prefix, key, value); - Ok(()) - } - } -} diff --git a/utils/subkey/src/main.rs b/utils/subkey/src/main.rs deleted file mode 100644 index ccf929a277..0000000000 --- a/utils/subkey/src/main.rs +++ /dev/null @@ -1,23 +0,0 @@ -// This file is part of Bifrost. - -// Copyright (C) 2019-2021 Liebi Technologies (UK) Ltd. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -//! Subkey utility, based on node_runtime. - -fn main() -> Result<(), sc_cli::Error> { - subkey::run() -} diff --git a/utils/subkey/src/offchain_rpc.rs b/utils/subkey/src/offchain_rpc.rs deleted file mode 100644 index 1f2822e37e..0000000000 --- a/utils/subkey/src/offchain_rpc.rs +++ /dev/null @@ -1,55 +0,0 @@ -// This file is part of Bifrost. - -// Copyright (C) 2019-2021 Liebi Technologies (UK) Ltd. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -use futures::Future; -use jsonrpc_core_client::transports::http; -use sc_rpc::offchain::OffchainClient; -use sp_core::{offchain::StorageKind, Bytes}; - -pub fn get_offchain_storage(url: &str, prefix: StorageKind, key: Bytes) { - tokio::run( - http::connect(&url) - .and_then(move |client: OffchainClient| { - client.get_local_storage(prefix, key.clone()).map(move |ret| match ret { - Some(value) => println!( - "Value of key(0x{}) is 0x{}", - hex::encode(&*key), - hex::encode(&*value), - ), - None => println!("Value of key(0x{}) not exists", hex::encode(&*key)), - }) - }) - .map_err(|e| { - println!("Error getting local storage: {:?}", e); - }), - ); -} - -pub fn set_offchain_storage(url: &str, prefix: StorageKind, key: Bytes, value: Bytes) { - tokio::run( - http::connect(&url) - .and_then(move |client: OffchainClient| { - client.set_local_storage(prefix, key, value).map(|_| { - println!("Set local storage successfully"); - }) - }) - .map_err(|e| { - println!("Error setting local storage: {:?}", e); - }), - ); -} diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 73e50e951e..18154fbcfb 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -9,13 +9,13 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } paste = "1.0.5" smallvec = "1.6.1" -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.10", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.10", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.10", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11", default-features = false } node-primitives = { default-features = false, path = "../node/primitives" } [features] diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs index e1fe757fb5..7bcf120c13 100644 --- a/xcm-support/src/lib.rs +++ b/xcm-support/src/lib.rs @@ -86,10 +86,10 @@ impl< } fn ump_transact( - origin: MultiLocation, + _origin: MultiLocation, call: DoubleEncoded<()>, weight: u64, - relay: bool, + _relay: bool, nonce: u32, ) -> Result { let sovereign_account: AccountId = ParaId::from(SelfParaId::get()).into_account(); @@ -99,80 +99,51 @@ impl< fun: Fungible(WeightToFee::calc(&Self::transact_weight(weight, nonce))), }; - let mut message = Xcm::WithdrawAsset { - assets: MultiAssets::from(asset.clone()), - effects: vec![ - BuyExecution { - fees: asset, - weight: weight + 1 * BaseXcmWeight::get() + nonce as u64, - debt: 3 * BaseXcmWeight::get(), - halt_on_error: true, - instructions: vec![Xcm::Transact { - origin_type: OriginKind::SovereignAccount, - require_weight_at_most: 100_000_000_000, - call, - }], - }, - DepositAsset { - assets: All.into(), - max_assets: u32::max_value(), - beneficiary: X1(Junction::AccountId32 { - network: NetworkId::Any, - id: sovereign_account.into(), - }) - .into(), - }, - ], - }; - - if relay { - message = Xcm::<()>::RelayedFrom { - who: origin.interior().clone(), - message: Box::new(message.clone()), - }; - } + let message = Xcm(vec![ + WithdrawAsset(asset.clone().into()), + BuyExecution { + fees: asset, + weight_limit: Some(weight + 1 * BaseXcmWeight::get() + nonce as u64).into(), + }, + Instruction::Transact { + origin_type: OriginKind::SovereignAccount, + require_weight_at_most: 100_000_000_000, + call, + }, + DepositAsset { + assets: All.into(), + max_assets: u32::max_value(), + beneficiary: X1(Junction::AccountId32 { + network: NetworkId::Any, + id: sovereign_account.into(), + }) + .into(), + }, + ]); let data = VersionedXcm::<()>::from(message.clone()).encode(); let id = sp_io::hashing::blake2_256(&data[..]); - XcmSender::send_xcm(MultiLocation::parent(), message).map_err(|_e| XcmError::Undefined)?; + XcmSender::send_xcm(MultiLocation::parent(), message) + .map_err(|_e| XcmError::Unimplemented)?; Ok(id) } fn ump_transfer_asset( - origin: MultiLocation, + _origin: MultiLocation, dest: MultiLocation, amount: u128, - relay: bool, + _relay: bool, nonce: u32, ) -> Result { - let mut message = Xcm::WithdrawAsset { - assets: vec![MultiAsset { id: Concrete(MultiLocation::here()), fun: Fungible(amount) }] - .into(), - effects: vec![ - Order::BuyExecution { - fees: MultiAsset { id: Concrete(MultiLocation::here()), fun: Fungible(amount) }, - weight: nonce as u64, - debt: 3 * BaseXcmWeight::get(), - halt_on_error: false, - instructions: vec![], - }, - DepositAsset { - assets: Wild(WildMultiAsset::All), - max_assets: 1, - beneficiary: dest, - }, - ], - }; - - if relay { - message = Xcm::<()>::RelayedFrom { - who: origin.interior().clone(), - message: Box::new(message), - }; - } + let asset = MultiAsset { id: Concrete(MultiLocation::here()), fun: Fungible(amount) }; + let message = Xcm(vec![ + WithdrawAsset(asset.clone().into()), + BuyExecution { fees: asset, weight_limit: Some(nonce as u64).into() }, + DepositAsset { assets: Wild(WildMultiAsset::All), max_assets: 1, beneficiary: dest }, + ]); let data = VersionedXcm::<()>::from(message.clone()).encode();