From 372fc9c9c8da59db3d5376b393de839247223d9d Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Tue, 12 Jan 2021 13:37:44 +0800 Subject: [PATCH 1/5] companion: for #drml-442 --- Cargo.lock | 55 +++++++++++++++++++------------------ runtime/crab/Cargo.toml | 1 + runtime/crab/src/lib.rs | 22 +++++++-------- runtime/darwinia/src/lib.rs | 2 +- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1f769949..f93784ce9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,7 @@ checksum = "43759f68cc29a37659a6b7a48a49674e03a888b6d41f36f4204c36d0d09a51de" [[package]] name = "array-bytes" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "sp-std 2.0.0", ] @@ -893,6 +893,7 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" name = "crab-runtime" version = "0.8.7" dependencies = [ + "array-bytes 0.3.0", "darwinia-balances", "darwinia-balances-rpc-runtime-api", "darwinia-claims", @@ -1239,7 +1240,7 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", @@ -1254,7 +1255,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-balances-rpc-runtime-api", "jsonrpc-core", @@ -1269,7 +1270,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1281,7 +1282,7 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "array-bytes 1.2.3", "darwinia-support", @@ -1322,7 +1323,7 @@ dependencies = [ [[package]] name = "darwinia-cli" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "sc-cli", "sc-client-api", @@ -1335,7 +1336,7 @@ dependencies = [ [[package]] name = "darwinia-crab-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "frame-support", "frame-system", @@ -1347,7 +1348,7 @@ dependencies = [ [[package]] name = "darwinia-crab-issuing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "frame-support", "frame-system", @@ -1359,7 +1360,7 @@ dependencies = [ [[package]] name = "darwinia-democracy" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "frame-support", @@ -1374,7 +1375,7 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "frame-support", @@ -1389,7 +1390,7 @@ dependencies = [ [[package]] name = "darwinia-ethereum-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "array-bytes 1.2.3", "darwinia-relay-primitives", @@ -1409,7 +1410,7 @@ dependencies = [ [[package]] name = "darwinia-ethereum-relay" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "array-bytes 1.2.3", "blake2-rfc", @@ -1433,7 +1434,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api", @@ -1450,7 +1451,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-header-mmr-rpc-runtime-api", "jsonrpc-core", @@ -1465,7 +1466,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1489,7 +1490,7 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-relay-primitives", "darwinia-support", @@ -1504,7 +1505,7 @@ dependencies = [ [[package]] name = "darwinia-relay-primitives" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "frame-support", "parity-scale-codec", @@ -1515,7 +1516,7 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-relay-primitives", "darwinia-support", @@ -1700,7 +1701,7 @@ dependencies = [ [[package]] name = "darwinia-staking" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", @@ -1724,7 +1725,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-staking-rpc-runtime-api", "jsonrpc-core", @@ -1739,7 +1740,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1751,7 +1752,7 @@ dependencies = [ [[package]] name = "darwinia-support" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "ethereum-primitives", "frame-support", @@ -1765,7 +1766,7 @@ dependencies = [ [[package]] name = "darwinia-treasury" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "frame-support", @@ -1779,7 +1780,7 @@ dependencies = [ [[package]] name = "darwinia-tron-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "frame-support", "frame-system", @@ -1791,7 +1792,7 @@ dependencies = [ [[package]] name = "darwinia-vesting" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "darwinia-support", "enumflags2", @@ -2036,7 +2037,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "array-bytes 1.2.3", "ethash", @@ -4100,7 +4101,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#d7650ad83552b73e114345197facbe7c1d865522" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" dependencies = [ "hashbrown 0.9.1", "keccak-hash", diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index cb4019ad7..b8e05cf1b 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -11,6 +11,7 @@ version = "0.8.7" [dependencies] # crates +array-bytes = { version = "0.3.0" } codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = ["derive"] } serde = { version = "1.0.118", optional = true } smallvec = { version = "1.6.1" } diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index c3438f7b4..b32a97c5b 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -137,7 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("Crab"), impl_name: create_runtime_str!("Darwinia Crab"), authoring_version: 0, - spec_version: 32, + spec_version: 33, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, @@ -1321,18 +1321,18 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { // --- substrate --- use frame_support::migration::*; - if let Some(term) = take_storage_value::( + put_storage_value::<([u8; 32], Vec<(AccountId, [u8; 65])>)>( b"Instance0DarwiniaRelayAuthorities", - b"AuthorityTerm", + b"AuthoritiesToSign", &[], - ) { - put_storage_value( - b"Instance0DarwiniaRelayAuthorities", - b"AuthorityTerm", - &[], - term - 1, - ); - } + ( + array_bytes::bytes_array_unchecked!( + "0x380132304c719f4aec2b56ad3f67828da851e226923de36cba246e401273f203", + 32 + ), + vec![], + ), + ); ::MaximumBlockWeight::get() } diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index a13a5bedd..5859887ba 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -172,7 +172,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("Darwinia"), impl_name: create_runtime_str!("Darwinia"), authoring_version: 0, - spec_version: 13, + spec_version: 14, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, From ccd21cbd4591d4aa6858aa0a0a50b5a8bba63055 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Tue, 12 Jan 2021 13:44:18 +0800 Subject: [PATCH 2/5] bump: log version --- Cargo.lock | 4 ++-- cli/Cargo.toml | 2 +- node/service/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f93784ce9..a629b17e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3977,9 +3977,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" dependencies = [ "cfg-if 0.1.10", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 3a7d53185..6fad36f95 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -19,7 +19,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] # crates -log = { version = "0.4.11" } +log = { version = "0.4.13" } serde = { version = "1.0.118", optional = true } structopt = { version = "0.3.21" } tokio = { version = "0.3.5", optional = true, features = ["rt-multi-thread"] } diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index df8ed53ff..aa1b057c6 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -13,7 +13,7 @@ version = "0.8.7" array-bytes = { version = "0.3.0" } codec = { package = "parity-scale-codec", version = "1.3.5", features = ["derive"] } futures = { version = "0.3.8" } -log = { version = "0.4.11" } +log = { version = "0.4.13" } serde = { version = "1.0.118", features = ["derive"] } serde_json = { version = "1.0.61" } # darwinia frame From 5953823458172f16d8a49e441713dd9172730dfe Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Tue, 12 Jan 2021 13:45:32 +0800 Subject: [PATCH 3/5] bump: darwinia version --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- cli/Cargo.toml | 2 +- node/service/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/common/Cargo.toml | 2 +- runtime/crab/Cargo.toml | 2 +- runtime/darwinia/Cargo.toml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a629b17e8..a69d22fcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -891,7 +891,7 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crab-runtime" -version = "0.8.7" +version = "0.8.8" dependencies = [ "array-bytes 0.3.0", "darwinia-balances", @@ -1229,9 +1229,9 @@ dependencies = [ [[package]] name = "darwinia" -version = "0.8.7" +version = "0.8.8" dependencies = [ - "darwinia-cli 0.8.7", + "darwinia-cli 0.8.8", "darwinia-service", "futures 0.3.8", "parity-util-mem", @@ -1298,7 +1298,7 @@ dependencies = [ [[package]] name = "darwinia-cli" -version = "0.8.7" +version = "0.8.8" dependencies = [ "darwinia-cli 1.2.3", "darwinia-service", @@ -1478,7 +1478,7 @@ dependencies = [ [[package]] name = "darwinia-primitives" -version = "0.8.7" +version = "0.8.8" dependencies = [ "frame-system", "parity-scale-codec", @@ -1530,7 +1530,7 @@ dependencies = [ [[package]] name = "darwinia-rpc" -version = "0.8.7" +version = "0.8.8" dependencies = [ "darwinia-balances-rpc", "darwinia-header-mmr-rpc", @@ -1559,7 +1559,7 @@ dependencies = [ [[package]] name = "darwinia-runtime" -version = "0.8.7" +version = "0.8.8" dependencies = [ "array-bytes 0.3.0", "darwinia-balances", @@ -1632,7 +1632,7 @@ dependencies = [ [[package]] name = "darwinia-runtime-common" -version = "0.8.7" +version = "0.8.8" dependencies = [ "darwinia-balances", "darwinia-primitives", @@ -1650,7 +1650,7 @@ dependencies = [ [[package]] name = "darwinia-service" -version = "0.8.7" +version = "0.8.8" dependencies = [ "array-bytes 0.3.0", "crab-runtime", diff --git a/Cargo.toml b/Cargo.toml index 82072d6f1..21702b20d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [[bin]] name = "darwinia" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 6fad36f95..b6c3118af 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-cli" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [package.metadata.wasm-pack.profile.release] # `wasm-opt` has some problems on linux, see diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index aa1b057c6..dff80b24f 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-service" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index be9fc0e4e..3803f698e 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-primitives" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 59a548df5..a00396cc6 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-rpc" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 67aadb4a9..68c58c36f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-runtime-common" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index b8e05cf1b..11158d1c5 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "crab-runtime" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml index 1df62ade3..db91579b4 100644 --- a/runtime/darwinia/Cargo.toml +++ b/runtime/darwinia/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://darwinia.network/" license = "GPL-3.0" name = "darwinia-runtime" repository = "https://github.com/darwinia-network/darwinia/" -version = "0.8.7" +version = "0.8.8" [dependencies] # crates From acbd2819a3bd718473cba0caa86d0df59de6c334 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Tue, 12 Jan 2021 13:56:06 +0800 Subject: [PATCH 4/5] migration: remove --- runtime/darwinia/src/lib.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs index 5859887ba..9cbc93406 100644 --- a/runtime/darwinia/src/lib.rs +++ b/runtime/darwinia/src/lib.rs @@ -1379,16 +1379,10 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { // --- substrate --- // use frame_support::migration::*; - use frame_support::traits::Currency; // --- darwinia --- // use darwinia_relay_primitives::relay_authorities::RelayAuthority; // use darwinia_support::balance::lock::{LockFor, LockableCurrency, WithdrawReasons}; - Ring::make_free_balance_be( - &>::fee_account_id(), - Ring::minimum_balance(), - ); - // // @wuminzhe // let account_id = array_bytes::hex_str_array_unchecked!( // "0x129f002b1c0787ea72c31b2dc986e66911fe1b4d6dc16f83a1127f33e5a74c7d", From 04e72b1abad2c9f1e5b314fe567477b53731a803 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Wed, 13 Jan 2021 12:43:32 +0800 Subject: [PATCH 5/5] companion: for #drml-443 --- Cargo.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a69d22fcd..6788d718e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,7 @@ checksum = "43759f68cc29a37659a6b7a48a49674e03a888b6d41f36f4204c36d0d09a51de" [[package]] name = "array-bytes" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "sp-std 2.0.0", ] @@ -1240,7 +1240,7 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-balances-rpc-runtime-api", "jsonrpc-core", @@ -1270,7 +1270,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1282,7 +1282,7 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "array-bytes 1.2.3", "darwinia-support", @@ -1323,7 +1323,7 @@ dependencies = [ [[package]] name = "darwinia-cli" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "sc-cli", "sc-client-api", @@ -1336,7 +1336,7 @@ dependencies = [ [[package]] name = "darwinia-crab-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "frame-support", "frame-system", @@ -1348,7 +1348,7 @@ dependencies = [ [[package]] name = "darwinia-crab-issuing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "frame-support", "frame-system", @@ -1360,7 +1360,7 @@ dependencies = [ [[package]] name = "darwinia-democracy" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "frame-support", @@ -1375,7 +1375,7 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "frame-support", @@ -1390,7 +1390,7 @@ dependencies = [ [[package]] name = "darwinia-ethereum-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "array-bytes 1.2.3", "darwinia-relay-primitives", @@ -1410,7 +1410,7 @@ dependencies = [ [[package]] name = "darwinia-ethereum-relay" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "array-bytes 1.2.3", "blake2-rfc", @@ -1434,7 +1434,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api", @@ -1451,7 +1451,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-header-mmr-rpc-runtime-api", "jsonrpc-core", @@ -1466,7 +1466,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1490,7 +1490,7 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-relay-primitives", "darwinia-support", @@ -1505,7 +1505,7 @@ dependencies = [ [[package]] name = "darwinia-relay-primitives" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "frame-support", "parity-scale-codec", @@ -1516,7 +1516,7 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-relay-primitives", "darwinia-support", @@ -1701,7 +1701,7 @@ dependencies = [ [[package]] name = "darwinia-staking" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", @@ -1725,7 +1725,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-staking-rpc-runtime-api", "jsonrpc-core", @@ -1740,7 +1740,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1752,7 +1752,7 @@ dependencies = [ [[package]] name = "darwinia-support" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "ethereum-primitives", "frame-support", @@ -1766,7 +1766,7 @@ dependencies = [ [[package]] name = "darwinia-treasury" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "frame-support", @@ -1780,7 +1780,7 @@ dependencies = [ [[package]] name = "darwinia-tron-backing" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "frame-support", "frame-system", @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "darwinia-vesting" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "darwinia-support", "enumflags2", @@ -2037,7 +2037,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "array-bytes 1.2.3", "ethash", @@ -4101,7 +4101,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" version = "1.2.3" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#20577ac863e585ad182cb7d7e4ed37684470ded0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#5bafe86a232b2a1d00400ed57299c40ffbe04bd0" dependencies = [ "hashbrown 0.9.1", "keccak-hash",