diff --git a/Cargo.lock b/Cargo.lock index 47dfa5cfd..aa2164b86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,16 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" dependencies = [ - "gimli", + "gimli 0.23.0", +] + +[[package]] +name = "addr2line" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a" +dependencies = [ + "gimli 0.24.0", ] [[package]] @@ -89,9 +98,9 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -201,16 +210,16 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" +checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", "once_cell", - "vec-arena", + "slab", ] [[package]] @@ -231,29 +240,29 @@ dependencies = [ [[package]] name = "async-io" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd" +checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" dependencies = [ "concurrent-queue", "fastrand", "futures-lite", "libc", "log", - "nb-connect", "once_cell", "parking", "polling", - "vec-arena", + "slab", + "socket2 0.4.0", "waker-fn", "winapi 0.3.9", ] [[package]] name = "async-lock" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb" +checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" dependencies = [ "event-listener", ] @@ -269,15 +278,16 @@ dependencies = [ [[package]] name = "async-process" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b" +checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac" dependencies = [ "async-io", "blocking", "cfg-if 1.0.0", "event-listener", "futures-lite", + "libc", "once_cell", "signal-hook", "winapi 0.3.9", @@ -294,7 +304,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.3", + "crossbeam-utils 0.8.4", "futures-channel", "futures-core", "futures-io", @@ -313,9 +323,9 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665c56111e244fe38e7708ee10948a4356ad6a548997c21f5a63a0f4e0edc4d" +checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638" dependencies = [ "async-std", "async-trait", @@ -333,9 +343,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589652ce7ccb335d1e7ecb3be145425702b290dbcb7029bbeaae263fc1d87b48" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2", "quote", @@ -402,15 +412,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.56" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" +checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744" dependencies = [ - "addr2line", + "addr2line 0.15.1", + "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.23.0", + "object 0.24.0", "rustc-demangle", ] @@ -438,6 +449,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "beef" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409" + [[package]] name = "bincode" version = "1.3.3" @@ -449,26 +466,21 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.54.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" +checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" dependencies = [ "bitflags", "cexpr", - "cfg-if 0.1.10", "clang-sys", - "clap", - "env_logger 0.7.1", "lazy_static", "lazycell", - "log", "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "which 3.1.1", ] [[package]] @@ -479,9 +491,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ "funty", "radium", @@ -615,9 +627,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" dependencies = [ "memchr", ] @@ -684,6 +696,15 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +[[package]] +name = "camino" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9" +dependencies = [ + "serde", +] + [[package]] name = "cargo-platform" version = "0.1.1" @@ -695,10 +716,11 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" dependencies = [ + "camino", "cargo-platform", "semver 0.11.0", "semver-parser 0.10.2", @@ -802,13 +824,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "0.29.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.0", ] [[package]] @@ -883,10 +905,13 @@ dependencies = [ ] [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8" +dependencies = [ + "libc", +] [[package]] name = "cpuid-bool" @@ -917,6 +942,7 @@ dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", "darwinia-treasury", + "darwinia-vesting", "dp-storage", "dvm-ethereum", "dvm-rpc-runtime-api", @@ -973,25 +999,25 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb" +checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60" +checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b" dependencies = [ "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli", + "gimli 0.23.0", "log", "regalloc", "serde", @@ -1002,9 +1028,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810" +checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -1012,24 +1038,27 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c" +checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab" +dependencies = [ + "serde", +] [[package]] name = "cranelift-entity" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3" +checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93" +checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444" dependencies = [ "cranelift-codegen", "log", @@ -1039,25 +1068,24 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3" +checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637" dependencies = [ "cranelift-codegen", - "raw-cpuid", "target-lexicon", ] [[package]] name = "cranelift-wasm" -version = "0.69.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d" +checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.0", "log", "serde", "smallvec 1.6.1", @@ -1081,7 +1109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.3", + "crossbeam-utils 0.8.4", ] [[package]] @@ -1102,8 +1130,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.3", - "crossbeam-utils 0.8.3", + "crossbeam-epoch 0.9.4", + "crossbeam-utils 0.8.4", ] [[package]] @@ -1123,12 +1151,12 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" +checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.3", + "crossbeam-utils 0.8.4", "lazy_static", "memoffset 0.6.3", "scopeguard", @@ -1158,9 +1186,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" dependencies = [ "autocfg", "cfg-if 1.0.0", @@ -1255,14 +1283,14 @@ version = "0.10.0" dependencies = [ "darwinia-cli 0.10.0", "darwinia-service", - "futures 0.3.14", + "futures 0.3.15", "parity-util-mem", ] [[package]] name = "darwinia-balances" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", @@ -1270,15 +1298,14 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] [[package]] name = "darwinia-balances-rpc" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-balances-rpc-runtime-api", "jsonrpc-core", @@ -1292,8 +1319,8 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1304,8 +1331,8 @@ dependencies = [ [[package]] name = "darwinia-claims" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "darwinia-support", @@ -1324,7 +1351,7 @@ dependencies = [ name = "darwinia-cli" version = "0.10.0" dependencies = [ - "darwinia-cli 2.2.0", + "darwinia-cli 2.3.0", "darwinia-service", "log", "sc-cli", @@ -1344,8 +1371,8 @@ dependencies = [ [[package]] name = "darwinia-cli" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "sc-cli", "sc-client-api", @@ -1357,20 +1384,19 @@ dependencies = [ [[package]] name = "darwinia-crab-backing" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-runtime", ] [[package]] name = "darwinia-crab-issuing" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "frame-support", "frame-system", @@ -1381,8 +1407,8 @@ dependencies = [ [[package]] name = "darwinia-democracy" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "frame-support", @@ -1396,15 +1422,16 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", + "sp-core", + "sp-io", "sp-npos-elections", "sp-runtime", "sp-std", @@ -1412,8 +1439,8 @@ dependencies = [ [[package]] name = "darwinia-ethereum-backing" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "darwinia-relay-primitives", @@ -1433,8 +1460,8 @@ dependencies = [ [[package]] name = "darwinia-ethereum-relay" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "blake2-rfc", @@ -1457,8 +1484,8 @@ dependencies = [ [[package]] name = "darwinia-evm" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-balances", "dp-evm", @@ -1482,8 +1509,8 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-empty" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "dp-evm", "evm", @@ -1491,8 +1518,8 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-simple" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "dp-evm", "evm", @@ -1503,8 +1530,8 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-withdraw" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-evm", "darwinia-support", @@ -1523,8 +1550,8 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api", @@ -1541,8 +1568,8 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-header-mmr-rpc-runtime-api", "jsonrpc-core", @@ -1556,8 +1583,8 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1580,23 +1607,22 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-relay-primitives", "darwinia-support", "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] [[package]] name = "darwinia-relay-primitives" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "frame-support", "parity-scale-codec", @@ -1606,8 +1632,8 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-relay-primitives", "darwinia-support", @@ -1615,7 +1641,6 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] @@ -1772,7 +1797,7 @@ dependencies = [ "dp-rpc", "dvm-rpc-runtime-api", "frame-system-rpc-runtime-api", - "futures 0.3.14", + "futures 0.3.15", "log", "pallet-im-online", "pallet-transaction-payment-rpc-runtime-api", @@ -1813,8 +1838,8 @@ dependencies = [ [[package]] name = "darwinia-staking" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", @@ -1825,7 +1850,6 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "paste", "serde", "sp-arithmetic", "sp-core", @@ -1839,8 +1863,8 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-staking-rpc-runtime-api", "jsonrpc-core", @@ -1854,8 +1878,8 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1866,8 +1890,8 @@ dependencies = [ [[package]] name = "darwinia-support" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "ethereum-primitives", "frame-support", @@ -1880,8 +1904,8 @@ dependencies = [ [[package]] name = "darwinia-treasury" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", "frame-support", @@ -1894,27 +1918,24 @@ dependencies = [ [[package]] name = "darwinia-tron-backing" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-runtime", ] [[package]] name = "darwinia-vesting" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-support", - "enumflags2", "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] @@ -1945,34 +1966,10 @@ dependencies = [ "syn", ] -[[package]] -name = "dc-consensus" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" -dependencies = [ - "dc-db", - "derive_more", - "dp_consensus", - "dvm-rpc-runtime-api", - "futures 0.3.14", - "log", - "parity-scale-codec", - "sc-client-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-timestamp", - "substrate-prometheus-endpoint", -] - [[package]] name = "dc-db" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "kvdb", "kvdb-rocksdb", @@ -1985,14 +1982,13 @@ dependencies = [ [[package]] name = "dc-mapping-sync" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ - "dc-consensus", "dc-db", "dp_consensus", "dvm-rpc-runtime-api", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "log", "sc-client-api", @@ -2003,12 +1999,10 @@ dependencies = [ [[package]] name = "dc-rpc" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", - "darwinia-evm", - "dc-consensus", "dc-db", "dp-rpc", "dp-storage", @@ -2019,7 +2013,7 @@ dependencies = [ "ethereum", "ethereum-types", "evm", - "futures 0.3.14", + "futures 0.3.15", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -2044,9 +2038,9 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.13" +version = "0.99.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" +checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320" dependencies = [ "convert_case", "proc-macro2", @@ -2074,9 +2068,9 @@ dependencies = [ [[package]] name = "directories" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" dependencies = [ "dirs-sys", ] @@ -2093,12 +2087,12 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users 0.3.5", + "redox_users", "winapi 0.3.9", ] @@ -2109,7 +2103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi 0.3.9", ] @@ -2125,8 +2119,8 @@ dependencies = [ [[package]] name = "dp-evm" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "evm", "impl-trait-for-tuples", @@ -2138,8 +2132,8 @@ dependencies = [ [[package]] name = "dp-rpc" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "ethereum-types", "jsonrpc-core", @@ -2153,13 +2147,13 @@ dependencies = [ [[package]] name = "dp-storage" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" [[package]] name = "dp_consensus" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "ethereum", "parity-scale-codec", @@ -2172,8 +2166,8 @@ dependencies = [ [[package]] name = "dvm-ethereum" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "darwinia-evm", @@ -2201,8 +2195,8 @@ dependencies = [ [[package]] name = "dvm-rpc-core" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-evm", "dp-evm", @@ -2221,10 +2215,11 @@ dependencies = [ [[package]] name = "dvm-rpc-runtime-api" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "darwinia-evm", + "darwinia-support", "dp-evm", "ethereum", "ethereum-types", @@ -2265,9 +2260,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" [[package]] name = "ed25519" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef" +checksum = "8d0860415b12243916284c67a9be413e044ee6668247b99ba26d94b2bc06c8f6" dependencies = [ "signature", ] @@ -2282,7 +2277,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.3", + "sha2 0.9.5", "zeroize", ] @@ -2352,9 +2347,9 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6576a1755ddffd988788025e75bce9e74b018f7cc226198fe931d077911c6d7e" +checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" [[package]] name = "erased-serde" @@ -2447,8 +2442,8 @@ dependencies = [ [[package]] name = "ethereum-primitives" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "ethash", @@ -2510,9 +2505,9 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4eea3882c798813a6f92e8855ec1fc3f5ababd8b274cb81d4bedee701b478e" +checksum = "e1e6640dd44ba663316c7121e0c6fee38000d8249127fd9221bfdc331f75cbfe" dependencies = [ "funty", "parity-scale-codec", @@ -2548,7 +2543,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", ] [[package]] @@ -2587,9 +2582,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" +checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" dependencies = [ "instant", ] @@ -2620,7 +2615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c" dependencies = [ "either", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "log", "num-traits", @@ -2668,7 +2663,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", ] @@ -2686,7 +2681,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -2705,7 +2700,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -2718,12 +2713,11 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -2734,7 +2728,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "serde", @@ -2745,7 +2739,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "bitflags", "frame-metadata", @@ -2771,7 +2765,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2783,7 +2777,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2795,7 +2789,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "proc-macro2", "quote", @@ -2805,7 +2799,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2822,7 +2816,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-api", @@ -2831,7 +2825,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "parity-scale-codec", @@ -2848,7 +2842,7 @@ checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" dependencies = [ "lazy_static", "libc", - "libloading", + "libloading 0.5.2", "winapi 0.3.9", ] @@ -2904,9 +2898,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -2919,9 +2913,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -2929,9 +2923,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-cpupool" @@ -2950,7 +2944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ "futures 0.1.31", - "futures 0.3.14", + "futures 0.3.15", "lazy_static", "log", "parking_lot 0.9.0", @@ -2961,9 +2955,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -2973,9 +2967,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" @@ -2994,10 +2988,11 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg", "proc-macro-hack", "proc-macro2", "quote", @@ -3011,21 +3006,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls 0.19.0", + "rustls 0.19.1", "webpki", ] [[package]] name = "futures-sink" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-timer" @@ -3041,10 +3036,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg", "futures 0.1.31", "futures-channel", "futures-core", @@ -3137,6 +3133,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" + [[package]] name = "glob" version = "0.3.0" @@ -3355,9 +3357,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.3.6" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -3426,7 +3428,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.6", + "pin-project 1.0.7", "socket2 0.3.19", "tokio 0.2.25", "tower-service", @@ -3465,9 +3467,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -3497,12 +3499,12 @@ dependencies = [ [[package]] name = "if-watch" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144c0ecbda48cc819482c37e460723b634dc060e23922f8ace87d94ff95ea4e5" +checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" dependencies = [ "async-io", - "futures 0.3.14", + "futures 0.3.15", "futures-lite", "if-addrs", "ipnet", @@ -3584,7 +3586,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "futures-timer 2.0.2", ] @@ -3630,6 +3632,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.7" @@ -3659,18 +3670,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" +checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" dependencies = [ "wasm-bindgen", ] @@ -3799,30 +3810,31 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1d8440e2617bdebdf45114e90f65aed3f14bf73e23d874dde8e4b764676fe9" +checksum = "2737440f37efa10e5ef7beeec43d059d29dc92640978be21fcdcef481a2edb0d" dependencies = [ "async-trait", - "futures 0.3.14", + "fnv", "hyper 0.13.10", + "hyper-rustls", "jsonrpsee-types", "jsonrpsee-utils", "log", "serde", "serde_json", "thiserror", - "unicase", - "url 2.2.1", + "url 2.2.2", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb3f732ccbeafd15cefb59c7c7b5ac6c553c2653613b63e5e7feb7f06a219e9" +checksum = "5784ee8bb31988fa2c7a755fe31b0e21aa51894a67e5c99b6d4470f0253bf31a" dependencies = [ "Inflector", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -3830,32 +3842,29 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78" +checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51" dependencies = [ "async-trait", - "futures 0.3.14", + "beef", + "futures-channel", + "futures-util", "log", "serde", "serde_json", - "smallvec 1.6.1", "thiserror", ] [[package]] name = "jsonrpsee-utils" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51670a3b56e5fb0d325920ce317c76184b8afabfd7bc5009831229cfef0732b" +checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922" dependencies = [ - "futures 0.3.14", - "globset", + "futures-util", "hyper 0.13.10", "jsonrpsee-types", - "lazy_static", - "log", - "unicase", ] [[package]] @@ -3916,9 +3925,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4" +checksum = "94b27cdb788bf1c8ade782289f9dbee626940be2961fd75c7cde993fa2f1ded1" dependencies = [ "fs-swap", "kvdb", @@ -3952,9 +3961,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" [[package]] name = "libloading" @@ -3966,6 +3975,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + [[package]] name = "libm" version = "0.2.1" @@ -3974,13 +3993,13 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.36.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5759b526f75102829c15e4d8566603b4bf502ed19b5f35920d98113873470d" +checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b" dependencies = [ "atomic", "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "lazy_static", "libp2p-core", "libp2p-deflate", @@ -4006,23 +4025,23 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "smallvec 1.6.1", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71dd51b562e14846e65bad00e5808d0644376e6588668c490d3c48e1dfeb4a9a" +checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -4031,13 +4050,13 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "prost", "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", - "sha2 0.9.3", + "sha2 0.9.5", "smallvec 1.6.1", "thiserror", "unsigned-varint 0.7.0", @@ -4052,7 +4071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08" dependencies = [ "flate2", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", ] @@ -4063,7 +4082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b" dependencies = [ "async-std-resolver", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "log", "smallvec 1.6.1", @@ -4072,13 +4091,13 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897645f99e9b396df256a6aa8ba8c4bc019ac6b7c62556f624b5feea9acc82bb" +checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "libp2p-swarm", "log", @@ -4090,16 +4109,16 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.29.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794b0c85f5df1acbc1fc38414d37272594811193b6325c76d3931c3e3f5df8c0" +checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9" dependencies = [ "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", "bytes 1.0.1", "fnv", - "futures 0.3.14", + "futures 0.3.15", "hex_fmt", "libp2p-core", "libp2p-swarm", @@ -4108,7 +4127,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.3", + "sha2 0.9.5", "smallvec 1.6.1", "unsigned-varint 0.7.0", "wasm-timer", @@ -4116,11 +4135,11 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88ebc841d744979176ab4b8b294a3e655a7ba4ef26a905d073a52b49ed4dff5" +checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "libp2p-swarm", "log", @@ -4132,23 +4151,23 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb5b90b6bda749023a85f60b49ea74b387c25f17d8df541ae72a3c75dd52e63" +checksum = "b07312ebe5ee4fd2404447a0609814574df55c65d4e20838b957bbd34907d820" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", "bytes 1.0.1", "either", "fnv", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.3", + "sha2 0.9.5", "smallvec 1.6.1", "uint", "unsigned-varint 0.7.0", @@ -4158,14 +4177,14 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.29.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be28ca13bb648d249a9baebd750ebc64ce7040ddd5f0ce1035ff1f4549fb596d" +checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.14", + "futures 0.3.15", "if-watch", "lazy_static", "libp2p-core", @@ -4185,7 +4204,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "log", "nohash-hasher", @@ -4203,14 +4222,14 @@ checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" dependencies = [ "bytes 1.0.1", "curve25519-dalek 3.1.0", - "futures 0.3.14", + "futures 0.3.15", "lazy_static", "libp2p-core", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.3", + "sha2 0.9.5", "snow", "static_assertions", "x25519-dalek", @@ -4219,11 +4238,11 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea10fc5209260915ea65b78f612d7ff78a29ab288e7aa3250796866af861c45" +checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "libp2p-swarm", "log", @@ -4240,7 +4259,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "log", "prost", @@ -4255,9 +4274,9 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "log", - "pin-project 1.0.6", + "pin-project 1.0.7", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -4265,18 +4284,18 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff268be6a9d6f3c6cca3b81bbab597b15217f9ad8787c6c40fc548c1af7cd24" +checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.6", + "pin-project 1.0.7", "prost", "prost-build", "rand 0.7.3", @@ -4288,13 +4307,13 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "725367dd2318c54c5ab1a6418592e5b01c63b0dedfbbfb8389220b2bcf691899" +checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3" dependencies = [ "async-trait", "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "libp2p-swarm", "log", @@ -4308,12 +4327,12 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c26980cadd7c25d89071cb23e1f7f5df4863128cc91d83c6ddc72338cecafa" +checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92" dependencies = [ "either", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "log", "rand 0.7.3", @@ -4324,9 +4343,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" +checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed" dependencies = [ "quote", "syn", @@ -4339,7 +4358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9" dependencies = [ "async-io", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "if-watch", "ipnet", @@ -4356,18 +4375,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5" dependencies = [ "async-std", - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de" +checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4382,24 +4401,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74" dependencies = [ "either", - "futures 0.3.14", + "futures 0.3.15", "futures-rustls", "libp2p-core", "log", "quicksink", "rw-stream-sink", "soketto", - "url 2.2.1", + "url 2.2.2", "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d6144cc94143fb0a8dd1e7c2fbcc32a2808168bcd1d69920635424d5993b7b" +checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "libp2p-core", "parking_lot 0.11.1", "thiserror", @@ -4408,9 +4427,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.11.4" +version = "6.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09" +checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9" dependencies = [ "bindgen", "cc", @@ -4436,9 +4455,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" dependencies = [ "cc", "pkg-config", @@ -4481,9 +4500,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ "scopeguard", ] @@ -4572,9 +4591,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memmap2" @@ -4622,8 +4641,8 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" -version = "2.2.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.10.0#1bece1e78a43598cc0bebbe0268cd18c624e892f" +version = "2.3.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.0#4e2a5dff2b30cb37a404466f00953767a75b1980" dependencies = [ "array-bytes", "hashbrown", @@ -4778,7 +4797,7 @@ dependencies = [ "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.3", + "sha2 0.9.5", "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -4810,9 +4829,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" dependencies = [ "bytes 1.0.1", - "futures 0.3.14", + "futures 0.3.15", "log", - "pin-project 1.0.6", + "pin-project 1.0.7", "smallvec 1.6.1", "unsigned-varint 0.7.0", ] @@ -4861,16 +4880,6 @@ dependencies = [ "rand 0.3.23", ] -[[package]] -name = "nb-connect" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d" -dependencies = [ - "libc", - "socket2 0.4.0", -] - [[package]] name = "net2" version = "0.2.37" @@ -4989,9 +4998,9 @@ dependencies = [ [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" dependencies = [ "crc32fast", "indexmap", @@ -4999,9 +5008,9 @@ dependencies = [ [[package]] name = "object" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" [[package]] name = "once_cell" @@ -5026,9 +5035,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "owning_ref" @@ -5042,13 +5051,12 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "pallet-session", "parity-scale-codec", - "serde", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5058,7 +5066,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -5073,7 +5081,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-benchmarking", "frame-support", @@ -5083,7 +5091,6 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "serde", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5097,14 +5104,13 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", "sp-runtime", "sp-std", ] @@ -5112,13 +5118,12 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -5128,14 +5133,13 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-election-provider-support", "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", "sp-arithmetic", "sp-io", "sp-npos-elections", @@ -5147,7 +5151,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-benchmarking", "frame-support", @@ -5156,7 +5160,6 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "serde", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -5169,14 +5172,13 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -5185,14 +5187,13 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "log", "pallet-authorship", "parity-scale-codec", - "serde", "sp-application-crypto", "sp-core", "sp-io", @@ -5204,12 +5205,11 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-keyring", @@ -5220,12 +5220,13 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -5234,12 +5235,11 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -5249,7 +5249,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -5265,12 +5265,11 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -5280,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -5293,13 +5292,12 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "enumflags2", "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -5308,14 +5306,13 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -5324,14 +5321,13 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-timestamp", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -5344,13 +5340,12 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", - "serde", "sp-runtime", "sp-std", ] @@ -5358,12 +5353,11 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -5372,7 +5366,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-benchmarking", "frame-support", @@ -5380,7 +5374,6 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "serde", "sp-inherents", "sp-runtime", "sp-std", @@ -5390,7 +5383,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", @@ -5406,7 +5399,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5423,7 +5416,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5434,12 +5427,11 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -5478,7 +5470,7 @@ dependencies = [ "serde", "static_assertions", "unsigned-varint 0.7.0", - "url 2.2.1", + "url 2.2.2", ] [[package]] @@ -5589,7 +5581,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.2.1", + "url 2.2.2", ] [[package]] @@ -5626,7 +5618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.3", + "lock_api 0.4.4", "parking_lot_core 0.8.3", ] @@ -5668,7 +5660,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.6", + "redox_syscall 0.2.8", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -5752,11 +5744,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" +checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" dependencies = [ - "pin-project-internal 1.0.6", + "pin-project-internal 1.0.7", ] [[package]] @@ -5772,9 +5764,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" +checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2", "quote", @@ -5830,7 +5822,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" dependencies = [ - "cpuid-bool 0.2.0", + "cpuid-bool", "universal-hash", ] @@ -5840,7 +5832,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" dependencies = [ - "cpuid-bool 0.2.0", + "cpuid-bool", "opaque-debug 0.3.0", "universal-hash", ] @@ -5960,14 +5952,14 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes 1.0.1", "heck", - "itertools", + "itertools 0.9.0", "log", "multimap", "petgraph", "prost", "prost-types", "tempfile", - "which 4.1.0", + "which", ] [[package]] @@ -5977,7 +5969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools", + "itertools 0.9.0", "proc-macro2", "quote", "syn", @@ -6183,17 +6175,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "raw-cpuid" -version = "8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73" -dependencies = [ - "bitflags", - "cc", - "rustc_version", -] - [[package]] name = "rawpointer" version = "0.2.1" @@ -6220,7 +6201,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.3", + "crossbeam-utils 0.8.4", "lazy_static", "num_cpus", ] @@ -6242,24 +6223,13 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.0" @@ -6267,7 +6237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.2", - "redox_syscall 0.2.6", + "redox_syscall 0.2.8", ] [[package]] @@ -6298,14 +6268,15 @@ checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" dependencies = [ "log", "rustc-hash", + "serde", "smallvec 1.6.1", ] [[package]] name = "regex" -version = "1.4.5" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -6324,9 +6295,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "region" @@ -6343,13 +6314,12 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "env_logger 0.8.3", "hex-literal", "jsonrpsee-http-client", "jsonrpsee-proc-macros", - "jsonrpsee-types", "log", "parity-scale-codec", "sp-core", @@ -6378,9 +6348,9 @@ dependencies = [ [[package]] name = "retain_mut" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1" +checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b" [[package]] name = "ring" @@ -6431,9 +6401,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" +checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" dependencies = [ "libc", "librocksdb-sys", @@ -6449,23 +6419,11 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.3", -] - [[package]] name = "rustc-demangle" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "rustc-hash" @@ -6503,9 +6461,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.0", "log", @@ -6526,13 +6484,23 @@ dependencies = [ "security-framework", ] +[[package]] +name = "ruzstd" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d425143485a37727c7a46e689bbe3b883a00f42b4a52c4ac0f44855c1009b00" +dependencies = [ + "byteorder", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "pin-project 0.4.28", "static_assertions", ] @@ -6573,13 +6541,14 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "async-trait", "derive_more", "either", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", + "ip_network", "libp2p", "log", "parity-scale-codec", @@ -6601,9 +6570,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -6624,7 +6593,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6640,7 +6609,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6661,7 +6630,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -6672,11 +6641,11 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "chrono", "fdlimit", - "futures 0.3.14", + "futures 0.3.15", "hex", "libp2p", "log", @@ -6710,11 +6679,11 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", "fnv", - "futures 0.3.14", + "futures 0.3.15", "hash-db", "kvdb", "lazy_static", @@ -6744,7 +6713,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "blake2-rfc", "hash-db", @@ -6774,8 +6743,9 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ + "parking_lot 0.11.1", "sc-client-api", "sp-blockchain", "sp-consensus", @@ -6785,11 +6755,12 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ + "async-trait", "derive_more", "fork-tree", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "log", "merlin", @@ -6831,10 +6802,10 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", - "futures 0.3.14", + "futures 0.3.15", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6855,12 +6826,12 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "fork-tree", "parity-scale-codec", - "parking_lot 0.11.1", "sc-client-api", + "sc-consensus", "sp-blockchain", "sp-runtime", ] @@ -6868,13 +6839,13 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "async-trait", + "futures 0.3.15", "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.11.1", "sc-client-api", "sc-telemetry", "sp-api", @@ -6895,7 +6866,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "sc-client-api", @@ -6909,7 +6880,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", "lazy_static", @@ -6925,6 +6896,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-io", + "sp-maybe-compressed-blob", "sp-panic-handler", "sp-runtime-interface", "sp-serializer", @@ -6938,11 +6910,12 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", "parity-scale-codec", "parity-wasm 0.41.0", + "pwasm-utils", "sp-allocator", "sp-core", "sp-serializer", @@ -6954,7 +6927,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "parity-scale-codec", @@ -6969,7 +6942,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "parity-scale-codec", @@ -6987,19 +6960,20 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ + "async-trait", "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -7026,11 +7000,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", "finality-grandpa", - "futures 0.3.14", + "futures 0.3.15", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7050,10 +7024,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.14", + "futures 0.3.15", "log", "parity-util-mem", "sc-client-api", @@ -7068,11 +7042,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "async-trait", "derive_more", - "futures 0.3.14", + "futures 0.3.15", "futures-util", "hex", "merlin", @@ -7088,7 +7062,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "hash-db", "lazy_static", @@ -7107,7 +7081,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "async-std", "async-trait", @@ -7121,7 +7095,7 @@ dependencies = [ "erased-serde", "fnv", "fork-tree", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "hex", "ip_network", @@ -7133,7 +7107,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "prost", "prost-build", "rand 0.7.3", @@ -7160,9 +7134,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "libp2p", "log", @@ -7177,11 +7151,11 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "hex", "hyper 0.13.10", @@ -7205,9 +7179,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "libp2p", "log", "serde_json", @@ -7218,7 +7192,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7227,9 +7201,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -7261,10 +7235,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", - "futures 0.3.14", + "futures 0.3.15", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7285,7 +7259,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "futures 0.1.31", "jsonrpc-core", @@ -7303,12 +7277,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ + "async-trait", "directories", "exit-future", "futures 0.1.31", - "futures 0.3.14", + "futures 0.3.15", "futures-timer 3.0.2", "hash-db", "jsonrpc-core", @@ -7318,7 +7293,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -7366,7 +7341,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "parity-scale-codec", @@ -7381,7 +7356,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7401,14 +7376,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "chrono", - "futures 0.3.14", + "futures 0.3.15", "libp2p", "log", "parking_lot 0.11.1", - "pin-project 1.0.6", + "pin-project 1.0.7", "rand 0.7.3", "serde", "serde_json", @@ -7421,7 +7396,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "ansi_term 0.12.1", "atty", @@ -7448,7 +7423,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7459,10 +7434,10 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", - "futures 0.3.14", + "futures 0.3.15", "linked-hash-map", "log", "parity-util-mem", @@ -7481,9 +7456,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "futures-diagnose", "intervalier", "log", @@ -7652,18 +7627,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -7695,13 +7670,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" +checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool 0.1.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7720,13 +7695,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool 0.1.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7810,9 +7785,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "smallvec" @@ -7842,7 +7817,7 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.3", + "sha2 0.9.5", "subtle 2.4.0", "x25519-dalek", ] @@ -7877,17 +7852,17 @@ dependencies = [ "base64 0.12.3", "bytes 0.5.6", "flate2", - "futures 0.3.14", + "futures 0.3.15", "httparse", "log", "rand 0.7.3", - "sha-1 0.9.4", + "sha-1 0.9.6", ] [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "sp-core", @@ -7899,7 +7874,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "hash-db", "log", @@ -7916,7 +7891,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -7928,7 +7903,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "serde", @@ -7940,7 +7915,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "integer-sqrt", "num-traits", @@ -7948,12 +7923,13 @@ dependencies = [ "serde", "sp-debug-derive", "sp-std", + "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-api", @@ -7965,7 +7941,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7976,7 +7952,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-api", @@ -7988,9 +7964,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "log", "lru", "parity-scale-codec", @@ -8006,7 +7982,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "serde", "serde_json", @@ -8015,9 +7991,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "async-trait", + "futures 0.3.15", "futures-timer 3.0.2", "libp2p", "log", @@ -8041,7 +8018,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "merlin", "parity-scale-codec", @@ -8062,7 +8039,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8072,7 +8049,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8084,14 +8061,14 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "base58", "blake2-rfc", "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.14", + "futures 0.3.15", "hash-db", "hash256-std-hasher", "hex", @@ -8110,7 +8087,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.3", + "sha2 0.9.5", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -8128,7 +8105,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8137,7 +8114,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "proc-macro2", "quote", @@ -8147,7 +8124,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "environmental", "parity-scale-codec", @@ -8158,7 +8135,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "finality-grandpa", "log", @@ -8175,7 +8152,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -8187,9 +8164,9 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "hash-db", "libsecp256k1", "log", @@ -8211,7 +8188,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "lazy_static", "sp-core", @@ -8222,11 +8199,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "async-trait", "derive_more", - "futures 0.3.14", + "futures 0.3.15", "merlin", "parity-scale-codec", "parking_lot 0.11.1", @@ -8236,10 +8213,19 @@ dependencies = [ "sp-externalities", ] +[[package]] +name = "sp-maybe-compressed-blob" +version = "3.0.0" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" +dependencies = [ + "ruzstd", + "zstd", +] + [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "serde", @@ -8252,7 +8238,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8263,7 +8249,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "sp-api", "sp-core", @@ -8273,7 +8259,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "backtrace", ] @@ -8281,7 +8267,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "serde", "sp-core", @@ -8290,7 +8276,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "either", "hash256-std-hasher", @@ -8311,7 +8297,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8328,7 +8314,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -8340,7 +8326,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "serde", "serde_json", @@ -8349,7 +8335,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-api", @@ -8362,7 +8348,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8372,7 +8358,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "hash-db", "log", @@ -8394,12 +8380,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8412,7 +8398,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "sp-core", @@ -8425,7 +8411,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "parity-scale-codec", "sp-api", @@ -8438,7 +8424,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "log", "parity-scale-codec", @@ -8451,10 +8437,10 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "derive_more", - "futures 0.3.14", + "futures 0.3.15", "log", "parity-scale-codec", "serde", @@ -8467,7 +8453,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "hash-db", "memory-db", @@ -8481,9 +8467,9 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -8493,7 +8479,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8505,7 +8491,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8627,7 +8613,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "platforms", ] @@ -8644,10 +8630,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.14", + "futures 0.3.15", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -8667,7 +8653,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "async-std", "derive_more", @@ -8681,12 +8667,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "4.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "ansi_term 0.12.1", "atty", "build-helper", "cargo_metadata", + "sp-maybe-compressed-blob", "tempfile", "toml", "walkdir", @@ -8707,9 +8694,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.69" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -8755,7 +8742,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.6", + "redox_syscall 0.2.8", "remove_dir_all", "winapi 0.3.9", ] @@ -8839,7 +8826,7 @@ dependencies = [ "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.3", + "sha2 0.9.5", "thiserror", "unicode-normalization", "zeroize", @@ -9161,9 +9148,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", "log", @@ -9185,9 +9172,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" dependencies = [ "lazy_static", ] @@ -9198,7 +9185,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.6", + "pin-project 1.0.7", "tracing", ] @@ -9225,9 +9212,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa" +checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -9279,9 +9266,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d57e219ba600dd96c2f6d82eb79645068e14edbc5c7e27514af40436b88150c" +checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -9290,7 +9277,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.2", + "idna 0.2.3", "ipnet", "lazy_static", "log", @@ -9298,14 +9285,14 @@ dependencies = [ "smallvec 1.6.1", "thiserror", "tinyvec", - "url 2.2.1", + "url 2.2.2", ] [[package]] name = "trust-dns-resolver" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0437eea3a6da51acc1e946545ff53d5b8fb2611ff1c3bed58522dde100536ae" +checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -9329,7 +9316,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.10.0#3655f9bb44d75ff205737023760198733a237685" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.0#dc9acd2d74a5451a63e34060a4c7869021780b3e" dependencies = [ "frame-try-runtime", "log", @@ -9424,9 +9411,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "universal-hash" @@ -9487,36 +9474,31 @@ dependencies = [ [[package]] name = "url" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.2", + "idna 0.2.3", "matches", "percent-encoding 2.1.0", ] [[package]] name = "value-bag" -version = "1.0.0-alpha.6" +version = "1.0.0-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1" +checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" dependencies = [ "ctor", + "version_check", ] [[package]] name = "vcpkg" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" - -[[package]] -name = "vec-arena" -version = "1.1.0" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1" +checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" [[package]] name = "vec_map" @@ -9588,9 +9570,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -9598,9 +9580,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" dependencies = [ "bumpalo", "lazy_static", @@ -9613,9 +9595,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" +checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -9625,9 +9607,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9635,9 +9617,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2", "quote", @@ -9648,9 +9630,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "wasm-gc-api" @@ -9669,7 +9651,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "js-sys", "parking_lot 0.11.1", "pin-utils", @@ -9703,15 +9685,15 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.71.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1" +checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8" [[package]] name = "wasmtime" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d" +checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9" dependencies = [ "anyhow", "backtrace", @@ -9721,6 +9703,7 @@ dependencies = [ "indexmap", "libc", "log", + "paste", "region", "rustc-demangle", "serde", @@ -9729,6 +9712,7 @@ dependencies = [ "wasmparser", "wasmtime-cache", "wasmtime-environ", + "wasmtime-fiber", "wasmtime-jit", "wasmtime-profiling", "wasmtime-runtime", @@ -9738,9 +9722,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709" +checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c" dependencies = [ "anyhow", "base64 0.13.0", @@ -9751,7 +9735,7 @@ dependencies = [ "libc", "log", "serde", - "sha2 0.9.3", + "sha2 0.9.5", "toml", "winapi 0.3.9", "zstd", @@ -9759,27 +9743,28 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962" +checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "cranelift-wasm", + "wasmparser", "wasmtime-environ", ] [[package]] name = "wasmtime-debug" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411" +checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c" dependencies = [ "anyhow", - "gimli", + "gimli 0.23.0", "more-asserts", - "object 0.22.0", + "object 0.23.0", "target-lexicon", "thiserror", "wasmparser", @@ -9788,16 +9773,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220" +checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60" dependencies = [ "anyhow", "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", "cranelift-wasm", - "gimli", + "gimli 0.23.0", "indexmap", "log", "more-asserts", @@ -9806,13 +9791,24 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "wasmtime-fiber" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd" +dependencies = [ + "cc", + "libc", + "winapi 0.3.9", +] + [[package]] name = "wasmtime-jit" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68" +checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb" dependencies = [ - "addr2line", + "addr2line 0.14.1", "anyhow", "cfg-if 1.0.0", "cranelift-codegen", @@ -9820,10 +9816,10 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.23.0", "log", "more-asserts", - "object 0.22.0", + "object 0.23.0", "rayon", "region", "serde", @@ -9841,13 +9837,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906" +checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1" dependencies = [ "anyhow", "more-asserts", - "object 0.22.0", + "object 0.23.0", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -9855,16 +9851,16 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb" +checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2" dependencies = [ "anyhow", "cfg-if 1.0.0", - "gimli", + "gimli 0.23.0", "lazy_static", "libc", - "object 0.22.0", + "object 0.23.0", "scroll", "serde", "target-lexicon", @@ -9874,9 +9870,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d" +checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0" dependencies = [ "backtrace", "cc", @@ -9914,9 +9910,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" dependencies = [ "js-sys", "wasm-bindgen", @@ -9950,15 +9946,6 @@ dependencies = [ "cc", ] -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "which" version = "4.1.0" @@ -10056,32 +10043,32 @@ dependencies = [ [[package]] name = "yamux" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271" +checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" dependencies = [ - "futures 0.3.14", + "futures 0.3.15", "log", "nohash-hasher", "parking_lot 0.11.1", - "rand 0.7.3", + "rand 0.8.3", "static_assertions", ] [[package]] name = "zeroize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" +checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" dependencies = [ "proc-macro2", "quote", @@ -10091,18 +10078,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.5.4+zstd.1.4.7" +version = "0.6.1+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" +checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" +version = "3.0.1+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" +checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" dependencies = [ "libc", "zstd-sys", @@ -10110,12 +10097,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" +version = "1.4.20+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" +checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" dependencies = [ "cc", - "glob", - "itertools", "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 13d4d7c97..b6c00c0f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" } [dependencies] # crates -futures = { version = "0.3.13" } +futures = { version = "0.3.15" } parity-util-mem = { version = "0.9.0", default-features = false, features = ["jemalloc-global"] } # darwinia darwinia-cli = { path = "cli" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bc5edef5d..845be6f3d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -20,30 +20,30 @@ crate-type = ["cdylib", "rlib"] [dependencies] # crates log = { version = "0.4.14" } -serde = { version = "1.0.125", optional = true } +serde = { version = "1.0.126", optional = true } structopt = { version = "0.3.21" } tokio = { version = "0.3.7", optional = true, features = ["rt-multi-thread"] } # darwinia client -darwinia-cli = { optional = true, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-cli = { optional = true, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia service darwinia-service = { default-features = false, path = "../node/service" } # substrate client -sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-network = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-tracing = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sc-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-network = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-tracing = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # this crate is used only to enable `trie-memory-tracker` feature # see https://github.com/paritytech/substrate/pull/6745 -sp-trie = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-trie = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +substrate-build-script-utils = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +try-runtime-cli = { optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = [ diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 13e1bd9e1..dd033b8bd 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -11,22 +11,22 @@ version = "0.10.0" [dependencies] # crates array-bytes = { version = "1.1.0" } -codec = { package = "parity-scale-codec", version = "2.0.1", features = ["derive"] } -futures = { version = "0.3.13" } +codec = { package = "parity-scale-codec", version = "2.1.1", features = ["derive"] } +futures = { version = "0.3.15" } log = { version = "0.4.14" } -serde = { version = "1.0.125", features = ["derive"] } +serde = { version = "1.0.126", features = ["derive"] } serde_json = { version = "1.0.64" } # darwinia frame -darwinia-balances-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-balances-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # dvm -darwinia-evm = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dc-mapping-sync = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-evm = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dc-mapping-sync = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia primitives darwinia-primitives = { path = "../../primitives" } # darwinia rpc @@ -35,41 +35,41 @@ darwinia-rpc = { path = "../../rpc" } crab-runtime = { path = "../../runtime/crab" } darwinia-runtime = { path = "../../runtime/darwinia" } # substrate client -sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sc-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-basic-authorship = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-client-db = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-executor = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-service = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-telemetry = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate frame -frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-im-online = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +substrate-prometheus-endpoint = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sc-consensus-slots = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-authority-discovery = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-inherents = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-offchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-session = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = ["db", "full-node"] diff --git a/node/service/src/chain_spec/crab.rs b/node/service/src/chain_spec/crab.rs index 5b9b47b7f..38c9137ad 100644 --- a/node/service/src/chain_spec/crab.rs +++ b/node/service/src/chain_spec/crab.rs @@ -135,7 +135,7 @@ pub fn crab_build_spec_genesis() -> GenesisConfig { epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), }, pallet_indices: Default::default(), - darwinia_balances_Instance0: BalancesConfig { + darwinia_balances_Instance1: BalancesConfig { balances: endowed_accounts .iter() .cloned() @@ -150,7 +150,7 @@ pub fn crab_build_spec_genesis() -> GenesisConfig { ) .collect(), }, - darwinia_balances_Instance1: KtonConfig { + darwinia_balances_Instance2: KtonConfig { balances: endowed_accounts .iter() .cloned() @@ -187,10 +187,10 @@ pub fn crab_build_spec_genesis() -> GenesisConfig { pallet_im_online: Default::default(), pallet_authority_discovery: Default::default(), darwinia_democracy: Default::default(), - pallet_collective_Instance0: Default::default(), + pallet_collective_Instance2: Default::default(), pallet_collective_Instance1: Default::default(), darwinia_elections_phragmen: Default::default(), - pallet_membership_Instance0: Default::default(), + pallet_membership_Instance1: Default::default(), darwinia_claims: ClaimsConfig { claims_list: ClaimsList::from_file( "node/service/res/crab/claims-list.json", @@ -198,6 +198,7 @@ pub fn crab_build_spec_genesis() -> GenesisConfig { ), }, pallet_sudo: SudoConfig { key: root }, + darwinia_vesting: Default::default(), darwinia_crab_issuing: CrabIssuingConfig { total_mapped_ring: 40_000_000 * COIN, }, @@ -256,14 +257,14 @@ pub fn crab_testnet_genesis( epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), }, pallet_indices: Default::default(), - darwinia_balances_Instance0: BalancesConfig { + darwinia_balances_Instance1: BalancesConfig { balances: endowed_accounts .iter() .cloned() .map(|k| (k, 1 << 56)) .collect(), }, - darwinia_balances_Instance1: KtonConfig { + darwinia_balances_Instance2: KtonConfig { balances: endowed_accounts .iter() .cloned() @@ -295,10 +296,10 @@ pub fn crab_testnet_genesis( pallet_im_online: Default::default(), pallet_authority_discovery: Default::default(), darwinia_democracy: Default::default(), - pallet_collective_Instance0: Default::default(), + pallet_collective_Instance2: Default::default(), pallet_collective_Instance1: Default::default(), darwinia_elections_phragmen: Default::default(), - pallet_membership_Instance0: Default::default(), + pallet_membership_Instance1: Default::default(), darwinia_claims: ClaimsConfig { claims_list: ClaimsList::from_file( "node/service/res/crab/claims-list.json", @@ -306,6 +307,7 @@ pub fn crab_testnet_genesis( ), }, pallet_sudo: SudoConfig { key: root }, + darwinia_vesting: Default::default(), darwinia_crab_issuing: CrabIssuingConfig { total_mapped_ring: 1 << 56, }, diff --git a/node/service/src/chain_spec/darwinia.rs b/node/service/src/chain_spec/darwinia.rs index 9cd9ce339..5f8cd9d93 100644 --- a/node/service/src/chain_spec/darwinia.rs +++ b/node/service/src/chain_spec/darwinia.rs @@ -246,8 +246,8 @@ pub fn darwinia_build_spec_genesis() -> GenesisConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) }, - darwinia_balances_Instance0: BalancesConfig { balances: rings.into_iter().collect() }, - darwinia_balances_Instance1: KtonConfig { balances: ktons.into_iter().collect() }, + darwinia_balances_Instance1: BalancesConfig { balances: rings.into_iter().collect() }, + darwinia_balances_Instance2: KtonConfig { balances: ktons.into_iter().collect() }, darwinia_staking: StakingConfig { minimum_validator_count: 1, validator_count: 15, @@ -287,10 +287,10 @@ pub fn darwinia_build_spec_genesis() -> GenesisConfig { pallet_grandpa: Default::default(), pallet_im_online: Default::default(), pallet_authority_discovery: Default::default(), - pallet_collective_Instance0: Default::default(), + pallet_collective_Instance2: Default::default(), pallet_collective_Instance1: Default::default(), darwinia_elections_phragmen: Default::default(), - pallet_membership_Instance0: Default::default(), + pallet_membership_Instance1: Default::default(), darwinia_vesting: VestingConfig { vesting: vec![ // Team vesting: 1 year period start after 1 year since mainnet lanuch @@ -309,8 +309,8 @@ pub fn darwinia_build_spec_genesis() -> GenesisConfig { // Berlin : 9/25/2020, 10:42:52 AM // Beijing: 9/25/2020, 9:42:52 AM // New York : 9/24/2020, 9:42:52 PM - ring_locked: 1_141_998_248_692_824_029_753_349_753_u128 / COIN + 1, - kton_locked: 55_760_225_171_204_355_332_737_u128 / COIN + 1, + backed_ring: 1_141_998_248_692_824_029_753_349_753_u128 / COIN + 1, + backed_kton: 55_760_225_171_204_355_332_737_u128 / COIN + 1, ..Default::default() }, darwinia_ethereum_relay: EthereumRelayConfig { @@ -388,14 +388,14 @@ pub fn darwinia_testnet_genesis( authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) }, - darwinia_balances_Instance0: BalancesConfig { + darwinia_balances_Instance1: BalancesConfig { balances: endowed_accounts .iter() .cloned() .map(|k| (k, 1 << 56)) .collect(), }, - darwinia_balances_Instance1: KtonConfig { + darwinia_balances_Instance2: KtonConfig { balances: endowed_accounts .iter() .cloned() @@ -426,10 +426,10 @@ pub fn darwinia_testnet_genesis( pallet_grandpa: Default::default(), pallet_im_online: Default::default(), pallet_authority_discovery: Default::default(), - pallet_collective_Instance0: Default::default(), + pallet_collective_Instance2: Default::default(), pallet_collective_Instance1: Default::default(), darwinia_elections_phragmen: Default::default(), - pallet_membership_Instance0: Default::default(), + pallet_membership_Instance1: Default::default(), darwinia_vesting: Default::default(), pallet_sudo: SudoConfig { key: root }, darwinia_ethereum_backing: EthereumBackingConfig { @@ -437,8 +437,8 @@ pub fn darwinia_testnet_genesis( deposit_redeem_address: array_bytes::hex2array_unchecked!(DEPOSIT_REDEEM_ADDRESS, 20).into(), ring_token_address: array_bytes::hex2array_unchecked!(RING_TOKEN_ADDRESS, 20).into(), kton_token_address: array_bytes::hex2array_unchecked!(KTON_TOKEN_ADDRESS, 20).into(), - ring_locked: 1 << 56, - kton_locked: 1 << 56, + backed_ring: 1 << 56, + backed_kton: 1 << 56, ..Default::default() }, darwinia_ethereum_relay: EthereumRelayConfig { diff --git a/node/service/src/service/crab.rs b/node/service/src/service/crab.rs index 328fa4e73..bef3b67f1 100644 --- a/node/service/src/service/crab.rs +++ b/node/service/src/service/crab.rs @@ -29,6 +29,7 @@ use std::{ // --- crates --- use futures::stream::StreamExt; // --- substrate --- +use sc_authority_discovery::WorkerConfig; use sc_basic_authorship::ProposerFactory; use sc_client_api::{BlockchainEvents, ExecutorProvider, RemoteBackend, StateBackendFor}; use sc_consensus::LongestChain; @@ -342,6 +343,7 @@ where let prometheus_registry = config.prometheus_registry().cloned(); let shared_voter_state = rpc_setup; + let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; config .network @@ -488,13 +490,18 @@ where _ => None, } }); - let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service( - client.clone(), - network, - Box::pin(dht_event_stream), - authority_discovery_role, - prometheus_registry, - ); + let (authority_discovery_worker, _service) = + sc_authority_discovery::new_worker_and_service_with_config( + WorkerConfig { + publish_non_global_ips: auth_disc_publish_non_global_ips, + ..Default::default() + }, + client.clone(), + network, + Box::pin(dht_event_stream), + authority_discovery_role, + prometheus_registry, + ); task_manager.spawn_handle().spawn( "authority-discovery-worker", diff --git a/node/service/src/service/darwinia.rs b/node/service/src/service/darwinia.rs index 984093339..cded57871 100644 --- a/node/service/src/service/darwinia.rs +++ b/node/service/src/service/darwinia.rs @@ -25,6 +25,7 @@ use std::{sync::Arc, time::Duration}; // --- crates --- use futures::stream::StreamExt; // --- substrate --- +use sc_authority_discovery::WorkerConfig; use sc_basic_authorship::ProposerFactory; use sc_client_api::{ExecutorProvider, RemoteBackend, StateBackendFor}; use sc_consensus::LongestChain; @@ -273,6 +274,7 @@ where let prometheus_registry = config.prometheus_registry().cloned(); let shared_voter_state = rpc_setup; + let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; config .network @@ -404,13 +406,18 @@ where _ => None, } }); - let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service( - client.clone(), - network, - Box::pin(dht_event_stream), - authority_discovery_role, - prometheus_registry, - ); + let (authority_discovery_worker, _service) = + sc_authority_discovery::new_worker_and_service_with_config( + WorkerConfig { + publish_non_global_ips: auth_disc_publish_non_global_ips, + ..Default::default() + }, + client.clone(), + network, + Box::pin(dht_event_stream), + authority_discovery_role, + prometheus_registry, + ); task_manager.spawn_handle().spawn( "authority-discovery-worker", diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index ca9e61456..b34b98435 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -10,13 +10,13 @@ version = "0.10.0" [dependencies] # crates -codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false } +codec = { package = "parity-scale-codec", version = "2.1.1", default-features = false } # substrate frame -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sp-application-crypto = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-application-crypto = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = ["std"] diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 491eebc73..2fa58b2a5 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -79,14 +79,15 @@ pub type OpaqueBlock = generic::Block; #[test] fn print_module_account() { // --- substrate --- + use frame_support::PalletId; use sp_core::crypto::{set_default_ss58_version, Ss58AddressFormat, Ss58AddressFormat::*}; - use sp_runtime::{traits::AccountIdConversion, ModuleId}; + use sp_runtime::traits::AccountIdConversion; fn account_of(alias: [u8; 8], ss58_version: Ss58AddressFormat) { set_default_ss58_version(ss58_version); let alias_str = unsafe { core::str::from_utf8_unchecked(&alias) }; - let id = >::into_account(&ModuleId(alias)); + let id = >::into_account(&PalletId(alias)); eprintln!("{}:\n\t{}\n\t{:?}", alias_str, id, id); } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index f7b4b6e90..c212111f5 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -10,41 +10,41 @@ version = "0.10.0" [dependencies] # crates -code = { package = "parity-scale-codec", version = "2.0.1", default-features = false } +code = { package = "parity-scale-codec", version = "2.1.1", default-features = false } jsonrpc-core = { version = "15.1.0" } jsonrpc-pubsub = { version = "15.1.0" } # darwinia frame -darwinia-balances-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dvm-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-balances-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dc-db = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dp-rpc = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dvm-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dvm-rpc-runtime-api = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia primitives crab-runtime = { path = "../runtime/crab" } darwinia-primitives = { path = "../primitives" } # substrate client -sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-finality-grandpa-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sc-sync-state-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sc-chain-spec = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-client-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-consensus-babe-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-consensus-epochs = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-finality-grandpa-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sc-sync-state-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate frame -pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +substrate-frame-rpc-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sc-network = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-api = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-block-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus-babe = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-keystore = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-transaction-pool = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index de544f653..1a99d20e6 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -10,23 +10,23 @@ version = "0.10.0" [dependencies] # crates -codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false } +codec = { package = "parity-scale-codec", version = "2.1.1", default-features = false } static_assertions = { version = "1.1.0" } # darwinia frame -darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia primitives darwinia-primitives = { default-features = false, path = "../../primitives" } # substrate frame -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = ["std"] diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index ebd0a950c..0fda4d262 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -45,13 +45,7 @@ where R: darwinia_balances::Config + pallet_authorship::Config, ::AccountId: From, ::AccountId: Into, - ::Event: From< - darwinia_balances::RawEvent< - ::AccountId, - >::Balance, - RingInstance, - >, - >, + ::Event: From>, { fn on_nonzero_unbalanced(amount: NegativeImbalance) { let numeric_amount = amount.peek(); @@ -60,9 +54,10 @@ where &>::author(), amount, ); - >::deposit_event( - >::Deposit(author, numeric_amount), - ); + >::deposit_event(darwinia_balances::Event::Deposit( + author, + numeric_amount, + )); } } @@ -75,13 +70,7 @@ where darwinia_treasury::Pallet: OnUnbalanced>, ::AccountId: From, ::AccountId: Into, - ::Event: From< - darwinia_balances::RawEvent< - ::AccountId, - >::Balance, - RingInstance, - >, - >, + ::Event: From>, { fn on_unbalanceds(mut fees_then_tips: impl Iterator>) { if let Some(fees) = fees_then_tips.next() { diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index fb6d1ac3a..77d27b472 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -33,6 +33,9 @@ pub use sp_runtime::BuildStorage; #[cfg(feature = "std")] pub use darwinia_staking::StakerStatus; +pub use darwinia_balances::Instance1 as RingInstance; +pub use darwinia_balances::Instance2 as KtonInstance; + // --- crates --- use static_assertions::const_assert; // --- substrate --- @@ -47,9 +50,6 @@ use sp_runtime::{FixedPointNumber, Perbill, Perquintill}; // --- darwinia --- use darwinia_primitives::BlockNumber; -pub type RingInstance = darwinia_balances::Instance0; -pub type KtonInstance = darwinia_balances::Instance1; - pub type NegativeImbalance = as Currency< ::AccountId, >>::NegativeImbalance; @@ -109,6 +109,14 @@ parameter_types! { .max_extrinsic .expect("Normal extrinsics have weight limit configured by default; qed") .saturating_sub(BlockExecutionWeight::get()); + + /// A limit for off-chain phragmen unsigned solution length. + /// + /// We allow up to 90% of the block's size to be consumed by the solution. + pub OffchainSolutionLengthLimit: u32 = Perbill::from_rational(90_u32, 100) * + *RuntimeBlockLength::get() + .max + .get(DispatchClass::Normal); } /// Parameterized slow adjusting fee updated based on diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index d330c4e78..cd63c32a9 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -12,83 +12,84 @@ version = "0.10.0" [dependencies] # crates array-bytes = { version = "1.1.0" } -codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14" } -serde = { version = "1.0.125", optional = true } +serde = { version = "1.0.126", optional = true } smallvec = { version = "1.6.1" } static_assertions = { version = "1.1.0" } # darwinia frame -darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-balances-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-claims = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-crab-issuing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-democracy = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-elections-phragmen = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-evm = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-evm-precompile-empty = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-evm-precompile-withdraw = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dp-storage = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dvm-ethereum = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -dvm-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-balances-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-claims = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-crab-issuing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-democracy = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-elections-phragmen = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-evm = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-evm-precompile-empty = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-evm-precompile-simple = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-evm-precompile-withdraw = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-vesting = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dp-storage = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dvm-ethereum = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +dvm-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia primitives darwinia-primitives = { default-features = false, path = "../../primitives" } -ethereum-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +ethereum-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia runtime darwinia-runtime-common = { default-features = false, path = "../common" } # substrate frame -frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-try-runtime = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-election-provider-multi-phase = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-multisig = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-proxy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-try-runtime = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-election-provider-multi-phase = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-indices = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-multisig = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-proxy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-npos-elections = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-npos-elections = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = ["std"] @@ -114,6 +115,7 @@ std = [ "frame-try-runtime/std", "darwinia-support/std", "darwinia-treasury/std", + "darwinia-vesting/std", "darwinia-primitives/std", "darwinia-runtime-common/std", "dp-storage/std", diff --git a/runtime/crab/src/constants.rs b/runtime/crab/src/constants.rs index 3ab3b0f3f..bd399ccb4 100644 --- a/runtime/crab/src/constants.rs +++ b/runtime/crab/src/constants.rs @@ -43,15 +43,12 @@ pub mod time { // --- darwinia --- use darwinia_primitives::{BlockNumber, Moment}; - #[cfg(feature = "dev")] - pub const MILLISECS_PER_BLOCK: Moment = 3000; - #[cfg(not(feature = "dev"))] pub const MILLISECS_PER_BLOCK: Moment = 6000; pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; #[cfg(feature = "dev")] - pub const BLOCKS_PER_SESSION: BlockNumber = MINUTES / 2; + pub const BLOCKS_PER_SESSION: BlockNumber = 10 * MINUTES; #[cfg(not(feature = "dev"))] pub const BLOCKS_PER_SESSION: BlockNumber = 1 * HOURS; diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index 85ae02bf5..1785f4d22 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -140,7 +140,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_runtime::create_runtime_str!("Crab"), impl_name: sp_runtime::create_runtime_str!("Darwinia Crab"), authoring_version: 0, - spec_version: 43, + // crate version ~0.11.0 := >=0.11.0, <0.12.0 + spec_version: 1100, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, @@ -174,8 +175,8 @@ frame_support::construct_runtime! { Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 4, - Balances: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 23, - Kton: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 24, + Balances: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 23, + Kton: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 24, TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 5, // Consensus support. @@ -191,10 +192,10 @@ frame_support::construct_runtime! { HeaderMMR: darwinia_header_mmr::{Pallet, Call, Storage} = 31, // Governance stuff; uncallable initially. - Council: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 14, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 14, TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 15, - ElectionsPhragmen: darwinia_elections_phragmen::{Pallet, Call, Storage, Config, Event} = 26, - TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Config, Event} = 16, + PhragmenElection: darwinia_elections_phragmen::{Pallet, Call, Storage, Config, Event} = 26, + TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Config, Event} = 16, Treasury: darwinia_treasury::{Pallet, Call, Storage, Event} = 32, Democracy: darwinia_democracy::{Pallet, Call, Storage, Config, Event} = 36, @@ -215,6 +216,9 @@ frame_support::construct_runtime! { Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 22, + // Vesting. Usable initially, but removed once all vesting is finished. + Vesting: darwinia_vesting::{Pallet, Call, Storage, Event, Config} = 41, + // Claims. Usable initially. Claims: darwinia_claims::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 27, @@ -225,7 +229,7 @@ frame_support::construct_runtime! { Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 34, // Crab bridge. - CrabIssuing: darwinia_crab_issuing::{Pallet, Call, Storage, Config, Event} = 35, + CrabIssuing: darwinia_crab_issuing::{Pallet, Call, Storage, Config} = 35, // Ethereum bridge. // EthereumRelay: darwinia_ethereum_relay::{Pallet, Call, Storage, Config, Event} = 29, @@ -640,150 +644,28 @@ impl dvm_rpc_runtime_api::ConvertTransaction for TransactionCon } } -impl pallet_babe::migrations::BabePalletPrefix for Runtime { - fn pallet_prefix() -> &'static str { - "Babe" - } -} - pub struct CustomOnRuntimeUpgrade; impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { // --- substrate --- - // use frame_support::migration::*; - use frame_support::storage::unhashed; - // --- darwinia --- - use dp_storage::PALLET_ETHEREUM_SCHEMA; - use dvm_ethereum::EthereumStorageSchema; - - assert!(unhashed::get::(&PALLET_ETHEREUM_SCHEMA).is_none()); - - Self::on_runtime_upgrade(); - darwinia_staking::migrations::v6::pre_migrate::()?; - - assert_eq!( - unhashed::get::(&PALLET_ETHEREUM_SCHEMA), - Some(EthereumStorageSchema::V1), - ); + // use frame_support::migration; Ok(()) } fn on_runtime_upgrade() -> Weight { // --- substrate --- - use frame_support::{ - migration::*, - pallet_prelude::Blake2_128Concat, - storage::unhashed, - traits::{Currency, ExistenceRequirement}, - }; - use sp_runtime::{traits::AccountIdConversion, ModuleId}; - // --- darwinia --- - use darwinia_support::traits::LockableCurrency; - use dp_storage::PALLET_ETHEREUM_SCHEMA; - use dvm_ethereum::EthereumStorageSchema; - - fn transfer_all(from: &AccountId, to: &AccountId) - where - Module: Currency, - { - if Module::transfer( - from, - to, - Module::free_balance(from), - ExistenceRequirement::AllowDeath, - ) - .is_ok() - { - log::info!("Migrate `ethbk`'s fee succeed"); - } else { - log::info!("Migrate `ethbk`'s fee failed"); - } - } + use frame_support::migration; - let ethereum_backing_module_account = ModuleId(*b"da/ethfe").into_account(); - let multisig_account = array_bytes::hex2array_unchecked!( - // 5FGWcEpsd5TbDh14UGJEzRQENwrPXUt7e2ufzFzfcCEMesAQ - "0x8db5c746c14cf05e182b10576a9ee765265366c3b7fd53c41d43640c97f4a8b8", - 32 - ) - .into(); - - transfer_all::(ðereum_backing_module_account, &multisig_account); - transfer_all::(ðereum_backing_module_account, &multisig_account); - - const BACKING: &[u8] = b"DarwiniaEthereumBacking"; - remove_storage_prefix(BACKING, b"VerifiedProof", &[]); - remove_storage_prefix(BACKING, b"TokenRedeemAddress", &[]); - remove_storage_prefix(BACKING, b"DepositRedeemAddress", &[]); - remove_storage_prefix(BACKING, b"SetAuthoritiesAddress", &[]); - remove_storage_prefix(BACKING, b"RingTokenAddress", &[]); - remove_storage_prefix(BACKING, b"KtonTokenAddress", &[]); - remove_storage_prefix(BACKING, b"RedeemStatus", &[]); - remove_storage_prefix(BACKING, b"LockAssetEvents", &[]); - - const RELAY: &[u8] = b"DarwiniaEthereumRelay"; - remove_storage_prefix(RELAY, b"ConfirmedHeaderParcels", &[]); - remove_storage_prefix(RELAY, b"ConfirmedBlockNumbers", &[]); - remove_storage_prefix(RELAY, b"BestConfirmedBlockNumber", &[]); - remove_storage_prefix(RELAY, b"ConfirmedDepth", &[]); - remove_storage_prefix(RELAY, b"DagsMerkleRoots", &[]); - remove_storage_prefix(RELAY, b"ReceiptVerifyFee", &[]); - remove_storage_prefix(RELAY, b"PendingRelayHeaderParcels", &[]); - - const RELAYER_GAME: &[u8] = b"Instance0DarwiniaRelayerGame"; - const RELAYER_GAME_LOCK_IDENTIFIER: [u8; 8] = *b"da/rgame"; - remove_storage_prefix(RELAYER_GAME, b"RelayHeaderParcelToResolve", &[]); - remove_storage_prefix(RELAYER_GAME, b"Affirmations", &[]); - remove_storage_prefix(RELAYER_GAME, b"BestConfirmedHeaderId", &[]); - remove_storage_prefix(RELAYER_GAME, b"RoundCounts", &[]); - remove_storage_prefix(RELAYER_GAME, b"AffirmTime", &[]); - remove_storage_prefix(RELAYER_GAME, b"GamesToUpdate", &[]); - for (staker, _) in - >::new(RELAYER_GAME, b"Stakes") - .drain() - { - Ring::remove_lock(RELAYER_GAME_LOCK_IDENTIFIER, &staker); - } - remove_storage_prefix(RELAYER_GAME, b"Stakes", &[]); - remove_storage_prefix(RELAYER_GAME, b"GameSamplePoints", &[]); - - type EthereumAddress = [u8; 20]; - #[derive(Decode)] - struct RelayAuthority { - pub account_id: AccountId, - pub signer: EthereumAddress, - pub stake: Balance, - pub term: BlockNumber, - } - const RELAY_AUTHORITIES: &[u8] = b"Instance0DarwiniaRelayAuthorities"; - const RELAY_AUTHORITIES_LOCK_IDENTIFIER: [u8; 8] = *b"ethrauth"; - for RelayAuthority { account_id, .. } in - take_storage_value(RELAY_AUTHORITIES, b"Candidates", &[]) - { - Ring::remove_lock(RELAY_AUTHORITIES_LOCK_IDENTIFIER, &account_id); - } - remove_storage_prefix(RELAY_AUTHORITIES, b"Candidates", &[]); - for RelayAuthority { account_id, .. } in - take_storage_value(RELAY_AUTHORITIES, b"Authorities", &[]) - { - Ring::remove_lock(RELAY_AUTHORITIES_LOCK_IDENTIFIER, &account_id); - } - remove_storage_prefix(RELAY_AUTHORITIES, b"Authorities", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"NextAuthorities", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"NextTerm", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"AuthoritiesToSign", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"MMRRootsToSignKeys", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"MMRRootsToSign", &[]); - remove_storage_prefix(RELAY_AUTHORITIES, b"SubmitDuration", &[]); - - unhashed::put::(&PALLET_ETHEREUM_SCHEMA, &EthereumStorageSchema::V1); - - pallet_babe::migrations::add_epoch_configuration::(BabeEpochConfiguration { - allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots, - ..BABE_GENESIS_EPOCH_CONFIG - }); + migration::move_pallet(b"Instance0DarwiniaBalances", b"Balances"); + migration::move_pallet(b"Instance1DarwiniaBalances", b"Kton"); + + migration::move_pallet(b"Instance0Collective", b"Instance2Collective"); + + migration::move_pallet(b"Instance0Membership", b"Instance1Membership"); + + migration::move_pallet(b"DarwiniaPhragmenElection", b"PhragmenElection"); RuntimeBlockWeights::get().max_block } diff --git a/runtime/crab/src/pallets/authorship.rs b/runtime/crab/src/pallets/authorship.rs index 48fe0755f..2fc04be52 100644 --- a/runtime/crab/src/pallets/authorship.rs +++ b/runtime/crab/src/pallets/authorship.rs @@ -7,6 +7,7 @@ use crate::*; frame_support::parameter_types! { pub const UncleGenerations: BlockNumber = 0; } + // TODO: substrate#2986 implement this properly impl Config for Runtime { type FindAuthor = FindAccountFromAuthorIndex; diff --git a/runtime/crab/src/pallets/babe.rs b/runtime/crab/src/pallets/babe.rs index b47cbd492..e9d0530fd 100644 --- a/runtime/crab/src/pallets/babe.rs +++ b/runtime/crab/src/pallets/babe.rs @@ -11,6 +11,7 @@ frame_support::parameter_types! { pub const ReportLongevity: u64 = BondingDurationInEra::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get(); } + impl Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs index f009193be..7fc9e4be6 100644 --- a/runtime/crab/src/pallets/balances.rs +++ b/runtime/crab/src/pallets/balances.rs @@ -7,6 +7,7 @@ frame_support::parameter_types! { pub const KtonExistentialDeposit: Balance = 0; pub const MaxLocks: u32 = 50; } + impl Config for Runtime { type Balance = Balance; type DustRemoval = (); diff --git a/runtime/crab/src/pallets/claims.rs b/runtime/crab/src/pallets/claims.rs index a0df14c60..28c86830e 100644 --- a/runtime/crab/src/pallets/claims.rs +++ b/runtime/crab/src/pallets/claims.rs @@ -2,18 +2,19 @@ pub use darwinia_claims::ClaimsList; // --- substrate --- -use sp_runtime::ModuleId; +use frame_support::PalletId; // --- darwinia --- use crate::*; use darwinia_claims::Config; frame_support::parameter_types! { - pub const ClaimsModuleId: ModuleId = ModuleId(*b"da/claim"); + pub const ClaimsPalletId: PalletId = PalletId(*b"da/claim"); pub Prefix: &'static [u8] = b"Pay RINGs to the Crab account:"; } + impl Config for Runtime { type Event = Event; - type ModuleId = ClaimsModuleId; + type PalletId = ClaimsPalletId; type Prefix = Prefix; type RingCurrency = Ring; type MoveClaimOrigin = EnsureRootOrMoreThanHalfCouncil; diff --git a/runtime/crab/src/pallets/collective.rs b/runtime/crab/src/pallets/collective.rs index 1aa67e9d4..a1039edc3 100644 --- a/runtime/crab/src/pallets/collective.rs +++ b/runtime/crab/src/pallets/collective.rs @@ -1,4 +1,4 @@ -pub use pallet_collective::{Instance0 as CouncilCollective, Instance1 as TechnicalCollective}; +pub use pallet_collective::{Instance1 as TechnicalCollective, Instance2 as CouncilCollective}; // --- substrate --- use frame_system::{EnsureOneOf, EnsureRoot}; @@ -36,16 +36,26 @@ pub type TechnicalCommitteeApproveOrigin = EnsureOneOf< EnsureProportionMoreThan<_3, _5, AccountId, TechnicalCollective>, >; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const CouncilMotionDuration: BlockNumber = 3 * MINUTES; + pub const TechnicalMotionDuration: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { pub const CouncilMotionDuration: BlockNumber = 3 * DAYS; + pub const TechnicalMotionDuration: BlockNumber = 3 * DAYS; +} +frame_support::parameter_types! { pub const CouncilMaxProposals: u32 = 100; pub const CouncilMaxMembers: u32 = 100; - pub const TechnicalMotionDuration: BlockNumber = 3 * DAYS; pub const TechnicalMaxProposals: u32 = 100; pub const TechnicalMaxMembers: u32 = 100; } + // Make sure that there are no more than MaxMembers members elected via phragmen. static_assertions::const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); + impl Config for Runtime { type Origin = Origin; type Proposal = Call; diff --git a/runtime/crab/src/pallets/crab_issuing.rs b/runtime/crab/src/pallets/crab_issuing.rs index 889bf16f7..a2a39a3ca 100644 --- a/runtime/crab/src/pallets/crab_issuing.rs +++ b/runtime/crab/src/pallets/crab_issuing.rs @@ -1,15 +1,15 @@ // --- substrate --- -use sp_runtime::ModuleId; +use frame_support::PalletId; // --- darwinia --- use crate::*; use darwinia_crab_issuing::Config; frame_support::parameter_types! { - pub const CrabIssuingModuleId: ModuleId = ModuleId(*b"da/crais"); + pub const CrabIssuingPalletId: PalletId = PalletId(*b"da/crais"); } + impl Config for Runtime { - type Event = Event; - type ModuleId = CrabIssuingModuleId; + type PalletId = CrabIssuingPalletId; type RingCurrency = Ring; type WeightInfo = (); } diff --git a/runtime/crab/src/pallets/democracy.rs b/runtime/crab/src/pallets/democracy.rs index d1df88c72..198bef8a1 100644 --- a/runtime/crab/src/pallets/democracy.rs +++ b/runtime/crab/src/pallets/democracy.rs @@ -6,18 +6,30 @@ use sp_core::u32_trait::{_1, _2, _3}; use crate::{weights::darwinia_democracy::WeightInfo, *}; use darwinia_democracy::Config; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const LaunchPeriod: BlockNumber = 3 * MINUTES; + pub const VotingPeriod: BlockNumber = 3 * MINUTES; + pub const FastTrackVotingPeriod: BlockNumber = 3 * MINUTES; + pub const EnactmentPeriod: BlockNumber = 3 * MINUTES; + pub const CooloffPeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { pub const LaunchPeriod: BlockNumber = 7 * DAYS; pub const VotingPeriod: BlockNumber = 7 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; - pub const MinimumDeposit: Balance = 1 * MILLI; pub const EnactmentPeriod: BlockNumber = 8 * DAYS; pub const CooloffPeriod: BlockNumber = 7 * DAYS; +} +frame_support::parameter_types! { + pub const MinimumDeposit: Balance = 1 * MILLI; pub const PreimageByteDeposit: Balance = 10 * NANO; pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; } + impl Config for Runtime { type Proposal = Call; type Event = Event; diff --git a/runtime/crab/src/pallets/election_provider_multi_phase.rs b/runtime/crab/src/pallets/election_provider_multi_phase.rs index 06289d559..bee112f01 100644 --- a/runtime/crab/src/pallets/election_provider_multi_phase.rs +++ b/runtime/crab/src/pallets/election_provider_multi_phase.rs @@ -1,13 +1,16 @@ // --- substrate --- -use pallet_election_provider_multi_phase::{weights::SubstrateWeight, Config}; +use pallet_election_provider_multi_phase::Config; use sp_runtime::{transaction_validity::TransactionPriority, Perbill}; // --- darwinia --- -use crate::*; +use crate::{weights::pallet_election_provider_multi_phase::WeightInfo, *}; sp_npos_elections::generate_solution_type!( #[compact] - pub struct NposCompactSolution16::(16) - // -------------------- ^^ + pub struct NposCompactSolution24::< + VoterIndex = u32, + TargetIndex = u16, + Accuracy = sp_runtime::PerU16, + >(24) ); frame_support::parameter_types! { @@ -25,6 +28,7 @@ frame_support::parameter_types! { pub NposSolutionPriority: TransactionPriority = Perbill::from_percent(90) * TransactionPriority::max_value(); pub const MinerMaxIterations: u32 = 10; } + impl Config for Runtime { type Event = Event; type Currency = Balances; @@ -32,12 +36,13 @@ impl Config for Runtime { type UnsignedPhase = UnsignedPhase; type SolutionImprovementThreshold = SolutionImprovementThreshold; type MinerMaxIterations = MinerMaxIterations; - type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.; + type MinerMaxWeight = OffchainSolutionWeightLimit; + type MinerMaxLength = OffchainSolutionLengthLimit; type MinerTxPriority = NposSolutionPriority; type DataProvider = Staking; type OnChainAccuracy = Perbill; - type CompactSolution = NposCompactSolution16; + type CompactSolution = NposCompactSolution24; type Fallback = Fallback; - type WeightInfo = SubstrateWeight; + type WeightInfo = WeightInfo; type BenchmarkingConfig = (); } diff --git a/runtime/crab/src/pallets/elections_phragmen.rs b/runtime/crab/src/pallets/elections_phragmen.rs index 648c2b4d3..40df5e296 100644 --- a/runtime/crab/src/pallets/elections_phragmen.rs +++ b/runtime/crab/src/pallets/elections_phragmen.rs @@ -5,7 +5,7 @@ use crate::{weights::darwinia_elections_phragmen::WeightInfo, *}; use darwinia_elections_phragmen::Config; frame_support::parameter_types! { - pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect"; + pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect"; pub const CandidacyBond: Balance = 1 * COIN; // 1 storage item created, key size is 32 bytes, value size is 16+16. pub const VotingBondBase: Balance = deposit(1, 64); @@ -16,9 +16,10 @@ frame_support::parameter_types! { pub const DesiredMembers: u32 = 7; pub const DesiredRunnersUp: u32 = 7; } + impl Config for Runtime { type Event = Event; - type ModuleId = ElectionsPhragmenModuleId; + type PalletId = PhragmenElectionPalletId; type Currency = Ring; type ChangeMembers = Council; type InitializeMembers = Council; diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs index 93ee55a3f..21964d127 100644 --- a/runtime/crab/src/pallets/evm.rs +++ b/runtime/crab/src/pallets/evm.rs @@ -1,12 +1,13 @@ // --- substrate --- -use sp_core::U256; +use sp_core::{H160, U256}; +use sp_runtime::DispatchResult; // --- darwinia --- use crate::*; use darwinia_evm::{ runner::stack::Runner, ConcatAddressMapping, Config, EnsureAddressTruncated, FeeCalculator, + IssuingHandler, }; -use dvm_ethereum::account_basic::DvmAccountBasic; -use dvm_ethereum::account_basic::{KtonRemainBalance, RingRemainBalance}; +use dvm_ethereum::account_basic::{DvmAccountBasic, KtonRemainBalance, RingRemainBalance}; /// Fixed gas price. pub struct FixedGasPrice; @@ -49,7 +50,6 @@ impl Config for Runtime { type FeeCalculator = FixedGasPrice; type GasWeightMapping = (); type CallOrigin = EnsureAddressTruncated; - type WithdrawOrigin = EnsureAddressTruncated; type AddressMapping = ConcatAddressMapping; type RingCurrency = Ring; type KtonCurrency = Kton; @@ -60,4 +60,12 @@ impl Config for Runtime { type RingAccountBasic = DvmAccountBasic; type KtonAccountBasic = DvmAccountBasic; type Runner = Runner; + type IssuingHandler = DisableIssuing; +} + +pub struct DisableIssuing; +impl IssuingHandler for DisableIssuing { + fn handle(_: H160, _: H160, _: &[u8]) -> DispatchResult { + Err("unimplemented".into()) + } } diff --git a/runtime/crab/src/pallets/identity.rs b/runtime/crab/src/pallets/identity.rs index 9b039ae7c..68321418b 100644 --- a/runtime/crab/src/pallets/identity.rs +++ b/runtime/crab/src/pallets/identity.rs @@ -12,6 +12,7 @@ frame_support::parameter_types! { pub const MaxAdditionalFields: u32 = 100; pub const MaxRegistrars: u32 = 20; } + impl Config for Runtime { type Event = Event; type Currency = Ring; diff --git a/runtime/crab/src/pallets/im_online.rs b/runtime/crab/src/pallets/im_online.rs index 439a67f0c..6b99a04ec 100644 --- a/runtime/crab/src/pallets/im_online.rs +++ b/runtime/crab/src/pallets/im_online.rs @@ -7,6 +7,7 @@ use crate::{weights::pallet_im_online::WeightInfo, *}; frame_support::parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } + impl Config for Runtime { type AuthorityId = AuthorityId; type Event = Event; diff --git a/runtime/crab/src/pallets/indices.rs b/runtime/crab/src/pallets/indices.rs index 69a5f8f0a..289b82733 100644 --- a/runtime/crab/src/pallets/indices.rs +++ b/runtime/crab/src/pallets/indices.rs @@ -6,6 +6,7 @@ use crate::{weights::pallet_indices::WeightInfo, *}; frame_support::parameter_types! { pub const IndexDeposit: Balance = 1 * COIN; } + impl Config for Runtime { type AccountIndex = AccountIndex; type Currency = Ring; diff --git a/runtime/crab/src/pallets/membership.rs b/runtime/crab/src/pallets/membership.rs index 5b70adb38..6ff6d6867 100644 --- a/runtime/crab/src/pallets/membership.rs +++ b/runtime/crab/src/pallets/membership.rs @@ -1,9 +1,9 @@ // --- substrate --- -use pallet_membership::{Config, Instance0}; +use pallet_membership::{Config, Instance1}; // --- darwinia --- -use crate::*; +use crate::{weights::pallet_membership::WeightInfo, *}; -impl Config for Runtime { +impl Config for Runtime { type Event = Event; type AddOrigin = EnsureRootOrMoreThanHalfCouncil; type RemoveOrigin = EnsureRootOrMoreThanHalfCouncil; @@ -12,4 +12,6 @@ impl Config for Runtime { type PrimeOrigin = EnsureRootOrMoreThanHalfCouncil; type MembershipInitialized = TechnicalCommittee; type MembershipChanged = TechnicalCommittee; + type MaxMembers = TechnicalMaxMembers; + type WeightInfo = WeightInfo; } diff --git a/runtime/crab/src/pallets/mod.rs b/runtime/crab/src/pallets/mod.rs index 12cd31cce..a31e3a7ca 100644 --- a/runtime/crab/src/pallets/mod.rs +++ b/runtime/crab/src/pallets/mod.rs @@ -64,6 +64,9 @@ pub use treasury::*; pub mod sudo; pub use sudo::*; +pub mod vesting; +pub use vesting::*; + pub mod claims; pub use claims::*; diff --git a/runtime/crab/src/pallets/multisig.rs b/runtime/crab/src/pallets/multisig.rs index 0e6a2eb6b..1ae3de674 100644 --- a/runtime/crab/src/pallets/multisig.rs +++ b/runtime/crab/src/pallets/multisig.rs @@ -10,6 +10,7 @@ frame_support::parameter_types! { pub const DepositFactor: Balance = deposit(0, 32); pub const MaxSignatories: u16 = 100; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/crab/src/pallets/offences.rs b/runtime/crab/src/pallets/offences.rs index 57dece3ae..616cea9b1 100644 --- a/runtime/crab/src/pallets/offences.rs +++ b/runtime/crab/src/pallets/offences.rs @@ -10,6 +10,7 @@ frame_support::parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * RuntimeBlockWeights::get().max_block; } + impl Config for Runtime { type Event = Event; type IdentificationTuple = IdentificationTuple; diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs index 4f6f4a546..48c4bf945 100644 --- a/runtime/crab/src/pallets/proxy.rs +++ b/runtime/crab/src/pallets/proxy.rs @@ -46,7 +46,7 @@ impl InstanceFilter for ProxyType { Call::AuthorityDiscovery(..) | Call::Council(..) | Call::TechnicalCommittee(..) | - Call::ElectionsPhragmen(..) | + Call::PhragmenElection(..) | Call::TechnicalMembership(..) | Call::Treasury(..) | Call::Claims(..) | @@ -68,7 +68,7 @@ impl InstanceFilter for ProxyType { c, Call::Democracy(..) | Call::Council(..) | Call::TechnicalCommittee(..) - | Call::ElectionsPhragmen(..) + | Call::PhragmenElection(..) | Call::Treasury(..) | Call::Utility(..) ), ProxyType::Staking => matches!(c, Call::Staking(..) | Call::Utility(..)), @@ -101,6 +101,7 @@ frame_support::parameter_types! { pub const AnnouncementDepositFactor: Balance = deposit(0, 66); pub const MaxPending: u16 = 32; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/crab/src/pallets/recovery.rs b/runtime/crab/src/pallets/recovery.rs index c6d494216..ceb2232f4 100644 --- a/runtime/crab/src/pallets/recovery.rs +++ b/runtime/crab/src/pallets/recovery.rs @@ -9,6 +9,7 @@ frame_support::parameter_types! { pub const MaxFriends: u16 = 9; pub const RecoveryDeposit: Balance = 5 * COIN; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/crab/src/pallets/scheduler.rs b/runtime/crab/src/pallets/scheduler.rs index ef91f10cd..dd6e1a30b 100644 --- a/runtime/crab/src/pallets/scheduler.rs +++ b/runtime/crab/src/pallets/scheduler.rs @@ -11,6 +11,7 @@ frame_support::parameter_types! { * RuntimeBlockWeights::get().max_block; pub const MaxScheduledPerBlock: u32 = 50; } + impl Config for Runtime { type Event = Event; type Origin = Origin; diff --git a/runtime/crab/src/pallets/session.rs b/runtime/crab/src/pallets/session.rs index 2e380b3f4..b576c1ee3 100644 --- a/runtime/crab/src/pallets/session.rs +++ b/runtime/crab/src/pallets/session.rs @@ -14,9 +14,11 @@ sp_runtime::impl_opaque_keys! { pub authority_discovery: AuthorityDiscovery, } } + frame_support::parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } + impl Config for Runtime { type Event = Event; type ValidatorId = AccountId; diff --git a/runtime/crab/src/pallets/society.rs b/runtime/crab/src/pallets/society.rs index b84012dac..4287b1a29 100644 --- a/runtime/crab/src/pallets/society.rs +++ b/runtime/crab/src/pallets/society.rs @@ -1,23 +1,33 @@ // --- substrate --- +use frame_support::PalletId; use pallet_society::{Config, EnsureFounder}; -use sp_runtime::ModuleId; // --- darwinia --- use crate::*; +#[cfg(feature = "dev")] frame_support::parameter_types! { - pub const SocietyModuleId: ModuleId = ModuleId(*b"da/socie"); + pub const RotationPeriod: BlockNumber = 3 * MINUTES; + pub const MaxLockDuration: BlockNumber = 3 * MINUTES; + pub const ChallengePeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] +frame_support::parameter_types! { + pub const RotationPeriod: BlockNumber = 80 * HOURS; + pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS; + pub const ChallengePeriod: BlockNumber = 7 * DAYS; +} +frame_support::parameter_types! { + pub const SocietyPalletId: PalletId = PalletId(*b"da/socie"); pub const CandidateDeposit: Balance = 10 * COIN; pub const WrongSideDeduction: Balance = 2 * COIN; pub const MaxStrikes: u32 = 10; - pub const RotationPeriod: BlockNumber = 80 * HOURS; pub const PeriodSpend: Balance = 500 * COIN; - pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS; - pub const ChallengePeriod: BlockNumber = 7 * DAYS; pub const MaxCandidateIntake: u32 = 1; } + impl Config for Runtime { type Event = Event; - type ModuleId = SocietyModuleId; + type PalletId = SocietyPalletId; type Currency = Ring; type Randomness = RandomnessCollectiveFlip; type CandidateDeposit = CandidateDeposit; diff --git a/runtime/crab/src/pallets/staking.rs b/runtime/crab/src/pallets/staking.rs index 96f523623..5afa21267 100644 --- a/runtime/crab/src/pallets/staking.rs +++ b/runtime/crab/src/pallets/staking.rs @@ -2,31 +2,40 @@ pub use darwinia_staking::{Forcing, StakerStatus}; // --- substrate --- +use frame_support::PalletId; use sp_npos_elections::CompactSolution; -use sp_runtime::ModuleId; use sp_staking::SessionIndex; // --- darwinia --- use crate::{weights::darwinia_staking::WeightInfo, *}; use darwinia_staking::{Config, EraIndex}; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const BondingDurationInEra: BlockNumber = 2; + pub const BondingDurationInBlockNumber: BlockNumber = 2 * SESSIONS_PER_ERA * BLOCKS_PER_SESSION; + pub const SlashDeferDuration: EraIndex = 1; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { - pub const StakingModuleId: ModuleId = ModuleId(*b"da/staki"); - pub const SessionsPerEra: SessionIndex = SESSIONS_PER_ERA; pub const BondingDurationInEra: EraIndex = 14 * DAYS / (SESSIONS_PER_ERA as BlockNumber * BLOCKS_PER_SESSION); pub const BondingDurationInBlockNumber: BlockNumber = 14 * DAYS; // slightly less than 14 days. pub const SlashDeferDuration: EraIndex = 14 * DAYS / (SESSIONS_PER_ERA as BlockNumber * BLOCKS_PER_SESSION) - 1; +} +frame_support::parameter_types! { + pub const StakingPalletId: PalletId = PalletId(*b"da/staki"); + pub const SessionsPerEra: SessionIndex = SESSIONS_PER_ERA; // quarter of the last session will be for election. pub const MaxNominatorRewardedPerValidator: u32 = 64; pub const Cap: Balance = CAP; pub const TotalPower: Power = TOTAL_POWER; } impl Config for Runtime { - const MAX_NOMINATIONS: u32 = ::LIMIT as u32; + const MAX_NOMINATIONS: u32 = ::LIMIT as u32; type Event = Event; - type ModuleId = StakingModuleId; + type PalletId = StakingPalletId; type UnixTime = Timestamp; type SessionsPerEra = SessionsPerEra; type BondingDurationInEra = BondingDurationInEra; diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs index ccdfa9bed..893a3d1ad 100644 --- a/runtime/crab/src/pallets/system.rs +++ b/runtime/crab/src/pallets/system.rs @@ -17,6 +17,7 @@ frame_support::parameter_types! { pub const Version: RuntimeVersion = VERSION; pub const SS58Prefix: u8 = 42; } + impl Config for Runtime { type BaseCallFilter = BaseFilter; type BlockWeights = RuntimeBlockWeights; @@ -40,4 +41,5 @@ impl Config for Runtime { type OnKilledAccount = (); type SystemWeightInfo = WeightInfo; type SS58Prefix = SS58Prefix; + type OnSetCode = (); } diff --git a/runtime/crab/src/pallets/timestamp.rs b/runtime/crab/src/pallets/timestamp.rs index 6f86b4372..85cce0139 100644 --- a/runtime/crab/src/pallets/timestamp.rs +++ b/runtime/crab/src/pallets/timestamp.rs @@ -6,6 +6,7 @@ use crate::{weights::pallet_timestamp::WeightInfo, *}; frame_support::parameter_types! { pub const MinimumPeriod: Moment = SLOT_DURATION / 2; } + impl Config for Runtime { type Moment = Moment; type OnTimestampSet = Babe; diff --git a/runtime/crab/src/pallets/transaction_payment.rs b/runtime/crab/src/pallets/transaction_payment.rs index f82314604..a84172faf 100644 --- a/runtime/crab/src/pallets/transaction_payment.rs +++ b/runtime/crab/src/pallets/transaction_payment.rs @@ -6,6 +6,7 @@ use crate::*; frame_support::parameter_types! { pub const TransactionByteFee: Balance = 5 * MILLI; } + impl Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; diff --git a/runtime/crab/src/pallets/treasury.rs b/runtime/crab/src/pallets/treasury.rs index 4e4c15f5a..37c15c797 100644 --- a/runtime/crab/src/pallets/treasury.rs +++ b/runtime/crab/src/pallets/treasury.rs @@ -1,34 +1,47 @@ // --- substrate --- -use sp_runtime::{ModuleId, Percent, Permill}; +use frame_support::PalletId; +use sp_runtime::{Percent, Permill}; // --- darwinia --- use crate::{weights::darwinia_treasury::WeightInfo, *}; use darwinia_treasury::Config; +#[cfg(feature = "dev")] frame_support::parameter_types! { - pub const TreasuryModuleId: ModuleId = ModuleId(*b"da/trsry"); + pub const SpendPeriod: BlockNumber = 3 * MINUTES; + pub const TipCountdown: BlockNumber = 3 * MINUTES; + pub const BountyDepositPayoutDelay: BlockNumber = 3 * MINUTES; + pub const BountyUpdatePeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] +frame_support::parameter_types! { + pub const SpendPeriod: BlockNumber = 6 * DAYS; + pub const TipCountdown: BlockNumber = 1 * DAYS; + pub const BountyDepositPayoutDelay: BlockNumber = 4 * DAYS; + pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; +} +frame_support::parameter_types! { + pub const TreasuryPalletId: PalletId = PalletId(*b"da/trsry"); pub const ProposalBond: Permill = Permill::from_percent(5); pub const RingProposalBondMinimum: Balance = 20 * COIN; pub const KtonProposalBondMinimum: Balance = 20 * COIN; - pub const SpendPeriod: BlockNumber = 6 * DAYS; pub const Burn: Permill = Permill::from_percent(0); - pub const TipCountdown: BlockNumber = 1 * DAYS; pub const TipFindersFee: Percent = Percent::from_percent(20); pub const TipReportDepositBase: Balance = 1 * COIN; pub const DataDepositPerByte: Balance = 1 * MILLI; pub const BountyDepositBase: Balance = 1 * COIN; - pub const BountyDepositPayoutDelay: BlockNumber = 4 * DAYS; - pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; pub const MaximumReasonLength: u32 = 16384; pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); pub const BountyValueMinimum: Balance = 2 * COIN; + pub const MaxApprovals: u32 = 100; } + impl Config for Runtime { - type ModuleId = TreasuryModuleId; + type PalletId = TreasuryPalletId; type RingCurrency = Ring; type KtonCurrency = Kton; type ApproveOrigin = ApproveOrigin; type RejectOrigin = EnsureRootOrMoreThanHalfCouncil; - type Tippers = ElectionsPhragmen; + type Tippers = PhragmenElection; type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; @@ -49,5 +62,6 @@ impl Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type RingBurnDestination = Society; type KtonBurnDestination = (); + type MaxApprovals = MaxApprovals; type WeightInfo = WeightInfo; } diff --git a/runtime/crab/src/pallets/vesting.rs b/runtime/crab/src/pallets/vesting.rs new file mode 100644 index 000000000..55455fb9c --- /dev/null +++ b/runtime/crab/src/pallets/vesting.rs @@ -0,0 +1,17 @@ +// --- darwinia --- +use crate::{weights::darwinia_vesting::WeightInfo, *}; +use darwinia_vesting::Config; +// --- substrate --- +use sp_runtime::traits::ConvertInto; + +frame_support::parameter_types! { + pub const MinVestedTransfer: Balance = 100 * MILLI; +} + +impl Config for Runtime { + type Event = Event; + type Currency = Ring; + type BlockNumberToBalance = ConvertInto; + type MinVestedTransfer = MinVestedTransfer; + type WeightInfo = WeightInfo; +} diff --git a/runtime/crab/src/weights/darwinia_staking.rs b/runtime/crab/src/weights/darwinia_staking.rs index a090e3826..abc061e29 100644 --- a/runtime/crab/src/weights/darwinia_staking.rs +++ b/runtime/crab/src/weights/darwinia_staking.rs @@ -158,21 +158,6 @@ impl darwinia_staking::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight))) } - fn submit_solution_better(v: u32, n: u32, a: u32, w: u32) -> Weight { - (0 as Weight) - // Standard Error: 43_000 - .saturating_add((1_426_000 as Weight).saturating_mul(v as Weight)) - // Standard Error: 17_000 - .saturating_add((588_000 as Weight).saturating_mul(n as Weight)) - // Standard Error: 43_000 - .saturating_add((69_239_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 90_000 - .saturating_add((8_062_000 as Weight).saturating_mul(w as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight))) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn get_npos_voters(v: u32, n: u32, s: u32) -> Weight { (0 as Weight) // Standard Error: 94_000 diff --git a/runtime/crab/src/weights/darwinia_treasury.rs b/runtime/crab/src/weights/darwinia_treasury.rs index f990ff70c..6c916f136 100644 --- a/runtime/crab/src/weights/darwinia_treasury.rs +++ b/runtime/crab/src/weights/darwinia_treasury.rs @@ -16,8 +16,10 @@ impl darwinia_treasury::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn approve_proposal() -> Weight { - (11_351_000 as Weight) + fn approve_proposal(p: u32) -> Weight { + (11_712_000 as Weight) + // Standard Error: 0 + .saturating_add((35_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/runtime/crab/src/weights/darwinia_vesting.rs b/runtime/crab/src/weights/darwinia_vesting.rs new file mode 100644 index 000000000..166aa0ae3 --- /dev/null +++ b/runtime/crab/src/weights/darwinia_vesting.rs @@ -0,0 +1,52 @@ +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for darwinia_vesting. +pub struct WeightInfo(PhantomData); +impl darwinia_vesting::WeightInfo for WeightInfo { + fn vest_locked(l: u32) -> Weight { + (41_841_000 as Weight) + // Standard Error: 13_000 + .saturating_add((202_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn vest_unlocked(l: u32) -> Weight { + (45_276_000 as Weight) + // Standard Error: 2_000 + .saturating_add((133_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn vest_other_locked(l: u32) -> Weight { + (41_217_000 as Weight) + // Standard Error: 12_000 + .saturating_add((217_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn vest_other_unlocked(l: u32) -> Weight { + (44_521_000 as Weight) + // Standard Error: 5_000 + .saturating_add((163_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn vested_transfer(l: u32) -> Weight { + (101_636_000 as Weight) + // Standard Error: 12_000 + .saturating_add((105_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn force_vested_transfer(l: u32) -> Weight { + (99_417_000 as Weight) + // Standard Error: 12_000 + .saturating_add((137_000 as Weight).saturating_mul(l as Weight)) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } +} diff --git a/runtime/crab/src/weights/mod.rs b/runtime/crab/src/weights/mod.rs index 4020f7aae..33468def0 100644 --- a/runtime/crab/src/weights/mod.rs +++ b/runtime/crab/src/weights/mod.rs @@ -5,11 +5,14 @@ pub mod darwinia_democracy; pub mod darwinia_elections_phragmen; pub mod darwinia_staking; pub mod darwinia_treasury; +pub mod darwinia_vesting; pub mod frame_system; pub mod pallet_collective; +pub mod pallet_election_provider_multi_phase; pub mod pallet_identity; pub mod pallet_im_online; pub mod pallet_indices; +pub mod pallet_membership; pub mod pallet_multisig; pub mod pallet_proxy; pub mod pallet_scheduler; diff --git a/runtime/crab/src/weights/pallet_election_provider_multi_phase.rs b/runtime/crab/src/weights/pallet_election_provider_multi_phase.rs new file mode 100644 index 000000000..ba0f9d373 --- /dev/null +++ b/runtime/crab/src/weights/pallet_election_provider_multi_phase.rs @@ -0,0 +1,58 @@ +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_election_provider_multi_phase. +pub struct WeightInfo(PhantomData); +impl pallet_election_provider_multi_phase::WeightInfo for WeightInfo { + fn on_initialize_nothing() -> Weight { + (20_217_000 as Weight).saturating_add(T::DbWeight::get().reads(7 as Weight)) + } + fn on_initialize_open_signed() -> Weight { + (99_197_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn on_initialize_open_unsigned_with_snapshot() -> Weight { + (98_403_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn on_initialize_open_unsigned_without_snapshot() -> Weight { + (18_101_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn elect_queued() -> Weight { + (11_435_187_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight { + (0 as Weight) + // Standard Error: 23_000 + .saturating_add((6_005_000 as Weight).saturating_mul(v as Weight)) + // Standard Error: 79_000 + .saturating_add((115_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 23_000 + .saturating_add((18_959_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 119_000 + .saturating_add((4_858_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(6 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn feasibility_check(v: u32, t: u32, a: u32, d: u32) -> Weight { + (0 as Weight) + // Standard Error: 17_000 + .saturating_add((5_835_000 as Weight).saturating_mul(v as Weight)) + // Standard Error: 59_000 + .saturating_add((264_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 17_000 + .saturating_add((14_827_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 89_000 + .saturating_add((4_130_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + } +} diff --git a/runtime/crab/src/weights/pallet_membership.rs b/runtime/crab/src/weights/pallet_membership.rs new file mode 100644 index 000000000..7e93e089a --- /dev/null +++ b/runtime/crab/src/weights/pallet_membership.rs @@ -0,0 +1,58 @@ +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_membership. +pub struct WeightInfo(PhantomData); +impl pallet_membership::WeightInfo for WeightInfo { + fn add_member(m: u32) -> Weight { + (22_578_000 as Weight) + // Standard Error: 3_000 + .saturating_add((240_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn remove_member(m: u32) -> Weight { + (27_590_000 as Weight) + // Standard Error: 0 + .saturating_add((194_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn swap_member(m: u32) -> Weight { + (27_451_000 as Weight) + // Standard Error: 0 + .saturating_add((212_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn reset_member(m: u32) -> Weight { + (27_655_000 as Weight) + // Standard Error: 0 + .saturating_add((428_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn change_key(m: u32) -> Weight { + (29_256_000 as Weight) + // Standard Error: 0 + .saturating_add((206_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn set_prime(m: u32) -> Weight { + (7_334_000 as Weight) + // Standard Error: 0 + .saturating_add((113_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn clear_prime(m: u32) -> Weight { + (2_741_000 as Weight) + // Standard Error: 0 + .saturating_add((1_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } +} diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml index 927774f02..4557397e5 100644 --- a/runtime/darwinia/Cargo.toml +++ b/runtime/darwinia/Cargo.toml @@ -11,82 +11,82 @@ version = "0.10.0" [dependencies] # crates -codec = { package = "parity-scale-codec", version = "2.0.1", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14" } -serde = { version = "1.0.125", optional = true } +serde = { version = "1.0.126", optional = true } serde_json = { version = "1.0.64", optional = true } smallvec = { version = "1.6.1" } static_assertions = { version = "1.1.0" } # darwinia frame -darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-balances-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-crab-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-democracy = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-elections-phragmen = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-ethereum-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-ethereum-relay = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-header-mmr-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-relay-authorities = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-relay-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-relayer-game = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-staking-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-tron-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } -darwinia-vesting = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +darwinia-balances = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-balances-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-crab-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-democracy = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-elections-phragmen = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-ethereum-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-ethereum-relay = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-header-mmr-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-relay-authorities = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-relay-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-relayer-game = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-staking-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-support = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-treasury = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-tron-backing = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } +darwinia-vesting = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia primitives darwinia-primitives = { default-features = false, path = "../../primitives" } -ethereum-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.10.0" } +ethereum-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.0" } # darwinia runtime darwinia-runtime-common = { default-features = false, path = "../common" } # substrate frame -frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -frame-try-runtime = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-election-provider-multi-phase = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-multisig = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-proxy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +frame-executive = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +frame-try-runtime = { default-features = false, optional = true, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-authorship = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-collective = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-election-provider-multi-phase = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-identity = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-membership = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-multisig = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-proxy = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-session = { default-features = false, features = ["historical"], git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-society = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +pallet-utility = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } # substrate primitives -sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-npos-elections = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } -sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +sp-api = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-authority-discovery = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-block-builder = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-consensus-babe = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-inherents = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-npos-elections = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-offchain = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-session = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-staking = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-transaction-pool = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } +sp-version = { default-features = false, git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" } +substrate-wasm-builder = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.0" } [features] default = ["std"] diff --git a/runtime/darwinia/src/constants.rs b/runtime/darwinia/src/constants.rs index ae67200c5..a10c692fc 100644 --- a/runtime/darwinia/src/constants.rs +++ b/runtime/darwinia/src/constants.rs @@ -43,15 +43,13 @@ pub mod time { // --- darwinia --- use darwinia_primitives::{BlockNumber, Moment}; - #[cfg(feature = "dev")] - pub const MILLISECS_PER_BLOCK: Moment = 3000; #[cfg(not(feature = "dev"))] pub const MILLISECS_PER_BLOCK: Moment = 6000; pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK; #[cfg(feature = "dev")] - pub const BLOCKS_PER_SESSION: BlockNumber = MINUTES / 2; + pub const BLOCKS_PER_SESSION: BlockNumber = 10 * MINUTES; #[cfg(not(feature = "dev"))] pub const BLOCKS_PER_SESSION: BlockNumber = 4 * HOURS; diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 6eae6f0b1..edc8f4401 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -106,6 +106,7 @@ use codec::Encode; use frame_support::{ traits::{KeyOwnerProofSystem, OnRuntimeUpgrade, Randomness}, weights::Weight, + PalletId, }; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, @@ -120,11 +121,11 @@ use sp_core::OpaqueMetadata; use sp_runtime::{ generic, traits::{ - AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT, + AccountIdLookup, BlakeTwo256, Block as BlockT, Extrinsic as ExtrinsicT, NumberFor, SaturatedConversion, StaticLookup, Verify, }, transaction_validity::{TransactionSource, TransactionValidity}, - ApplyExtrinsicResult, ModuleId, MultiAddress, + ApplyExtrinsicResult, MultiAddress, }; use sp_std::prelude::*; #[cfg(any(feature = "std", test))] @@ -187,7 +188,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_runtime::create_runtime_str!("Darwinia"), impl_name: sp_runtime::create_runtime_str!("Darwinia"), authoring_version: 0, - spec_version: 24, + // crate version ~0.11.0 := >=0.11.0, <0.12.0 + spec_version: 1100, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, @@ -220,8 +222,8 @@ frame_support::construct_runtime! { Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 2, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - Balances: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 4, - Kton: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 5, + Balances: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 4, + Kton: darwinia_balances::::{Pallet, Call, Storage, Config, Event} = 5, TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 6, // Consensus support. @@ -238,10 +240,10 @@ frame_support::construct_runtime! { // Governance stuff; uncallable initially. Democracy: darwinia_democracy::{Pallet, Call, Storage, Config, Event} = 37, - Council: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 16, + Council: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 16, TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Config, Event} = 17, - ElectionsPhragmen: darwinia_elections_phragmen::{Pallet, Call, Storage, Config, Event} = 18, - TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Config, Event} = 19, + PhragmenElection: darwinia_elections_phragmen::{Pallet, Call, Storage, Config, Event} = 18, + TechnicalMembership: pallet_membership::::{Pallet, Call, Storage, Config, Event} = 19, Treasury: darwinia_treasury::{Pallet, Call, Storage, Event} = 20, Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 27, @@ -276,8 +278,8 @@ frame_support::construct_runtime! { // Ethereum bridge. EthereumRelay: darwinia_ethereum_relay::{Pallet, Call, Storage, Config, Event} = 32, EthereumBacking: darwinia_ethereum_backing::{Pallet, Call, Storage, Config, Event} = 31, - EthereumRelayerGame: darwinia_relayer_game::::{Pallet, Storage} = 33, - EthereumRelayAuthorities: darwinia_relay_authorities::::{Pallet, Call, Storage, Event} = 36, + EthereumRelayerGame: darwinia_relayer_game::::{Pallet, Storage} = 33, + EthereumRelayAuthorities: darwinia_relay_authorities::::{Pallet, Call, Storage, Event} = 36, // Tron bridge. TronBacking: darwinia_tron_backing::{Pallet, Storage, Config} = 34, @@ -554,24 +556,38 @@ impl_runtime_apis! { } } -impl pallet_babe::migrations::BabePalletPrefix for Runtime { - fn pallet_prefix() -> &'static str { - "Babe" - } -} - pub struct CustomOnRuntimeUpgrade; impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { - darwinia_staking::migrations::v6::pre_migrate::() + // --- substrate --- + // use frame_support::migration; + + Ok(()) } fn on_runtime_upgrade() -> Weight { - pallet_babe::migrations::add_epoch_configuration::(BabeEpochConfiguration { - allowed_slots: AllowedSlots::PrimaryAndSecondaryPlainSlots, - ..BABE_GENESIS_EPOCH_CONFIG - }); + // --- substrate --- + use frame_support::migration; + + migration::move_pallet(b"Instance0DarwiniaBalances", b"Balances"); + migration::move_pallet(b"Instance1DarwiniaBalances", b"Kton"); + + migration::move_pallet(b"Instance0Collective", b"Instance2Collective"); + + migration::move_pallet(b"Instance0Membership", b"Instance1Membership"); + + migration::move_pallet( + b"Instance0DarwiniaRelayerGame", + b"Instance1DarwiniaRelayerGame", + ); + + migration::move_pallet( + b"Instance0DarwiniaRelayAuthorities", + b"Instance1DarwiniaRelayAuthorities", + ); + + migration::move_pallet(b"DarwiniaPhragmenElection", b"PhragmenElection"); RuntimeBlockWeights::get().max_block } diff --git a/runtime/darwinia/src/pallets/authorship.rs b/runtime/darwinia/src/pallets/authorship.rs index 48fe0755f..2fc04be52 100644 --- a/runtime/darwinia/src/pallets/authorship.rs +++ b/runtime/darwinia/src/pallets/authorship.rs @@ -7,6 +7,7 @@ use crate::*; frame_support::parameter_types! { pub const UncleGenerations: BlockNumber = 0; } + // TODO: substrate#2986 implement this properly impl Config for Runtime { type FindAuthor = FindAccountFromAuthorIndex; diff --git a/runtime/darwinia/src/pallets/babe.rs b/runtime/darwinia/src/pallets/babe.rs index b47cbd492..e9d0530fd 100644 --- a/runtime/darwinia/src/pallets/babe.rs +++ b/runtime/darwinia/src/pallets/babe.rs @@ -11,6 +11,7 @@ frame_support::parameter_types! { pub const ReportLongevity: u64 = BondingDurationInEra::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get(); } + impl Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs index cf4d5a1de..33680c212 100644 --- a/runtime/darwinia/src/pallets/balances.rs +++ b/runtime/darwinia/src/pallets/balances.rs @@ -7,6 +7,7 @@ frame_support::parameter_types! { pub const KtonExistentialDeposit: Balance = MICRO; pub const MaxLocks: u32 = 50; } + impl Config for Runtime { type Balance = Balance; type DustRemoval = (); diff --git a/runtime/darwinia/src/pallets/collective.rs b/runtime/darwinia/src/pallets/collective.rs index 2a5c44c57..c36c3b1e2 100644 --- a/runtime/darwinia/src/pallets/collective.rs +++ b/runtime/darwinia/src/pallets/collective.rs @@ -1,4 +1,4 @@ -pub use pallet_collective::{Instance0 as CouncilCollective, Instance1 as TechnicalCollective}; +pub use pallet_collective::{Instance1 as TechnicalCollective, Instance2 as CouncilCollective}; // --- substrate --- use frame_system::{EnsureOneOf, EnsureRoot}; @@ -36,16 +36,26 @@ pub type TechnicalCommitteeApproveOrigin = EnsureOneOf< EnsureProportionMoreThan<_3, _5, AccountId, TechnicalCollective>, >; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const CouncilMotionDuration: BlockNumber = 3 * MINUTES; + pub const TechnicalMotionDuration: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { pub const CouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const TechnicalMotionDuration: BlockNumber = 7 * DAYS; +} +frame_support::parameter_types! { pub const CouncilMaxProposals: u32 = 100; pub const CouncilMaxMembers: u32 = 100; - pub const TechnicalMotionDuration: BlockNumber = 7 * DAYS; pub const TechnicalMaxProposals: u32 = 100; pub const TechnicalMaxMembers: u32 = 100; } + // Make sure that there are no more than MaxMembers members elected via phragmen. static_assertions::const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); + impl Config for Runtime { type Origin = Origin; type Proposal = Call; diff --git a/runtime/darwinia/src/pallets/crab_backing.rs b/runtime/darwinia/src/pallets/crab_backing.rs index 2a7a69f1f..b9e59f1cc 100644 --- a/runtime/darwinia/src/pallets/crab_backing.rs +++ b/runtime/darwinia/src/pallets/crab_backing.rs @@ -3,10 +3,11 @@ use crate::*; use darwinia_crab_backing::Config; frame_support::parameter_types! { - pub const CrabBackingModuleId: ModuleId = ModuleId(*b"da/crabk"); + pub const CrabBackingPalletId: PalletId = PalletId(*b"da/crabk"); } + impl Config for Runtime { - type ModuleId = CrabBackingModuleId; + type PalletId = CrabBackingPalletId; type RingCurrency = Ring; type WeightInfo = (); } diff --git a/runtime/darwinia/src/pallets/democracy.rs b/runtime/darwinia/src/pallets/democracy.rs index 2272fed09..5d1410396 100644 --- a/runtime/darwinia/src/pallets/democracy.rs +++ b/runtime/darwinia/src/pallets/democracy.rs @@ -6,19 +6,31 @@ use sp_core::u32_trait::{_1, _2, _3}; use crate::{weights::darwinia_democracy::WeightInfo, *}; use darwinia_democracy::Config; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const LaunchPeriod: BlockNumber = 3 * MINUTES; + pub const VotingPeriod: BlockNumber = 3 * MINUTES; + pub const FastTrackVotingPeriod: BlockNumber = 3 * MINUTES; + pub const EnactmentPeriod: BlockNumber = 3 * MINUTES; + pub const CooloffPeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { pub const LaunchPeriod: BlockNumber = 28 * DAYS; pub const VotingPeriod: BlockNumber = 28 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; - pub const MinimumDeposit: Balance = 100 * COIN; pub const EnactmentPeriod: BlockNumber = 28 * DAYS; pub const CooloffPeriod: BlockNumber = 7 * DAYS; +} +frame_support::parameter_types! { + pub const MinimumDeposit: Balance = 100 * COIN; // One milli: $10,000 / MB pub const PreimageByteDeposit: Balance = 1 * MILLI; pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; } + impl Config for Runtime { type Proposal = Call; type Event = Event; diff --git a/runtime/darwinia/src/pallets/election_provider_multi_phase.rs b/runtime/darwinia/src/pallets/election_provider_multi_phase.rs index 06289d559..6645e7df0 100644 --- a/runtime/darwinia/src/pallets/election_provider_multi_phase.rs +++ b/runtime/darwinia/src/pallets/election_provider_multi_phase.rs @@ -1,13 +1,17 @@ // --- substrate --- -use pallet_election_provider_multi_phase::{weights::SubstrateWeight, Config}; -use sp_runtime::{transaction_validity::TransactionPriority, Perbill}; +use pallet_election_provider_multi_phase::Config; +use sp_runtime::{transaction_validity::TransactionPriority, PerU16, Perbill}; // --- darwinia --- use crate::*; +use weights::pallet_election_provider_multi_phase::WeightInfo; sp_npos_elections::generate_solution_type!( #[compact] - pub struct NposCompactSolution16::(16) - // -------------------- ^^ + pub struct NposCompactSolution16::< + VoterIndex = u32, + TargetIndex = u16, + Accuracy = PerU16, + >(16) ); frame_support::parameter_types! { @@ -25,6 +29,7 @@ frame_support::parameter_types! { pub NposSolutionPriority: TransactionPriority = Perbill::from_percent(90) * TransactionPriority::max_value(); pub const MinerMaxIterations: u32 = 10; } + impl Config for Runtime { type Event = Event; type Currency = Balances; @@ -32,12 +37,13 @@ impl Config for Runtime { type UnsignedPhase = UnsignedPhase; type SolutionImprovementThreshold = SolutionImprovementThreshold; type MinerMaxIterations = MinerMaxIterations; - type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.; + type MinerMaxWeight = OffchainSolutionWeightLimit; + type MinerMaxLength = OffchainSolutionLengthLimit; type MinerTxPriority = NposSolutionPriority; type DataProvider = Staking; type OnChainAccuracy = Perbill; type CompactSolution = NposCompactSolution16; type Fallback = Fallback; - type WeightInfo = SubstrateWeight; + type WeightInfo = WeightInfo; type BenchmarkingConfig = (); } diff --git a/runtime/darwinia/src/pallets/elections_phragmen.rs b/runtime/darwinia/src/pallets/elections_phragmen.rs index c122e230d..5b1ac5d6c 100644 --- a/runtime/darwinia/src/pallets/elections_phragmen.rs +++ b/runtime/darwinia/src/pallets/elections_phragmen.rs @@ -5,7 +5,7 @@ use crate::{weights::darwinia_elections_phragmen::WeightInfo, *}; use darwinia_elections_phragmen::Config; frame_support::parameter_types! { - pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect"; + pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect"; pub const CandidacyBond: Balance = 100 * MILLI; // 1 storage item created, key size is 32 bytes, value size is 16+16. pub const VotingBondBase: Balance = deposit(1, 64); @@ -16,9 +16,10 @@ frame_support::parameter_types! { pub const DesiredMembers: u32 = 7; pub const DesiredRunnersUp: u32 = 7; } + impl Config for Runtime { type Event = Event; - type ModuleId = ElectionsPhragmenModuleId; + type PalletId = PhragmenElectionPalletId; type Currency = Ring; type ChangeMembers = Council; type InitializeMembers = Council; diff --git a/runtime/darwinia/src/pallets/ethereum_backing.rs b/runtime/darwinia/src/pallets/ethereum_backing.rs index ea172ccb1..dc25a95c1 100644 --- a/runtime/darwinia/src/pallets/ethereum_backing.rs +++ b/runtime/darwinia/src/pallets/ethereum_backing.rs @@ -1,21 +1,22 @@ // --- substrate --- -use sp_runtime::ModuleId; +use frame_support::PalletId; // --- darwinia --- use crate::*; use darwinia_ethereum_backing::Config; frame_support::parameter_types! { - pub const EthereumBackingModuleId: ModuleId = ModuleId(*b"da/ethbk"); - pub const EthereumBackingFeeModuleId: ModuleId = ModuleId(*b"da/ethfe"); + pub const EthereumBackingPalletId: PalletId = PalletId(*b"da/ethbk"); + pub const EthereumBackingFeePalletId: PalletId = PalletId(*b"da/ethfe"); pub const RingLockLimit: Balance = 10_000_000 * COIN; pub const KtonLockLimit: Balance = 1_000 * COIN; // https://github.com/darwinia-network/darwinia-common/pull/377#issuecomment-730369387 pub const AdvancedFee: Balance = 50 * COIN; pub const SyncReward: Balance = 1_000 * COIN; } + impl Config for Runtime { - type ModuleId = EthereumBackingModuleId; - type FeeModuleId = EthereumBackingFeeModuleId; + type PalletId = EthereumBackingPalletId; + type FeePalletId = EthereumBackingFeePalletId; type Event = Event; type RedeemAccountId = AccountId; type EthereumRelay = EthereumRelay; diff --git a/runtime/darwinia/src/pallets/ethereum_relay.rs b/runtime/darwinia/src/pallets/ethereum_relay.rs index 50f668b0d..bf24dfddc 100644 --- a/runtime/darwinia/src/pallets/ethereum_relay.rs +++ b/runtime/darwinia/src/pallets/ethereum_relay.rs @@ -2,21 +2,23 @@ pub use darwinia_ethereum_relay::DagsMerkleRootsLoader; // --- substrate --- -use sp_runtime::{ModuleId, Perbill}; +use frame_support::PalletId; +use sp_runtime::Perbill; // --- darwinia --- use crate::*; use darwinia_ethereum_relay::Config; use ethereum_primitives::EthereumNetworkType; frame_support::parameter_types! { - pub const EthereumRelayModuleId: ModuleId = ModuleId(*b"da/ethrl"); + pub const EthereumRelayPalletId: PalletId = PalletId(*b"da/ethrl"); pub const EthereumNetwork: EthereumNetworkType = EthereumNetworkType::Mainnet; pub const ConfirmPeriod: BlockNumber = 3 * DAYS; pub const ApproveThreshold: Perbill = Perbill::from_percent(60); pub const RejectThreshold: Perbill = Perbill::from_percent(1); } + impl Config for Runtime { - type ModuleId = EthereumRelayModuleId; + type PalletId = EthereumRelayPalletId; type Event = Event; type EthereumNetwork = EthereumNetwork; type Call = Call; diff --git a/runtime/darwinia/src/pallets/identity.rs b/runtime/darwinia/src/pallets/identity.rs index 60e569962..f9bb8cb8b 100644 --- a/runtime/darwinia/src/pallets/identity.rs +++ b/runtime/darwinia/src/pallets/identity.rs @@ -12,6 +12,7 @@ frame_support::parameter_types! { pub const MaxAdditionalFields: u32 = 100; pub const MaxRegistrars: u32 = 20; } + impl Config for Runtime { type Event = Event; type Currency = Ring; diff --git a/runtime/darwinia/src/pallets/im_online.rs b/runtime/darwinia/src/pallets/im_online.rs index 439a67f0c..6b99a04ec 100644 --- a/runtime/darwinia/src/pallets/im_online.rs +++ b/runtime/darwinia/src/pallets/im_online.rs @@ -7,6 +7,7 @@ use crate::{weights::pallet_im_online::WeightInfo, *}; frame_support::parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } + impl Config for Runtime { type AuthorityId = AuthorityId; type Event = Event; diff --git a/runtime/darwinia/src/pallets/membership.rs b/runtime/darwinia/src/pallets/membership.rs index 8ee016df6..f612d1756 100644 --- a/runtime/darwinia/src/pallets/membership.rs +++ b/runtime/darwinia/src/pallets/membership.rs @@ -1,8 +1,8 @@ // --- substrate --- use frame_support::traits::ChangeMembers; -use pallet_membership::{Config, Instance0}; +use pallet_membership::{Config, Instance1}; // --- darwinia --- -use crate::*; +use crate::{weights::pallet_membership::WeightInfo, *}; pub struct MembershipChangedGroup; impl ChangeMembers for MembershipChangedGroup { @@ -16,7 +16,7 @@ impl ChangeMembers for MembershipChangedGroup { } } -impl Config for Runtime { +impl Config for Runtime { type Event = Event; type AddOrigin = EnsureRootOrMoreThanHalfCouncil; type RemoveOrigin = EnsureRootOrMoreThanHalfCouncil; @@ -25,4 +25,6 @@ impl Config for Runtime { type PrimeOrigin = EnsureRootOrMoreThanHalfCouncil; type MembershipInitialized = TechnicalCommittee; type MembershipChanged = MembershipChangedGroup; + type MaxMembers = TechnicalMaxMembers; + type WeightInfo = WeightInfo; } diff --git a/runtime/darwinia/src/pallets/multisig.rs b/runtime/darwinia/src/pallets/multisig.rs index 0e6a2eb6b..1ae3de674 100644 --- a/runtime/darwinia/src/pallets/multisig.rs +++ b/runtime/darwinia/src/pallets/multisig.rs @@ -10,6 +10,7 @@ frame_support::parameter_types! { pub const DepositFactor: Balance = deposit(0, 32); pub const MaxSignatories: u16 = 100; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/darwinia/src/pallets/offences.rs b/runtime/darwinia/src/pallets/offences.rs index 57dece3ae..616cea9b1 100644 --- a/runtime/darwinia/src/pallets/offences.rs +++ b/runtime/darwinia/src/pallets/offences.rs @@ -10,6 +10,7 @@ frame_support::parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * RuntimeBlockWeights::get().max_block; } + impl Config for Runtime { type Event = Event; type IdentificationTuple = IdentificationTuple; diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs index 54fcc6e43..e4c4c42cc 100644 --- a/runtime/darwinia/src/pallets/proxy.rs +++ b/runtime/darwinia/src/pallets/proxy.rs @@ -41,7 +41,7 @@ impl InstanceFilter for ProxyType { Call::AuthorityDiscovery(..) | Call::Council(..) | Call::TechnicalCommittee(..) | - Call::ElectionsPhragmen(..) | + Call::PhragmenElection(..) | Call::TechnicalMembership(..) | Call::Treasury(..) | Call::Democracy(..) | @@ -70,7 +70,7 @@ impl InstanceFilter for ProxyType { c, Call::Council(..) | Call::TechnicalCommittee(..) - | Call::ElectionsPhragmen(..) + | Call::PhragmenElection(..) | Call::Treasury(..) | Call::Democracy(..) | Call::Utility(..) ), @@ -109,6 +109,7 @@ frame_support::parameter_types! { pub const AnnouncementDepositFactor: Balance = deposit(0, 66); pub const MaxPending: u16 = 32; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/darwinia/src/pallets/recovery.rs b/runtime/darwinia/src/pallets/recovery.rs index c6d494216..ceb2232f4 100644 --- a/runtime/darwinia/src/pallets/recovery.rs +++ b/runtime/darwinia/src/pallets/recovery.rs @@ -9,6 +9,7 @@ frame_support::parameter_types! { pub const MaxFriends: u16 = 9; pub const RecoveryDeposit: Balance = 5 * COIN; } + impl Config for Runtime { type Event = Event; type Call = Call; diff --git a/runtime/darwinia/src/pallets/relay_authorities.rs b/runtime/darwinia/src/pallets/relay_authorities.rs index 918bfb47d..3d371d39b 100644 --- a/runtime/darwinia/src/pallets/relay_authorities.rs +++ b/runtime/darwinia/src/pallets/relay_authorities.rs @@ -1,4 +1,4 @@ -pub use darwinia_relay_authorities::Instance0 as EthereumRelayAuthoritiesInstance; +pub use darwinia_relay_authorities::Instance1 as EthereumRelayAuthoritiesInstance; // --- substrate --- use frame_support::traits::LockIdentifier; @@ -19,6 +19,7 @@ frame_support::parameter_types! { pub const SignThreshold: Perbill = Perbill::from_percent(60); pub const SubmitDuration: BlockNumber = 300; } + impl Config for Runtime { type Event = Event; type RingCurrency = Ring; diff --git a/runtime/darwinia/src/pallets/relayer_game.rs b/runtime/darwinia/src/pallets/relayer_game.rs index af618691c..ebc8a2a4f 100644 --- a/runtime/darwinia/src/pallets/relayer_game.rs +++ b/runtime/darwinia/src/pallets/relayer_game.rs @@ -1,4 +1,4 @@ -pub use darwinia_relayer_game::Instance0 as EthereumRelayerGameInstance; +pub use darwinia_relayer_game::Instance1 as EthereumRelayerGameInstance; // --- substrate --- use frame_support::traits::LockIdentifier; @@ -9,6 +9,7 @@ use darwinia_relayer_game::Config; frame_support::parameter_types! { pub const EthereumRelayerGameLockId: LockIdentifier = *b"da/rgame"; } + impl Config for Runtime { type RingCurrency = Ring; type LockId = EthereumRelayerGameLockId; diff --git a/runtime/darwinia/src/pallets/scheduler.rs b/runtime/darwinia/src/pallets/scheduler.rs index ef91f10cd..dd6e1a30b 100644 --- a/runtime/darwinia/src/pallets/scheduler.rs +++ b/runtime/darwinia/src/pallets/scheduler.rs @@ -11,6 +11,7 @@ frame_support::parameter_types! { * RuntimeBlockWeights::get().max_block; pub const MaxScheduledPerBlock: u32 = 50; } + impl Config for Runtime { type Event = Event; type Origin = Origin; diff --git a/runtime/darwinia/src/pallets/session.rs b/runtime/darwinia/src/pallets/session.rs index 2e380b3f4..b576c1ee3 100644 --- a/runtime/darwinia/src/pallets/session.rs +++ b/runtime/darwinia/src/pallets/session.rs @@ -14,9 +14,11 @@ sp_runtime::impl_opaque_keys! { pub authority_discovery: AuthorityDiscovery, } } + frame_support::parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } + impl Config for Runtime { type Event = Event; type ValidatorId = AccountId; diff --git a/runtime/darwinia/src/pallets/society.rs b/runtime/darwinia/src/pallets/society.rs index b84012dac..4287b1a29 100644 --- a/runtime/darwinia/src/pallets/society.rs +++ b/runtime/darwinia/src/pallets/society.rs @@ -1,23 +1,33 @@ // --- substrate --- +use frame_support::PalletId; use pallet_society::{Config, EnsureFounder}; -use sp_runtime::ModuleId; // --- darwinia --- use crate::*; +#[cfg(feature = "dev")] frame_support::parameter_types! { - pub const SocietyModuleId: ModuleId = ModuleId(*b"da/socie"); + pub const RotationPeriod: BlockNumber = 3 * MINUTES; + pub const MaxLockDuration: BlockNumber = 3 * MINUTES; + pub const ChallengePeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] +frame_support::parameter_types! { + pub const RotationPeriod: BlockNumber = 80 * HOURS; + pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS; + pub const ChallengePeriod: BlockNumber = 7 * DAYS; +} +frame_support::parameter_types! { + pub const SocietyPalletId: PalletId = PalletId(*b"da/socie"); pub const CandidateDeposit: Balance = 10 * COIN; pub const WrongSideDeduction: Balance = 2 * COIN; pub const MaxStrikes: u32 = 10; - pub const RotationPeriod: BlockNumber = 80 * HOURS; pub const PeriodSpend: Balance = 500 * COIN; - pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS; - pub const ChallengePeriod: BlockNumber = 7 * DAYS; pub const MaxCandidateIntake: u32 = 1; } + impl Config for Runtime { type Event = Event; - type ModuleId = SocietyModuleId; + type PalletId = SocietyPalletId; type Currency = Ring; type Randomness = RandomnessCollectiveFlip; type CandidateDeposit = CandidateDeposit; diff --git a/runtime/darwinia/src/pallets/staking.rs b/runtime/darwinia/src/pallets/staking.rs index 66e56146b..0f7b0bdd8 100644 --- a/runtime/darwinia/src/pallets/staking.rs +++ b/runtime/darwinia/src/pallets/staking.rs @@ -2,31 +2,41 @@ pub use darwinia_staking::{Forcing, StakerStatus}; // --- substrate --- +use frame_support::PalletId; use sp_npos_elections::CompactSolution; -use sp_runtime::ModuleId; use sp_staking::SessionIndex; // --- darwinia --- use crate::{weights::darwinia_staking::WeightInfo, *}; use darwinia_staking::{Config, EraIndex}; +#[cfg(feature = "dev")] +frame_support::parameter_types! { + pub const BondingDurationInEra: BlockNumber = 2; + pub const BondingDurationInBlockNumber: BlockNumber = 2 * SESSIONS_PER_ERA * BLOCKS_PER_SESSION; + pub const SlashDeferDuration: EraIndex = 1; +} +#[cfg(not(feature = "dev"))] frame_support::parameter_types! { - pub const StakingModuleId: ModuleId = ModuleId(*b"da/staki"); - pub const SessionsPerEra: SessionIndex = SESSIONS_PER_ERA; pub const BondingDurationInEra: EraIndex = 14 * DAYS / (SESSIONS_PER_ERA as BlockNumber * BLOCKS_PER_SESSION); pub const BondingDurationInBlockNumber: BlockNumber = 14 * DAYS; // slightly less than 14 days. pub const SlashDeferDuration: EraIndex = 14 * DAYS / (SESSIONS_PER_ERA as BlockNumber * BLOCKS_PER_SESSION) - 1; +} +frame_support::parameter_types! { + pub const StakingPalletId: PalletId = PalletId(*b"da/staki"); + pub const SessionsPerEra: SessionIndex = SESSIONS_PER_ERA; // last 15 minutes of the last session will be for election. pub const MaxNominatorRewardedPerValidator: u32 = 64; pub const Cap: Balance = CAP; pub const TotalPower: Power = TOTAL_POWER; } + impl Config for Runtime { const MAX_NOMINATIONS: u32 = ::LIMIT as u32; type Event = Event; - type ModuleId = StakingModuleId; + type PalletId = StakingPalletId; type UnixTime = Timestamp; type SessionsPerEra = SessionsPerEra; type BondingDurationInEra = BondingDurationInEra; diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs index 2c8f675bb..a0cbf931d 100644 --- a/runtime/darwinia/src/pallets/system.rs +++ b/runtime/darwinia/src/pallets/system.rs @@ -17,6 +17,7 @@ frame_support::parameter_types! { pub const Version: RuntimeVersion = VERSION; pub const SS58Prefix: u8 = 18; } + impl Config for Runtime { type BaseCallFilter = BaseFilter; type BlockWeights = RuntimeBlockWeights; @@ -40,4 +41,5 @@ impl Config for Runtime { type OnKilledAccount = (); type SystemWeightInfo = WeightInfo; type SS58Prefix = SS58Prefix; + type OnSetCode = (); } diff --git a/runtime/darwinia/src/pallets/timestamp.rs b/runtime/darwinia/src/pallets/timestamp.rs index 6f86b4372..85cce0139 100644 --- a/runtime/darwinia/src/pallets/timestamp.rs +++ b/runtime/darwinia/src/pallets/timestamp.rs @@ -6,6 +6,7 @@ use crate::{weights::pallet_timestamp::WeightInfo, *}; frame_support::parameter_types! { pub const MinimumPeriod: Moment = SLOT_DURATION / 2; } + impl Config for Runtime { type Moment = Moment; type OnTimestampSet = Babe; diff --git a/runtime/darwinia/src/pallets/transaction_payment.rs b/runtime/darwinia/src/pallets/transaction_payment.rs index 11c05b1b6..232064abf 100644 --- a/runtime/darwinia/src/pallets/transaction_payment.rs +++ b/runtime/darwinia/src/pallets/transaction_payment.rs @@ -6,6 +6,7 @@ use crate::*; frame_support::parameter_types! { pub const TransactionByteFee: Balance = 50 * MICRO; } + impl Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; diff --git a/runtime/darwinia/src/pallets/treasury.rs b/runtime/darwinia/src/pallets/treasury.rs index a795c1785..9d1302164 100644 --- a/runtime/darwinia/src/pallets/treasury.rs +++ b/runtime/darwinia/src/pallets/treasury.rs @@ -1,34 +1,47 @@ // --- substrate --- -use sp_runtime::{ModuleId, Percent, Permill}; +use frame_support::PalletId; +use sp_runtime::{Percent, Permill}; // --- darwinia --- use crate::{weights::darwinia_treasury::WeightInfo, *}; use darwinia_treasury::Config; +#[cfg(feature = "dev")] frame_support::parameter_types! { - pub const TreasuryModuleId: ModuleId = ModuleId(*b"da/trsry"); + pub const SpendPeriod: BlockNumber = 3 * MINUTES; + pub const TipCountdown: BlockNumber = 3 * MINUTES; + pub const BountyDepositPayoutDelay: BlockNumber = 3 * MINUTES; + pub const BountyUpdatePeriod: BlockNumber = 3 * MINUTES; +} +#[cfg(not(feature = "dev"))] +frame_support::parameter_types! { + pub const SpendPeriod: BlockNumber = 24 * DAYS; + pub const TipCountdown: BlockNumber = 1 * DAYS; + pub const BountyDepositPayoutDelay: BlockNumber = 8 * DAYS; + pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; +} +frame_support::parameter_types! { + pub const TreasuryPalletId: PalletId = PalletId(*b"da/trsry"); pub const ProposalBond: Permill = Permill::from_percent(5); pub const RingProposalBondMinimum: Balance = 100 * MILLI; pub const KtonProposalBondMinimum: Balance = 100 * MILLI; - pub const SpendPeriod: BlockNumber = 24 * DAYS; pub const Burn: Permill = Permill::from_percent(1); - pub const TipCountdown: BlockNumber = 1 * DAYS; pub const TipFindersFee: Percent = Percent::from_percent(20); pub const TipReportDepositBase: Balance = 1 * MILLI; pub const DataDepositPerByte: Balance = 1 * MILLI; pub const BountyDepositBase: Balance = 1 * COIN; - pub const BountyDepositPayoutDelay: BlockNumber = 8 * DAYS; - pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; pub const MaximumReasonLength: u32 = 16384; pub const BountyCuratorDeposit: Permill = Permill::from_percent(50); pub const BountyValueMinimum: Balance = 10 * COIN; + pub const MaxApprovals: u32 = 100; } + impl Config for Runtime { - type ModuleId = TreasuryModuleId; + type PalletId = TreasuryPalletId; type RingCurrency = Ring; type KtonCurrency = Kton; type ApproveOrigin = ApproveOrigin; type RejectOrigin = EnsureRootOrMoreThanHalfCouncil; - type Tippers = ElectionsPhragmen; + type Tippers = PhragmenElection; type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; @@ -49,5 +62,6 @@ impl Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type RingBurnDestination = (); type KtonBurnDestination = (); + type MaxApprovals = MaxApprovals; type WeightInfo = WeightInfo; } diff --git a/runtime/darwinia/src/pallets/tron_backing.rs b/runtime/darwinia/src/pallets/tron_backing.rs index ecc0ee9ba..02e9c4889 100644 --- a/runtime/darwinia/src/pallets/tron_backing.rs +++ b/runtime/darwinia/src/pallets/tron_backing.rs @@ -3,10 +3,11 @@ use crate::*; use darwinia_tron_backing::Config; frame_support::parameter_types! { - pub const TronBackingModuleId: ModuleId = ModuleId(*b"da/trobk"); + pub const TronBackingPalletId: PalletId = PalletId(*b"da/trobk"); } + impl Config for Runtime { - type ModuleId = TronBackingModuleId; + type PalletId = TronBackingPalletId; type RingCurrency = Ring; type KtonCurrency = Kton; type WeightInfo = (); diff --git a/runtime/darwinia/src/pallets/vesting.rs b/runtime/darwinia/src/pallets/vesting.rs index 23f6295e6..55455fb9c 100644 --- a/runtime/darwinia/src/pallets/vesting.rs +++ b/runtime/darwinia/src/pallets/vesting.rs @@ -1,10 +1,13 @@ // --- darwinia --- use crate::{weights::darwinia_vesting::WeightInfo, *}; use darwinia_vesting::Config; +// --- substrate --- +use sp_runtime::traits::ConvertInto; frame_support::parameter_types! { pub const MinVestedTransfer: Balance = 100 * MILLI; } + impl Config for Runtime { type Event = Event; type Currency = Ring; diff --git a/runtime/darwinia/src/weights/darwinia_staking.rs b/runtime/darwinia/src/weights/darwinia_staking.rs index 3fcdd59eb..9a0d8deb8 100644 --- a/runtime/darwinia/src/weights/darwinia_staking.rs +++ b/runtime/darwinia/src/weights/darwinia_staking.rs @@ -158,21 +158,6 @@ impl darwinia_staking::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight))) } - fn submit_solution_better(v: u32, n: u32, a: u32, w: u32) -> Weight { - (0 as Weight) - // Standard Error: 48_000 - .saturating_add((729_000 as Weight).saturating_mul(v as Weight)) - // Standard Error: 19_000 - .saturating_add((341_000 as Weight).saturating_mul(n as Weight)) - // Standard Error: 48_000 - .saturating_add((68_493_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 100_000 - .saturating_add((6_236_000 as Weight).saturating_mul(w as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight))) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } fn get_npos_voters(v: u32, n: u32, s: u32) -> Weight { (0 as Weight) // Standard Error: 94_000 diff --git a/runtime/darwinia/src/weights/darwinia_treasury.rs b/runtime/darwinia/src/weights/darwinia_treasury.rs index ee42a6e72..b1cceb543 100644 --- a/runtime/darwinia/src/weights/darwinia_treasury.rs +++ b/runtime/darwinia/src/weights/darwinia_treasury.rs @@ -16,8 +16,10 @@ impl darwinia_treasury::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn approve_proposal() -> Weight { - (11_101_000 as Weight) + fn approve_proposal(p: u32) -> Weight { + (11_110_000 as Weight) + // Standard Error: 0 + .saturating_add((35_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/runtime/darwinia/src/weights/mod.rs b/runtime/darwinia/src/weights/mod.rs index 66d37fca9..cd3dd61da 100644 --- a/runtime/darwinia/src/weights/mod.rs +++ b/runtime/darwinia/src/weights/mod.rs @@ -8,8 +8,10 @@ pub mod darwinia_treasury; pub mod darwinia_vesting; pub mod frame_system; pub mod pallet_collective; +pub mod pallet_election_provider_multi_phase; pub mod pallet_identity; pub mod pallet_im_online; +pub mod pallet_membership; pub mod pallet_multisig; pub mod pallet_proxy; pub mod pallet_scheduler; diff --git a/runtime/darwinia/src/weights/pallet_election_provider_multi_phase.rs b/runtime/darwinia/src/weights/pallet_election_provider_multi_phase.rs new file mode 100644 index 000000000..1ee9caa9d --- /dev/null +++ b/runtime/darwinia/src/weights/pallet_election_provider_multi_phase.rs @@ -0,0 +1,56 @@ +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_election_provider_multi_phase. +pub struct WeightInfo(PhantomData); +impl pallet_election_provider_multi_phase::WeightInfo for WeightInfo { + fn on_initialize_nothing() -> Weight { + (19_802_000 as Weight).saturating_add(T::DbWeight::get().reads(7 as Weight)) + } + fn on_initialize_open_signed() -> Weight { + (100_008_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn on_initialize_open_unsigned_with_snapshot() -> Weight { + (99_255_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn on_initialize_open_unsigned_without_snapshot() -> Weight { + (18_383_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn elect_queued() -> Weight { + (7_631_033_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32) -> Weight { + (0 as Weight) + // Standard Error: 19_000 + .saturating_add((4_133_000 as Weight).saturating_mul(v as Weight)) + // Standard Error: 19_000 + .saturating_add((12_776_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 99_000 + .saturating_add((2_879_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(6 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn feasibility_check(v: u32, t: u32, a: u32, d: u32) -> Weight { + (0 as Weight) + // Standard Error: 11_000 + .saturating_add((4_286_000 as Weight).saturating_mul(v as Weight)) + // Standard Error: 39_000 + .saturating_add((468_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 11_000 + .saturating_add((9_291_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 58_000 + .saturating_add((3_405_000 as Weight).saturating_mul(d as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + } +} diff --git a/runtime/darwinia/src/weights/pallet_membership.rs b/runtime/darwinia/src/weights/pallet_membership.rs new file mode 100644 index 000000000..ef12e8384 --- /dev/null +++ b/runtime/darwinia/src/weights/pallet_membership.rs @@ -0,0 +1,58 @@ +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for pallet_membership. +pub struct WeightInfo(PhantomData); +impl pallet_membership::WeightInfo for WeightInfo { + fn add_member(m: u32) -> Weight { + (22_388_000 as Weight) + // Standard Error: 3_000 + .saturating_add((242_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn remove_member(m: u32) -> Weight { + (26_932_000 as Weight) + // Standard Error: 0 + .saturating_add((197_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn swap_member(m: u32) -> Weight { + (27_337_000 as Weight) + // Standard Error: 0 + .saturating_add((214_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn reset_member(m: u32) -> Weight { + (27_387_000 as Weight) + // Standard Error: 0 + .saturating_add((431_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn change_key(m: u32) -> Weight { + (28_911_000 as Weight) + // Standard Error: 0 + .saturating_add((206_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn set_prime(m: u32) -> Weight { + (6_857_000 as Weight) + // Standard Error: 0 + .saturating_add((112_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn clear_prime(m: u32) -> Weight { + (2_684_000 as Weight) + // Standard Error: 0 + .saturating_add((1_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } +}