From 23facb5ae98377c41d064a6b88d337cc3d93dfef Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 16:15:51 +0800 Subject: [PATCH 1/6] Update dependencies --- Cargo.lock | 509 +++++++++++------- components/client-crab-s2s/Cargo.toml | 8 +- components/client-darwinia-s2s/Cargo.toml | 10 +- components/client-pangolin-s2s/Cargo.toml | 4 +- components/client-pangoro-s2s/Cargo.toml | 4 +- task/task-darwinia-crab/Cargo.toml | 6 +- task/task-darwinia-crab/src/chains/crab.rs | 12 +- .../task-darwinia-crab/src/chains/darwinia.rs | 12 +- task/task-pangolin-pangoro/Cargo.toml | 6 +- 9 files changed, 345 insertions(+), 226 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index debd7a66b..43e543aec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -619,6 +619,21 @@ dependencies = [ "once_cell", ] +[[package]] +name = "bp-header-chain" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "finality-grandpa", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "parity-scale-codec", + "serde 1.0.130", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-finality-grandpa", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "bp-header-chain" version = "0.1.0" @@ -634,6 +649,17 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "bp-message-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "parity-scale-codec", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "bp-message-dispatch" version = "0.1.0" @@ -709,12 +735,27 @@ dependencies = [ "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "bp-test-utils" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "ed25519-dalek", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-finality-grandpa", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "bp-test-utils" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "ed25519-dalek", "finality-grandpa", "parity-scale-codec", @@ -739,39 +780,25 @@ dependencies = [ ] [[package]] -name = "bridge-primitives" -version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#db5f7808f496ce757326797a2b794a64669737db" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common", - "common-primitives 0.11.6", - "darwinia-fee-market 2.6.10", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-bridge-dispatch", - "sp-api", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "bridge-primitives" -version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +name = "bridge-runtime-common" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common", - "common-primitives 2.7.0", - "darwinia-fee-market 2.7.0", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-bridge-dispatch", - "sp-api", + "hash-db", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-transaction-payment", + "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -779,14 +806,14 @@ name = "bridge-runtime-common" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-transaction-payment", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -826,7 +853,7 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bsc-primitives" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "ethbloom", @@ -1056,33 +1083,14 @@ dependencies = [ "winapi", ] -[[package]] -name = "common-primitives" -version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#db5f7808f496ce757326797a2b794a64669737db" -dependencies = [ - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "common-primitives" -version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" -dependencies = [ - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "common-runtime" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "common-primitives 2.7.0", "darwinia-balances 2.7.0", "darwinia-support 2.7.0", + "drml-common-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "max-encoded-len", @@ -1103,10 +1111,10 @@ dependencies = [ "async-trait", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 0.11.6", "bridge-traits", - "common-primitives 0.11.6", "crab-runtime", + "darwinia-bridge-primitives", + "darwinia-common-primitives", "dp-fee 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1130,10 +1138,10 @@ dependencies = [ "async-trait", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 0.11.6", "bridge-traits", - "common-primitives 0.11.6", "darwinia-bridge-ethereum 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", + "darwinia-bridge-primitives", + "darwinia-common-primitives", "darwinia-runtime", "dp-fee 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1157,7 +1165,7 @@ dependencies = [ "anyhow", "array-bytes", "async-trait", - "bridge-primitives 0.4.8", + "bridge-primitives", "bridge-traits", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "jsonrpsee-types", @@ -1213,11 +1221,11 @@ dependencies = [ "async-trait", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 2.7.0", "bridge-traits", - "common-primitives 2.7.0", "darwinia-bridge-ethereum 2.7.0", "dp-fee 2.7.0", + "drml-bridge-primitives", + "drml-common-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "futures-test", @@ -1267,10 +1275,10 @@ dependencies = [ "async-trait", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 2.7.0", "bridge-traits", - "common-primitives 2.7.0", "dp-fee 2.7.0", + "drml-bridge-primitives", + "drml-common-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "headers-relay", @@ -1424,18 +1432,19 @@ dependencies = [ [[package]] name = "crab-runtime" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#db5f7808f496ce757326797a2b794a64669737db" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" dependencies = [ "array-bytes", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 0.11.6", - "bridge-runtime-common", - "common-primitives 0.11.6", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "darwinia-balances 2.6.10", "darwinia-balances-rpc-runtime-api 2.6.10", + "darwinia-bridge-primitives", "darwinia-claims 2.6.10", + "darwinia-common-primitives", + "darwinia-common-runtime", "darwinia-democracy 2.6.10", "darwinia-elections-phragmen 2.6.10", "darwinia-evm 2.6.10", @@ -1445,7 +1454,6 @@ dependencies = [ "darwinia-fee-market-rpc-runtime-api 2.6.10", "darwinia-header-mmr 2.6.10", "darwinia-header-mmr-rpc-runtime-api 2.6.6", - "darwinia-runtime-common", "darwinia-staking 2.6.10", "darwinia-staking-rpc-runtime-api 2.6.10", "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", @@ -1466,9 +1474,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -1726,7 +1734,7 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-balances-rpc-runtime-api 2.7.0", "darwinia-support 2.7.0", @@ -1754,7 +1762,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "parity-scale-codec", @@ -1766,7 +1774,7 @@ dependencies = [ [[package]] name = "darwinia-bridge-bsc" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bsc-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1829,7 +1837,7 @@ dependencies = [ [[package]] name = "darwinia-bridge-ethereum" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "blake2-rfc", @@ -1850,13 +1858,31 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "darwinia-bridge-primitives" +version = "0.11.6" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "darwinia-common-primitives", + "darwinia-fee-market 2.6.10", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "sp-api", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "darwinia-bridger" version = "0.4.8" dependencies = [ "anyhow", "async-recursion", - "bridge-primitives 0.4.8", + "bridge-primitives", "bridge-traits", "colored", "component-state", @@ -1903,7 +1929,7 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "darwinia-support 2.7.0", @@ -1918,6 +1944,36 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "darwinia-common-primitives" +version = "0.11.6" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +dependencies = [ + "parity-scale-codec", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + +[[package]] +name = "darwinia-common-runtime" +version = "0.11.6" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +dependencies = [ + "darwinia-balances 2.6.10", + "darwinia-common-primitives", + "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len", + "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-transaction-payment", + "pallet-treasury", + "parity-scale-codec", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "static_assertions", +] + [[package]] name = "darwinia-democracy" version = "2.6.10" @@ -1936,7 +1992,7 @@ dependencies = [ [[package]] name = "darwinia-democracy" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1968,7 +2024,7 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2013,7 +2069,7 @@ dependencies = [ [[package]] name = "darwinia-evm" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "darwinia-balances 2.7.0", @@ -2041,7 +2097,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-bridge-ethereum" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-evm 2.7.0", "darwinia-evm-precompile-utils", @@ -2057,9 +2113,9 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-bridge-s2s" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "darwinia-evm 2.7.0", "darwinia-evm-precompile-utils", @@ -2080,7 +2136,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-dispatch" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-evm 2.7.0", "darwinia-support 2.7.0", @@ -2107,7 +2163,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-simple" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "dp-evm 2.7.0", "evm", @@ -2144,7 +2200,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-transfer" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "darwinia-evm 2.7.0", @@ -2169,7 +2225,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-utils" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-evm-precompile-utils-macro", "darwinia-support 2.7.0", @@ -2179,7 +2235,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-utils-macro" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "evm", "proc-macro2", @@ -2203,7 +2259,7 @@ dependencies = [ "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", "num-traits 0.2.14", - "pallet-bridge-messages", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-timestamp", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2215,7 +2271,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bitvec", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", @@ -2226,7 +2282,7 @@ dependencies = [ "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", "num-traits 0.2.14", - "pallet-bridge-messages", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-timestamp", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2251,7 +2307,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market-rpc-runtime-api" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "parity-scale-codec", @@ -2284,7 +2340,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api 2.7.0", @@ -2317,7 +2373,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "parity-scale-codec", @@ -2345,7 +2401,7 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-relay-primitives 2.7.0", "darwinia-support 2.7.0", @@ -2382,7 +2438,7 @@ dependencies = [ [[package]] name = "darwinia-relay-primitives" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", @@ -2423,7 +2479,7 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-relay-primitives 2.7.0", "darwinia-support 2.7.0", @@ -2438,17 +2494,18 @@ dependencies = [ [[package]] name = "darwinia-runtime" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#db5f7808f496ce757326797a2b794a64669737db" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" dependencies = [ - "bp-message-dispatch", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 0.11.6", - "bridge-runtime-common", - "common-primitives 0.11.6", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", "darwinia-balances 2.6.10", "darwinia-balances-rpc-runtime-api 2.6.10", "darwinia-bridge-ethereum 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-bridge-primitives", + "darwinia-common-primitives", + "darwinia-common-runtime", "darwinia-democracy 2.6.10", "darwinia-elections-phragmen 2.6.10", "darwinia-fee-market 2.6.10", @@ -2458,7 +2515,6 @@ dependencies = [ "darwinia-relay-authorities 2.6.10", "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", "darwinia-relayer-game 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-runtime-common", "darwinia-staking 2.6.10", "darwinia-staking-rpc-runtime-api 2.6.10", "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", @@ -2475,9 +2531,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -2523,27 +2579,6 @@ dependencies = [ "to-tron-backing 2.6.10", ] -[[package]] -name = "darwinia-runtime-common" -version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#db5f7808f496ce757326797a2b794a64669737db" -dependencies = [ - "common-primitives 0.11.6", - "darwinia-balances 2.6.10", - "darwinia-staking 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "max-encoded-len", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-transaction-payment", - "pallet-treasury", - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "static_assertions", -] - [[package]] name = "darwinia-staking" version = "2.6.10" @@ -2571,7 +2606,7 @@ dependencies = [ [[package]] name = "darwinia-staking" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-staking-rpc-runtime-api 2.7.0", "darwinia-support 2.7.0", @@ -2607,7 +2642,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "parity-scale-codec", @@ -2663,7 +2698,7 @@ dependencies = [ [[package]] name = "darwinia-support" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", @@ -2698,7 +2733,7 @@ dependencies = [ [[package]] name = "darwinia-vesting" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2816,7 +2851,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dp-asset" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "ethereum-types", "parity-scale-codec", @@ -2841,7 +2876,7 @@ dependencies = [ [[package]] name = "dp-consensus" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "ethereum", "parity-scale-codec", @@ -2855,7 +2890,7 @@ dependencies = [ [[package]] name = "dp-contract" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "dp-asset", @@ -2881,7 +2916,7 @@ dependencies = [ [[package]] name = "dp-evm" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "evm", "impl-trait-for-tuples", @@ -2918,7 +2953,7 @@ dependencies = [ [[package]] name = "dp-fee" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2930,10 +2965,10 @@ dependencies = [ [[package]] name = "dp-s2s" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "dp-asset", "dp-contract", @@ -2951,7 +2986,34 @@ source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-de [[package]] name = "dp-storage" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" + +[[package]] +name = "drml-bridge-primitives" +version = "2.7.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" +dependencies = [ + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "darwinia-fee-market 2.7.0", + "drml-common-primitives", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "sp-api", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + +[[package]] +name = "drml-common-primitives" +version = "2.7.0" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" +dependencies = [ + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] [[package]] name = "dtoa" @@ -2991,7 +3053,7 @@ dependencies = [ [[package]] name = "dvm-ethereum" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-evm 2.7.0", "darwinia-support 2.7.0", @@ -3038,7 +3100,7 @@ dependencies = [ [[package]] name = "dvm-rpc-runtime-api" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-evm 2.7.0", "darwinia-support 2.7.0", @@ -3306,7 +3368,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "ethash", @@ -3460,7 +3522,7 @@ dependencies = [ "async-std", "async-trait", "backoff", - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "futures 0.3.17", "headers-relay", "log", @@ -3805,7 +3867,7 @@ dependencies = [ [[package]] name = "from-ethereum-issuing" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "darwinia-bridge-ethereum 2.7.0", @@ -3829,10 +3891,10 @@ dependencies = [ [[package]] name = "from-substrate-issuing" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "darwinia-evm 2.7.0", @@ -5684,7 +5746,7 @@ dependencies = [ [[package]] name = "merkle-patricia-trie" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "hashbrown 0.9.1", "keccak-hash", @@ -5798,7 +5860,7 @@ dependencies = [ [[package]] name = "module-transaction-pause" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -6189,12 +6251,28 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "pallet-bridge-dispatch" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "log", + "parity-scale-codec", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -6205,14 +6283,35 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "finality-grandpa", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "log", + "num-traits 0.2.14", + "parity-scale-codec", + "serde 1.0.130", + "sp-finality-grandpa", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-test-utils", + "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "finality-grandpa", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -6226,13 +6325,33 @@ dependencies = [ "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" +dependencies = [ + "bitvec", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "log", + "num-traits 0.2.14", + "parity-scale-codec", + "serde 1.0.130", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", +] + [[package]] name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ "bitvec", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -6646,15 +6765,13 @@ dependencies = [ [[package]] name = "pangolin-runtime" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 2.7.0", - "bridge-runtime-common", - "common-primitives 2.7.0", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "common-runtime", "darwinia-balances 2.7.0", "darwinia-balances-rpc-runtime-api 2.7.0", @@ -6685,6 +6802,8 @@ dependencies = [ "dp-evm 2.7.0", "dp-fee 2.7.0", "dp-s2s", + "drml-bridge-primitives", + "drml-common-primitives", "dvm-ethereum 2.7.0", "dvm-rpc-runtime-api 2.7.0", "ethereum-primitives 2.7.0", @@ -6705,9 +6824,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -6757,16 +6876,14 @@ dependencies = [ [[package]] name = "pangoro-runtime" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-header-chain", - "bp-message-dispatch", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 2.7.0", - "bridge-runtime-common", - "common-primitives 2.7.0", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "common-runtime", "darwinia-balances 2.7.0", "darwinia-balances-rpc-runtime-api 2.7.0", @@ -6778,6 +6895,8 @@ dependencies = [ "dp-asset", "dp-fee 2.7.0", "dp-s2s", + "drml-bridge-primitives", + "drml-common-primitives", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -6791,9 +6910,9 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", + "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pallet-election-provider-multi-phase", "pallet-grandpa", "pallet-im-online 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -7657,7 +7776,7 @@ source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag= dependencies = [ "async-std", "async-trait", - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "finality-relay", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -10173,10 +10292,10 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "finality-grandpa", "finality-relay", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -10184,7 +10303,7 @@ dependencies = [ "log", "messages-relay", "num-traits 0.2.14", - "pallet-bridge-messages", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "parity-scale-codec", "relay-substrate-client", "relay-utils", @@ -10274,7 +10393,7 @@ name = "support-ethereum" version = "0.4.8" dependencies = [ "anyhow", - "bridge-primitives 0.4.8", + "bridge-primitives", "frame-support 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log", "pallet-im-online 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -10305,7 +10424,7 @@ name = "support-proc-macro" version = "0.4.8" dependencies = [ "anyhow", - "bridge-primitives 0.4.8", + "bridge-primitives", "proc-macro2", "proc_macro_roids", "quote", @@ -10394,19 +10513,19 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 0.11.6", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bridge-traits", - "common-primitives 0.11.6", "component-crab-s2s", "component-darwinia-s2s", "component-subscan", "crab-runtime", + "darwinia-bridge-primitives", + "darwinia-common-primitives", + "darwinia-common-runtime", "darwinia-runtime", - "darwinia-runtime-common", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "futures 0.3.17", "futures-timer", @@ -10414,7 +10533,7 @@ dependencies = [ "lifeline", "log", "messages-relay", - "pallet-bridge-messages", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "parity-scale-codec", "postage", "relay-substrate-client", @@ -10470,17 +10589,17 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-header-chain", + "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-primitives 2.7.0", - "bridge-runtime-common", + "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bridge-traits", - "common-primitives 2.7.0", "common-runtime", "component-pangolin-s2s", "component-pangoro-s2s", "component-subscan", + "drml-bridge-primitives", + "drml-common-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "futures 0.3.17", "futures-timer", @@ -10488,7 +10607,7 @@ dependencies = [ "lifeline", "log", "messages-relay", - "pallet-bridge-messages", + "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "pangolin-runtime", "pangoro-runtime", "parity-scale-codec", @@ -10745,7 +10864,7 @@ dependencies = [ [[package]] name = "to-ethereum-backing" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", "darwinia-relay-primitives 2.7.0", @@ -10766,10 +10885,10 @@ dependencies = [ [[package]] name = "to-substrate-backing" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch", + "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "darwinia-support 2.7.0", @@ -10804,7 +10923,7 @@ dependencies = [ [[package]] name = "to-tron-backing" version = "2.7.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#2799b0afede7de6ac67c646fcdd7227d68909e08" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "darwinia-support 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -11107,7 +11226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" dependencies = [ "cfg-if 1.0.0", - "rand 0.8.4", + "rand 0.3.23", "static_assertions", ] diff --git a/components/client-crab-s2s/Cargo.toml b/components/client-crab-s2s/Cargo.toml index 29793cc3f..d4723a896 100644 --- a/components/client-crab-s2s/Cargo.toml +++ b/components/client-crab-s2s/Cargo.toml @@ -33,10 +33,10 @@ bp-messages = { git = "https://github.com/darwinia-network/parity-bri bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-4" } ## Bridge dependencies -crab-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } +crab-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } diff --git a/components/client-darwinia-s2s/Cargo.toml b/components/client-darwinia-s2s/Cargo.toml index 3f0d1bf62..5b72408b7 100644 --- a/components/client-darwinia-s2s/Cargo.toml +++ b/components/client-darwinia-s2s/Cargo.toml @@ -33,11 +33,11 @@ bp-messages = { git = "https://github.com/darwinia-network/parity-bri bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-4" } ## Bridge dependencies -darwinia-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } -dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } +darwinia-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } diff --git a/components/client-pangolin-s2s/Cargo.toml b/components/client-pangolin-s2s/Cargo.toml index 4bdcba28b..0087b1cac 100644 --- a/components/client-pangolin-s2s/Cargo.toml +++ b/components/client-pangolin-s2s/Cargo.toml @@ -34,8 +34,8 @@ bp-runtime = { git = "https://github.com/darwinia-network/parity-bri ## Bridge dependencies pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } diff --git a/components/client-pangoro-s2s/Cargo.toml b/components/client-pangoro-s2s/Cargo.toml index ec3764ac6..154aa536c 100644 --- a/components/client-pangoro-s2s/Cargo.toml +++ b/components/client-pangoro-s2s/Cargo.toml @@ -35,8 +35,8 @@ bp-runtime = { git = "https://github.com/darwinia-network/parity-bri ## Bridge dependencies pangoro-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } diff --git a/task/task-darwinia-crab/Cargo.toml b/task/task-darwinia-crab/Cargo.toml index 81375c4bd..5a9857350 100644 --- a/task/task-darwinia-crab/Cargo.toml +++ b/task/task-darwinia-crab/Cargo.toml @@ -64,9 +64,9 @@ component-crab-s2s = { path = "../../components/client-crab-s2s" } component-subscan = { path = "../../components/subscan" } ## darwinia common -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -darwinia-runtime-common = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } +darwinia-common-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } ## darwinia darwinia-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } diff --git a/task/task-darwinia-crab/src/chains/crab.rs b/task/task-darwinia-crab/src/chains/crab.rs index 827c5c3cd..9ea6d12b3 100644 --- a/task/task-darwinia-crab/src/chains/crab.rs +++ b/task/task-darwinia-crab/src/chains/crab.rs @@ -248,9 +248,9 @@ mod s2s_messages { TARGET_NAME, SOURCE_NAME, call_weight, - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), transaction.encode().len(), - darwinia_runtime_common::max_extrinsic_size(), + darwinia_common_runtime::max_extrinsic_size(), ); Bytes(transaction.encode()) } @@ -298,9 +298,9 @@ mod s2s_messages { SOURCE_NAME, TARGET_NAME, call_weight, - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), transaction.encode().len(), - darwinia_runtime_common::max_extrinsic_size(), + darwinia_common_runtime::max_extrinsic_size(), ); Bytes(transaction.encode()) } @@ -342,13 +342,13 @@ mod s2s_messages { // 2/3 is reserved for proofs and tx overhead let max_messages_size_in_single_batch = - darwinia_runtime_common::max_extrinsic_size() / 3; + darwinia_common_runtime::max_extrinsic_size() / 3; let (max_messages_in_single_batch, max_messages_weight_in_single_batch) = substrate_relay_helper::messages_lane::select_delivery_transaction_limits::< // todo: there can be change to special weight pallet_bridge_messages::weights::RialtoWeight, >( - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), DarwiniaChainConst::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE, ); diff --git a/task/task-darwinia-crab/src/chains/darwinia.rs b/task/task-darwinia-crab/src/chains/darwinia.rs index c783ece24..b704787e3 100644 --- a/task/task-darwinia-crab/src/chains/darwinia.rs +++ b/task/task-darwinia-crab/src/chains/darwinia.rs @@ -247,9 +247,9 @@ mod s2s_messages { TARGET_NAME, SOURCE_NAME, call_weight, - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), transaction.encode().len(), - darwinia_runtime_common::max_extrinsic_size(), + darwinia_common_runtime::max_extrinsic_size(), ); Bytes(transaction.encode()) } @@ -297,9 +297,9 @@ mod s2s_messages { SOURCE_NAME, TARGET_NAME, call_weight, - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), transaction.encode().len(), - darwinia_runtime_common::max_extrinsic_size(), + darwinia_common_runtime::max_extrinsic_size(), ); Bytes(transaction.encode()) } @@ -341,13 +341,13 @@ mod s2s_messages { // 2/3 is reserved for proofs and tx overhead let max_messages_size_in_single_batch = - darwinia_runtime_common::max_extrinsic_size() / 3; + darwinia_common_runtime::max_extrinsic_size() / 3; let (max_messages_in_single_batch, max_messages_weight_in_single_batch) = substrate_relay_helper::messages_lane::select_delivery_transaction_limits::< // todo: there can be change to special weight pallet_bridge_messages::weights::RialtoWeight, >( - darwinia_runtime_common::max_extrinsic_weight(), + darwinia_common_runtime::max_extrinsic_weight(), CrabChainConst::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE, ); diff --git a/task/task-pangolin-pangoro/Cargo.toml b/task/task-pangolin-pangoro/Cargo.toml index 53ce18948..2bf8604fd 100644 --- a/task/task-pangolin-pangoro/Cargo.toml +++ b/task/task-pangolin-pangoro/Cargo.toml @@ -64,9 +64,9 @@ component-pangoro-s2s = { path = "../../components/client-pangoro-s2s" } component-subscan = { path = "../../components/subscan" } ## darwinia common -common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } -common-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +drml-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } +common-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } ## pangolin pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps" } From 789d415275b8f9347e8123a2a0015c1554073a04 Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 16:23:11 +0800 Subject: [PATCH 2/6] Fix package --- components/client-crab-s2s/src/api.rs | 8 ++-- components/client-crab-s2s/src/crab.rs | 34 +++++++++-------- components/client-crab-s2s/src/feemarket.rs | 6 +-- components/client-darwinia-s2s/src/api.rs | 8 ++-- .../client-darwinia-s2s/src/darwinia.rs | 34 +++++++++-------- .../client-darwinia-s2s/src/feemarket.rs | 6 +-- components/client-pangolin-s2s/src/api.rs | 8 ++-- .../client-pangolin-s2s/src/feemarket.rs | 6 +-- .../client-pangolin-s2s/src/pangolin.rs | 32 ++++++++-------- .../tests/client_substrate.rs | 2 +- components/client-pangoro-s2s/src/api.rs | 8 ++-- .../client-pangoro-s2s/src/feemarket.rs | 6 +-- components/client-pangoro-s2s/src/pangoro.rs | 32 ++++++++-------- task/task-darwinia-crab/src/chains/crab.rs | 36 +++++++++--------- .../task-darwinia-crab/src/chains/darwinia.rs | 36 +++++++++--------- .../src/fee/strategy/crazy_strategy.rs | 2 +- .../src/fee/strategy/reasonable_strategy.rs | 12 +++--- task/task-darwinia-crab/src/service/relay.rs | 10 ++--- .../src/chains/pangolin.rs | 38 +++++++++---------- .../src/chains/pangoro.rs | 38 +++++++++---------- .../src/fee/strategy/crazy_strategy.rs | 2 +- .../src/fee/strategy/reasonable_strategy.rs | 12 +++--- .../src/service/relay.rs | 10 ++--- 23 files changed, 199 insertions(+), 187 deletions(-) diff --git a/components/client-crab-s2s/src/api.rs b/components/client-crab-s2s/src/api.rs index 2b25548ef..77a5349a9 100644 --- a/components/client-crab-s2s/src/api.rs +++ b/components/client-crab-s2s/src/api.rs @@ -1,8 +1,8 @@ use bp_messages::{LaneId, MessageNonce}; use codec::Encode; -use common_primitives::AccountId; -use common_primitives::Balance; -use common_primitives::BlockNumber; +use darwinia_common_primitives::AccountId; +use darwinia_common_primitives::Balance; +use darwinia_common_primitives::BlockNumber; use dp_fee::{Order, Relayer}; use relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; use relay_utils::relay_loop::Client as RelayLoopClient; @@ -106,7 +106,7 @@ impl CrabApi { /// Return number of the best finalized block. pub async fn best_finalized_header_number( &mut self, - ) -> anyhow::Result { + ) -> anyhow::Result { match self.client.best_finalized_header_number().await { Ok(v) => Ok(v), Err(e) => { diff --git a/components/client-crab-s2s/src/crab.rs b/components/client-crab-s2s/src/crab.rs index 9359fd075..bec964c1a 100644 --- a/components/client-crab-s2s/src/crab.rs +++ b/components/client-crab-s2s/src/crab.rs @@ -11,7 +11,10 @@ use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; use std::time::Duration; /// Pangoro header id. -pub type HeaderId = relay_utils::HeaderId; +pub type HeaderId = relay_utils::HeaderId< + darwinia_common_primitives::Hash, + darwinia_common_primitives::BlockNumber, +>; /// Pangoro chain definition. #[derive(Debug, Clone, Copy)] @@ -22,23 +25,24 @@ impl BridgeChain for CrabChain { } impl ChainBase for CrabChain { - type BlockNumber = common_primitives::BlockNumber; - type Hash = common_primitives::Hash; - type Hasher = common_primitives::Hashing; - type Header = common_primitives::Header; - - type AccountId = common_primitives::AccountId; - type Balance = common_primitives::Balance; - type Index = common_primitives::Nonce; - type Signature = common_primitives::Signature; + type BlockNumber = darwinia_common_primitives::BlockNumber; + type Hash = darwinia_common_primitives::Hash; + type Hasher = darwinia_common_primitives::Hashing; + type Header = darwinia_common_primitives::Header; + + type AccountId = darwinia_common_primitives::AccountId; + type Balance = darwinia_common_primitives::Balance; + type Index = darwinia_common_primitives::Nonce; + type Signature = darwinia_common_primitives::Signature; } impl Chain for CrabChain { const NAME: &'static str = "Crab"; const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(common_primitives::MILLISECS_PER_BLOCK); - const STORAGE_PROOF_OVERHEAD: u32 = bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; - const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; + Duration::from_millis(darwinia_common_primitives::MILLISECS_PER_BLOCK); + const STORAGE_PROOF_OVERHEAD: u32 = darwinia_bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; + const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = + darwinia_bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; type SignedBlock = crab_runtime::SignedBlock; type Call = crab_runtime::Call; @@ -110,7 +114,7 @@ impl TransactionSignScheme for CrabChain { tx.signature .as_ref() .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = + let account_id: darwinia_common_primitives::AccountId = (*signer.public().as_array_ref()).into(); *address == crab_runtime::Address::from(account_id) }) @@ -135,4 +139,4 @@ impl TransactionSignScheme for CrabChain { pub type SigningParams = sp_core::sr25519::Pair; /// Pangoro header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; +pub type SyncHeader = relay_substrate_client::SyncHeader; diff --git a/components/client-crab-s2s/src/feemarket.rs b/components/client-crab-s2s/src/feemarket.rs index 7ddc2b73b..1eef8c071 100644 --- a/components/client-crab-s2s/src/feemarket.rs +++ b/components/client-crab-s2s/src/feemarket.rs @@ -1,6 +1,6 @@ use std::ops::Range; -use common_primitives::AccountId; +use darwinia_common_primitives::AccountId; use messages_relay::message_lane::MessageLane; use messages_relay::message_lane_loop::{ SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, @@ -42,7 +42,7 @@ impl CrabRelayStrategy { let nonce = &reference.nonce; let order = self .api - .order(bridge_primitives::DARWINIA_CRAB_LANE, *nonce) + .order(darwinia_bridge_primitives::DARWINIA_CRAB_LANE, *nonce) .await .map_err(|e| { log::error!("[Pangoro] Failed to query order: {:?}", e); @@ -101,7 +101,7 @@ impl CrabRelayStrategy { let ranges = relayers .iter() .map(|item| item.valid_range.clone()) - .collect::>>(); + .collect::>>(); let mut maximum_timeout = 0; for range in ranges { diff --git a/components/client-darwinia-s2s/src/api.rs b/components/client-darwinia-s2s/src/api.rs index 072e67ebc..d234f8e85 100644 --- a/components/client-darwinia-s2s/src/api.rs +++ b/components/client-darwinia-s2s/src/api.rs @@ -1,8 +1,8 @@ use bp_messages::{LaneId, MessageNonce}; use codec::Encode; -use common_primitives::AccountId; -use common_primitives::Balance; -use common_primitives::BlockNumber; +use darwinia_common_primitives::AccountId; +use darwinia_common_primitives::Balance; +use darwinia_common_primitives::BlockNumber; use dp_fee::{Order, Relayer}; use relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; use relay_utils::relay_loop::Client as RelayLoopClient; @@ -106,7 +106,7 @@ impl DarwiniaApi { /// Return number of the best finalized block. pub async fn best_finalized_header_number( &mut self, - ) -> anyhow::Result { + ) -> anyhow::Result { match self.client.best_finalized_header_number().await { Ok(v) => Ok(v), Err(e) => { diff --git a/components/client-darwinia-s2s/src/darwinia.rs b/components/client-darwinia-s2s/src/darwinia.rs index bf2a3a2b8..f18344af5 100644 --- a/components/client-darwinia-s2s/src/darwinia.rs +++ b/components/client-darwinia-s2s/src/darwinia.rs @@ -10,10 +10,13 @@ use sp_core::{storage::StorageKey, Pair}; use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; /// Pangolin header id. -pub type HeaderId = relay_utils::HeaderId; +pub type HeaderId = relay_utils::HeaderId< + darwinia_common_primitives::Hash, + darwinia_common_primitives::BlockNumber, +>; /// Rialto header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; +pub type SyncHeader = relay_substrate_client::SyncHeader; /// Millau chain definition. #[derive(Debug, Clone, Copy)] @@ -24,23 +27,24 @@ impl BridgeChain for DarwiniaChain { } impl ChainBase for DarwiniaChain { - type BlockNumber = common_primitives::BlockNumber; - type Hash = common_primitives::Hash; - type Hasher = common_primitives::Hashing; - type Header = common_primitives::Header; - - type AccountId = common_primitives::AccountId; - type Balance = common_primitives::Balance; - type Index = common_primitives::Nonce; - type Signature = common_primitives::Signature; + type BlockNumber = darwinia_common_primitives::BlockNumber; + type Hash = darwinia_common_primitives::Hash; + type Hasher = darwinia_common_primitives::Hashing; + type Header = darwinia_common_primitives::Header; + + type AccountId = darwinia_common_primitives::AccountId; + type Balance = darwinia_common_primitives::Balance; + type Index = darwinia_common_primitives::Nonce; + type Signature = darwinia_common_primitives::Signature; } impl Chain for DarwiniaChain { const NAME: &'static str = "Darwinia"; const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(common_primitives::MILLISECS_PER_BLOCK); - const STORAGE_PROOF_OVERHEAD: u32 = bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; - const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; + Duration::from_millis(darwinia_common_primitives::MILLISECS_PER_BLOCK); + const STORAGE_PROOF_OVERHEAD: u32 = darwinia_bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; + const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = + darwinia_bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; type SignedBlock = darwinia_runtime::SignedBlock; type Call = darwinia_runtime::Call; @@ -110,7 +114,7 @@ impl TransactionSignScheme for DarwiniaChain { tx.signature .as_ref() .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = + let account_id: darwinia_common_primitives::AccountId = (*signer.public().as_array_ref()).into(); *address == darwinia_runtime::Address::from(account_id) }) diff --git a/components/client-darwinia-s2s/src/feemarket.rs b/components/client-darwinia-s2s/src/feemarket.rs index b9a7bddee..29d119292 100644 --- a/components/client-darwinia-s2s/src/feemarket.rs +++ b/components/client-darwinia-s2s/src/feemarket.rs @@ -1,6 +1,6 @@ use std::ops::Range; -use common_primitives::AccountId; +use darwinia_common_primitives::AccountId; use messages_relay::message_lane::MessageLane; use messages_relay::message_lane_loop::{ SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, @@ -39,7 +39,7 @@ impl RelayStrategy for DarwiniaRelayStrategy { let nonce = &reference.nonce; let order = self .api - .order(bridge_primitives::DARWINIA_CRAB_LANE, *nonce) + .order(darwinia_bridge_primitives::DARWINIA_CRAB_LANE, *nonce) .await .map_err(|e| { log::error!("Failed to query order: {:?}", e); @@ -94,7 +94,7 @@ impl RelayStrategy for DarwiniaRelayStrategy { let ranges = relayers .iter() .map(|item| item.valid_range.clone()) - .collect::>>(); + .collect::>>(); let mut maximum_timeout = 0; for range in ranges { diff --git a/components/client-pangolin-s2s/src/api.rs b/components/client-pangolin-s2s/src/api.rs index 2b24d48f4..a13bd534d 100644 --- a/components/client-pangolin-s2s/src/api.rs +++ b/components/client-pangolin-s2s/src/api.rs @@ -4,10 +4,10 @@ use std::pin::Pin; use bp_messages::{LaneId, MessageNonce}; use bridge_traits::error::StandardError; use codec::{Decode, Encode}; -use common_primitives::AccountId; -use common_primitives::Balance; -use common_primitives::BlockNumber; use dp_fee::{Order, Relayer}; +use drml_common_primitives::AccountId; +use drml_common_primitives::Balance; +use drml_common_primitives::BlockNumber; use relay_substrate_client::{ ChainBase, Client, HeaderIdOf, TransactionSignScheme, UnsignedTransaction, }; @@ -112,7 +112,7 @@ impl PangolinApi { /// Return number of the best finalized block. pub async fn best_finalized_header_number( &mut self, - ) -> anyhow::Result { + ) -> anyhow::Result { match self.client.best_finalized_header_number().await { Ok(v) => Ok(v), Err(e) => { diff --git a/components/client-pangolin-s2s/src/feemarket.rs b/components/client-pangolin-s2s/src/feemarket.rs index 2330ab30f..275480505 100644 --- a/components/client-pangolin-s2s/src/feemarket.rs +++ b/components/client-pangolin-s2s/src/feemarket.rs @@ -1,6 +1,6 @@ use std::ops::Range; -use common_primitives::AccountId; +use drml_common_primitives::AccountId; use messages_relay::message_lane::MessageLane; use messages_relay::message_lane_loop::{ SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, @@ -39,7 +39,7 @@ impl RelayStrategy for PangolinRelayStrategy { let nonce = &reference.nonce; let order = self .api - .order(bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) + .order(drml_bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) .await .map_err(|e| { log::error!("Failed to query order: {:?}", e); @@ -94,7 +94,7 @@ impl RelayStrategy for PangolinRelayStrategy { let ranges = relayers .iter() .map(|item| item.valid_range.clone()) - .collect::>>(); + .collect::>>(); let mut maximum_timeout = 0; for range in ranges { diff --git a/components/client-pangolin-s2s/src/pangolin.rs b/components/client-pangolin-s2s/src/pangolin.rs index a5ca133e6..3394074ff 100644 --- a/components/client-pangolin-s2s/src/pangolin.rs +++ b/components/client-pangolin-s2s/src/pangolin.rs @@ -10,10 +10,11 @@ use sp_core::{storage::StorageKey, Pair}; use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; /// Pangolin header id. -pub type HeaderId = relay_utils::HeaderId; +pub type HeaderId = + relay_utils::HeaderId; /// Rialto header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; +pub type SyncHeader = relay_substrate_client::SyncHeader; /// Millau chain definition. #[derive(Debug, Clone, Copy)] @@ -24,23 +25,24 @@ impl BridgeChain for PangolinChain { } impl ChainBase for PangolinChain { - type BlockNumber = common_primitives::BlockNumber; - type Hash = common_primitives::Hash; - type Hasher = common_primitives::Hashing; - type Header = common_primitives::Header; - - type AccountId = common_primitives::AccountId; - type Balance = common_primitives::Balance; - type Index = common_primitives::Nonce; - type Signature = common_primitives::Signature; + type BlockNumber = drml_common_primitives::BlockNumber; + type Hash = drml_common_primitives::Hash; + type Hasher = drml_common_primitives::Hashing; + type Header = drml_common_primitives::Header; + + type AccountId = drml_common_primitives::AccountId; + type Balance = drml_common_primitives::Balance; + type Index = drml_common_primitives::Nonce; + type Signature = drml_common_primitives::Signature; } impl Chain for PangolinChain { const NAME: &'static str = "Pangolin"; const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(common_primitives::MILLISECS_PER_BLOCK); - const STORAGE_PROOF_OVERHEAD: u32 = bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; - const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; + Duration::from_millis(drml_common_primitives::MILLISECS_PER_BLOCK); + const STORAGE_PROOF_OVERHEAD: u32 = drml_bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; + const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = + drml_bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; type SignedBlock = pangolin_runtime::SignedBlock; type Call = pangolin_runtime::Call; @@ -110,7 +112,7 @@ impl TransactionSignScheme for PangolinChain { tx.signature .as_ref() .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = + let account_id: drml_common_primitives::AccountId = (*signer.public().as_array_ref()).into(); *address == pangolin_runtime::Address::from(account_id) }) diff --git a/components/client-pangolin-s2s/tests/client_substrate.rs b/components/client-pangolin-s2s/tests/client_substrate.rs index a890630cc..9083e6743 100644 --- a/components/client-pangolin-s2s/tests/client_substrate.rs +++ b/components/client-pangolin-s2s/tests/client_substrate.rs @@ -5,7 +5,7 @@ fn test_account() { let signer = "//Alice"; let pair = sp_core::sr25519::Pair::from_string(&signer, None).unwrap(); let public = pair.public(); - let account = common_primitives::AccountId::from(public.0); + let account = drml_common_primitives::AccountId::from(public.0); assert_eq!( account.to_string(), "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY" diff --git a/components/client-pangoro-s2s/src/api.rs b/components/client-pangoro-s2s/src/api.rs index 9f80e9cdd..16a51515d 100644 --- a/components/client-pangoro-s2s/src/api.rs +++ b/components/client-pangoro-s2s/src/api.rs @@ -1,9 +1,9 @@ use bp_messages::{LaneId, MessageNonce}; use codec::Encode; -use common_primitives::AccountId; -use common_primitives::Balance; -use common_primitives::BlockNumber; use dp_fee::{Order, Relayer}; +use drml_common_primitives::AccountId; +use drml_common_primitives::Balance; +use drml_common_primitives::BlockNumber; use relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; use relay_utils::relay_loop::Client as RelayLoopClient; use relay_utils::MaybeConnectionError; @@ -106,7 +106,7 @@ impl PangoroApi { /// Return number of the best finalized block. pub async fn best_finalized_header_number( &mut self, - ) -> anyhow::Result { + ) -> anyhow::Result { match self.client.best_finalized_header_number().await { Ok(v) => Ok(v), Err(e) => { diff --git a/components/client-pangoro-s2s/src/feemarket.rs b/components/client-pangoro-s2s/src/feemarket.rs index 8d9cf15be..fd15f3532 100644 --- a/components/client-pangoro-s2s/src/feemarket.rs +++ b/components/client-pangoro-s2s/src/feemarket.rs @@ -1,6 +1,6 @@ use std::ops::Range; -use common_primitives::AccountId; +use drml_common_primitives::AccountId; use messages_relay::message_lane::MessageLane; use messages_relay::message_lane_loop::{ SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, @@ -42,7 +42,7 @@ impl PangoroRelayStrategy { let nonce = &reference.nonce; let order = self .api - .order(bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) + .order(drml_bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) .await .map_err(|e| { log::error!("[Pangoro] Failed to query order: {:?}", e); @@ -101,7 +101,7 @@ impl PangoroRelayStrategy { let ranges = relayers .iter() .map(|item| item.valid_range.clone()) - .collect::>>(); + .collect::>>(); let mut maximum_timeout = 0; for range in ranges { diff --git a/components/client-pangoro-s2s/src/pangoro.rs b/components/client-pangoro-s2s/src/pangoro.rs index 3abb41663..c3d2965e6 100644 --- a/components/client-pangoro-s2s/src/pangoro.rs +++ b/components/client-pangoro-s2s/src/pangoro.rs @@ -11,7 +11,8 @@ use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; use std::time::Duration; /// Pangoro header id. -pub type HeaderId = relay_utils::HeaderId; +pub type HeaderId = + relay_utils::HeaderId; /// Pangoro chain definition. #[derive(Debug, Clone, Copy)] @@ -22,23 +23,24 @@ impl BridgeChain for PangoroChain { } impl ChainBase for PangoroChain { - type BlockNumber = common_primitives::BlockNumber; - type Hash = common_primitives::Hash; - type Hasher = common_primitives::Hashing; - type Header = common_primitives::Header; - - type AccountId = common_primitives::AccountId; - type Balance = common_primitives::Balance; - type Index = common_primitives::Nonce; - type Signature = common_primitives::Signature; + type BlockNumber = drml_common_primitives::BlockNumber; + type Hash = drml_common_primitives::Hash; + type Hasher = drml_common_primitives::Hashing; + type Header = drml_common_primitives::Header; + + type AccountId = drml_common_primitives::AccountId; + type Balance = drml_common_primitives::Balance; + type Index = drml_common_primitives::Nonce; + type Signature = drml_common_primitives::Signature; } impl Chain for PangoroChain { const NAME: &'static str = "Pangoro"; const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(common_primitives::MILLISECS_PER_BLOCK); - const STORAGE_PROOF_OVERHEAD: u32 = bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; - const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; + Duration::from_millis(drml_common_primitives::MILLISECS_PER_BLOCK); + const STORAGE_PROOF_OVERHEAD: u32 = drml_bridge_primitives::EXTRA_STORAGE_PROOF_SIZE; + const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = + drml_bridge_primitives::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE; type SignedBlock = pangoro_runtime::SignedBlock; type Call = pangoro_runtime::Call; @@ -106,7 +108,7 @@ impl TransactionSignScheme for PangoroChain { tx.signature .as_ref() .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = + let account_id: drml_common_primitives::AccountId = (*signer.public().as_array_ref()).into(); *address == pangoro_runtime::Address::from(account_id) }) @@ -131,4 +133,4 @@ impl TransactionSignScheme for PangoroChain { pub type SigningParams = sp_core::sr25519::Pair; /// Pangoro header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; +pub type SyncHeader = relay_substrate_client::SyncHeader; diff --git a/task/task-darwinia-crab/src/chains/crab.rs b/task/task-darwinia-crab/src/chains/crab.rs index 9ea6d12b3..d89c0be85 100644 --- a/task/task-darwinia-crab/src/chains/crab.rs +++ b/task/task-darwinia-crab/src/chains/crab.rs @@ -27,33 +27,33 @@ mod s2s_const { impl ChainConst for CrabChainConst { const OUTBOUND_LANE_MESSAGE_DETAILS_METHOD: &'static str = - bridge_primitives::TO_CRAB_MESSAGE_DETAILS_METHOD; + darwinia_bridge_primitives::TO_CRAB_MESSAGE_DETAILS_METHOD; const OUTBOUND_LANE_LATEST_GENERATED_NONCE_METHOD: &'static str = - bridge_primitives::TO_CRAB_LATEST_GENERATED_NONCE_METHOD; + darwinia_bridge_primitives::TO_CRAB_LATEST_GENERATED_NONCE_METHOD; const OUTBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::TO_CRAB_LATEST_RECEIVED_NONCE_METHOD; + darwinia_bridge_primitives::TO_CRAB_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_CRAB_LATEST_RECEIVED_NONCE_METHOD; + darwinia_bridge_primitives::FROM_CRAB_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_CONFIRMED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_CRAB_LATEST_CONFIRMED_NONCE_METHOD; + darwinia_bridge_primitives::FROM_CRAB_LATEST_CONFIRMED_NONCE_METHOD; const INBOUND_LANE_UNREWARDED_RELAYERS_STATE: &'static str = - bridge_primitives::FROM_CRAB_UNREWARDED_RELAYERS_STATE; + darwinia_bridge_primitives::FROM_CRAB_UNREWARDED_RELAYERS_STATE; const BEST_FINALIZED_SOURCE_HEADER_ID_AT_TARGET: &'static str = - bridge_primitives::BEST_FINALIZED_CRAB_HEADER_METHOD; + darwinia_bridge_primitives::BEST_FINALIZED_CRAB_HEADER_METHOD; const BEST_FINALIZED_TARGET_HEADER_ID_AT_SOURCE: &'static str = - bridge_primitives::BEST_FINALIZED_CRAB_HEADER_METHOD; + darwinia_bridge_primitives::BEST_FINALIZED_CRAB_HEADER_METHOD; const MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; + darwinia_bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; const MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; + darwinia_bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; const AVERAGE_BLOCK_INTERVAL: Duration = DarwiniaChain::AVERAGE_BLOCK_INTERVAL; - const BRIDGE_CHAIN_ID: ChainId = bridge_primitives::CRAB_CHAIN_ID; + const BRIDGE_CHAIN_ID: ChainId = darwinia_bridge_primitives::CRAB_CHAIN_ID; const MESSAGE_PALLET_NAME_AT_SOURCE: &'static str = - bridge_primitives::WITH_DARWINIA_MESSAGES_PALLET_NAME; + darwinia_bridge_primitives::WITH_DARWINIA_MESSAGES_PALLET_NAME; const MESSAGE_PALLET_NAME_AT_TARGET: &'static str = - bridge_primitives::WITH_CRAB_MESSAGES_PALLET_NAME; + darwinia_bridge_primitives::WITH_CRAB_MESSAGES_PALLET_NAME; const PAY_INBOUND_DISPATCH_FEE_WEIGHT_AT_TARGET_CHAIN: Weight = - bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; + darwinia_bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; type SigningParams = sp_core::sr25519::Pair; } @@ -111,7 +111,7 @@ mod s2s_headers { type TargetChain = DarwiniaChain; - fn transactions_author(&self) -> common_primitives::AccountId { + fn transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.finality_pipeline.target_sign.public().as_array_ref()).into() } @@ -120,7 +120,7 @@ mod s2s_headers { era: bp_runtime::TransactionEraOf, transaction_nonce: IndexOf, header: component_crab_s2s::SyncHeader, - proof: GrandpaJustification, + proof: GrandpaJustification, ) -> Bytes { let call = darwinia_runtime::BridgeGrandpaCall::< darwinia_runtime::Runtime, @@ -217,7 +217,7 @@ mod s2s_messages { type SourceChain = CrabChain; type TargetChain = DarwiniaChain; - fn source_transactions_author(&self) -> common_primitives::AccountId { + fn source_transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.message_lane.source_sign.public().as_array_ref()).into() } @@ -255,7 +255,7 @@ mod s2s_messages { Bytes(transaction.encode()) } - fn target_transactions_author(&self) -> common_primitives::AccountId { + fn target_transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.message_lane.target_sign.public().as_array_ref()).into() } diff --git a/task/task-darwinia-crab/src/chains/darwinia.rs b/task/task-darwinia-crab/src/chains/darwinia.rs index b704787e3..76432001d 100644 --- a/task/task-darwinia-crab/src/chains/darwinia.rs +++ b/task/task-darwinia-crab/src/chains/darwinia.rs @@ -26,33 +26,33 @@ mod s2s_const { impl ChainConst for DarwiniaChainConst { const OUTBOUND_LANE_MESSAGE_DETAILS_METHOD: &'static str = - bridge_primitives::TO_DARWINIA_MESSAGE_DETAILS_METHOD; + darwinia_bridge_primitives::TO_DARWINIA_MESSAGE_DETAILS_METHOD; const OUTBOUND_LANE_LATEST_GENERATED_NONCE_METHOD: &'static str = - bridge_primitives::TO_DARWINIA_LATEST_GENERATED_NONCE_METHOD; + darwinia_bridge_primitives::TO_DARWINIA_LATEST_GENERATED_NONCE_METHOD; const OUTBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::TO_DARWINIA_LATEST_RECEIVED_NONCE_METHOD; + darwinia_bridge_primitives::TO_DARWINIA_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_DARWINIA_LATEST_RECEIVED_NONCE_METHOD; + darwinia_bridge_primitives::FROM_DARWINIA_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_CONFIRMED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_DARWINIA_LATEST_CONFIRMED_NONCE_METHOD; + darwinia_bridge_primitives::FROM_DARWINIA_LATEST_CONFIRMED_NONCE_METHOD; const INBOUND_LANE_UNREWARDED_RELAYERS_STATE: &'static str = - bridge_primitives::FROM_DARWINIA_UNREWARDED_RELAYERS_STATE; + darwinia_bridge_primitives::FROM_DARWINIA_UNREWARDED_RELAYERS_STATE; const BEST_FINALIZED_SOURCE_HEADER_ID_AT_TARGET: &'static str = - bridge_primitives::BEST_FINALIZED_DARWINIA_HEADER_METHOD; + darwinia_bridge_primitives::BEST_FINALIZED_DARWINIA_HEADER_METHOD; const BEST_FINALIZED_TARGET_HEADER_ID_AT_SOURCE: &'static str = - bridge_primitives::BEST_FINALIZED_DARWINIA_HEADER_METHOD; + darwinia_bridge_primitives::BEST_FINALIZED_DARWINIA_HEADER_METHOD; const MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; + darwinia_bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; const MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; + darwinia_bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; const AVERAGE_BLOCK_INTERVAL: Duration = DarwiniaChain::AVERAGE_BLOCK_INTERVAL; - const BRIDGE_CHAIN_ID: ChainId = bridge_primitives::DARWINIA_CHAIN_ID; + const BRIDGE_CHAIN_ID: ChainId = darwinia_bridge_primitives::DARWINIA_CHAIN_ID; const MESSAGE_PALLET_NAME_AT_SOURCE: &'static str = - bridge_primitives::WITH_CRAB_MESSAGES_PALLET_NAME; + darwinia_bridge_primitives::WITH_CRAB_MESSAGES_PALLET_NAME; const MESSAGE_PALLET_NAME_AT_TARGET: &'static str = - bridge_primitives::WITH_DARWINIA_MESSAGES_PALLET_NAME; + darwinia_bridge_primitives::WITH_DARWINIA_MESSAGES_PALLET_NAME; const PAY_INBOUND_DISPATCH_FEE_WEIGHT_AT_TARGET_CHAIN: Weight = - bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; + darwinia_bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; type SigningParams = sp_core::sr25519::Pair; } @@ -110,7 +110,7 @@ mod s2s_headers { type TargetChain = CrabChain; - fn transactions_author(&self) -> common_primitives::AccountId { + fn transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.finality_pipeline.target_sign.public().as_array_ref()).into() } @@ -119,7 +119,7 @@ mod s2s_headers { era: bp_runtime::TransactionEraOf, transaction_nonce: IndexOf, header: component_darwinia_s2s::SyncHeader, - proof: GrandpaJustification, + proof: GrandpaJustification, ) -> Bytes { let call = crab_runtime::BridgeGrandpaCall::< crab_runtime::Runtime, @@ -216,7 +216,7 @@ mod s2s_messages { type SourceChain = DarwiniaChain; type TargetChain = CrabChain; - fn source_transactions_author(&self) -> common_primitives::AccountId { + fn source_transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.message_lane.source_sign.public().as_array_ref()).into() } @@ -254,7 +254,7 @@ mod s2s_messages { Bytes(transaction.encode()) } - fn target_transactions_author(&self) -> common_primitives::AccountId { + fn target_transactions_author(&self) -> darwinia_common_primitives::AccountId { (*self.message_lane.target_sign.public().as_array_ref()).into() } diff --git a/task/task-darwinia-crab/src/fee/strategy/crazy_strategy.rs b/task/task-darwinia-crab/src/fee/strategy/crazy_strategy.rs index 5240427b6..30d2ac246 100644 --- a/task/task-darwinia-crab/src/fee/strategy/crazy_strategy.rs +++ b/task/task-darwinia-crab/src/fee/strategy/crazy_strategy.rs @@ -1,4 +1,4 @@ -use common_primitives::AccountId; +use darwinia_common_primitives::AccountId; use sp_core::Pair; use bridge_traits::bridge::task::BridgeSand; diff --git a/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs b/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs index 88378171c..cdb48147b 100644 --- a/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs +++ b/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs @@ -11,8 +11,8 @@ use crate::fee::strategy::common::StrategyHelper; use crate::fee::UpdateFeeStrategy; use crate::task::DarwiniaCrabTask; -const MIN_RELAY_FEE_DARWINIA: u128 = 15 * common_primitives::COIN; -const MIN_RELAY_FEE_CRAB: u128 = 15 * common_primitives::COIN; +const MIN_RELAY_FEE_DARWINIA: u128 = 15 * darwinia_common_primitives::COIN; +const MIN_RELAY_FEE_CRAB: u128 = 15 * darwinia_common_primitives::COIN; #[derive(Clone)] pub struct ReasonableStrategy { @@ -79,8 +79,8 @@ impl ReasonableStrategy { async fn conversion_darwinia_to_crab( &self, - darwinia_currency: common_primitives::Balance, - ) -> anyhow::Result { + darwinia_currency: darwinia_common_primitives::Balance, + ) -> anyhow::Result { let price_darwinia = self._darwinia_open_price().await?; let price_crab = self._crab_open_price().await?; let rate = price_darwinia / price_crab; @@ -90,8 +90,8 @@ impl ReasonableStrategy { } async fn conversion_crab_to_darwinia( &self, - crab_currency: common_primitives::Balance, - ) -> anyhow::Result { + crab_currency: darwinia_common_primitives::Balance, + ) -> anyhow::Result { let price_darwinia = self._darwinia_open_price().await?; let price_crab = self._crab_open_price().await?; let rate = price_crab / price_darwinia; diff --git a/task/task-darwinia-crab/src/service/relay.rs b/task/task-darwinia-crab/src/service/relay.rs index 3cc35d68c..fca24fe30 100644 --- a/task/task-darwinia-crab/src/service/relay.rs +++ b/task/task-darwinia-crab/src/service/relay.rs @@ -1,4 +1,4 @@ -use common_primitives::AccountId; +use darwinia_common_primitives::AccountId; use futures::{FutureExt, TryFutureExt}; use lifeline::{Bus, Lifeline, Receiver, Service, Task}; use relay_substrate_client::{AccountIdOf, Chain, Client, TransactionSignScheme}; @@ -116,7 +116,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result if relay_info.create_relayers_fund_accounts { let relayer_fund_acount_id = pallet_bridge_messages::relayer_fund_account_id::< AccountIdOf, - bridge_primitives::AccountIdConverter, + darwinia_bridge_primitives::AccountIdConverter, >(); let relayers_fund_account_balance = darwinia_client .free_native_balance(relayer_fund_acount_id.clone()) @@ -135,7 +135,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result let relayer_fund_acount_id = pallet_bridge_messages::relayer_fund_account_id::< AccountIdOf, - bridge_primitives::AccountIdConverter, + darwinia_bridge_primitives::AccountIdConverter, >(); let relayers_fund_account_balance = crab_client .free_native_balance(relayer_fund_acount_id.clone()) @@ -158,7 +158,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result crab_client.clone(), pangoro_transactions_mortality, DarwiniaFinalityToCrab::new(crab_client.clone(), pangoro_sign.clone()), - common_primitives::DARWINIA_BLOCKS_PER_SESSION, + darwinia_common_primitives::DARWINIA_BLOCKS_PER_SESSION, relay_info.only_mandatory_headers, ); let crab_to_darwinia_on_demand_headers = OnDemandHeadersRelay::new( @@ -166,7 +166,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result darwinia_client.clone(), darwinia_transactions_mortality, CrabFinalityToDarwinia::new(darwinia_client.clone(), darwinia_sign.clone()), - common_primitives::CRAB_BLOCKS_PER_SESSION, + darwinia_common_primitives::CRAB_BLOCKS_PER_SESSION, relay_info.only_mandatory_headers, ); diff --git a/task/task-pangolin-pangoro/src/chains/pangolin.rs b/task/task-pangolin-pangoro/src/chains/pangolin.rs index 2bc0d085b..a9847c27b 100644 --- a/task/task-pangolin-pangoro/src/chains/pangolin.rs +++ b/task/task-pangolin-pangoro/src/chains/pangolin.rs @@ -26,34 +26,34 @@ mod s2s_const { impl ChainConst for PangolinChainConst { const OUTBOUND_LANE_MESSAGE_DETAILS_METHOD: &'static str = - bridge_primitives::TO_PANGOLIN_MESSAGE_DETAILS_METHOD; + drml_bridge_primitives::TO_PANGOLIN_MESSAGE_DETAILS_METHOD; const OUTBOUND_LANE_LATEST_GENERATED_NONCE_METHOD: &'static str = - bridge_primitives::TO_PANGOLIN_LATEST_GENERATED_NONCE_METHOD; + drml_bridge_primitives::TO_PANGOLIN_LATEST_GENERATED_NONCE_METHOD; const OUTBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::TO_PANGOLIN_LATEST_RECEIVED_NONCE_METHOD; + drml_bridge_primitives::TO_PANGOLIN_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_PANGOLIN_LATEST_RECEIVED_NONCE_METHOD; + drml_bridge_primitives::FROM_PANGOLIN_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_CONFIRMED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_PANGOLIN_LATEST_CONFIRMED_NONCE_METHOD; + drml_bridge_primitives::FROM_PANGOLIN_LATEST_CONFIRMED_NONCE_METHOD; const INBOUND_LANE_UNREWARDED_RELAYERS_STATE: &'static str = - bridge_primitives::FROM_PANGOLIN_UNREWARDED_RELAYERS_STATE; + drml_bridge_primitives::FROM_PANGOLIN_UNREWARDED_RELAYERS_STATE; const BEST_FINALIZED_SOURCE_HEADER_ID_AT_TARGET: &'static str = - bridge_primitives::BEST_FINALIZED_PANGOLIN_HEADER_METHOD; + drml_bridge_primitives::BEST_FINALIZED_PANGOLIN_HEADER_METHOD; const BEST_FINALIZED_TARGET_HEADER_ID_AT_SOURCE: &'static str = - bridge_primitives::BEST_FINALIZED_PANGOLIN_HEADER_METHOD; + drml_bridge_primitives::BEST_FINALIZED_PANGOLIN_HEADER_METHOD; const MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; + drml_bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; const MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; + drml_bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; const AVERAGE_BLOCK_INTERVAL: Duration = PangolinChain::AVERAGE_BLOCK_INTERVAL; - const BRIDGE_CHAIN_ID: ChainId = bridge_primitives::PANGOLIN_CHAIN_ID; + const BRIDGE_CHAIN_ID: ChainId = drml_bridge_primitives::PANGOLIN_CHAIN_ID; const MESSAGE_PALLET_NAME_AT_SOURCE: &'static str = - bridge_primitives::WITH_PANGORO_MESSAGES_PALLET_NAME; + drml_bridge_primitives::WITH_PANGORO_MESSAGES_PALLET_NAME; const MESSAGE_PALLET_NAME_AT_TARGET: &'static str = - bridge_primitives::WITH_PANGOLIN_MESSAGES_PALLET_NAME; + drml_bridge_primitives::WITH_PANGOLIN_MESSAGES_PALLET_NAME; const PAY_INBOUND_DISPATCH_FEE_WEIGHT_AT_TARGET_CHAIN: Weight = - bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; - type SigningParams = common_primitives::SigningParams; + drml_bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; + type SigningParams = drml_common_primitives::SigningParams; } // === end @@ -110,7 +110,7 @@ mod s2s_headers { type TargetChain = PangoroChain; - fn transactions_author(&self) -> common_primitives::AccountId { + fn transactions_author(&self) -> drml_common_primitives::AccountId { (*self.finality_pipeline.target_sign.public().as_array_ref()).into() } @@ -119,7 +119,7 @@ mod s2s_headers { era: bp_runtime::TransactionEraOf, transaction_nonce: IndexOf, header: component_pangolin_s2s::SyncHeader, - proof: GrandpaJustification, + proof: GrandpaJustification, ) -> Bytes { let call = pangoro_runtime::BridgeGrandpaCall::< pangoro_runtime::Runtime, @@ -216,7 +216,7 @@ mod s2s_messages { type SourceChain = PangolinChain; type TargetChain = PangoroChain; - fn source_transactions_author(&self) -> common_primitives::AccountId { + fn source_transactions_author(&self) -> drml_common_primitives::AccountId { (*self.message_lane.source_sign.public().as_array_ref()).into() } @@ -254,7 +254,7 @@ mod s2s_messages { Bytes(transaction.encode()) } - fn target_transactions_author(&self) -> common_primitives::AccountId { + fn target_transactions_author(&self) -> drml_common_primitives::AccountId { (*self.message_lane.target_sign.public().as_array_ref()).into() } diff --git a/task/task-pangolin-pangoro/src/chains/pangoro.rs b/task/task-pangolin-pangoro/src/chains/pangoro.rs index 34bdcf9cd..5e5936e4f 100644 --- a/task/task-pangolin-pangoro/src/chains/pangoro.rs +++ b/task/task-pangolin-pangoro/src/chains/pangoro.rs @@ -27,34 +27,34 @@ mod s2s_const { impl ChainConst for PangoroChainConst { const OUTBOUND_LANE_MESSAGE_DETAILS_METHOD: &'static str = - bridge_primitives::TO_PANGORO_MESSAGE_DETAILS_METHOD; + drml_bridge_primitives::TO_PANGORO_MESSAGE_DETAILS_METHOD; const OUTBOUND_LANE_LATEST_GENERATED_NONCE_METHOD: &'static str = - bridge_primitives::TO_PANGORO_LATEST_GENERATED_NONCE_METHOD; + drml_bridge_primitives::TO_PANGORO_LATEST_GENERATED_NONCE_METHOD; const OUTBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::TO_PANGORO_LATEST_RECEIVED_NONCE_METHOD; + drml_bridge_primitives::TO_PANGORO_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_RECEIVED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_PANGORO_LATEST_RECEIVED_NONCE_METHOD; + drml_bridge_primitives::FROM_PANGORO_LATEST_RECEIVED_NONCE_METHOD; const INBOUND_LANE_LATEST_CONFIRMED_NONCE_METHOD: &'static str = - bridge_primitives::FROM_PANGORO_LATEST_CONFIRMED_NONCE_METHOD; + drml_bridge_primitives::FROM_PANGORO_LATEST_CONFIRMED_NONCE_METHOD; const INBOUND_LANE_UNREWARDED_RELAYERS_STATE: &'static str = - bridge_primitives::FROM_PANGORO_UNREWARDED_RELAYERS_STATE; + drml_bridge_primitives::FROM_PANGORO_UNREWARDED_RELAYERS_STATE; const BEST_FINALIZED_SOURCE_HEADER_ID_AT_TARGET: &'static str = - bridge_primitives::BEST_FINALIZED_PANGORO_HEADER_METHOD; + drml_bridge_primitives::BEST_FINALIZED_PANGORO_HEADER_METHOD; const BEST_FINALIZED_TARGET_HEADER_ID_AT_SOURCE: &'static str = - bridge_primitives::BEST_FINALIZED_PANGORO_HEADER_METHOD; + drml_bridge_primitives::BEST_FINALIZED_PANGORO_HEADER_METHOD; const MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; + drml_bridge_primitives::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE; const MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE: MessageNonce = - bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; + drml_bridge_primitives::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE; const AVERAGE_BLOCK_INTERVAL: Duration = PangolinChain::AVERAGE_BLOCK_INTERVAL; - const BRIDGE_CHAIN_ID: ChainId = bridge_primitives::PANGORO_CHAIN_ID; + const BRIDGE_CHAIN_ID: ChainId = drml_bridge_primitives::PANGORO_CHAIN_ID; const MESSAGE_PALLET_NAME_AT_SOURCE: &'static str = - bridge_primitives::WITH_PANGOLIN_MESSAGES_PALLET_NAME; + drml_bridge_primitives::WITH_PANGOLIN_MESSAGES_PALLET_NAME; const MESSAGE_PALLET_NAME_AT_TARGET: &'static str = - bridge_primitives::WITH_PANGORO_MESSAGES_PALLET_NAME; + drml_bridge_primitives::WITH_PANGORO_MESSAGES_PALLET_NAME; const PAY_INBOUND_DISPATCH_FEE_WEIGHT_AT_TARGET_CHAIN: Weight = - bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; - type SigningParams = common_primitives::SigningParams; + drml_bridge_primitives::PAY_INBOUND_DISPATCH_FEE_WEIGHT; + type SigningParams = drml_common_primitives::SigningParams; } // === end @@ -111,7 +111,7 @@ mod s2s_headers { type TargetChain = PangolinChain; - fn transactions_author(&self) -> common_primitives::AccountId { + fn transactions_author(&self) -> drml_common_primitives::AccountId { (*self.finality_pipeline.target_sign.public().as_array_ref()).into() } @@ -120,7 +120,7 @@ mod s2s_headers { era: bp_runtime::TransactionEraOf, transaction_nonce: IndexOf, header: component_pangoro_s2s::SyncHeader, - proof: GrandpaJustification, + proof: GrandpaJustification, ) -> Bytes { let call = pangolin_runtime::BridgeGrandpaCall::< pangolin_runtime::Runtime, @@ -217,7 +217,7 @@ mod s2s_messages { type SourceChain = PangoroChain; type TargetChain = PangolinChain; - fn source_transactions_author(&self) -> common_primitives::AccountId { + fn source_transactions_author(&self) -> drml_common_primitives::AccountId { (*self.message_lane.source_sign.public().as_array_ref()).into() } @@ -255,7 +255,7 @@ mod s2s_messages { Bytes(transaction.encode()) } - fn target_transactions_author(&self) -> common_primitives::AccountId { + fn target_transactions_author(&self) -> drml_common_primitives::AccountId { (*self.message_lane.target_sign.public().as_array_ref()).into() } diff --git a/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs b/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs index 9dae70161..fa4b11c59 100644 --- a/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs +++ b/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs @@ -1,4 +1,4 @@ -use common_primitives::AccountId; +use drml_common_primitives::AccountId; use sp_core::Pair; use bridge_traits::bridge::task::BridgeSand; diff --git a/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs index 656d54ac5..97628b8d2 100644 --- a/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs +++ b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs @@ -11,8 +11,8 @@ use crate::fee::strategy::common::StrategyHelper; use crate::fee::UpdateFeeStrategy; use crate::task::PangolinPangoroTask; -const MIN_RELAY_FEE_PANGOLIN: u128 = 15 * common_primitives::COIN; -const MIN_RELAY_FEE_PANGORO: u128 = 15 * common_primitives::COIN; +const MIN_RELAY_FEE_PANGOLIN: u128 = 15 * drml_common_primitives::COIN; +const MIN_RELAY_FEE_PANGORO: u128 = 15 * drml_common_primitives::COIN; #[derive(Clone)] pub struct ReasonableStrategy { @@ -80,8 +80,8 @@ impl ReasonableStrategy { async fn conversion_pangolin_to_pangoro( &self, - pangolin_currency: common_primitives::Balance, - ) -> anyhow::Result { + pangolin_currency: drml_common_primitives::Balance, + ) -> anyhow::Result { let price_pangolin = self._pangolin_open_price().await?; let price_pangoro = self._pangoro_open_price().await?; let rate = price_pangolin / price_pangoro; @@ -91,8 +91,8 @@ impl ReasonableStrategy { } async fn conversion_pangoro_to_pangolin( &self, - pangoro_currency: common_primitives::Balance, - ) -> anyhow::Result { + pangoro_currency: drml_common_primitives::Balance, + ) -> anyhow::Result { let price_pangolin = self._pangolin_open_price().await?; let price_pangoro = self._pangoro_open_price().await?; let rate = price_pangoro / price_pangolin; diff --git a/task/task-pangolin-pangoro/src/service/relay.rs b/task/task-pangolin-pangoro/src/service/relay.rs index 65f3d563c..11b20d6b1 100644 --- a/task/task-pangolin-pangoro/src/service/relay.rs +++ b/task/task-pangolin-pangoro/src/service/relay.rs @@ -1,4 +1,4 @@ -use common_primitives::AccountId; +use drml_common_primitives::AccountId; use futures::{FutureExt, TryFutureExt}; use lifeline::{Bus, Lifeline, Receiver, Service, Task}; use relay_substrate_client::{AccountIdOf, Chain, Client, TransactionSignScheme}; @@ -137,7 +137,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result if relay_info.create_relayers_fund_accounts { let relayer_fund_acount_id = pallet_bridge_messages::relayer_fund_account_id::< AccountIdOf, - bridge_primitives::AccountIdConverter, + drml_bridge_primitives::AccountIdConverter, >(); let relayers_fund_account_balance = pangolin_client .free_native_balance(relayer_fund_acount_id.clone()) @@ -156,7 +156,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result let relayer_fund_acount_id = pallet_bridge_messages::relayer_fund_account_id::< AccountIdOf, - bridge_primitives::AccountIdConverter, + drml_bridge_primitives::AccountIdConverter, >(); let relayers_fund_account_balance = pangoro_client .free_native_balance(relayer_fund_acount_id.clone()) @@ -179,7 +179,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result pangoro_client.clone(), pangoro_transactions_mortality, PangolinFinalityToPangoro::new(pangoro_client.clone(), pangoro_sign.clone()), - common_primitives::PANGOLIN_BLOCKS_PER_SESSION, + drml_common_primitives::PANGOLIN_BLOCKS_PER_SESSION, relay_info.only_mandatory_headers, ); let pangoro_to_pangolin_on_demand_headers = OnDemandHeadersRelay::new( @@ -187,7 +187,7 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result pangolin_client.clone(), pangolin_transactions_mortality, PangoroFinalityToPangolin::new(pangolin_client.clone(), pangolin_sign.clone()), - common_primitives::PANGORO_BLOCKS_PER_SESSION, + drml_common_primitives::PANGORO_BLOCKS_PER_SESSION, relay_info.only_mandatory_headers, ); From 6f314c1de60a2d4c6e19442f034ddf344700b303 Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 16:37:03 +0800 Subject: [PATCH 3/6] Update dependencies --- Cargo.lock | 258 ++++++---------------- components/client-crab-s2s/Cargo.toml | 2 +- components/client-darwinia-s2s/Cargo.toml | 4 +- 3 files changed, 75 insertions(+), 189 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43e543aec..1a029e124 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1115,7 +1115,7 @@ dependencies = [ "crab-runtime", "darwinia-bridge-primitives", "darwinia-common-primitives", - "dp-fee 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", + "dp-fee 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "headers-relay", @@ -1139,11 +1139,11 @@ dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bridge-traits", - "darwinia-bridge-ethereum 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", + "darwinia-bridge-ethereum 2.6.10", "darwinia-bridge-primitives", "darwinia-common-primitives", "darwinia-runtime", - "dp-fee 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", + "dp-fee 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "headers-relay", @@ -1456,12 +1456,12 @@ dependencies = [ "darwinia-header-mmr-rpc-runtime-api 2.6.6", "darwinia-staking 2.6.10", "darwinia-staking-rpc-runtime-api 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "darwinia-vesting 2.6.10", "dp-evm 2.6.10", "dvm-ethereum 2.6.10", "dvm-rpc-runtime-api 2.6.10", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "ethereum-primitives 2.6.10", "evm", "frame-executive", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1718,10 +1718,10 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "darwinia-balances-rpc-runtime-api 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -1750,9 +1750,9 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "parity-scale-codec", "serde 1.0.130", "sp-api", @@ -1789,39 +1789,15 @@ dependencies = [ [[package]] name = "darwinia-bridge-ethereum" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", "blake2-rfc", "ckb-merkle-mountain-range", - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "darwinia-relayer-game 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "ethereum-types", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "parity-scale-codec", - "rlp 0.5.1", - "serde 1.0.130", - "serde_json", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "darwinia-bridge-ethereum" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" -dependencies = [ - "array-bytes", - "blake2-rfc", - "ckb-merkle-mountain-range", - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-relayer-game 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-relayer-game 2.6.10", + "darwinia-support 2.6.10", + "ethereum-primitives 2.6.10", "ethereum-types", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1911,10 +1887,10 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -1961,7 +1937,7 @@ source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps# dependencies = [ "darwinia-balances 2.6.10", "darwinia-common-primitives", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "max-encoded-len", @@ -1977,9 +1953,9 @@ dependencies = [ [[package]] name = "darwinia-democracy" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", @@ -2007,9 +1983,9 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -2041,11 +2017,11 @@ dependencies = [ [[package]] name = "darwinia-evm" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", "darwinia-balances 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "dp-evm 2.6.10", "evm", "evm-gasometer", @@ -2151,7 +2127,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-simple" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "dp-evm 2.6.10", "evm", @@ -2175,11 +2151,11 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-transfer" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", "darwinia-evm 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "dp-evm 2.6.10", "ethabi 13.0.0", "ethereum-types", @@ -2248,13 +2224,13 @@ dependencies = [ [[package]] name = "darwinia-fee-market" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "bitvec", "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "dp-fee 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", + "dp-fee 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -2294,7 +2270,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "parity-scale-codec", @@ -2320,12 +2296,12 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api 2.6.6", - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -2360,9 +2336,9 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" version = "2.6.6" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "parity-scale-codec", "serde 1.0.130", "sp-api", @@ -2386,10 +2362,10 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -2416,18 +2392,7 @@ dependencies = [ [[package]] name = "darwinia-relay-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "darwinia-relay-primitives" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", @@ -2449,25 +2414,10 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "log", - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "darwinia-relayer-game" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" -dependencies = [ - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -2502,7 +2452,7 @@ dependencies = [ "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", "darwinia-balances 2.6.10", "darwinia-balances-rpc-runtime-api 2.6.10", - "darwinia-bridge-ethereum 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-bridge-ethereum 2.6.10", "darwinia-bridge-primitives", "darwinia-common-primitives", "darwinia-common-runtime", @@ -2513,13 +2463,13 @@ dependencies = [ "darwinia-header-mmr 2.6.10", "darwinia-header-mmr-rpc-runtime-api 2.6.6", "darwinia-relay-authorities 2.6.10", - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-relayer-game 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-relayer-game 2.6.10", "darwinia-staking 2.6.10", "darwinia-staking-rpc-runtime-api 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "darwinia-vesting 2.6.10", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "ethereum-primitives 2.6.10", "frame-executive", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2582,10 +2532,10 @@ dependencies = [ [[package]] name = "darwinia-staking" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "darwinia-staking-rpc-runtime-api 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-election-provider-support", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2630,9 +2580,9 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "parity-scale-codec", "serde 1.0.130", "sp-api", @@ -2654,34 +2604,12 @@ dependencies = [ [[package]] name = "darwinia-support" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "ethereum", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "impl-trait-for-tuples", - "max-encoded-len", - "num-traits 0.2.14", - "parity-scale-codec", - "sha3 0.9.1", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "darwinia-support" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "ethereum", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "ethereum-primitives 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "impl-trait-for-tuples", @@ -2720,9 +2648,9 @@ dependencies = [ [[package]] name = "darwinia-vesting" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", @@ -2862,7 +2790,7 @@ dependencies = [ [[package]] name = "dp-consensus" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "ethereum", "parity-scale-codec", @@ -2903,7 +2831,7 @@ dependencies = [ [[package]] name = "dp-evm" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "evm", "impl-trait-for-tuples", @@ -2929,19 +2857,7 @@ dependencies = [ [[package]] name = "dp-fee" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" -dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "dp-fee" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2981,7 +2897,7 @@ dependencies = [ [[package]] name = "dp-storage" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" [[package]] name = "dp-storage" @@ -3024,10 +2940,10 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "dvm-ethereum" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "darwinia-evm 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "dp-consensus 2.6.10", "dp-evm 2.6.10", "dp-storage 2.6.10", @@ -3082,10 +2998,10 @@ dependencies = [ [[package]] name = "dvm-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "darwinia-evm 2.6.10", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "dp-evm 2.6.10", "ethereum", "ethereum-types", @@ -3330,33 +3246,14 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", "ethash", "ethbloom", "ethereum-types", "keccak-hash", - "merkle-patricia-trie 2.6.10 (git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3)", - "parity-scale-codec", - "rlp 0.5.1", - "rlp-derive", - "serde 1.0.130", - "sp-debug-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "subhasher", -] - -[[package]] -name = "ethereum-primitives" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" -dependencies = [ - "array-bytes", - "ethash", - "ethbloom", - "ethereum-types", - "keccak-hash", - "merkle-patricia-trie 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "merkle-patricia-trie 2.6.10", "parity-scale-codec", "rlp 0.5.1", "rlp-derive", @@ -5724,18 +5621,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=darwinia-v0.11.6-3#ed73e1a2619107dbe02ce636f174c4570552c946" -dependencies = [ - "hashbrown 0.9.1", - "keccak-hash", - "rlp 0.5.1", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - -[[package]] -name = "merkle-patricia-trie" -version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "hashbrown 0.9.1", "keccak-hash", @@ -10843,13 +10729,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "to-ethereum-backing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "array-bytes", - "darwinia-relay-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-relay-primitives 2.6.10", + "darwinia-support 2.6.10", "ethabi 13.0.0", - "ethereum-primitives 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "ethereum-primitives 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -10911,9 +10797,9 @@ dependencies = [ [[package]] name = "to-tron-backing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "darwinia-support 2.6.10 (git+https://github.com/darwinia-network/darwinia-common?branch=bump-deps-darwinia)", + "darwinia-support 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", diff --git a/components/client-crab-s2s/Cargo.toml b/components/client-crab-s2s/Cargo.toml index d4723a896..727adfbbc 100644 --- a/components/client-crab-s2s/Cargo.toml +++ b/components/client-crab-s2s/Cargo.toml @@ -36,7 +36,7 @@ bp-runtime = { git = "https://github.com/darwinia-network/parity-bri crab-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } darwinia-common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } darwinia-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps-darwinia" } diff --git a/components/client-darwinia-s2s/Cargo.toml b/components/client-darwinia-s2s/Cargo.toml index 5b72408b7..124e75177 100644 --- a/components/client-darwinia-s2s/Cargo.toml +++ b/components/client-darwinia-s2s/Cargo.toml @@ -36,8 +36,8 @@ bp-runtime = { git = "https://github.com/darwinia-network/parity-bri darwinia-runtime = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } darwinia-common-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } darwinia-bridge-primitives = { git = "https://github.com/darwinia-network/darwinia.git", branch = "bump-deps" } -darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } -dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "darwinia-v0.11.6-3" } +darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps-darwinia" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "bump-deps-darwinia" } From a2882e1e389c870a7c3f492b43e94c911742eaa7 Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 16:55:35 +0800 Subject: [PATCH 4/6] Update dependencies --- Cargo.lock | 376 ++++++++++++++++------------------------------------- 1 file changed, 112 insertions(+), 264 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a029e124..a595b03e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -619,21 +619,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "finality-grandpa", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "parity-scale-codec", - "serde 1.0.130", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-finality-grandpa", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bp-header-chain" version = "0.1.0" @@ -649,50 +634,24 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bp-message-dispatch" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-runtime", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bitvec", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "impl-trait-for-tuples", - "parity-scale-codec", - "serde 1.0.130", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bp-messages" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ "bitvec", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-runtime", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "impl-trait-for-tuples", @@ -701,23 +660,6 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "hash-db", - "num-traits 0.2.14", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bp-runtime" version = "0.1.0" @@ -735,27 +677,12 @@ dependencies = [ "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-finality-grandpa", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bp-test-utils" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", "ed25519-dalek", "finality-grandpa", "parity-scale-codec", @@ -779,41 +706,19 @@ dependencies = [ "uint 0.8.5", ] -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "pallet-transaction-payment", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "bridge-runtime-common" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "hash-db", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-transaction-payment", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1109,8 +1014,8 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "bridge-traits", "crab-runtime", "darwinia-bridge-primitives", @@ -1136,8 +1041,8 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "bridge-traits", "darwinia-bridge-ethereum 2.6.10", "darwinia-bridge-primitives", @@ -1219,8 +1124,8 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "bridge-traits", "darwinia-bridge-ethereum 2.7.0", "dp-fee 2.7.0", @@ -1273,8 +1178,8 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "bridge-traits", "dp-fee 2.7.0", "drml-bridge-primitives", @@ -1432,13 +1337,13 @@ dependencies = [ [[package]] name = "crab-runtime" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#4ea75571cce207c1989f31eeb83fe2a872e30529" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "darwinia-balances 2.6.10", "darwinia-balances-rpc-runtime-api 2.6.10", "darwinia-bridge-primitives", @@ -1474,9 +1379,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -1837,15 +1742,15 @@ dependencies = [ [[package]] name = "darwinia-bridge-primitives" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#4ea75571cce207c1989f31eeb83fe2a872e30529" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "darwinia-common-primitives", "darwinia-fee-market 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", "sp-api", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1923,7 +1828,7 @@ dependencies = [ [[package]] name = "darwinia-common-primitives" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#4ea75571cce207c1989f31eeb83fe2a872e30529" dependencies = [ "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -1933,7 +1838,7 @@ dependencies = [ [[package]] name = "darwinia-common-runtime" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#4ea75571cce207c1989f31eeb83fe2a872e30529" dependencies = [ "darwinia-balances 2.6.10", "darwinia-common-primitives", @@ -2091,8 +1996,8 @@ name = "darwinia-evm-precompile-bridge-s2s" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-runtime", "darwinia-evm 2.7.0", "darwinia-evm-precompile-utils", "darwinia-support 2.7.0", @@ -2227,15 +2132,15 @@ version = "2.6.10" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ "bitvec", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "darwinia-support 2.6.10", "dp-fee 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", "num-traits 0.2.14", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages", "pallet-timestamp", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2250,15 +2155,15 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "bitvec", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "darwinia-support 2.7.0", "dp-fee 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", "num-traits 0.2.14", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages", "pallet-timestamp", "parity-scale-codec", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2272,7 +2177,7 @@ name = "darwinia-fee-market-rpc-runtime-api" version = "2.6.10" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", "parity-scale-codec", "serde 1.0.130", "sp-api", @@ -2285,7 +2190,7 @@ name = "darwinia-fee-market-rpc-runtime-api" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", "parity-scale-codec", "serde 1.0.130", "sp-api", @@ -2444,12 +2349,12 @@ dependencies = [ [[package]] name = "darwinia-runtime" version = "0.11.6" -source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#0093687255339e0cdbb14ad1ae493fff7761857e" +source = "git+https://github.com/darwinia-network/darwinia.git?branch=bump-deps#4ea75571cce207c1989f31eeb83fe2a872e30529" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "darwinia-balances 2.6.10", "darwinia-balances-rpc-runtime-api 2.6.10", "darwinia-bridge-ethereum 2.6.10", @@ -2481,9 +2386,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -2606,8 +2511,8 @@ name = "darwinia-support" version = "2.6.10" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "ethereum", "ethereum-primitives 2.6.10", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2628,8 +2533,8 @@ name = "darwinia-support" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "ethereum", "ethereum-primitives 2.7.0", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2820,7 +2725,7 @@ name = "dp-contract" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", "dp-asset", "ethabi 13.0.0", "ethereum-primitives 2.7.0", @@ -2859,7 +2764,7 @@ name = "dp-fee" version = "2.6.10" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps-darwinia#ac559d47c4fa4dbaf4c807015c4461d7a8464c80" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2871,7 +2776,7 @@ name = "dp-fee" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2884,8 +2789,8 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-runtime", "dp-asset", "dp-contract", "parity-scale-codec", @@ -2909,13 +2814,13 @@ name = "drml-bridge-primitives" version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "darwinia-fee-market 2.7.0", "drml-common-primitives", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", "sp-api", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -3419,7 +3324,7 @@ dependencies = [ "async-std", "async-trait", "backoff", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", "futures 0.3.17", "headers-relay", "log", @@ -3791,9 +3696,9 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "darwinia-evm 2.7.0", "darwinia-support 2.7.0", "dp-asset", @@ -5660,8 +5565,8 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-messages", + "bp-runtime", "futures 0.3.17", "hex", "log", @@ -6137,29 +6042,13 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "log", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-runtime", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -6169,35 +6058,14 @@ dependencies = [ "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "finality-grandpa", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "log", - "num-traits 0.2.14", - "parity-scale-codec", - "serde 1.0.130", - "sp-finality-grandpa", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-runtime", + "bp-test-utils", "finality-grandpa", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -6211,35 +6079,15 @@ dependencies = [ "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa" -dependencies = [ - "bitvec", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "log", - "num-traits 0.2.14", - "parity-scale-codec", - "serde 1.0.130", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", -] - [[package]] name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4#495a773403e5827bbf9d7b20d97333f673628db9" dependencies = [ "bitvec", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "log", @@ -6654,10 +6502,10 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "common-runtime", "darwinia-balances 2.7.0", "darwinia-balances-rpc-runtime-api 2.7.0", @@ -6710,9 +6558,9 @@ dependencies = [ "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", "pallet-bounties", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-collective", "pallet-election-provider-multi-phase", "pallet-grandpa", @@ -6765,11 +6613,11 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "common-runtime", "darwinia-balances 2.7.0", "darwinia-balances-rpc-runtime-api 2.7.0", @@ -6796,9 +6644,9 @@ dependencies = [ "pallet-authority-discovery", "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-babe", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-dispatch", + "pallet-bridge-grandpa", + "pallet-bridge-messages", "pallet-election-provider-multi-phase", "pallet-grandpa", "pallet-im-online 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -7662,8 +7510,8 @@ source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag= dependencies = [ "async-std", "async-trait", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-runtime", "finality-relay", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -10178,10 +10026,10 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "finality-grandpa", "finality-relay", "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -10189,7 +10037,7 @@ dependencies = [ "log", "messages-relay", "num-traits 0.2.14", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages", "parity-scale-codec", "relay-substrate-client", "relay-utils", @@ -10399,10 +10247,10 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "bridge-traits", "component-crab-s2s", "component-darwinia-s2s", @@ -10419,7 +10267,7 @@ dependencies = [ "lifeline", "log", "messages-relay", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages", "parity-scale-codec", "postage", "relay-substrate-client", @@ -10475,10 +10323,10 @@ version = "0.4.8" dependencies = [ "anyhow", "async-trait", - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-header-chain", + "bp-messages", + "bp-runtime", + "bridge-runtime-common", "bridge-traits", "common-runtime", "component-pangolin-s2s", @@ -10493,7 +10341,7 @@ dependencies = [ "lifeline", "log", "messages-relay", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "pallet-bridge-messages", "pangolin-runtime", "pangoro-runtime", "parity-scale-codec", @@ -10774,9 +10622,9 @@ version = "2.7.0" source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=bump-deps#d36cfb35c5d0b57104a0724d3825c04284de92e2" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-4)", + "bp-message-dispatch", + "bp-messages", + "bp-runtime", "darwinia-support 2.7.0", "dp-asset", "dp-contract", From 4ab3bdb1f276b99a9d867635d2ba36e26f3e811d Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 17:00:36 +0800 Subject: [PATCH 5/6] fix compile --- .../src/fee/strategy/reasonable_strategy.rs | 6 ++++-- task/task-darwinia-crab/src/service/fee.rs | 4 ++-- .../src/fee/strategy/reasonable_strategy.rs | 8 ++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs b/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs index cdb48147b..4fe73ca4b 100644 --- a/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs +++ b/task/task-darwinia-crab/src/fee/strategy/reasonable_strategy.rs @@ -137,6 +137,8 @@ impl UpdateFeeStrategy for ReasonableStrategy { let expect_fee_darwinia = MIN_RELAY_FEE_DARWINIA + (top100_max_cost_darwinia * 15); let expect_fee_crab = MIN_RELAY_FEE_CRAB + (top100_max_cost_crab * 15); + let crab_signer = self.helper.crab_signer().clone(); + let darwinia_signer = self.helper.darwinia_signer().clone(); log::info!( target: DarwiniaCrabTask::NAME, "[reasonable] Update crab fee: {}", @@ -144,7 +146,7 @@ impl UpdateFeeStrategy for ReasonableStrategy { ); let crab_api = self.helper.crab_api_mut(); crab_api - .update_relay_fee(self.helper.crab_signer().clone(), expect_fee_crab) + .update_relay_fee(crab_signer, expect_fee_crab) .await?; log::info!( @@ -154,7 +156,7 @@ impl UpdateFeeStrategy for ReasonableStrategy { ); let darwinia_api = self.helper.darwinia_api_mut(); darwinia_api - .update_relay_fee(self.helper.darwinia_signer().clone(), expect_fee_darwinia) + .update_relay_fee(darwinia_signer, expect_fee_darwinia) .await?; Ok(()) } diff --git a/task/task-darwinia-crab/src/service/fee.rs b/task/task-darwinia-crab/src/service/fee.rs index d5de626e4..3861294b3 100644 --- a/task/task-darwinia-crab/src/service/fee.rs +++ b/task/task-darwinia-crab/src/service/fee.rs @@ -74,14 +74,14 @@ async fn run_update_fee(config_task: TaskConfig) -> anyhow::Result<()> { if !exists_subscan_config { return Ok(()); } - let strategy = CrazyStrategy::new().await?; + let mut strategy = CrazyStrategy::new().await?; strategy.handle().await } UpdateFeeStrategyType::Reasonable => { if !exists_subscan_config { return Ok(()); } - let strategy = ReasonableStrategy::new().await?; + let mut strategy = ReasonableStrategy::new().await?; strategy.handle().await } } diff --git a/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs index 97628b8d2..d32ae03e4 100644 --- a/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs +++ b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs @@ -145,9 +145,13 @@ impl UpdateFeeStrategy for ReasonableStrategy { "[reasonable] Update pangoro fee: {}", expect_fee_pangoro ); + + let pangoro_signer = self.helper.pangoro_signer().clone(); + let pangolin_signer = self.helper.pangolin_signer().clone(); + let pangoro_api = self.helper.pangoro_api_mut(); pangoro_api - .update_relay_fee(self.helper.pangoro_signer().clone(), expect_fee_pangoro) + .update_relay_fee(pangoro_signer, expect_fee_pangoro) .await?; log::info!( @@ -157,7 +161,7 @@ impl UpdateFeeStrategy for ReasonableStrategy { ); let pangolin_api = self.helper.pangolin_api_mut(); pangolin_api - .update_relay_fee(self.helper.pangolin_signer().clone(), expect_fee_pangolin) + .update_relay_fee(pangolin_signer, expect_fee_pangolin) .await?; Ok(()) } From 7dd9e4eece0992921c770118dd6883b75de49b44 Mon Sep 17 00:00:00 2001 From: fewensa Date: Wed, 1 Dec 2021 17:12:32 +0800 Subject: [PATCH 6/6] Clippy --- components/client-crab-s2s/src/api.rs | 14 +++++------ components/client-darwinia-s2s/src/api.rs | 14 +++++------ components/client-pangolin-s2s/src/api.rs | 24 +++++++------------ components/client-pangoro-s2s/src/api.rs | 14 +++++------ .../src/fee/strategy/common.rs | 6 ----- .../src/fee/strategy/common.rs | 6 ----- 6 files changed, 30 insertions(+), 48 deletions(-) diff --git a/components/client-crab-s2s/src/api.rs b/components/client-crab-s2s/src/api.rs index 77a5349a9..0e54c67df 100644 --- a/components/client-crab-s2s/src/api.rs +++ b/components/client-crab-s2s/src/api.rs @@ -35,7 +35,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -57,7 +57,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -73,7 +73,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -94,7 +94,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -113,7 +113,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -149,7 +149,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -185,7 +185,7 @@ impl CrabApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } diff --git a/components/client-darwinia-s2s/src/api.rs b/components/client-darwinia-s2s/src/api.rs index d234f8e85..406306b9d 100644 --- a/components/client-darwinia-s2s/src/api.rs +++ b/components/client-darwinia-s2s/src/api.rs @@ -35,7 +35,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -57,7 +57,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -73,7 +73,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -94,7 +94,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -113,7 +113,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -149,7 +149,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -186,7 +186,7 @@ impl DarwiniaApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } diff --git a/components/client-pangolin-s2s/src/api.rs b/components/client-pangolin-s2s/src/api.rs index a13bd534d..724472e3d 100644 --- a/components/client-pangolin-s2s/src/api.rs +++ b/components/client-pangolin-s2s/src/api.rs @@ -1,16 +1,10 @@ -use std::future::Future; -use std::pin::Pin; - use bp_messages::{LaneId, MessageNonce}; -use bridge_traits::error::StandardError; -use codec::{Decode, Encode}; +use codec::Encode; use dp_fee::{Order, Relayer}; use drml_common_primitives::AccountId; use drml_common_primitives::Balance; use drml_common_primitives::BlockNumber; -use relay_substrate_client::{ - ChainBase, Client, HeaderIdOf, TransactionSignScheme, UnsignedTransaction, -}; +use relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; use relay_utils::relay_loop::Client as RelayLoopClient; use relay_utils::MaybeConnectionError; use sp_core::storage::StorageKey; @@ -41,7 +35,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -63,7 +57,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -79,7 +73,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -100,7 +94,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -119,7 +113,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -155,7 +149,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -192,7 +186,7 @@ impl PangolinApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } diff --git a/components/client-pangoro-s2s/src/api.rs b/components/client-pangoro-s2s/src/api.rs index 16a51515d..d0edc1402 100644 --- a/components/client-pangoro-s2s/src/api.rs +++ b/components/client-pangoro-s2s/src/api.rs @@ -35,7 +35,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -57,7 +57,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -73,7 +73,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -94,7 +94,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -113,7 +113,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -149,7 +149,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } @@ -185,7 +185,7 @@ impl PangoroApi { if e.is_connection_error() { self.client.reconnect().await?; } - Err(e)? + Err(e.into()) } } } diff --git a/task/task-darwinia-crab/src/fee/strategy/common.rs b/task/task-darwinia-crab/src/fee/strategy/common.rs index e4f129d23..d688a4bdb 100644 --- a/task/task-darwinia-crab/src/fee/strategy/common.rs +++ b/task/task-darwinia-crab/src/fee/strategy/common.rs @@ -58,12 +58,6 @@ impl StrategyHelper { } impl StrategyHelper { - pub fn darwinia_api(&self) -> &DarwiniaApi { - &self.darwinia_api - } - pub fn crab_api(&self) -> &CrabApi { - &self.crab_api - } pub fn darwinia_signer(&self) -> &::AccountKeyPair { &self.darwinia_signer } diff --git a/task/task-pangolin-pangoro/src/fee/strategy/common.rs b/task/task-pangolin-pangoro/src/fee/strategy/common.rs index 47850e05a..a7c746f8d 100644 --- a/task/task-pangolin-pangoro/src/fee/strategy/common.rs +++ b/task/task-pangolin-pangoro/src/fee/strategy/common.rs @@ -60,12 +60,6 @@ impl StrategyHelper { } impl StrategyHelper { - pub fn pangolin_api(&self) -> &PangolinApi { - &self.pangolin_api - } - pub fn pangoro_api(&self) -> &PangoroApi { - &self.pangoro_api - } pub fn pangolin_signer(&self) -> &::AccountKeyPair { &self.pangolin_signer }