diff --git a/.maintain/config/task-pangolin-pangoro.toml b/.maintain/config/task-pangolin-pangoro.toml index 956809d70..16d3d0ec8 100644 --- a/.maintain/config/task-pangolin-pangoro.toml +++ b/.maintain/config/task-pangolin-pangoro.toml @@ -40,3 +40,18 @@ create_relayers_fund_accounts = false no_prometheus = false prometheus_host = "127.0.0.1" prometheus_port = 9616 + +[pangolin_subscan] +endpoint = "https://pangolin.api.subscan.io" +token = "12345abcde" +timeout = 30 + +[pangoro_subscan] +endpoint = "https://pangoro.api.subscan.io" +token = "12345abcde" +timeout = 30 + +[task] +# 1800 seconds, 30 minutes +interval_update_fee = 1800 +update_fee_strategy = "Nothing" diff --git a/Cargo.lock b/Cargo.lock index 51b806291..c65b951aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,6 +130,15 @@ dependencies = [ "serde 1.0.130", ] +[[package]] +name = "array-init" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" +dependencies = [ + "nodrop", +] + [[package]] name = "array_tool" version = "1.0.3" @@ -613,74 +622,74 @@ dependencies = [ [[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#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "finality-grandpa", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "bp-runtime", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "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#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "bitvec", "bp-runtime", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "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#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "bp-header-chain", "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)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -700,41 +709,41 @@ dependencies = [ [[package]] name = "bridge-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bp-messages", "bp-runtime", "bridge-runtime-common", "common-primitives", "darwinia-fee-market", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-bridge-dispatch", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "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)", + "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-transaction-payment", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -767,7 +776,7 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bsc-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "ethbloom", @@ -777,9 +786,9 @@ dependencies = [ "primitive-types", "rlp 0.5.1", "serde 1.0.130", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "triehash", ] @@ -1000,10 +1009,10 @@ dependencies = [ [[package]] name = "common-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -1065,22 +1074,31 @@ dependencies = [ name = "component-pangolin-s2s" version = "0.4.7" dependencies = [ + "anyhow", + "async-trait", + "bp-messages", + "bp-runtime", "bridge-primitives 2.6.10", "bridge-traits", "common-primitives", "darwinia-bridge-ethereum", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "dp-fee", + "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", "headers-relay", + "log", + "messages-relay", "pallet-transaction-payment", "pangolin-constants", "pangolin-runtime", "parity-scale-codec", "relay-substrate-client", "relay-utils", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keyring 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keyring 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)", + "tokio 1.11.0", ] [[package]] @@ -1111,21 +1129,28 @@ dependencies = [ name = "component-pangoro-s2s" version = "0.4.7" dependencies = [ + "anyhow", + "async-trait", + "bp-messages", + "bp-runtime", "bridge-primitives 2.6.10", "bridge-traits", "common-primitives", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "dp-fee", + "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", + "log", + "messages-relay", "pallet-transaction-payment", "pangoro-constants", "pangoro-runtime", "parity-scale-codec", "relay-substrate-client", "relay-utils", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keyring 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keyring 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]] @@ -1158,6 +1183,21 @@ dependencies = [ "serde 1.0.130", ] +[[package]] +name = "component-subscan" +version = "0.4.7" +dependencies = [ + "anyhow", + "async-trait", + "bridge-traits", + "log", + "reqwest", + "serde 1.0.130", + "serde-aux", + "serde-hex", + "serde_json", +] + [[package]] name = "component-thegraph-liketh" version = "0.4.7" @@ -1446,50 +1486,50 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "max-encoded-len", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-balances-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "darwinia-bridge-bsc" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bsc-primitives", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-bridge-ethereum" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "blake2-rfc", @@ -1499,15 +1539,15 @@ dependencies = [ "darwinia-support", "ethereum-primitives", "ethereum-types", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -1544,57 +1584,57 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "serde 1.0.130", "serde_json", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-democracy" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "serde 1.0.130", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-elections-phragmen" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-npos-elections", + "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-evm" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "darwinia-balances", @@ -1603,26 +1643,26 @@ dependencies = [ "evm", "evm-gasometer", "evm-runtime", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "parity-scale-codec", "primitive-types", "rlp 0.5.1", "serde 1.0.130", "sha3 0.9.1", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-evm-precompile-bridge-ethereum" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-evm", "darwinia-evm-precompile-utils", @@ -1630,15 +1670,15 @@ dependencies = [ "evm", "from-ethereum-issuing", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "darwinia-evm-precompile-bridge-s2s" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -1649,46 +1689,46 @@ dependencies = [ "dp-evm", "dp-s2s", "evm", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "from-substrate-issuing", "log", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "darwinia-evm-precompile-dispatch" version = "2.6.8" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-evm", "darwinia-support", "dp-evm", "evm", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", ] [[package]] name = "darwinia-evm-precompile-simple" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "dp-evm", "evm", "ripemd160", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", ] [[package]] name = "darwinia-evm-precompile-transfer" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "darwinia-evm", @@ -1697,23 +1737,23 @@ dependencies = [ "ethabi 13.0.0", "ethereum-types", "evm", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "parity-scale-codec", "ripemd160", "sha3 0.9.1", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-evm-precompile-utils" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-evm-precompile-utils-macro", "darwinia-support", @@ -1723,146 +1763,146 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-utils-macro" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "evm", "proc-macro2", "quote", "sha3 0.9.1", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "syn", ] [[package]] name = "darwinia-fee-market" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bitvec", "bp-messages", "bp-runtime", "darwinia-support", "dp-fee", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-fee-market-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bp-messages", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "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-header-mmr" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api", "darwinia-relay-primitives", "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "serde 1.0.130", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-header-mmr-rpc-runtime-api" version = "2.6.6" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "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-authorities" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-relay-primitives", "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-relay-primitives", "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-staking" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", - "frame-election-provider-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "serde 1.0.130", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-session", + "parity-scale-codec", + "serde 1.0.130", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-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-staking 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", "substrate-fixed", ] @@ -1870,48 +1910,48 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-runtime 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.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bp-messages", "bp-runtime", "ethereum", "ethereum-primitives", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-vesting" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -2022,69 +2062,69 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dp-asset" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "ethereum-primitives", "parity-scale-codec", "sha3 0.9.1", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "dp-consensus" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "ethereum", "parity-scale-codec", "rlp 0.5.1", "sha3 0.9.1", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "dp-contract" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "dp-asset", "ethabi 13.0.0", "ethereum-primitives", "ethereum-types", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "dp-evm" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "evm", "impl-trait-for-tuples", "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 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.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "bp-messages", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-s2s" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -2092,15 +2132,15 @@ dependencies = [ "dp-asset", "dp-contract", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "dp-storage" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" [[package]] name = "dtoa" @@ -2111,7 +2151,7 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "dvm-ethereum" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-evm", "darwinia-support", @@ -2122,25 +2162,25 @@ dependencies = [ "ethereum", "ethereum-types", "evm", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "libsecp256k1 0.5.0", "log", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "parity-scale-codec", "rlp 0.5.1", "serde 1.0.130", "sha3 0.9.1", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "dvm-rpc-runtime-api" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-evm", "darwinia-support", @@ -2148,11 +2188,11 @@ dependencies = [ "ethereum", "ethereum-types", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "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]] @@ -2370,7 +2410,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "ethash", @@ -2518,7 +2558,7 @@ dependencies = [ [[package]] name = "finality-relay" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "anyhow", "async-std", @@ -2587,7 +2627,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", ] @@ -2602,25 +2642,6 @@ dependencies = [ "percent-encoding 2.1.0", ] -[[package]] -name = "frame-benchmarking" -version = "3.1.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "linregress", - "log", - "parity-scale-codec", - "paste", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "frame-benchmarking" version = "3.1.0" @@ -2632,7 +2653,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-api", "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-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2640,19 +2661,6 @@ dependencies = [ "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "frame-election-provider-support" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "frame-election-provider-support" version = "3.0.0" @@ -2662,34 +2670,23 @@ dependencies = [ "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-npos-elections", "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "frame-metadata" -version = "13.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" 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)", "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -2715,33 +2712,6 @@ dependencies = [ "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "frame-support" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "bitflags", - "frame-metadata 13.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support-procedural 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "impl-trait-for-tuples", - "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "once_cell", - "parity-scale-codec", - "paste", - "serde 1.0.130", - "smallvec", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "frame-support" version = "3.0.0" @@ -2752,12 +2722,12 @@ dependencies = [ "frame-support-procedural 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "impl-trait-for-tuples", "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len", "once_cell", "parity-scale-codec", "paste", "serde 1.0.130", - "smallvec", + "smallvec 1.6.1", "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -2784,7 +2754,7 @@ dependencies = [ "parity-scale-codec", "paste", "serde 1.0.130", - "smallvec", + "smallvec 1.6.1", "sp-arithmetic 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-inherents 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2799,22 +2769,10 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "Inflector", - "frame-support-procedural-tools 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" -dependencies = [ - "Inflector", - "frame-support-procedural-tools 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "frame-support-procedural-tools 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "proc-macro2", "quote", "syn", @@ -2833,18 +2791,6 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-support-procedural-tools" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools" version = "3.0.0" @@ -2870,16 +2816,6 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -2901,23 +2837,6 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-system" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "impl-trait-for-tuples", - "log", - "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "frame-system" version = "3.0.0" @@ -2955,42 +2874,42 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", ] [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "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 = "from-ethereum-issuing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "darwinia-bridge-ethereum", @@ -3001,20 +2920,20 @@ dependencies = [ "dp-evm", "dvm-ethereum", "ethereum-primitives", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", "sha3 0.9.1", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "from-substrate-issuing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -3029,17 +2948,17 @@ dependencies = [ "dvm-ethereum", "ethereum-primitives", "ethereum-types", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", "serde 1.0.130", "serde_json", "sha3 0.9.1", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -3160,6 +3079,23 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +[[package]] +name = "futures-test" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46b9f6d284a9595a613f881a7b08d46abaab1005995e6fe3ccfe2398f6aea492" +dependencies = [ + "futures-core", + "futures-executor", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "futures-util", + "pin-project 1.0.8", + "pin-utils", +] + [[package]] name = "futures-timer" version = "3.0.2" @@ -3373,7 +3309,7 @@ dependencies = [ [[package]] name = "headers-relay" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "anyhow", "async-std", @@ -4051,7 +3987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8891bd853eff90e33024195d79d578dc984c82f9e0715fcd2b525a0c19d52811" dependencies = [ "parity-util-mem", - "smallvec", + "smallvec 1.6.1", ] [[package]] @@ -4130,7 +4066,7 @@ dependencies = [ "parity-multiaddr", "parking_lot 0.11.2", "pin-project 1.0.8", - "smallvec", + "smallvec 1.6.1", "wasm-timer", ] @@ -4161,7 +4097,7 @@ dependencies = [ "ring", "rw-stream-sink", "sha2 0.9.8", - "smallvec", + "smallvec 1.6.1", "thiserror", "unsigned-varint 0.7.0", "void", @@ -4189,7 +4125,7 @@ dependencies = [ "futures 0.3.17", "libp2p-core", "log", - "smallvec", + "smallvec 1.6.1", "trust-dns-resolver", ] @@ -4208,7 +4144,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", ] [[package]] @@ -4232,7 +4168,7 @@ dependencies = [ "rand 0.7.3", "regex", "sha2 0.9.8", - "smallvec", + "smallvec 1.6.1", "unsigned-varint 0.7.0", "wasm-timer", ] @@ -4249,7 +4185,7 @@ dependencies = [ "log", "prost", "prost-build", - "smallvec", + "smallvec 1.6.1", "wasm-timer", ] @@ -4272,7 +4208,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sha2 0.9.8", - "smallvec", + "smallvec 1.6.1", "uint 0.9.1", "unsigned-varint 0.7.0", "void", @@ -4295,7 +4231,7 @@ dependencies = [ "libp2p-swarm", "log", "rand 0.8.4", - "smallvec", + "smallvec 1.6.1", "socket2 0.4.1", "void", ] @@ -4314,7 +4250,7 @@ dependencies = [ "nohash-hasher", "parking_lot 0.11.2", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "unsigned-varint 0.7.0", ] @@ -4403,7 +4339,7 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "unsigned-varint 0.7.0", "void", "wasm-timer", @@ -4424,7 +4360,7 @@ dependencies = [ "lru", "minicbor", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "unsigned-varint 0.7.0", "wasm-timer", ] @@ -4440,7 +4376,7 @@ dependencies = [ "libp2p-core", "log", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "void", "wasm-timer", ] @@ -4767,24 +4703,13 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "max-encoded-len" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-trait-for-tuples", - "max-encoded-len-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "primitive-types", -] - [[package]] name = "max-encoded-len" version = "3.0.0" source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "impl-trait-for-tuples", - "max-encoded-len-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len-derive", "parity-scale-codec", "primitive-types", ] @@ -4792,7 +4717,7 @@ dependencies = [ [[package]] name = "max-encoded-len-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4801,15 +4726,10 @@ dependencies = [ ] [[package]] -name = "max-encoded-len-derive" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" -dependencies = [ - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" @@ -4846,12 +4766,12 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" 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)", + "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -4869,7 +4789,7 @@ dependencies = [ [[package]] name = "messages-relay" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "anyhow", "async-std", @@ -4882,6 +4802,7 @@ dependencies = [ "num-traits 0.2.14", "parking_lot 0.11.2", "relay-utils", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -4959,13 +4880,13 @@ dependencies = [ [[package]] name = "module-transaction-pause" version = "2.0.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -5026,7 +4947,7 @@ dependencies = [ "futures 0.3.17", "log", "pin-project 1.0.8", - "smallvec", + "smallvec 1.6.1", "unsigned-varint 0.7.0", ] @@ -5257,30 +5178,16 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "pallet-session", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-authority-discovery", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "pallet-authorship" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -5316,198 +5223,180 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-session", + "pallet-timestamp", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-session", + "sp-staking 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-balances" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "max-encoded-len", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-bounties" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "pallet-treasury", "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "bp-message-dispatch", "bp-runtime", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "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)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "bitvec", "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)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-collective" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-election-provider-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "log", "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-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-npos-elections", + "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 = "pallet-grandpa" version = "3.1.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-session", "parity-scale-codec", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-finality-grandpa", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-session", + "sp-staking 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-identity" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "enumflags2", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "pallet-im-online" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "log", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -5582,123 +5471,103 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "pallet-balances", "parity-scale-codec", "serde 1.0.130", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-staking 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-proxy" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "safe-mix", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-recovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "enumflags2", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "log", - "parity-scale-codec", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "pallet-session" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "impl-trait-for-tuples", + "frame-benchmarking", + "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", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -5710,12 +5579,12 @@ dependencies = [ "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "impl-trait-for-tuples", "log", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-timestamp", "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-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-session", "sp-staking 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)", @@ -5724,14 +5593,14 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "rand_chacha 0.2.2", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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]] @@ -5739,12 +5608,12 @@ name = "pallet-staking" version = "3.0.0" source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-election-provider-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "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)", "log", "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "pallet-session", "parity-scale-codec", "paste", "serde 1.0.130", @@ -5759,133 +5628,116 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "pallet-timestamp" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" -dependencies = [ - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "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)", + "frame-benchmarking", + "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", "log", "parity-scale-codec", "sp-inherents 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)", - "sp-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-timestamp", ] [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "pallet-treasury", "parity-scale-codec", "serde 1.0.130", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-transaction-payment" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "serde 1.0.130", - "smallvec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "smallvec 1.6.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 = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "pallet-balances", "parity-scale-codec", "serde 1.0.130", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-utility" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "pangolin-constants" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "common-primitives", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "pangolin-runtime" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -5927,19 +5779,20 @@ dependencies = [ "dvm-rpc-runtime-api", "ethereum-primitives", "evm", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "frame-election-provider-support", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", "from-ethereum-issuing", "from-substrate-issuing", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "max-encoded-len", "module-transaction-pause", "pallet-authority-discovery", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", @@ -5949,7 +5802,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-grandpa", "pallet-identity", - "pallet-im-online 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-im-online 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-membership", "pallet-multisig", "pallet-offences", @@ -5957,10 +5810,10 @@ dependencies = [ "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-session", "pallet-society", "pallet-sudo", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -5972,23 +5825,23 @@ dependencies = [ "pangoro-runtime-system-params", "parity-scale-codec", "serde 1.0.130", - "smallvec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "smallvec 1.6.1", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 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-npos-elections", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-session", + "sp-staking 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-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "static_assertions", "substrate-wasm-builder", "to-ethereum-backing", @@ -5998,27 +5851,27 @@ dependencies = [ [[package]] name = "pangolin-runtime-system-params" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "static_assertions", ] [[package]] name = "pangoro-constants" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "common-primitives", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "pangoro-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "bp-header-chain", @@ -6038,30 +5891,31 @@ dependencies = [ "dp-asset", "dp-fee", "dp-s2s", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "frame-election-provider-support", "frame-executive", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "max-encoded-len", "module-transaction-pause", "pallet-authority-discovery", - "pallet-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-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)", + "pallet-im-online 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "pallet-offences", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-session", "pallet-sudo", - "pallet-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pangolin-constants", @@ -6070,22 +5924,22 @@ dependencies = [ "pangoro-runtime-system-params", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-finality-grandpa", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-npos-elections", "sp-offchain", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-session 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-session", + "sp-staking 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-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "substrate-wasm-builder", "to-substrate-backing", ] @@ -6093,11 +5947,11 @@ dependencies = [ [[package]] name = "pangoro-runtime-system-params" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "static_assertions", ] @@ -6235,7 +6089,7 @@ dependencies = [ "cloudabi", "libc", "redox_syscall 0.1.57", - "smallvec", + "smallvec 1.6.1", "winapi", ] @@ -6249,7 +6103,7 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.10", - "smallvec", + "smallvec 1.6.1", "winapi", ] @@ -6925,15 +6779,15 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "relay-substrate-client" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "async-std", "async-trait", "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)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 0.3.17", "headers-relay", "jsonrpsee-proc-macros", @@ -6947,21 +6801,21 @@ dependencies = [ "rand 0.7.3", "relay-utils", "sc-rpc-api", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-finality-grandpa", - "sp-rpc 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-rpc", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "tokio 1.11.0", ] [[package]] name = "relay-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "ansi_term 0.12.1", "anyhow", @@ -7262,35 +7116,35 @@ dependencies = [ [[package]] name = "sc-allocator" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "log", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 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-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "thiserror", ] [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 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)", ] [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7303,14 +7157,14 @@ dependencies = [ "serde 1.0.130", "serde_json", "sp-consensus-babe", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7321,7 +7175,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "derive_more", "fnv", @@ -7333,42 +7187,42 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "sc-executor", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-database", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keystore 0.9.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-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-transaction-pool", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "parking_lot 0.11.2", "sc-client-api", "sp-blockchain", "sp-consensus", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "derive_more", @@ -7393,41 +7247,41 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 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-keystore 0.9.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-utils", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "futures 0.3.17", @@ -7437,36 +7291,36 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-telemetry", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 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-timestamp", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "sc-client-api", - "sp-authorship 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-authorship 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)", "thiserror", ] [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "derive_more", "lazy_static", @@ -7477,33 +7331,33 @@ dependencies = [ "parking_lot 0.11.2", "sc-executor-common", "sc-executor-wasmi", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-panic-handler 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-externalities 0.9.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-panic-handler 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-serializer", "sp-tasks", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "wasmi 0.9.1", ] [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "derive_more", "parity-scale-codec", "pwasm-utils", "sc-allocator", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-maybe-compressed-blob", "sp-serializer", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "thiserror", "wasmi 0.9.1", ] @@ -7511,22 +7365,22 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "wasmi 0.9.1", ] [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "derive_more", @@ -7549,16 +7403,16 @@ dependencies = [ "sc-network-gossip", "sc-telemetry", "serde_json", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-finality-grandpa", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keystore 0.9.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-utils", "substrate-prometheus-endpoint", "wasm-timer", @@ -7567,7 +7421,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "derive_more", @@ -7578,16 +7432,16 @@ dependencies = [ "parking_lot 0.11.2", "rand 0.7.3", "serde_json", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "subtle 2.4.1", ] [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-std", "async-trait", @@ -7622,12 +7476,12 @@ dependencies = [ "sc-peerset", "serde 1.0.130", "serde_json", - "smallvec", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "smallvec 1.6.1", + "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-blockchain", "sp-consensus", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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-utils", "substrate-prometheus-endpoint", "thiserror", @@ -7640,7 +7494,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "futures 0.3.17", "futures-timer", @@ -7648,7 +7502,7 @@ dependencies = [ "log", "lru", "sc-network", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "substrate-prometheus-endpoint", "tracing", "wasm-timer", @@ -7657,7 +7511,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "futures 0.3.17", "libp2p", @@ -7670,7 +7524,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "derive_more", "futures 0.3.17", @@ -7684,18 +7538,18 @@ dependencies = [ "sc-chain-spec", "serde 1.0.130", "serde_json", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-rpc 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-rpc", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-transaction-pool", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "chrono", "futures 0.3.17", @@ -7912,6 +7766,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde-hex" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca37e3e4d1b39afd7ff11ee4e947efae85adfddf4841787bfa47c470e96dc26d" +dependencies = [ + "array-init", + "serde 1.0.130", + "smallvec 0.6.14", +] + [[package]] name = "serde-hjson" version = "0.9.1" @@ -8112,6 +7977,15 @@ dependencies = [ "futures-io", ] +[[package]] +name = "smallvec" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + [[package]] name = "smallvec" version = "1.6.1" @@ -8215,23 +8089,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "sp-api" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "thiserror", -] - [[package]] name = "sp-api" version = "3.0.0" @@ -8240,7 +8097,7 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-api-proc-macro", "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)", @@ -8249,18 +8106,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "blake2-rfc", - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-api-proc-macro" version = "3.0.0" @@ -8273,25 +8118,12 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-application-crypto" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "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)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-application-crypto" version = "3.0.0" source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len", "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)", @@ -8312,20 +8144,6 @@ dependencies = [ "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-arithmetic" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "integer-sqrt", - "num-traits 0.2.14", - "parity-scale-codec", - "serde 1.0.130", - "sp-debug-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "static_assertions", -] - [[package]] name = "sp-arithmetic" version = "3.0.0" @@ -8357,25 +8175,13 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "sp-authorship" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "async-trait", "parity-scale-codec", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-application-crypto 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]] @@ -8405,37 +8211,37 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-inherents 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 = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "futures 0.3.17", "log", "lru", "parity-scale-codec", "parking_lot 0.11.2", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", "sp-consensus", "sp-database", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", "thiserror", ] [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "futures 0.3.17", @@ -8445,15 +8251,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 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)", "sp-utils", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -8462,90 +8268,45 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-trait", "merlin", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-timestamp 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keystore 0.9.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)", + "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-arithmetic 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 = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "sp-core" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "base58", - "blake2-rfc", - "byteorder", - "dyn-clonable", - "ed25519-dalek", - "futures 0.3.17", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1 0.3.5", - "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "merlin", - "num-traits 0.2.14", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.2", - "primitive-types", - "rand 0.7.3", - "regex", - "schnorrkel", - "secrecy", - "serde 1.0.130", - "sha2 0.9.8", - "sp-debug-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "tiny-keccak", - "twox-hash", - "wasmi 0.9.1", - "zeroize", + "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]] @@ -8566,7 +8327,7 @@ dependencies = [ "lazy_static", "libsecp256k1 0.3.5", "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len", "merlin", "num-traits 0.2.14", "parity-scale-codec", @@ -8641,22 +8402,12 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "kvdb", "parking_lot 0.11.2", ] -[[package]] -name = "sp-debug-derive" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-debug-derive" version = "3.0.0" @@ -8678,17 +8429,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-externalities" -version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-externalities" version = "0.9.0" @@ -8715,32 +8455,18 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "sp-inherents" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "thiserror", + "sp-api", + "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-keystore 0.9.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]] @@ -8770,31 +8496,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-io" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "futures 0.3.17", - "hash-db", - "libsecp256k1 0.3.5", - "log", - "parity-scale-codec", - "parking_lot 0.11.2", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-state-machine 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "3.0.0" @@ -8809,7 +8510,7 @@ dependencies = [ "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-keystore 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-maybe-compressed-blob", "sp-runtime-interface 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)", @@ -8845,17 +8546,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-keyring" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "lazy_static", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "strum 0.20.0", -] - [[package]] name = "sp-keyring" version = "3.0.0" @@ -8879,23 +8569,6 @@ dependencies = [ "strum 0.20.0", ] -[[package]] -name = "sp-keystore" -version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "async-trait", - "derive_more", - "futures 0.3.17", - "merlin", - "parity-scale-codec", - "parking_lot 0.11.2", - "schnorrkel", - "serde 1.0.130", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-keystore" version = "0.9.0" @@ -8908,6 +8581,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "schnorrkel", + "serde 1.0.130", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] @@ -8929,15 +8603,6 @@ dependencies = [ "sp-externalities 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-maybe-compressed-blob" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "ruzstd", - "zstd", -] - [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" @@ -8947,19 +8612,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "sp-npos-elections" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "parity-scale-codec", - "serde 1.0.130", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-npos-elections-compact 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-npos-elections" version = "3.0.0" @@ -8969,21 +8621,10 @@ dependencies = [ "serde 1.0.130", "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-npos-elections-compact 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-npos-elections-compact", "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] -[[package]] -name = "sp-npos-elections-compact" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-npos-elections-compact" version = "3.0.0" @@ -8998,19 +8639,11 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "sp-panic-handler" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "backtrace", + "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)", ] [[package]] @@ -9030,17 +8663,6 @@ dependencies = [ "backtrace", ] -[[package]] -name = "sp-rpc" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "rustc-hash", - "serde 1.0.130", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "tracing-core", -] - [[package]] name = "sp-rpc" version = "3.0.0" @@ -9052,28 +8674,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-runtime" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "serde 1.0.130", - "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-arithmetic 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-runtime" version = "3.0.0" @@ -9083,7 +8683,7 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "max-encoded-len 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "max-encoded-len", "parity-scale-codec", "parity-util-mem", "paste", @@ -9118,23 +8718,6 @@ dependencies = [ "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-runtime-interface" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface-proc-macro 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-storage 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-tracing 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-wasm-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "3.0.0" @@ -9170,18 +8753,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "Inflector", - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" @@ -9210,48 +8781,25 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "serde 1.0.130", "serde_json", ] -[[package]] -name = "sp-session" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-session" version = "3.0.0" source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "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-staking 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 = "sp-staking" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "parity-scale-codec", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-staking" version = "3.0.0" @@ -9273,29 +8821,6 @@ dependencies = [ "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-state-machine" -version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "hash-db", - "log", - "num-traits 0.2.14", - "parity-scale-codec", - "parking_lot 0.11.2", - "rand 0.7.3", - "smallvec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-panic-handler 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-state-machine" version = "0.9.0" @@ -9307,7 +8832,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-panic-handler 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -9331,7 +8856,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.2", "rand 0.7.3", - "smallvec", + "smallvec 1.6.1", "sp-core 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-externalities 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-panic-handler 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -9342,11 +8867,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-std" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" - [[package]] name = "sp-std" version = "3.0.0" @@ -9358,19 +8878,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35391ea974fa5ee869cb094d5b437688fbf3d8127d64d1b9fed5822a1ed39b12" -[[package]] -name = "sp-storage" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde 1.0.130", - "sp-debug-derive 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-storage" version = "3.0.0" @@ -9401,31 +8908,14 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "log", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-externalities 0.9.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime-interface 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - -[[package]] -name = "sp-timestamp" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ - "async-trait", - "futures-timer", "log", - "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-inherents 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "thiserror", - "wasm-timer", + "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-externalities 0.9.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-interface 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]] @@ -9437,7 +8927,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-api", "sp-inherents 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)", @@ -9445,24 +8935,6 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "sp-tracing" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "erased-serde", - "log", - "parity-scale-codec", - "parking_lot 0.10.2", - "serde 1.0.130", - "serde_json", - "slog", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-tracing" version = "3.0.0" @@ -9498,33 +8970,19 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "derive_more", "futures 0.3.17", "log", "parity-scale-codec", "serde 1.0.130", - "sp-api 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-api", "sp-blockchain", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "thiserror", ] -[[package]] -name = "sp-trie" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "trie-db", - "trie-root", -] - [[package]] name = "sp-trie" version = "3.0.0" @@ -9557,7 +9015,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "futures 0.3.17", "futures-core", @@ -9566,19 +9024,6 @@ dependencies = [ "prometheus", ] -[[package]] -name = "sp-version" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "serde 1.0.130", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version-proc-macro 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", -] - [[package]] name = "sp-version" version = "3.0.0" @@ -9589,7 +9034,7 @@ dependencies = [ "serde 1.0.130", "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-version-proc-macro 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-version-proc-macro", ] [[package]] @@ -9605,18 +9050,6 @@ dependencies = [ "sp-std 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-version-proc-macro" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "parity-scale-codec", - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-version-proc-macro" version = "3.0.0" @@ -9629,17 +9062,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-wasm-interface" -version = "3.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "wasmi 0.9.1", -] - [[package]] name = "sp-wasm-interface" version = "3.0.0" @@ -9856,7 +9278,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "async-std", "derive_more", @@ -9870,7 +9292,7 @@ dependencies = [ [[package]] name = "substrate-relay-helper" version = "0.1.0" -source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6#5935408997db8f7ef1959f8dba319a5f0991f53c" +source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344" dependencies = [ "anyhow", "async-std", @@ -9881,7 +9303,7 @@ dependencies = [ "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)", + "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "futures 0.3.17", "log", "messages-relay", @@ -9890,9 +9312,9 @@ dependencies = [ "parity-scale-codec", "relay-substrate-client", "relay-utils", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -9919,7 +9341,7 @@ dependencies = [ "serde_json", "sp-application-crypto 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", - "sp-rpc 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", + "sp-rpc", "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-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", @@ -9946,13 +9368,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "4.0.0" -source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6#74101dc21cfffb4c2d014fcc28edc166d5ca1b16" +source = "git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1#3c951d7eb441b8dec5f438084b0c264422385069" dependencies = [ "ansi_term 0.12.1", "atty", "build-helper", "cargo_metadata", - "sp-maybe-compressed-blob 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-maybe-compressed-blob", "tempfile", "toml", "walkdir", @@ -10138,8 +9560,10 @@ dependencies = [ "common-primitives", "component-pangolin-s2s", "component-pangoro-s2s", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "component-subscan", + "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", "hex", "lifeline", "log", @@ -10157,11 +9581,11 @@ dependencies = [ "relay-utils", "serde 1.0.130", "serde_json", - "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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)", - "sp-trie 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 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)", + "sp-version 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", "strum 0.21.0", "substrate-relay-helper", "support-keep", @@ -10384,28 +9808,28 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "to-ethereum-backing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "darwinia-relay-primitives", "darwinia-support", "ethabi 13.0.0", "ethereum-primitives", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", "serde 1.0.130", "serde_json", - "sp-io 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "to-substrate-backing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -10417,27 +9841,27 @@ dependencies = [ "dp-s2s", "ethereum-primitives", "ethereum-types", - "frame-benchmarking 3.1.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "frame-benchmarking", + "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", "serde 1.0.130", "serde_json", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "sp-std 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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 = "to-tron-backing" version = "2.6.10" -source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10#931b471794cab9de63744ad230ac16420d866f8d" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d" dependencies = [ "darwinia-support", - "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", - "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "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", - "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6)", + "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)", ] [[package]] @@ -10638,7 +10062,7 @@ dependencies = [ "serde 1.0.130", "serde_json", "sharded-slab", - "smallvec", + "smallvec 1.6.1", "thread_local", "tracing", "tracing-core", @@ -10656,7 +10080,7 @@ dependencies = [ "hashbrown 0.11.2", "log", "rustc-hex", - "smallvec", + "smallvec 1.6.1", ] [[package]] @@ -10696,7 +10120,7 @@ dependencies = [ "lazy_static", "log", "rand 0.8.4", - "smallvec", + "smallvec 1.6.1", "thiserror", "tinyvec", "url 2.2.2", @@ -10716,7 +10140,7 @@ dependencies = [ "lru-cache", "parking_lot 0.11.2", "resolv-conf", - "smallvec", + "smallvec 1.6.1", "thiserror", "trust-dns-proto", ] diff --git a/bin/src/initialize.rs b/bin/src/initialize.rs index 4af97290a..3725cd29e 100644 --- a/bin/src/initialize.rs +++ b/bin/src/initialize.rs @@ -22,11 +22,14 @@ fn init_log() { "darwinia_bridge=debug", "bridge=info", "component_pangolin_subxt=trace", + "subscan=debug", "support_tracker_evm_log=info", "task-darwinia-ethereum=trace", "task-pangolin-ropsten=trace", "task-pangolin-pangoro=trace", "jsonrpsee_ws_client=error", + "component_pangoro_s2s=trace", + "component_pangolin_s2s=trace", ] .join(","), ); diff --git a/components/client-darwinia-subxt/src/component.rs b/components/client-darwinia-subxt/src/component.rs index 4e043b224..16ce8d194 100644 --- a/components/client-darwinia-subxt/src/component.rs +++ b/components/client-darwinia-subxt/src/component.rs @@ -19,7 +19,8 @@ impl DarwiniaSubxtComponent { #[async_trait::async_trait] impl BridgeComponent for DarwiniaSubxtComponent { fn restore_with_namespace(namespace: String) -> BridgeResult { - let config: DarwiniaSubxtConfig = Config::restore_with_namespace(T::NAME, namespace)?; + let config: DarwiniaSubxtConfig = + Config::restore_with_namespace_unwrap(T::NAME, namespace)?; Ok(Self::new(config)) } diff --git a/components/client-pangolin-s2s/Cargo.toml b/components/client-pangolin-s2s/Cargo.toml index 9444b6540..91037035a 100644 --- a/components/client-pangolin-s2s/Cargo.toml +++ b/components/client-pangolin-s2s/Cargo.toml @@ -18,27 +18,42 @@ readme = 'README.md' edition = "2018" [dependencies] +anyhow = "1" +async-trait = "0.1" +log = "0.4" bridge-traits = { path = "../../traits" } codec = { package = "parity-scale-codec", version = "2.0.0" } -headers-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } +headers-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +messages-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } ## Bridge dependencies -pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangolin-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } +pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangolin-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } ## Substrate Dependencies -frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } + + +[dev-dependencies] +anyhow = "1" +futures-test = "0.3" +tokio = { version = "1", features = ["time"] } +codec = { package = "parity-scale-codec", version = "2.2.0" } + diff --git a/components/client-pangolin-s2s/src/api.rs b/components/client-pangolin-s2s/src/api.rs new file mode 100644 index 000000000..e18ffaae9 --- /dev/null +++ b/components/client-pangolin-s2s/src/api.rs @@ -0,0 +1,160 @@ +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 relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; +use sp_core::storage::StorageKey; +use sp_core::{Bytes, Pair}; + +use crate::{patch, PangolinChain}; + +#[derive(Clone)] +pub struct PangolinApi { + client: Client, +} + +impl PangolinApi { + pub fn new(client: Client) -> Self { + Self { client } + } +} + +impl PangolinApi { + pub async fn client(&self) -> &Client { + &self.client + } + + /// Query assigned relayers + pub async fn assigned_relayers(&self) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + StorageKey( + patch::storage_prefix("FeeMarket".as_bytes(), "AssignedRelayers".as_bytes()) + .to_vec(), + ), + None, + ) + .await? + .unwrap_or_else(Vec::new)) + } + + /// Query all relayers + pub async fn relayers(&self) -> anyhow::Result> { + Ok(self + .client + .storage_value( + StorageKey( + patch::storage_prefix("FeeMarket".as_bytes(), "Relayers".as_bytes()).to_vec(), + ), + None, + ) + .await? + .unwrap_or_else(Vec::new)) + } + + /// Query relayer info by account id + pub async fn relayer( + &self, + account: AccountId, + ) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + bp_runtime::storage_map_final_key_blake2_128concat( + "FeeMarket", + "RelayersMap", + account.encode().as_slice(), + ), + None, + ) + .await?) + } + + pub async fn is_relayer(&self, account: AccountId) -> anyhow::Result { + self.relayer(account).await.map(|item| item.is_some()) + } + + /// Query order + pub async fn order( + &self, + laned_id: LaneId, + message_nonce: MessageNonce, + ) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + bp_runtime::storage_map_final_key_blake2_128concat( + "FeeMarket", + "Orders", + (laned_id, message_nonce).encode().as_slice(), + ), + None, + ) + .await?) + } + + /// Return number of the best finalized block. + pub async fn best_finalized_header_number( + &self, + ) -> anyhow::Result { + Ok(self.client.best_finalized_header_number().await?) + } + + /// Update relay fee + pub async fn update_relay_fee( + &self, + signer: ::AccountKeyPair, + amount: ::Balance, + ) -> anyhow::Result<()> { + let signer_id = (*signer.public().as_array_ref()).into(); + let genesis_hash = *self.client.genesis_hash(); + self.client + .submit_signed_extrinsic(signer_id, move |_, transaction_nonce| { + Bytes( + PangolinChain::sign_transaction( + genesis_hash, + &signer, + relay_substrate_client::TransactionEra::immortal(), + UnsignedTransaction::new( + pangolin_runtime::FeeMarketCall::update_relay_fee(amount).into(), + transaction_nonce, + ), + ) + .encode(), + ) + }) + .await?; + Ok(()) + } + + /// Update locked collateral + pub async fn update_locked_collateral( + &self, + signer: ::AccountKeyPair, + amount: ::Balance, + ) -> anyhow::Result<()> { + let signer_id = (*signer.public().as_array_ref()).into(); + let genesis_hash = *self.client.genesis_hash(); + self.client + .submit_signed_extrinsic(signer_id, move |_, transaction_nonce| { + Bytes( + PangolinChain::sign_transaction( + genesis_hash, + &signer, + relay_substrate_client::TransactionEra::immortal(), + UnsignedTransaction::new( + pangolin_runtime::FeeMarketCall::update_locked_collateral(amount) + .into(), + transaction_nonce, + ), + ) + .encode(), + ) + }) + .await?; + Ok(()) + } +} diff --git a/components/client-pangolin-s2s/src/feemarket.rs b/components/client-pangolin-s2s/src/feemarket.rs new file mode 100644 index 000000000..0e5331235 --- /dev/null +++ b/components/client-pangolin-s2s/src/feemarket.rs @@ -0,0 +1,109 @@ +use std::ops::Range; + +use common_primitives::AccountId; +use messages_relay::message_lane::MessageLane; +use messages_relay::message_lane_loop::{ + SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, +}; +use messages_relay::relay_strategy::{RelayReference, RelayStrategy}; +use relay_substrate_client::Client; + +use crate::api::PangolinApi; +use crate::PangolinChain; + +#[derive(Clone)] +pub struct PangolinRelayStrategy { + api: PangolinApi, + account: AccountId, +} + +impl PangolinRelayStrategy { + pub fn new(client: Client, account: AccountId) -> Self { + Self { + api: PangolinApi::new(client), + account, + } + } +} + +#[async_trait::async_trait] +impl RelayStrategy for PangolinRelayStrategy { + async fn decide< + P: MessageLane, + SourceClient: MessageLaneSourceClient

, + TargetClient: MessageLaneTargetClient

, + >( + &self, + reference: &mut RelayReference, + ) -> bool { + let nonce = &reference.nonce; + let order = self + .api + .order(bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) + .await + .map_err(|e| { + log::error!("Failed to query order: {:?}", e); + }) + .unwrap_or(None); + + // If the order is not exists. + // 1. You are too behind. + // 2. The network question + // So, you can skip this currently + // Related: https://github.com/darwinia-network/darwinia-common/blob/90add536ed320ec7e17898e695c65ee9d7ce79b0/frame/fee-market/src/lib.rs?#L177 + if order.is_none() { + return false; + } + // ----- + + let order = order.unwrap(); + let relayers = order.relayers; + + // If not have any assigned relayers, everyone participates in the relay. + if relayers.is_empty() { + return true; + } + + // ----- + + let prior_relayer = relayers.iter().find(|item| item.id == self.account); + let is_assigned_relayer = prior_relayer.is_some(); + + // If you are assigned relayer, you must relay this nonce. + // If you don't do that, the fee market pallet will slash your deposit. + // Even though it is a timeout, although it will slash your deposit after the timeout is delivered, + // you can still get relay rewards. + if is_assigned_relayer { + return true; + } + + // ----- + + // If you aren't assigned relayer, only participate in the part about time out, earn more rewards + let latest_block_number = self + .api + .best_finalized_header_number() + .await + .map_err(|e| { + log::error!( + "Failed to query latest block, unable to decide whether to participate: {:?}", + e + ); + }) + .unwrap_or(0); + let ranges = relayers + .iter() + .map(|item| item.valid_range.clone()) + .collect::>>(); + + let mut maximum_timeout = 0; + for range in ranges { + maximum_timeout = std::cmp::max(maximum_timeout, range.end); + } + // If this order has timed out, decide to relay + if latest_block_number > maximum_timeout { + return true; + } + false + } +} diff --git a/components/client-pangolin-s2s/src/lib.rs b/components/client-pangolin-s2s/src/lib.rs index 3b04f1a5a..ba5116c30 100644 --- a/components/client-pangolin-s2s/src/lib.rs +++ b/components/client-pangolin-s2s/src/lib.rs @@ -1,132 +1,7 @@ -use std::time::Duration; +pub use self::feemarket::*; +pub use self::pangolin::*; -use bridge_traits::bridge::chain::{BridgeChain, ChainCategory}; -use codec::{Compact, Decode, Encode}; -use relay_substrate_client::{ - BalanceOf, Chain, ChainBase, ChainWithBalances, IndexOf, TransactionEraOf, - TransactionSignScheme, UnsignedTransaction, -}; -use sp_core::{storage::StorageKey, Pair}; -use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; - -/// Pangolin header id. -pub type HeaderId = relay_utils::HeaderId; - -/// Rialto header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; - -/// Millau chain definition. -#[derive(Debug, Clone, Copy)] -pub struct PangolinChain; - -impl BridgeChain for PangolinChain { - const CHAIN_CATEGORY: ChainCategory = ChainCategory::Substrate; -} - -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; -} - -impl Chain for PangolinChain { - const NAME: &'static str = "Pangolin"; - const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(pangolin_constants::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; - - type SignedBlock = pangolin_runtime::SignedBlock; - type Call = pangolin_runtime::Call; - type WeightToFee = pangolin_runtime::WeightToFee; -} - -impl ChainWithBalances for PangolinChain { - fn account_info_storage_key(account_id: &Self::AccountId) -> StorageKey { - use frame_support::storage::generator::StorageMap; - StorageKey( - frame_system::Account::::storage_map_final_key(account_id), - ) - } -} - -impl TransactionSignScheme for PangolinChain { - type Chain = PangolinChain; - type AccountKeyPair = sp_core::sr25519::Pair; - type SignedTransaction = pangolin_runtime::UncheckedExtrinsic; - - fn sign_transaction( - genesis_hash: ::Hash, - signer: &Self::AccountKeyPair, - _era: TransactionEraOf, - unsigned: UnsignedTransaction, - ) -> Self::SignedTransaction { - let raw_payload = SignedPayload::from_raw( - unsigned.call, - ( - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckEra::::from(sp_runtime::generic::Era::Immortal), - frame_system::CheckNonce::::from(unsigned.nonce), - frame_system::CheckWeight::::new(), - pallet_transaction_payment::ChargeTransactionPayment::::from(unsigned.tip), - darwinia_bridge_ethereum::CheckEthereumRelayHeaderParcel::::new(), - ), - ( - pangolin_runtime::VERSION.spec_version, - pangolin_runtime::VERSION.transaction_version, - genesis_hash, - genesis_hash, // era.signed_payload(genesis_hash), - (), - (), - (), - (), - ), - ); - let signature = raw_payload.using_encoded(|payload| signer.sign(payload)); - let signer: sp_runtime::MultiSigner = signer.public().into(); - let (call, extra, _) = raw_payload.deconstruct(); - - pangolin_runtime::UncheckedExtrinsic::new_signed( - call, - sp_runtime::MultiAddress::Id(signer.into_account()), - signature.into(), - extra, - ) - } - - fn is_signed(tx: &Self::SignedTransaction) -> bool { - tx.signature.is_some() - } - - fn is_signed_by(signer: &Self::AccountKeyPair, tx: &Self::SignedTransaction) -> bool { - tx.signature - .as_ref() - .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = - (*signer.public().as_array_ref()).into(); - *address == pangolin_runtime::Address::from(account_id) - }) - .unwrap_or(false) - } - - fn parse_transaction(tx: Self::SignedTransaction) -> Option> { - let extra = &tx.signature.as_ref()?.2; - Some(UnsignedTransaction { - call: tx.function, - nonce: Compact::>::decode(&mut &extra.4.encode()[..]) - .ok()? - .into(), - tip: Compact::>::decode(&mut &extra.6.encode()[..]) - .ok()? - .into(), - }) - } -} +pub mod api; +mod feemarket; +mod pangolin; +pub(crate) mod patch; diff --git a/components/client-pangolin-s2s/src/pangolin.rs b/components/client-pangolin-s2s/src/pangolin.rs new file mode 100644 index 000000000..3b04f1a5a --- /dev/null +++ b/components/client-pangolin-s2s/src/pangolin.rs @@ -0,0 +1,132 @@ +use std::time::Duration; + +use bridge_traits::bridge::chain::{BridgeChain, ChainCategory}; +use codec::{Compact, Decode, Encode}; +use relay_substrate_client::{ + BalanceOf, Chain, ChainBase, ChainWithBalances, IndexOf, TransactionEraOf, + TransactionSignScheme, UnsignedTransaction, +}; +use sp_core::{storage::StorageKey, Pair}; +use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; + +/// Pangolin header id. +pub type HeaderId = relay_utils::HeaderId; + +/// Rialto header type used in headers sync. +pub type SyncHeader = relay_substrate_client::SyncHeader; + +/// Millau chain definition. +#[derive(Debug, Clone, Copy)] +pub struct PangolinChain; + +impl BridgeChain for PangolinChain { + const CHAIN_CATEGORY: ChainCategory = ChainCategory::Substrate; +} + +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; +} + +impl Chain for PangolinChain { + const NAME: &'static str = "Pangolin"; + const AVERAGE_BLOCK_INTERVAL: Duration = + Duration::from_millis(pangolin_constants::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; + + type SignedBlock = pangolin_runtime::SignedBlock; + type Call = pangolin_runtime::Call; + type WeightToFee = pangolin_runtime::WeightToFee; +} + +impl ChainWithBalances for PangolinChain { + fn account_info_storage_key(account_id: &Self::AccountId) -> StorageKey { + use frame_support::storage::generator::StorageMap; + StorageKey( + frame_system::Account::::storage_map_final_key(account_id), + ) + } +} + +impl TransactionSignScheme for PangolinChain { + type Chain = PangolinChain; + type AccountKeyPair = sp_core::sr25519::Pair; + type SignedTransaction = pangolin_runtime::UncheckedExtrinsic; + + fn sign_transaction( + genesis_hash: ::Hash, + signer: &Self::AccountKeyPair, + _era: TransactionEraOf, + unsigned: UnsignedTransaction, + ) -> Self::SignedTransaction { + let raw_payload = SignedPayload::from_raw( + unsigned.call, + ( + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(sp_runtime::generic::Era::Immortal), + frame_system::CheckNonce::::from(unsigned.nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(unsigned.tip), + darwinia_bridge_ethereum::CheckEthereumRelayHeaderParcel::::new(), + ), + ( + pangolin_runtime::VERSION.spec_version, + pangolin_runtime::VERSION.transaction_version, + genesis_hash, + genesis_hash, // era.signed_payload(genesis_hash), + (), + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|payload| signer.sign(payload)); + let signer: sp_runtime::MultiSigner = signer.public().into(); + let (call, extra, _) = raw_payload.deconstruct(); + + pangolin_runtime::UncheckedExtrinsic::new_signed( + call, + sp_runtime::MultiAddress::Id(signer.into_account()), + signature.into(), + extra, + ) + } + + fn is_signed(tx: &Self::SignedTransaction) -> bool { + tx.signature.is_some() + } + + fn is_signed_by(signer: &Self::AccountKeyPair, tx: &Self::SignedTransaction) -> bool { + tx.signature + .as_ref() + .map(|(address, _, _)| { + let account_id: common_primitives::AccountId = + (*signer.public().as_array_ref()).into(); + *address == pangolin_runtime::Address::from(account_id) + }) + .unwrap_or(false) + } + + fn parse_transaction(tx: Self::SignedTransaction) -> Option> { + let extra = &tx.signature.as_ref()?.2; + Some(UnsignedTransaction { + call: tx.function, + nonce: Compact::>::decode(&mut &extra.4.encode()[..]) + .ok()? + .into(), + tip: Compact::>::decode(&mut &extra.6.encode()[..]) + .ok()? + .into(), + }) + } +} diff --git a/components/client-pangolin-s2s/src/patch.rs b/components/client-pangolin-s2s/src/patch.rs new file mode 100644 index 000000000..e40c3c3e5 --- /dev/null +++ b/components/client-pangolin-s2s/src/patch.rs @@ -0,0 +1,15 @@ +use frame_support::StorageHasher; + +/// Returns the storage prefix for a specific pallet name and storage name. +/// +/// The storage prefix is `concat(twox_128(pallet_name), twox_128(storage_name))`. +pub fn storage_prefix(pallet_name: &[u8], storage_name: &[u8]) -> [u8; 32] { + let pallet_hash = frame_support::Twox128::hash(pallet_name); + let storage_hash = frame_support::Twox128::hash(storage_name); + + let mut final_key = [0u8; 32]; + final_key[..16].copy_from_slice(&pallet_hash); + final_key[16..].copy_from_slice(&storage_hash); + + final_key +} diff --git a/components/client-pangolin-s2s/tests/client_substrate.rs b/components/client-pangolin-s2s/tests/client_substrate.rs new file mode 100644 index 000000000..ac32da9fd --- /dev/null +++ b/components/client-pangolin-s2s/tests/client_substrate.rs @@ -0,0 +1,19 @@ +use sp_core::Pair; + +mod common; + +#[futures_test::test] +async fn test_read_assigned_relayers() { + let api = common::api().await.unwrap(); + let assigned_relayers = api.assigned_relayers().await.unwrap(); + assert!(!assigned_relayers.is_empty()); +} + +#[test] +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); + println!("{:?}", account.to_string()); +} diff --git a/components/client-pangolin-s2s/tests/common.rs b/components/client-pangolin-s2s/tests/common.rs new file mode 100644 index 000000000..442f64cbc --- /dev/null +++ b/components/client-pangolin-s2s/tests/common.rs @@ -0,0 +1,20 @@ +use relay_substrate_client::Client; + +use component_pangolin_s2s::api::PangolinApi; +use component_pangolin_s2s::PangolinChain; + +async fn client() -> anyhow::Result> { + Ok( + relay_substrate_client::Client::new(relay_substrate_client::ConnectionParams { + host: "pangolin-rpc.darwinia.network".to_string(), + port: 443, + secure: true, + }) + .await, + ) +} + +pub async fn api() -> anyhow::Result { + let client = client().await?; + Ok(PangolinApi::new(client)) +} diff --git a/components/client-pangolin-subxt/src/component.rs b/components/client-pangolin-subxt/src/component.rs index 4e043b224..16ce8d194 100644 --- a/components/client-pangolin-subxt/src/component.rs +++ b/components/client-pangolin-subxt/src/component.rs @@ -19,7 +19,8 @@ impl DarwiniaSubxtComponent { #[async_trait::async_trait] impl BridgeComponent for DarwiniaSubxtComponent { fn restore_with_namespace(namespace: String) -> BridgeResult { - let config: DarwiniaSubxtConfig = Config::restore_with_namespace(T::NAME, namespace)?; + let config: DarwiniaSubxtConfig = + Config::restore_with_namespace_unwrap(T::NAME, namespace)?; Ok(Self::new(config)) } diff --git a/components/client-pangoro-s2s/Cargo.toml b/components/client-pangoro-s2s/Cargo.toml index a0528b2b3..b95adcfc8 100644 --- a/components/client-pangoro-s2s/Cargo.toml +++ b/components/client-pangoro-s2s/Cargo.toml @@ -18,28 +18,35 @@ readme = 'README.md' edition = "2018" [dependencies] +anyhow = "1" +async-trait = "0.1" +log = "0.4" bridge-traits = { path = "../../traits" } codec = { package = "parity-scale-codec", version = "2.0.0" } -headers-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } +headers-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +messages-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } ## Bridge dependencies -pangoro-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangoro-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } +pangoro-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangoro-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +dp-fee = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } ## Substrate Dependencies -frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } +frame-system = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +pallet-transaction-payment = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-keyring = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } diff --git a/components/client-pangoro-s2s/src/api.rs b/components/client-pangoro-s2s/src/api.rs new file mode 100644 index 000000000..f74b5b3d6 --- /dev/null +++ b/components/client-pangoro-s2s/src/api.rs @@ -0,0 +1,159 @@ +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 relay_substrate_client::{ChainBase, Client, TransactionSignScheme, UnsignedTransaction}; +use sp_core::storage::StorageKey; +use sp_core::{Bytes, Pair}; + +use crate::{patch, PangoroChain}; + +#[derive(Clone)] +pub struct PangoroApi { + client: Client, +} + +impl PangoroApi { + pub fn new(client: Client) -> Self { + Self { client } + } +} + +impl PangoroApi { + pub async fn client(&self) -> &Client { + &self.client + } + + /// Query assigned relayers + pub async fn assigned_relayers(&self) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + StorageKey( + patch::storage_prefix("FeeMarket".as_bytes(), "AssignedRelayers".as_bytes()) + .to_vec(), + ), + None, + ) + .await? + .unwrap_or_else(Vec::new)) + } + + /// Query order + pub async fn order( + &self, + laned_id: LaneId, + message_nonce: MessageNonce, + ) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + bp_runtime::storage_map_final_key_blake2_128concat( + "FeeMarket", + "Orders", + (laned_id, message_nonce).encode().as_slice(), + ), + None, + ) + .await?) + } + + /// Query all relayers + pub async fn relayers(&self) -> anyhow::Result> { + Ok(self + .client + .storage_value( + StorageKey( + patch::storage_prefix("FeeMarket".as_bytes(), "Relayers".as_bytes()).to_vec(), + ), + None, + ) + .await? + .unwrap_or_else(Vec::new)) + } + + /// Query relayer info by account id + pub async fn relayer( + &self, + account: AccountId, + ) -> anyhow::Result>> { + Ok(self + .client + .storage_value( + bp_runtime::storage_map_final_key_blake2_128concat( + "FeeMarket", + "RelayersMap", + account.encode().as_slice(), + ), + None, + ) + .await?) + } + + pub async fn is_relayer(&self, account: AccountId) -> anyhow::Result { + self.relayer(account).await.map(|item| item.is_some()) + } + + /// Return number of the best finalized block. + pub async fn best_finalized_header_number( + &self, + ) -> anyhow::Result { + Ok(self.client.best_finalized_header_number().await?) + } + + /// Update relay fee + pub async fn update_relay_fee( + &self, + signer: ::AccountKeyPair, + amount: ::Balance, + ) -> anyhow::Result<()> { + let signer_id = (*signer.public().as_array_ref()).into(); + let genesis_hash = *self.client.genesis_hash(); + self.client + .submit_signed_extrinsic(signer_id, move |_, transaction_nonce| { + Bytes( + PangoroChain::sign_transaction( + genesis_hash, + &signer, + relay_substrate_client::TransactionEra::immortal(), + UnsignedTransaction::new( + pangoro_runtime::FeeMarketCall::update_relay_fee(amount).into(), + transaction_nonce, + ), + ) + .encode(), + ) + }) + .await?; + Ok(()) + } + + /// Update locked collateral + pub async fn update_locked_collateral( + &self, + signer: ::AccountKeyPair, + amount: ::Balance, + ) -> anyhow::Result<()> { + let signer_id = (*signer.public().as_array_ref()).into(); + let genesis_hash = *self.client.genesis_hash(); + self.client + .submit_signed_extrinsic(signer_id, move |_, transaction_nonce| { + Bytes( + PangoroChain::sign_transaction( + genesis_hash, + &signer, + relay_substrate_client::TransactionEra::immortal(), + UnsignedTransaction::new( + pangoro_runtime::FeeMarketCall::update_locked_collateral(amount).into(), + transaction_nonce, + ), + ) + .encode(), + ) + }) + .await?; + Ok(()) + } +} diff --git a/components/client-pangoro-s2s/src/feemarket.rs b/components/client-pangoro-s2s/src/feemarket.rs new file mode 100644 index 000000000..d84eabe66 --- /dev/null +++ b/components/client-pangoro-s2s/src/feemarket.rs @@ -0,0 +1,140 @@ +use std::ops::Range; + +use common_primitives::AccountId; +use messages_relay::message_lane::MessageLane; +use messages_relay::message_lane_loop::{ + SourceClient as MessageLaneSourceClient, TargetClient as MessageLaneTargetClient, +}; +use messages_relay::relay_strategy::{RelayReference, RelayStrategy}; +use relay_substrate_client::Client; + +use crate::api::PangoroApi; +use crate::PangoroChain; + +#[derive(Clone)] +pub struct PangoroRelayStrategy { + api: PangoroApi, + account: AccountId, +} + +impl PangoroRelayStrategy { + pub fn new(client: Client, account: AccountId) -> Self { + Self { + api: PangoroApi::new(client), + account, + } + } +} + +impl PangoroRelayStrategy { + pub async fn handle< + P: MessageLane, + SourceClient: MessageLaneSourceClient

, + TargetClient: MessageLaneTargetClient

, + >( + &self, + reference: &mut RelayReference, + ) -> bool { + log::trace!( + "[Pangoro] Determine whether to relay for nonce: {}", + reference.nonce + ); + let nonce = &reference.nonce; + let order = self + .api + .order(bridge_primitives::PANGORO_PANGOLIN_LANE, *nonce) + .await + .map_err(|e| { + log::error!("[Pangoro] Failed to query order: {:?}", e); + }) + .unwrap_or(None); + + // If the order is not exists. + // 1. You are too behind. + // 2. The network question + // So, you can skip this currently + // Related: https://github.com/darwinia-network/darwinia-common/blob/90add536ed320ec7e17898e695c65ee9d7ce79b0/frame/fee-market/src/lib.rs?#L177 + if order.is_none() { + log::trace!( + "[Pangoro] The order not found by nonce: {}", + reference.nonce + ); + return false; + } + // ----- + + let order = order.unwrap(); + let relayers = order.relayers; + + // If not have any assigned relayers, everyone participates in the relay. + if relayers.is_empty() { + return true; + } + + // ----- + + let prior_relayer = relayers.iter().find(|item| item.id == self.account); + let is_assigned_relayer = prior_relayer.is_some(); + + // If you are assigned relayer, you must relay this nonce. + // If you don't do that, the fee market pallet will slash your deposit. + // Even though it is a timeout, although it will slash your deposit after the timeout is delivered, + // you can still get relay rewards. + if is_assigned_relayer { + return true; + } + + // ----- + + // If you aren't assigned relayer, only participate in the part about time out, earn more rewards + let latest_block_number = self + .api + .best_finalized_header_number() + .await + .map_err(|e| { + log::error!( + "[Pangoro] Failed to query latest block, unable to decide whether to participate: {:?}", + e + ); + }) + .unwrap_or(0); + let ranges = relayers + .iter() + .map(|item| item.valid_range.clone()) + .collect::>>(); + + let mut maximum_timeout = 0; + for range in ranges { + maximum_timeout = std::cmp::max(maximum_timeout, range.end); + } + // If this order has timed out, decide to relay + if latest_block_number > maximum_timeout { + return true; + } + log::trace!( + "[Pangoro] Decided not to relay this nonce : {}", + reference.nonce + ); + false + } +} + +#[async_trait::async_trait] +impl RelayStrategy for PangoroRelayStrategy { + async fn decide< + P: MessageLane, + SourceClient: MessageLaneSourceClient

, + TargetClient: MessageLaneTargetClient

, + >( + &self, + reference: &mut RelayReference, + ) -> bool { + let decide = self.handle(reference).await; + log::info!( + "[Pangoro] About nonce {} decide is {}", + reference.nonce, + decide + ); + decide + } +} diff --git a/components/client-pangoro-s2s/src/lib.rs b/components/client-pangoro-s2s/src/lib.rs index 7f3a17480..0fc6a1175 100644 --- a/components/client-pangoro-s2s/src/lib.rs +++ b/components/client-pangoro-s2s/src/lib.rs @@ -1,134 +1,7 @@ -//! Types used to connect to the Pangoro-Substrate chain. +pub use self::feemarket::*; +pub use self::pangoro::*; -use bridge_traits::bridge::chain::{BridgeChain, ChainCategory}; -use codec::{Compact, Decode, Encode}; -use relay_substrate_client::{ - BalanceOf, Chain, ChainBase, ChainWithBalances, IndexOf, TransactionEraOf, - TransactionSignScheme, UnsignedTransaction, -}; -use sp_core::{storage::StorageKey, Pair}; -use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; -use std::time::Duration; - -/// Pangoro header id. -pub type HeaderId = relay_utils::HeaderId; - -/// Pangoro chain definition. -#[derive(Debug, Clone, Copy)] -pub struct PangoroChain; - -impl BridgeChain for PangoroChain { - const CHAIN_CATEGORY: ChainCategory = ChainCategory::Substrate; -} - -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; -} - -impl Chain for PangoroChain { - const NAME: &'static str = "Pangoro"; - const AVERAGE_BLOCK_INTERVAL: Duration = - Duration::from_millis(pangoro_constants::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; - - type SignedBlock = pangoro_runtime::SignedBlock; - type Call = pangoro_runtime::Call; - type WeightToFee = pangoro_runtime::WeightToFee; -} - -impl ChainWithBalances for PangoroChain { - fn account_info_storage_key(account_id: &Self::AccountId) -> StorageKey { - use frame_support::storage::generator::StorageMap; - StorageKey( - frame_system::Account::::storage_map_final_key(account_id), - ) - } -} - -impl TransactionSignScheme for PangoroChain { - type Chain = PangoroChain; - type AccountKeyPair = sp_core::sr25519::Pair; - type SignedTransaction = pangoro_runtime::UncheckedExtrinsic; - - fn sign_transaction( - genesis_hash: ::Hash, - signer: &Self::AccountKeyPair, - _era: TransactionEraOf, - unsigned: UnsignedTransaction, - ) -> Self::SignedTransaction { - let raw_payload = SignedPayload::from_raw( - unsigned.call, - ( - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckEra::::from(sp_runtime::generic::Era::Immortal), - frame_system::CheckNonce::::from(unsigned.nonce), - frame_system::CheckWeight::::new(), - pallet_transaction_payment::ChargeTransactionPayment::::from(unsigned.tip), - ), - ( - pangoro_runtime::VERSION.spec_version, - pangoro_runtime::VERSION.transaction_version, - genesis_hash, - genesis_hash, //era.signed_payload(genesis_hash), - (), - (), - (), - ), - ); - let signature = raw_payload.using_encoded(|payload| signer.sign(payload)); - let signer: sp_runtime::MultiSigner = signer.public().into(); - let (call, extra, _) = raw_payload.deconstruct(); - - pangoro_runtime::UncheckedExtrinsic::new_signed( - call, - sp_runtime::MultiAddress::Id(signer.into_account()), - signature.into(), - extra, - ) - } - - fn is_signed(tx: &Self::SignedTransaction) -> bool { - tx.signature.is_some() - } - - fn is_signed_by(signer: &Self::AccountKeyPair, tx: &Self::SignedTransaction) -> bool { - tx.signature - .as_ref() - .map(|(address, _, _)| { - let account_id: common_primitives::AccountId = - (*signer.public().as_array_ref()).into(); - *address == pangoro_runtime::Address::from(account_id) - }) - .unwrap_or(false) - } - - fn parse_transaction(tx: Self::SignedTransaction) -> Option> { - let extra = &tx.signature.as_ref()?.2; - Some(UnsignedTransaction { - call: tx.function, - nonce: Compact::>::decode(&mut &extra.4.encode()[..]) - .ok()? - .into(), - tip: Compact::>::decode(&mut &extra.6.encode()[..]) - .ok()? - .into(), - }) - } -} - -/// Pangoro signing params. -pub type SigningParams = sp_core::sr25519::Pair; - -/// Pangoro header type used in headers sync. -pub type SyncHeader = relay_substrate_client::SyncHeader; +pub mod api; +mod feemarket; +mod pangoro; +mod patch; diff --git a/components/client-pangoro-s2s/src/pangoro.rs b/components/client-pangoro-s2s/src/pangoro.rs new file mode 100644 index 000000000..7f3a17480 --- /dev/null +++ b/components/client-pangoro-s2s/src/pangoro.rs @@ -0,0 +1,134 @@ +//! Types used to connect to the Pangoro-Substrate chain. + +use bridge_traits::bridge::chain::{BridgeChain, ChainCategory}; +use codec::{Compact, Decode, Encode}; +use relay_substrate_client::{ + BalanceOf, Chain, ChainBase, ChainWithBalances, IndexOf, TransactionEraOf, + TransactionSignScheme, UnsignedTransaction, +}; +use sp_core::{storage::StorageKey, Pair}; +use sp_runtime::{generic::SignedPayload, traits::IdentifyAccount}; +use std::time::Duration; + +/// Pangoro header id. +pub type HeaderId = relay_utils::HeaderId; + +/// Pangoro chain definition. +#[derive(Debug, Clone, Copy)] +pub struct PangoroChain; + +impl BridgeChain for PangoroChain { + const CHAIN_CATEGORY: ChainCategory = ChainCategory::Substrate; +} + +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; +} + +impl Chain for PangoroChain { + const NAME: &'static str = "Pangoro"; + const AVERAGE_BLOCK_INTERVAL: Duration = + Duration::from_millis(pangoro_constants::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; + + type SignedBlock = pangoro_runtime::SignedBlock; + type Call = pangoro_runtime::Call; + type WeightToFee = pangoro_runtime::WeightToFee; +} + +impl ChainWithBalances for PangoroChain { + fn account_info_storage_key(account_id: &Self::AccountId) -> StorageKey { + use frame_support::storage::generator::StorageMap; + StorageKey( + frame_system::Account::::storage_map_final_key(account_id), + ) + } +} + +impl TransactionSignScheme for PangoroChain { + type Chain = PangoroChain; + type AccountKeyPair = sp_core::sr25519::Pair; + type SignedTransaction = pangoro_runtime::UncheckedExtrinsic; + + fn sign_transaction( + genesis_hash: ::Hash, + signer: &Self::AccountKeyPair, + _era: TransactionEraOf, + unsigned: UnsignedTransaction, + ) -> Self::SignedTransaction { + let raw_payload = SignedPayload::from_raw( + unsigned.call, + ( + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(sp_runtime::generic::Era::Immortal), + frame_system::CheckNonce::::from(unsigned.nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(unsigned.tip), + ), + ( + pangoro_runtime::VERSION.spec_version, + pangoro_runtime::VERSION.transaction_version, + genesis_hash, + genesis_hash, //era.signed_payload(genesis_hash), + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|payload| signer.sign(payload)); + let signer: sp_runtime::MultiSigner = signer.public().into(); + let (call, extra, _) = raw_payload.deconstruct(); + + pangoro_runtime::UncheckedExtrinsic::new_signed( + call, + sp_runtime::MultiAddress::Id(signer.into_account()), + signature.into(), + extra, + ) + } + + fn is_signed(tx: &Self::SignedTransaction) -> bool { + tx.signature.is_some() + } + + fn is_signed_by(signer: &Self::AccountKeyPair, tx: &Self::SignedTransaction) -> bool { + tx.signature + .as_ref() + .map(|(address, _, _)| { + let account_id: common_primitives::AccountId = + (*signer.public().as_array_ref()).into(); + *address == pangoro_runtime::Address::from(account_id) + }) + .unwrap_or(false) + } + + fn parse_transaction(tx: Self::SignedTransaction) -> Option> { + let extra = &tx.signature.as_ref()?.2; + Some(UnsignedTransaction { + call: tx.function, + nonce: Compact::>::decode(&mut &extra.4.encode()[..]) + .ok()? + .into(), + tip: Compact::>::decode(&mut &extra.6.encode()[..]) + .ok()? + .into(), + }) + } +} + +/// Pangoro signing params. +pub type SigningParams = sp_core::sr25519::Pair; + +/// Pangoro header type used in headers sync. +pub type SyncHeader = relay_substrate_client::SyncHeader; diff --git a/components/client-pangoro-s2s/src/patch.rs b/components/client-pangoro-s2s/src/patch.rs new file mode 100644 index 000000000..e40c3c3e5 --- /dev/null +++ b/components/client-pangoro-s2s/src/patch.rs @@ -0,0 +1,15 @@ +use frame_support::StorageHasher; + +/// Returns the storage prefix for a specific pallet name and storage name. +/// +/// The storage prefix is `concat(twox_128(pallet_name), twox_128(storage_name))`. +pub fn storage_prefix(pallet_name: &[u8], storage_name: &[u8]) -> [u8; 32] { + let pallet_hash = frame_support::Twox128::hash(pallet_name); + let storage_hash = frame_support::Twox128::hash(storage_name); + + let mut final_key = [0u8; 32]; + final_key[..16].copy_from_slice(&pallet_hash); + final_key[16..].copy_from_slice(&storage_hash); + + final_key +} diff --git a/components/ethereum/src/ethereum/mod.rs b/components/ethereum/src/ethereum/mod.rs index 816a3ba6a..98f3a778c 100644 --- a/components/ethereum/src/ethereum/mod.rs +++ b/components/ethereum/src/ethereum/mod.rs @@ -31,7 +31,7 @@ impl BridgeComponent for EthereumComponent { where Self: Sized, { - let config: EthereumConfig = Config::restore_with_namespace(T::NAME, &namespace)?; + let config: EthereumConfig = Config::restore_with_namespace_unwrap(T::NAME, &namespace)?; let web3_component = Web3Component::restore_with_namespace::(namespace)?; Ok(Self::new(config, web3_component)) } diff --git a/components/ethereum/src/web3.rs b/components/ethereum/src/web3.rs index a3c3316f8..3616b9108 100644 --- a/components/ethereum/src/web3.rs +++ b/components/ethereum/src/web3.rs @@ -22,7 +22,7 @@ impl Web3Component { #[async_trait::async_trait] impl BridgeComponent> for Web3Component { fn restore_with_namespace(namespace: String) -> BridgeResult { - let config: Web3Config = Config::restore_with_namespace(T::NAME, namespace)?; + let config: Web3Config = Config::restore_with_namespace_unwrap(T::NAME, namespace)?; Ok(Self::new(config)) } diff --git a/components/http-client/src/lib.rs b/components/http-client/src/lib.rs index 60b14b2c4..1306ca6f7 100644 --- a/components/http-client/src/lib.rs +++ b/components/http-client/src/lib.rs @@ -21,7 +21,7 @@ impl HttpClientComponent { #[async_trait::async_trait] impl BridgeComponent for HttpClientComponent { fn restore_with_namespace(namespace: String) -> BridgeResult { - let config: HttpClientConfig = Config::restore_with_namespace(T::NAME, namespace)?; + let config: HttpClientConfig = Config::restore_with_namespace_unwrap(T::NAME, namespace)?; Ok(Self::new(config)) } diff --git a/components/shadow/src/lib.rs b/components/shadow/src/lib.rs index f8328b259..3972404e7 100644 --- a/components/shadow/src/lib.rs +++ b/components/shadow/src/lib.rs @@ -35,7 +35,7 @@ impl ShadowComponent { #[async_trait::async_trait] impl BridgeComponent for ShadowComponent { fn restore_with_namespace(namespace: String) -> BridgeResult { - let config: ShadowConfig = Config::restore_with_namespace(T::NAME, &namespace)?; + let config: ShadowConfig = Config::restore_with_namespace_unwrap(T::NAME, &namespace)?; let component_http_client = HttpClientComponent::restore_with_namespace::(namespace.clone())?; let component_ethereum = EthereumComponent::restore_with_namespace::(namespace)?; diff --git a/components/subscan/Cargo.toml b/components/subscan/Cargo.toml new file mode 100644 index 000000000..0108fc4fd --- /dev/null +++ b/components/subscan/Cargo.toml @@ -0,0 +1,31 @@ +[package] +name = "component-subscan" +version = "0.4.7" +authors = ["Darwinia Network "] +description = "Darwinia bridger" +repository = "https://github.com/darwinia-network/bridger" +license = "MIT" +documentation = "https://docs.rs/bridger" +homepage = "https://github.com/darwinia-network/bridger" +include = [ + "Cargo.toml", + "**/*.rs", + "README.md", + "LICENSE" +] +keywords = ["substrate", "darwinia"] +readme = 'README.md' +edition = "2018" + +[dependencies] +anyhow = "1" +log = "0.4" +async-trait = "0.1" +serde = { version = "1.0", features = ["derive"] } +serde_json = { version = "1.0" } +serde-hex = "0.1" +serde-aux = "0.6" + +bridge-traits = { path = "../../traits" } + +reqwest = { version = "0.11", features = ["json", "blocking"] } diff --git a/components/subscan/src/config.rs b/components/subscan/src/config.rs new file mode 100644 index 000000000..806faf838 --- /dev/null +++ b/components/subscan/src/config.rs @@ -0,0 +1,23 @@ +use bridge_traits::bridge::config::BridgeConfig; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, Default, Serialize, Deserialize)] +pub struct SubscanConfig { + pub endpoint: String, + pub token: String, + pub timeout: Option, +} + +impl BridgeConfig for SubscanConfig { + fn marker() -> &'static str { + "component-subscan" + } + + fn template() -> Self { + Self { + endpoint: "https://darwinia.api.subscan.io".to_string(), + token: "123456".to_string(), + timeout: Some(3000), + } + } +} diff --git a/components/subscan/src/lib.rs b/components/subscan/src/lib.rs new file mode 100644 index 000000000..4fd9b00ef --- /dev/null +++ b/components/subscan/src/lib.rs @@ -0,0 +1,54 @@ +use std::time::Duration; + +use bridge_traits::bridge::component::BridgeComponent; +use bridge_traits::bridge::config::Config; +use bridge_traits::bridge::task::BridgeSand; +use bridge_traits::error::BridgeResult; + +pub use self::config::*; +pub use self::subscan::*; + +mod config; +mod subscan; +pub mod types; + +#[derive(Clone, Debug, Default)] +pub struct SubscanComponent { + config: SubscanConfig, +} + +impl SubscanComponent { + pub fn new(config: SubscanConfig) -> Self { + Self { config } + } +} + +#[async_trait::async_trait] +impl BridgeComponent for SubscanComponent { + fn restore_with_namespace(namespace: String) -> BridgeResult + where + Self: Sized, + { + let config: SubscanConfig = Config::restore_with_namespace_unwrap(T::NAME, &namespace)?; + Ok(Self::new(config)) + } + + async fn component(&self) -> anyhow::Result { + // let client = reqwest::Client::builder() + // .timeout(Duration::from_secs(self.config.timeout.unwrap_or(3000))) + // .build()?; + let client = reqwest::blocking::Client::builder() + .timeout(Duration::from_secs(self.config.timeout.unwrap_or(30))) + .build()?; + let subscan = Subscan::new( + client, + self.config.endpoint.clone(), + self.config.token.clone(), + ); + Ok(subscan) + } + + fn config(&self) -> &SubscanConfig { + &self.config + } +} diff --git a/components/subscan/src/subscan.rs b/components/subscan/src/subscan.rs new file mode 100644 index 000000000..2bda44fca --- /dev/null +++ b/components/subscan/src/subscan.rs @@ -0,0 +1,75 @@ +use crate::types::ExtrinsicsData; +use crate::types::OpenPrice; +use crate::types::SubscanResponse; + +#[derive(Clone, Debug)] +pub struct Subscan { + /// HTTP Client + http: reqwest::blocking::Client, + endpoint: String, + token: String, +} + +impl Subscan { + pub fn new(http: reqwest::blocking::Client, endpoint: String, token: String) -> Self { + Self { + http, + endpoint, + token, + } + } +} + +impl Subscan { + pub fn endpoint(mut self, endpoint: impl AsRef) -> Self { + self.endpoint = endpoint.as_ref().to_string(); + self + } + + pub fn token(mut self, token: impl AsRef) -> Self { + self.token = token.as_ref().to_string(); + self + } +} + +impl Subscan { + async fn _post( + &self, + api: impl AsRef, + data_json_string: impl AsRef, + ) -> anyhow::Result { + let api = format!("{}{}", self.endpoint, api.as_ref()); + log::trace!(target: "subscan", "POST {} ---> {}", api, data_json_string.as_ref()); + let data = serde_json::from_str::(data_json_string.as_ref())?; + let value = self + .http + .post(api) + .header("X-API-Key", &self.token) + .header("Content-Type", "application/json") + .json(&data) + .send()? + .text()?; + log::trace!(target: "subscan", "<--- {}", value); + Ok(serde_json::from_str(&value)?) + } + + pub fn _endpoint(&self) -> &String { + &self.endpoint + } + + // https://docs.api.subscan.io/#extrinsics + pub async fn extrinsics( + &self, + page: u32, + row: u32, + ) -> anyhow::Result> { + let data = format!(r#"{{"row": {},"page": {}, "signed": "signed"}}"#, row, page); + self._post("/api/scan/extrinsics", data).await + } + + // https://docs.api.subscan.io/#price + pub async fn price(&self, time: u64) -> anyhow::Result> { + let data = format!(r#"{{"time": {}}}"#, time); + self._post("/api/open/price", data).await + } +} diff --git a/components/subscan/src/types/common.rs b/components/subscan/src/types/common.rs new file mode 100644 index 000000000..8df798e90 --- /dev/null +++ b/components/subscan/src/types/common.rs @@ -0,0 +1,26 @@ +use bridge_traits::error::StandardError; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct SubscanResponse { + code: i32, + message: String, + data: Option, +} + +impl SubscanResponse { + pub fn code(&self) -> i32 { + self.code + } + + pub fn data(&self) -> anyhow::Result> { + if self.code != 0 { + return Err(StandardError::Component(format!( + "Wrong response [{}]: {}", + self.code, self.message + )) + .into()); + } + Ok(self.data.clone()) + } +} diff --git a/components/subscan/src/types/general.rs b/components/subscan/src/types/general.rs new file mode 100644 index 000000000..1777dbe5a --- /dev/null +++ b/components/subscan/src/types/general.rs @@ -0,0 +1,136 @@ +use serde::{Deserialize, Serialize}; +use serde_hex::SerHex; +use serde_hex::StrictPfx; + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct ExtrinsicsData { + pub count: u32, + pub extrinsics: Vec, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct Extrinsic { + /* + https://docs.api.subscan.io/#extrinsic + { + "account_display": { + "account_index": "", + "address": "16hp43x8DUZtU8L3cJy9Z8JMwTzuu8ZZRWqDZnpMhp464oEd", + "display": "", + "identity": false, + "judgements": null, + "parent": "", + "parent_display": "" + }, + "account_id": "16hp43x8DUZtU8L3cJy9Z8JMwTzuu8ZZRWqDZnpMhp464oEd", + "block_num": 2028659, + "block_timestamp": 1602732510, + "call_module": "balances", + "call_module_function": "transfer", + "error": null, + "event": [ + { + "block_num": 2028659, + "event_id": "Transfer", + "event_idx": 2, + "event_index": "2028659-2", + "extrinsic_hash": "0x3d944ee0f1aead94a50730eec73aba16c930ca9f468a63d11415c73c80e325ba", + "extrinsic_idx": 2, + "finalized": true, + "module_id": "balances", + "params": "[{\"type\":\"AccountId\",\"value\":\"fc4d6069cb980fcde6ef73a46f1894d66c152e9ddfac3a499cf6a1654ff5f55b\",\"value_raw\":\"\"},{\"type\":\"AccountId\",\"value\":\"105fdf37958064a0c87096bd9cfbd307f955f275f3979c40fa701118ec0e657a\",\"value_raw\":\"\"},{\"type\":\"Balance\",\"value\":\"2561090000000\",\"value_raw\":\"\"}]" + } + ], + "event_count": 3, + "extrinsic_hash": "0x3d944ee0f1aead94a50730eec73aba16c930ca9f468a63d11415c73c80e325ba", + "extrinsic_index": "2028659-2", + "fee": "156000000", + "finalized": true, + "lifetime": { + "birth": 2028654, + "death": 2029166 + }, + "nonce": 5786, + "params": [ + { + "name": "dest", + "type": "Address", + "value": "105fdf37958064a0c87096bd9cfbd307f955f275f3979c40fa701118ec0e657a", + "valueRaw": "" + }, + { + "name": "value", + "type": "Compact", + "value": "2561090000000", + "valueRaw": "" + } + ], + "signature": "a672d84b55afd71df5fd45e48043b479e762124ff174db116ba5cd979040544b3b536c2e66a72231a698d4d0588f89470e25acbe8ff39ba7b78d302034a63e00", + "success": true, + "tip": "0", + "transfer": { + "amount": "256.109", + "block_num": 0, + "block_timestamp": 0, + "extrinsic_index": "", + "fee": "0", + "from": "16hp43x8DUZtU8L3cJy9Z8JMwTzuu8ZZRWqDZnpMhp464oEd", + "hash": "0x3d944ee0f1aead94a50730eec73aba16c930ca9f468a63d11415c73c80e325ba", + "module": "balances", + "success": true, + "to": "1NUFGnNcUpGh2biqtQ1yND7NCDY3q2Eoh7PbsurheeSNmAH", + "to_account_display": { + "account_index": "", + "address": "1NUFGnNcUpGh2biqtQ1yND7NCDY3q2Eoh7PbsurheeSNmAH", + "display": "", + "identity": false, + "judgements": null, + "parent": "", + "parent_display": "" + } + } + }, + */ + // pub account_display: null, + // #[serde(with = "SerHex::")] + // pub account_id: [u8; 32], + // pub account_index: "", + pub block_num: u32, + pub block_timestamp: u64, + pub call_module: String, + pub call_module_function: String, + // #[serde(with = "SerHex::")] + // pub extrinsic_hash: [u8; 32], + pub extrinsic_index: String, + #[serde(deserialize_with = "serde_aux::field_attributes::deserialize_number_from_string")] + pub fee: u128, + pub nonce: u64, + // #[serde(deserialize_with = "super::patch::smart_deserialize_param")] + // pub params: Vec, + // #[serde(with = "SerHex::")] + pub signature: String, + pub success: bool, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct AccountDisplay { + // pub account_index: "", + #[serde(with = "SerHex::")] + pub address: [u8; 32], + pub display: String, + pub identity: bool, + // pub judgements: null, + #[serde(with = "SerHex::")] + pub parent: [u8; 32], + pub parent_display: String, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct Param { + pub name: String, + #[serde(rename = "type")] + pub type_: String, + // #[serde(with = "SerHex::")] + pub value: String, + // pub value_raw: "" +} diff --git a/components/subscan/src/types/mod.rs b/components/subscan/src/types/mod.rs new file mode 100644 index 000000000..13b4c737b --- /dev/null +++ b/components/subscan/src/types/mod.rs @@ -0,0 +1,8 @@ +pub use self::common::*; +pub use self::general::*; +pub use self::price::*; + +mod common; +mod general; +mod patch; +mod price; diff --git a/components/subscan/src/types/patch.rs b/components/subscan/src/types/patch.rs new file mode 100644 index 000000000..e0019f16b --- /dev/null +++ b/components/subscan/src/types/patch.rs @@ -0,0 +1,35 @@ +use crate::types::general::Param; +use serde::de::Unexpected; +use serde::{Deserialize, Deserializer}; + +#[allow(dead_code)] +pub(crate) fn smart_deserialize_param<'de, D>(deserializer: D) -> Result, D::Error> +where + D: Deserializer<'de>, +{ + deserializer.deserialize_any(DeserializeVecParamFromStringOrVecVisitor) +} + +struct DeserializeVecParamFromStringOrVecVisitor; + +impl<'de> serde::de::Visitor<'de> for DeserializeVecParamFromStringOrVecVisitor { + type Value = Vec; + + fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { + formatter.write_str("an string or array") + } + + fn visit_str(self, v: &str) -> Result + where + E: serde::de::Error, + { + serde_json::from_str(v).map_err(|_e| E::invalid_value(Unexpected::Str(v), &self)) + } + + fn visit_newtype_struct(self, deserializer: D) -> Result + where + D: Deserializer<'de>, + { + Vec::::deserialize(deserializer) + } +} diff --git a/components/subscan/src/types/price.rs b/components/subscan/src/types/price.rs new file mode 100644 index 000000000..a0d20e86c --- /dev/null +++ b/components/subscan/src/types/price.rs @@ -0,0 +1,37 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct OpenPrice { + /* + { + "code": 0, + "message": "Success", + "generated_at": 1593479990, + "data": { + "price": "5.9032161816", + "time": 1593391878, + "height": 479676, + "records": [ + { + "price": "5.9032161816", + "height": 479676, + "time": 1593391878 + } + ] + } + } + */ + #[serde(deserialize_with = "serde_aux::field_attributes::deserialize_number_from_string")] + pub price: f64, + pub time: u64, + pub height: u32, + pub records: Vec, +} + +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct OpenPriceRecord { + #[serde(deserialize_with = "serde_aux::field_attributes::deserialize_number_from_string")] + pub price: f64, + pub time: u64, + pub height: u32, +} diff --git a/components/thegraph-liketh/src/lib.rs b/components/thegraph-liketh/src/lib.rs index 299d16106..e748aab4b 100644 --- a/components/thegraph-liketh/src/lib.rs +++ b/components/thegraph-liketh/src/lib.rs @@ -29,7 +29,8 @@ impl BridgeComponent for TheGraphLikeEth where Self: Sized, { - let config: TheGraphLikeEthConfig = Config::restore_with_namespace(T::NAME, namespace)?; + let config: TheGraphLikeEthConfig = + Config::restore_with_namespace_unwrap(T::NAME, namespace)?; Ok(Self::new(config)) } diff --git a/task/task-darwinia-ethereum/src/route/affirm.rs b/task/task-darwinia-ethereum/src/route/affirm.rs index c276e6c50..2ff62b493 100644 --- a/task/task-darwinia-ethereum/src/route/affirm.rs +++ b/task/task-darwinia-ethereum/src/route/affirm.rs @@ -49,7 +49,7 @@ pub async fn affirm_force( .ok_or_else(|| StandardError::Api("The `block` parameter is required".to_string()))?; let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Shadow let component_shadow = ShadowComponent::restore::()?; @@ -93,7 +93,7 @@ pub async fn affirm_raw( .ok_or_else(|| StandardError::Api("The `json` parameter is required".to_string()))?; let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Darwinia client let component_darwinia = DarwiniaSubxtComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/route/confirm.rs b/task/task-darwinia-ethereum/src/route/confirm.rs index 27799d3b6..f61a1d255 100644 --- a/task/task-darwinia-ethereum/src/route/confirm.rs +++ b/task/task-darwinia-ethereum/src/route/confirm.rs @@ -23,7 +23,7 @@ pub async fn confirm( .ok_or_else(|| StandardError::Api("The `block` parameter is required".to_string()))?; let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Shadow let component_shadow = ShadowComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/route/ecdsa.rs b/task/task-darwinia-ethereum/src/route/ecdsa.rs index bed20888d..d34ac168b 100644 --- a/task/task-darwinia-ethereum/src/route/ecdsa.rs +++ b/task/task-darwinia-ethereum/src/route/ecdsa.rs @@ -23,10 +23,10 @@ pub async fn ecdsa( .ok_or_else(|| StandardError::Api("The `message` parameter is required".to_string()))?; let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Web3 - let config_web3: Web3Config = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Darwinia client let component_darwinia = DarwiniaSubxtComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/route/guard.rs b/task/task-darwinia-ethereum/src/route/guard.rs index bf3eca739..b6b8771af 100644 --- a/task/task-darwinia-ethereum/src/route/guard.rs +++ b/task/task-darwinia-ethereum/src/route/guard.rs @@ -23,7 +23,7 @@ pub async fn guard( _param: serde_json::Value, ) -> anyhow::Result { let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Shadow let component_shadow = ShadowComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/route/keys.rs b/task/task-darwinia-ethereum/src/route/keys.rs index e7b21db03..641e8ba18 100644 --- a/task/task-darwinia-ethereum/src/route/keys.rs +++ b/task/task-darwinia-ethereum/src/route/keys.rs @@ -14,7 +14,7 @@ pub async fn keys( _bus: &DarwiniaEthereumBus, _param: serde_json::Value, ) -> anyhow::Result { - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; let client = ClientBuilder::::new() .set_url(config_darwinia.endpoint) diff --git a/task/task-darwinia-ethereum/src/route/mmr.rs b/task/task-darwinia-ethereum/src/route/mmr.rs index de8d89d57..5b0b44494 100644 --- a/task/task-darwinia-ethereum/src/route/mmr.rs +++ b/task/task-darwinia-ethereum/src/route/mmr.rs @@ -27,10 +27,10 @@ pub async fn sign_mmr_root( .ok_or_else(|| StandardError::Api("The `mmrblock` parameter is required".to_string()))?; let state = bus.storage().clone_resource::()?; - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Web3 - let config_web3: Web3Config = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Darwinia client let component_darwinia = DarwiniaSubxtComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/service/affirm/mod.rs b/task/task-darwinia-ethereum/src/service/affirm/mod.rs index 7a49c0a51..e91d87e7d 100644 --- a/task/task-darwinia-ethereum/src/service/affirm/mod.rs +++ b/task/task-darwinia-ethereum/src/service/affirm/mod.rs @@ -117,7 +117,7 @@ async fn handle_affirm_relay( sender_to_extrinsics: broadcast::Sender, ) -> anyhow::Result<()> { // Config - let task_config: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; let mut handler = AffirmHandler::new(microkv.clone(), sender_to_extrinsics.clone()).await; loop { if let Err(err) = handler.affirm().await { @@ -152,7 +152,7 @@ async fn run_scan( microkv: NamespaceMicroKV, sender_to_extrinsics: broadcast::Sender, ) -> anyhow::Result<()> { - let task_config: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // the graph let component_thegraph_liketh = TheGraphLikeEthComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/service/check.rs b/task/task-darwinia-ethereum/src/service/check.rs index 694981a79..e596a1f99 100644 --- a/task/task-darwinia-ethereum/src/service/check.rs +++ b/task/task-darwinia-ethereum/src/service/check.rs @@ -66,7 +66,7 @@ async fn run(tracker: &Tracker) -> anyhow::Result<()> { let component_thegraph_liketh = TheGraphLikeEthComponent::restore::()?; let thegraph_liketh = component_thegraph_liketh.component().await?; - let task_config: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; let component_pangolin_subxt = DarwiniaSubxtComponent::restore::()?; // Darwinia client diff --git a/task/task-darwinia-ethereum/src/service/darwinia/mod.rs b/task/task-darwinia-ethereum/src/service/darwinia/mod.rs index fe2b3e038..a0f12eca9 100644 --- a/task/task-darwinia-ethereum/src/service/darwinia/mod.rs +++ b/task/task-darwinia-ethereum/src/service/darwinia/mod.rs @@ -93,8 +93,8 @@ async fn _start( let delayed_extrinsics: HashMap = HashMap::new(); // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; - let config_web3: Web3Config = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Components let component_ethereum = EthereumComponent::restore::()?; diff --git a/task/task-darwinia-ethereum/src/service/extrinsics/handler.rs b/task/task-darwinia-ethereum/src/service/extrinsics/handler.rs index e01ab07d4..9079b9167 100644 --- a/task/task-darwinia-ethereum/src/service/extrinsics/handler.rs +++ b/task/task-darwinia-ethereum/src/service/extrinsics/handler.rs @@ -55,8 +55,9 @@ impl ExtrinsicsHandler { let component_darwinia = DarwiniaSubxtComponent::restore::()?; // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; - let config_web3: Web3Config = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = + Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Darwinia client & accounts let darwinia = component_darwinia.component().await?; diff --git a/task/task-darwinia-ethereum/src/service/guard.rs b/task/task-darwinia-ethereum/src/service/guard.rs index fac6f9354..c9d5f5f53 100644 --- a/task/task-darwinia-ethereum/src/service/guard.rs +++ b/task/task-darwinia-ethereum/src/service/guard.rs @@ -84,8 +84,8 @@ async fn start( let component_shadow = ShadowComponent::restore::()?; // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(DarwiniaEthereumTask::NAME)?; - let servce_config: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; + let servce_config: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // Darwinia client & account let darwinia = component_darwinia_subxt.component().await?; diff --git a/task/task-darwinia-ethereum/src/service/redeem/mod.rs b/task/task-darwinia-ethereum/src/service/redeem/mod.rs index ce7bde29c..93d8efea3 100644 --- a/task/task-darwinia-ethereum/src/service/redeem/mod.rs +++ b/task/task-darwinia-ethereum/src/service/redeem/mod.rs @@ -140,7 +140,7 @@ async fn run_scan( let thegraph_liketh = component_thegraph_liketh.component().await?; // task config - let task_config: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; let mut handler = RedeemHandler::new(sender_to_extrinsics.clone(), sender_to_redeem.clone()).await; diff --git a/task/task-darwinia-ethereum/src/service/starter.rs b/task/task-darwinia-ethereum/src/service/starter.rs index 744cd2e78..d4d589f2d 100644 --- a/task/task-darwinia-ethereum/src/service/starter.rs +++ b/task/task-darwinia-ethereum/src/service/starter.rs @@ -30,7 +30,7 @@ impl Service for StarterService { fn spawn(bus: &Self::Bus) -> Self::Lifeline { // task config - let config_task: TaskConfig = Config::restore(DarwiniaEthereumTask::NAME)?; + let config_task: TaskConfig = Config::restore_unwrap(DarwiniaEthereumTask::NAME)?; // State let state = bus.storage().clone_resource::()?; let mut tx_scan = bus.tx::()?; diff --git a/task/task-pangolin-pangoro/Cargo.toml b/task/task-pangolin-pangoro/Cargo.toml index 06dc145a7..0b0133376 100644 --- a/task/task-pangolin-pangoro/Cargo.toml +++ b/task/task-pangolin-pangoro/Cargo.toml @@ -26,6 +26,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" hex = "0.4" futures = "0.3" +futures-timer = "3" strum = { version = "0.21", features = ["derive"] } @@ -37,41 +38,42 @@ support-keep = { path = "../../supports/support-keep" } ## Substrate Dependencies -frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } -sp-version = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6" } +frame-support = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-core = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-finality-grandpa = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-runtime = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-trie = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } +sp-version = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.11.6-1" } ## bridge common -bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -bp-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -bp-header-chain = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -substrate-relay-helper = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -bridge-runtime-common = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -pallet-bridge-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } -messages-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6" } +bp-runtime = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bp-header-chain = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +substrate-relay-helper = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +relay-utils = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +bridge-runtime-common = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +pallet-bridge-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } +messages-relay = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" } ## component component-pangolin-s2s = { path = "../../components/client-pangolin-s2s" } 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", tag = "v2.6.10" } -bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } +common-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +bridge-primitives = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } ## pangolin -pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangolin-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangolin-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } +pangolin-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangolin-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangolin-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } ## pangoro -pangoro-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangoro-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } -pangoro-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10" } +pangoro-runtime = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangoro-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } +pangoro-constants = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" } diff --git a/task/task-pangolin-pangoro/docs/FeeMarketStrategy.md b/task/task-pangolin-pangoro/docs/FeeMarketStrategy.md new file mode 100644 index 000000000..fd4e1adda --- /dev/null +++ b/task/task-pangolin-pangoro/docs/FeeMarketStrategy.md @@ -0,0 +1,50 @@ +Fee Market Strategy +=== + +## Relay strategy + +In pangolin <> pangoro bridge. All relayers can decide whether to relay a transaction. Decide on your role (Assigned Relayer or Not Assigned Relayer). +Different roles will have different benefits. + +You can refer to this picture: + +![Fee market rewards strategy](./fee-market-rewards-strategy.png) + +So if you have good ideas, you can modify it yourself. + +- `pangolin`: [feemarket.rs](../../../components/client-pangolin-s2s/src/feemarket.rs) +- `pangoro`: [feemarket.rs](../../../components/client-pangoro-s2s/src/feemarket.rs) + +## Fee strategy + +In addition, All relayers can also modify fee strategy to automatically update your expected handling fees. +We provided two templates. + +- crazy +- reasonable + +### Crazy + +In this mode, Every time you find that the first one in Assigned relayers is not yourself, you will quote the other party's price -1. + +### Reasonable + +Query the real fee use [Subscan](https://subscan.io) and query the exchange rate of both chains. Get an appropriate price based on this. + + +### Custom + +If you want to use different strategy, follow these steps: + +1. Write your strategy to [src/fee/strategy](../src/fee/strategy) +2. Expose your strategy in [mod.rs](../src/fee/strategy/mod.rs) +3. Add your strategy to config [config.rs@UpdateFeeStrategyType](../src/config.rs) +4. Call your strategy in [fee.rs](../src/service/fee.rs) +5. Don't forget change your config file to use your strategy. + + ```toml + [task] + # 1800 seconds, 30 minutes + interval_update_fee = 1800 + update_fee_strategy = "YourStrategy" + ``` diff --git a/task/task-pangolin-pangoro/docs/fee-market-rewards-strategy.png b/task/task-pangolin-pangoro/docs/fee-market-rewards-strategy.png new file mode 100644 index 000000000..878e88fad Binary files /dev/null and b/task/task-pangolin-pangoro/docs/fee-market-rewards-strategy.png differ diff --git a/task/task-pangolin-pangoro/src/chains/pangolin.rs b/task/task-pangolin-pangoro/src/chains/pangolin.rs index 1e3fbf751..5b1dfff7f 100644 --- a/task/task-pangolin-pangoro/src/chains/pangolin.rs +++ b/task/task-pangolin-pangoro/src/chains/pangolin.rs @@ -161,7 +161,7 @@ mod s2s_messages { use substrate_relay_helper::messages_source::SubstrateMessagesSource; use substrate_relay_helper::messages_target::SubstrateMessagesTarget; - use component_pangolin_s2s::PangolinChain; + use component_pangolin_s2s::{PangolinChain, PangolinRelayStrategy}; use component_pangoro_s2s::PangoroChain; use crate::chains::pangolin::PangolinChainConst; @@ -321,6 +321,7 @@ mod s2s_messages { ::SigningParams, PangoroChain, ::SigningParams, + PangolinRelayStrategy, >, ) -> anyhow::Result<()> { let stall_timeout = Duration::from_secs(5 * 60); @@ -388,7 +389,7 @@ mod s2s_messages { max_messages_in_single_batch, max_messages_weight_in_single_batch, max_messages_size_in_single_batch, - relayer_mode: params.relayer_mode, + relay_strategy: params.relay_strategy, }, }, PangolinSourceClient::new( diff --git a/task/task-pangolin-pangoro/src/chains/pangoro.rs b/task/task-pangolin-pangoro/src/chains/pangoro.rs index 73a97188f..18fd57afb 100644 --- a/task/task-pangolin-pangoro/src/chains/pangoro.rs +++ b/task/task-pangolin-pangoro/src/chains/pangoro.rs @@ -163,7 +163,7 @@ mod s2s_messages { use substrate_relay_helper::messages_target::SubstrateMessagesTarget; use component_pangolin_s2s::PangolinChain; - use component_pangoro_s2s::PangoroChain; + use component_pangoro_s2s::{PangoroChain, PangoroRelayStrategy}; use crate::chains::pangolin::PangolinChainConst; use crate::chains::pangoro::PangoroChainConst; @@ -322,6 +322,7 @@ mod s2s_messages { ::SigningParams, PangolinChain, ::SigningParams, + PangoroRelayStrategy, >, ) -> anyhow::Result<()> { let stall_timeout = Duration::from_secs(5 * 60); @@ -389,7 +390,7 @@ mod s2s_messages { max_messages_in_single_batch, max_messages_weight_in_single_batch, max_messages_size_in_single_batch, - relayer_mode: params.relayer_mode, + relay_strategy: params.relay_strategy, }, }, PangoroSourceClient::new( diff --git a/task/task-pangolin-pangoro/src/config.rs b/task/task-pangolin-pangoro/src/config.rs index 9e2348d0f..6197e520b 100644 --- a/task/task-pangolin-pangoro/src/config.rs +++ b/task/task-pangolin-pangoro/src/config.rs @@ -3,14 +3,20 @@ use std::str::FromStr; use serde::{Deserialize, Serialize}; use bridge_traits::bridge::config::{BridgeConfig, Config}; +use component_subscan::SubscanConfig; -use crate::types::{ChainInfo, HexLaneId, PrometheusParamsInfo, WrapperRelayerMode}; +use crate::types::{ChainInfo, HexLaneId, PrometheusParamsInfo}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct PangolinPangoroConfig { pub pangolin: ChainInfoConfig, pub pangoro: ChainInfoConfig, pub relay: RelayConfig, + #[serde(skip_serializing_if = "Option::is_none")] + pub pangolin_subscan: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub pangoro_subscan: Option, + pub task: TaskConfig, } impl PangolinPangoroConfig { @@ -20,6 +26,13 @@ impl PangolinPangoroConfig { let name = sand_name.as_ref(); Config::store_with_namespace(name, self.pangolin.clone(), "pangolin")?; Config::store_with_namespace(name, self.pangoro.clone(), "pangoro")?; + if let Some(pangolin_subscan) = &self.pangolin_subscan { + Config::store_with_namespace(name, pangolin_subscan.clone(), "pangolin")?; + } + if let Some(pangoro_subscan) = &self.pangoro_subscan { + Config::store_with_namespace(name, pangoro_subscan.clone(), "pangoro")?; + } + Config::store(name, self.task.clone())?; Config::store(name, self.relay.clone())?; Ok(()) } @@ -28,10 +41,39 @@ impl PangolinPangoroConfig { pangolin: ChainInfoConfig::template(), pangoro: ChainInfoConfig::template(), relay: RelayConfig::template(), + pangolin_subscan: Some(SubscanConfig::template()), + pangoro_subscan: Some(SubscanConfig::template()), + task: TaskConfig::template(), } } } +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct TaskConfig { + pub interval_update_fee: u64, + pub update_fee_strategy: UpdateFeeStrategyType, +} + +impl BridgeConfig for TaskConfig { + fn marker() -> &'static str { + "config-task-pangolin-pangoro" + } + + fn template() -> Self { + Self { + interval_update_fee: 60, + update_fee_strategy: UpdateFeeStrategyType::Nothing, + } + } +} + +#[derive(Clone, Debug, Serialize, Deserialize, strum::EnumString)] +pub enum UpdateFeeStrategyType { + Nothing, + Crazy, + Reasonable, +} + #[derive(Clone, Debug, Serialize, Deserialize)] pub struct RelayConfig { /// Hex-encoded lane identifiers that should be served by the complex relay. @@ -41,8 +83,6 @@ pub struct RelayConfig { pub signer_pangolin: Option, #[serde(skip_serializing_if = "Option::is_none")] pub signer_pangoro: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub relayer_mode: Option, #[serde(default)] pub prometheus_params: PrometheusParamsInfo, /// If passed, only mandatory headers (headers that are changing the GRANDPA authorities set) @@ -75,7 +115,6 @@ impl BridgeConfig for RelayConfig { auto_start: false, signer_pangolin: Some("//Alice".to_string()), signer_pangoro: Some("//Alice".to_string()), - relayer_mode: Some(WrapperRelayerMode::Rational), prometheus_params: PrometheusParamsInfo { no_prometheus: false, prometheus_host: "127.0.0.1".to_string(), diff --git a/task/task-pangolin-pangoro/src/fee/mod.rs b/task/task-pangolin-pangoro/src/fee/mod.rs new file mode 100644 index 000000000..e8ae3fcf5 --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/mod.rs @@ -0,0 +1,5 @@ +pub use self::traits::*; + +mod traits; + +pub mod strategy; diff --git a/task/task-pangolin-pangoro/src/fee/strategy/common.rs b/task/task-pangolin-pangoro/src/fee/strategy/common.rs new file mode 100644 index 000000000..6d1235532 --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/strategy/common.rs @@ -0,0 +1,66 @@ +use relay_substrate_client::TransactionSignScheme; + +use bridge_traits::bridge::config::Config; +use bridge_traits::bridge::task::BridgeSand; +use component_pangolin_s2s::api::PangolinApi; +use component_pangolin_s2s::PangolinChain; +use component_pangoro_s2s::api::PangoroApi; +use component_pangoro_s2s::PangoroChain; + +use crate::config::{ChainInfoConfig, RelayConfig}; +use crate::task::PangolinPangoroTask; + +#[derive(Clone)] +pub struct StrategyHelper { + pangolin_api: PangolinApi, + pangoro_api: PangoroApi, + pangolin_signer: ::AccountKeyPair, + pangoro_signer: ::AccountKeyPair, +} + +impl StrategyHelper { + pub async fn new() -> anyhow::Result { + let config_pangolin: ChainInfoConfig = + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangolin")?; + let config_pangoro: ChainInfoConfig = + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangoro")?; + let config_relay: RelayConfig = Config::restore_unwrap(PangolinPangoroTask::NAME)?; + + let (pangolin_chain, pangoro_chain) = ( + config_pangolin + .to_chain_info_with_expect_signer(config_relay.signer_pangolin.clone())?, + config_pangoro.to_chain_info_with_expect_signer(config_relay.signer_pangoro.clone())?, + ); + + let pangolin_client = pangolin_chain + .to_substrate_relay_chain::() + .await?; + let pangoro_client = pangoro_chain + .to_substrate_relay_chain::() + .await?; + + let pangolin_signer = pangolin_chain.to_keypair::()?; + let pangoro_signer = pangoro_chain.to_keypair::()?; + Ok(Self { + pangolin_api: PangolinApi::new(pangolin_client), + pangoro_api: PangoroApi::new(pangoro_client), + pangolin_signer, + pangoro_signer, + }) + } +} + +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 + } + pub fn pangoro_signer(&self) -> &::AccountKeyPair { + &self.pangoro_signer + } +} diff --git a/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs b/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs new file mode 100644 index 000000000..997cb71d6 --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/strategy/crazy_strategy.rs @@ -0,0 +1,110 @@ +use common_primitives::AccountId; +use sp_core::Pair; + +use bridge_traits::bridge::task::BridgeSand; + +use crate::fee::strategy::common::StrategyHelper; +use crate::fee::UpdateFeeStrategy; +use crate::task::PangolinPangoroTask; + +/// Crazy strategy, always keep yourself as the first place in assigned relayers +pub struct CrazyStrategy { + helper: StrategyHelper, +} + +impl CrazyStrategy { + pub async fn new() -> anyhow::Result { + Ok(Self { + helper: StrategyHelper::new().await?, + }) + } +} + +#[async_trait::async_trait] +impl UpdateFeeStrategy for CrazyStrategy { + async fn handle(&self) -> anyhow::Result<()> { + self.handle_pangolin().await?; + self.handle_pangoro().await?; + Ok(()) + } +} + +impl CrazyStrategy { + async fn handle_pangolin(&self) -> anyhow::Result<()> { + let pangolin_api = self.helper.pangolin_api(); + let my_id = AccountId::from(self.helper.pangolin_signer().public().0); + + if !pangolin_api.is_relayer(my_id.clone()).await? { + log::warn!( + target: PangolinPangoroTask::NAME, + "You are not a relayer, please register first" + ); + return Ok(()); + } + + // Query all assigned relayers + let assigned_relayers = pangolin_api.assigned_relayers().await?; + let min_fee = match assigned_relayers.get(0) { + Some(relayer) => { + if relayer.id == my_id { + // If you are the first assigned relayer, no change will be made + return Ok(()); + } + relayer.fee + } + None => 51, // This is default value when not have any assigned relayers + }; + + // Nice ( + // RISK: If the cost is not judged, it may be a negative benefit. + let new_fee = min_fee - 1; + log::info!( + target: PangolinPangoroTask::NAME, + "[crazy] Update pangolin fee: {}", + new_fee + ); + pangolin_api + .update_relay_fee(self.helper.pangolin_signer().clone(), new_fee) + .await?; + Ok(()) + } + + async fn handle_pangoro(&self) -> anyhow::Result<()> { + let pangoro_api = self.helper.pangoro_api(); + let my_id = AccountId::from(self.helper.pangoro_signer().public().0); + + if !pangoro_api.is_relayer(my_id.clone()).await? { + log::warn!( + target: PangolinPangoroTask::NAME, + "You are not a relayer, please register first" + ); + return Ok(()); + } + + // Query all assigned relayers + let assigned_relayers = pangoro_api.assigned_relayers().await?; + let min_fee = match assigned_relayers.get(0) { + Some(relayer) => { + if relayer.id == my_id { + // If you are the first assigned relayer, no change will be made + return Ok(()); + } + relayer.fee + } + None => 51, // This is default value when not have any assigned relayers + }; + + // Nice ( + // RISK: If the cost is not judged, it may be a negative benefit. + let new_fee = min_fee - 1; + log::info!( + target: PangolinPangoroTask::NAME, + "[crazy] Update pangoro fee: {}", + new_fee + ); + pangoro_api + .update_relay_fee(self.helper.pangoro_signer().clone(), new_fee) + .await?; + Ok(()) + } +} diff --git a/task/task-pangolin-pangoro/src/fee/strategy/mod.rs b/task/task-pangolin-pangoro/src/fee/strategy/mod.rs new file mode 100644 index 000000000..5b4311a3f --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/strategy/mod.rs @@ -0,0 +1,6 @@ +pub use self::crazy_strategy::*; +pub use self::reasonable_strategy::*; + +mod common; +mod crazy_strategy; +mod reasonable_strategy; diff --git a/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs new file mode 100644 index 000000000..6ed66c7f9 --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/strategy/reasonable_strategy.rs @@ -0,0 +1,160 @@ +use std::time::{SystemTime, UNIX_EPOCH}; + +use sp_runtime::{FixedPointNumber, FixedU128}; + +use bridge_traits::bridge::component::BridgeComponent; +use bridge_traits::bridge::task::BridgeSand; +use bridge_traits::error::StandardError; +use component_subscan::{Subscan, SubscanComponent}; + +use crate::fee::strategy::common::StrategyHelper; +use crate::fee::UpdateFeeStrategy; +use crate::task::PangolinPangoroTask; + +const MIN_RELAY_FEE_PANGOLIN: u128 = 15 * pangolin_constants::COIN; +const MIN_RELAY_FEE_PANGORO: u128 = 15 * pangoro_constants::COIN; + +#[derive(Clone)] +pub struct ReasonableStrategy { + helper: StrategyHelper, + subscan_pangolin: Subscan, + subscan_pangoro: Subscan, +} + +impl ReasonableStrategy { + pub async fn new() -> anyhow::Result { + let helper = StrategyHelper::new().await?; + let component_subcan_pangolin = SubscanComponent::restore_with_namespace::< + PangolinPangoroTask, + >("pangolin".to_string())?; + let component_subscan_pangoro = + SubscanComponent::restore_with_namespace::("pangoro".to_string())?; + let subscan_pangolin = component_subcan_pangolin.component().await?; + let subscan_pangoro = component_subscan_pangoro.component().await?; + Ok(Self { + helper, + subscan_pangolin, + subscan_pangoro, + }) + } +} + +impl ReasonableStrategy { + async fn _pangolin_open_price(&self) -> anyhow::Result { + let now = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs(); + match self.subscan_pangolin.price(now).await?.data() { + Ok(Some(v)) => Ok(v.price), + _ => { + let subscan_dock = self + .subscan_pangolin + .clone() + .endpoint("https://dock.api.subscan.io"); + let open_price = subscan_dock.price(now).await?; + let data = open_price.data()?; + match data { + Some(v) => Ok(v.price), + None => anyhow::bail!("Can not query pangolin price"), + } + } + } + } + + async fn _pangoro_open_price(&self) -> anyhow::Result { + let now = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs(); + match self.subscan_pangoro.price(now).await?.data() { + Ok(Some(v)) => Ok(v.price), + _ => { + let subscan_darwinia = self + .subscan_pangoro + .clone() + .endpoint("https://darwinia.api.subscan.io"); + let open_price = subscan_darwinia.price(now).await?; + let data = open_price.data()?; + match data { + Some(v) => Ok(v.price), + None => anyhow::bail!("Can not query pangoro price"), + } + } + } + } + + async fn conversion_pangolin_to_pangoro( + &self, + pangolin_currency: 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; + let rate = FixedU128::from_float(rate); + let ret = rate.saturating_mul_int(pangolin_currency); + Ok(ret) + } + async fn conversion_pangoro_to_pangolin( + &self, + pangoro_currency: 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; + let rate = FixedU128::from_float(rate); + let ret = rate.saturating_mul_int(pangoro_currency); + Ok(ret) + } +} + +#[async_trait::async_trait] +impl UpdateFeeStrategy for ReasonableStrategy { + async fn handle(&self) -> anyhow::Result<()> { + let top100_pangolin = self.subscan_pangolin.extrinsics(1, 100).await?; + let top100_pangoro = self.subscan_pangoro.extrinsics(1, 100).await?; + let top100_pangolin = top100_pangolin.data()?.ok_or_else(|| { + StandardError::Api("Can not query pangolin extrinsics data".to_string()) + })?; + let top100_pangoro = top100_pangoro.data()?.ok_or_else(|| { + StandardError::Api("Can not query pangoro extrinsics data".to_string()) + })?; + + let max_fee_pangolin = (&top100_pangolin.extrinsics) + .iter() + .map(|item| item.fee) + .max() + .unwrap_or(0); + let max_fee_pangoro = (&top100_pangoro.extrinsics) + .iter() + .map(|item| item.fee) + .max() + .unwrap_or(0); + + let top100_max_cost_pangolin = + max_fee_pangolin + self.conversion_pangoro_to_pangolin(max_fee_pangoro).await?; + let top100_max_cost_pangoro = max_fee_pangoro + + self + .conversion_pangolin_to_pangoro(max_fee_pangolin) + .await?; + + // Nice ( + let expect_fee_pangolin = MIN_RELAY_FEE_PANGOLIN + (top100_max_cost_pangolin * 15); + let expect_fee_pangoro = MIN_RELAY_FEE_PANGORO + (top100_max_cost_pangoro * 15); + + log::info!( + target: PangolinPangoroTask::NAME, + "[reasonable] Update pangoro fee: {}", + expect_fee_pangoro + ); + let pangoro_api = self.helper.pangoro_api(); + pangoro_api + .update_relay_fee(self.helper.pangoro_signer().clone(), expect_fee_pangoro) + .await?; + + log::info!( + target: PangolinPangoroTask::NAME, + "[reasonable] Update pangolin fee: {}", + expect_fee_pangolin + ); + let pangolin_api = self.helper.pangolin_api(); + pangolin_api + .update_relay_fee(self.helper.pangolin_signer().clone(), expect_fee_pangolin) + .await?; + Ok(()) + } +} diff --git a/task/task-pangolin-pangoro/src/fee/traits.rs b/task/task-pangolin-pangoro/src/fee/traits.rs new file mode 100644 index 000000000..fb735cf2c --- /dev/null +++ b/task/task-pangolin-pangoro/src/fee/traits.rs @@ -0,0 +1,4 @@ +#[async_trait::async_trait] +pub trait UpdateFeeStrategy { + async fn handle(&self) -> anyhow::Result<()>; +} diff --git a/task/task-pangolin-pangoro/src/lib.rs b/task/task-pangolin-pangoro/src/lib.rs index 227071cd0..79d97ca2d 100644 --- a/task/task-pangolin-pangoro/src/lib.rs +++ b/task/task-pangolin-pangoro/src/lib.rs @@ -3,6 +3,7 @@ pub mod task; mod bus; mod chains; +mod fee; mod message; mod route; mod service; diff --git a/task/task-pangolin-pangoro/src/service/fee.rs b/task/task-pangolin-pangoro/src/service/fee.rs new file mode 100644 index 000000000..197678a0d --- /dev/null +++ b/task/task-pangolin-pangoro/src/service/fee.rs @@ -0,0 +1,89 @@ +use lifeline::{Lifeline, Service, Task}; + +use bridge_traits::bridge::config::Config; +use bridge_traits::bridge::service::BridgeService; +use bridge_traits::bridge::task::BridgeSand; +use component_subscan::SubscanConfig; + +use crate::bus::PangolinPangoroBus; +use crate::config::{TaskConfig, UpdateFeeStrategyType}; +use crate::fee::strategy::{CrazyStrategy, ReasonableStrategy}; +use crate::fee::UpdateFeeStrategy; +use crate::task::PangolinPangoroTask; + +#[derive(Debug)] +pub struct UpdateFeeService { + _greet: Lifeline, +} + +impl BridgeService for UpdateFeeService {} + +impl Service for UpdateFeeService { + type Bus = PangolinPangoroBus; + type Lifeline = anyhow::Result; + + fn spawn(_bus: &Self::Bus) -> Self::Lifeline { + let _greet = Self::try_task( + &format!("{}-update-fee", PangolinPangoroTask::NAME), + async move { + let config_task: TaskConfig = Config::restore_unwrap(PangolinPangoroTask::NAME)?; + std::thread::spawn(move || { + futures::executor::block_on(cron_update_fee(config_task)) + }) + .join() + .map_err(|_| anyhow::Error::msg("Failed to join thread handle"))??; + + Ok(()) + }, + ); + Ok(Self { _greet }) + } +} + +async fn cron_update_fee(config_task: TaskConfig) -> anyhow::Result<()> { + log::info!( + target: PangolinPangoroTask::NAME, + "Use update fee strategy: {:?}", + config_task.update_fee_strategy + ); + loop { + if let Err(e) = run_update_fee(config_task.clone()).await { + log::error!( + target: PangolinPangoroTask::NAME, + "Failed to update fee: {:?}", + e + ); + } + + futures_timer::Delay::new(std::time::Duration::from_secs( + config_task.interval_update_fee, + )) + .await; + } +} + +async fn run_update_fee(config_task: TaskConfig) -> anyhow::Result<()> { + let subscan_config_pangolin: Option = + Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangolin")?; + let subscan_config_pangoro: Option = + Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangoro")?; + let exists_subscan_config = + subscan_config_pangolin.is_some() && subscan_config_pangoro.is_some(); + match config_task.update_fee_strategy { + UpdateFeeStrategyType::Nothing => Ok(()), + UpdateFeeStrategyType::Crazy => { + if !exists_subscan_config { + return Ok(()); + } + let strategy = CrazyStrategy::new().await?; + strategy.handle().await + } + UpdateFeeStrategyType::Reasonable => { + if !exists_subscan_config { + return Ok(()); + } + let strategy = ReasonableStrategy::new().await?; + strategy.handle().await + } + } +} diff --git a/task/task-pangolin-pangoro/src/service/init.rs b/task/task-pangolin-pangoro/src/service/init.rs index a00926410..7b1d0de5a 100644 --- a/task/task-pangolin-pangoro/src/service/init.rs +++ b/task/task-pangolin-pangoro/src/service/init.rs @@ -32,9 +32,9 @@ impl Service for InitBridgeService { let mut rx = bus.rx::()?; let mut tx = bus.tx::()?; let config_pangolin: ChainInfoConfig = - Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangolin")?; + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangolin")?; let config_pangoro: ChainInfoConfig = - Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangoro")?; + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangoro")?; let _greet = Self::try_task( &format!("{}-init-bridge", PangolinPangoroTask::NAME), diff --git a/task/task-pangolin-pangoro/src/service/mod.rs b/task/task-pangolin-pangoro/src/service/mod.rs index be53715e6..3d9be2d45 100644 --- a/task/task-pangolin-pangoro/src/service/mod.rs +++ b/task/task-pangolin-pangoro/src/service/mod.rs @@ -1,2 +1,3 @@ +pub mod fee; pub mod init; pub mod relay; diff --git a/task/task-pangolin-pangoro/src/service/relay.rs b/task/task-pangolin-pangoro/src/service/relay.rs index d30377b46..40d974cb4 100644 --- a/task/task-pangolin-pangoro/src/service/relay.rs +++ b/task/task-pangolin-pangoro/src/service/relay.rs @@ -1,15 +1,17 @@ +use common_primitives::AccountId; use futures::{FutureExt, TryFutureExt}; use lifeline::{Bus, Lifeline, Receiver, Service, Task}; use relay_substrate_client::{AccountIdOf, Chain, Client, TransactionSignScheme}; use relay_utils::metrics::MetricsParams; +use sp_core::Pair; use substrate_relay_helper::messages_lane::{MessagesRelayParams, SubstrateMessageLane}; use substrate_relay_helper::on_demand_headers::OnDemandHeadersRelay; use bridge_traits::bridge::config::Config; use bridge_traits::bridge::service::BridgeService; use bridge_traits::bridge::task::BridgeSand; -use component_pangolin_s2s::PangolinChain; -use component_pangoro_s2s::PangoroChain; +use component_pangolin_s2s::{PangolinChain, PangolinRelayStrategy}; +use component_pangoro_s2s::{PangoroChain, PangoroRelayStrategy}; use crate::bus::PangolinPangoroBus; use crate::chains::pangolin::{ @@ -21,9 +23,7 @@ use crate::chains::pangoro::{ use crate::config::{ChainInfoConfig, RelayConfig}; use crate::message::PangolinPangoroMessageSend; use crate::task::PangolinPangoroTask; -use crate::types::{ - MessagesPalletOwnerSigningParams, RelayHeadersAndMessagesInfo, WrapperRelayerMode, -}; +use crate::types::{MessagesPalletOwnerSigningParams, RelayHeadersAndMessagesInfo}; /// Maximal allowed conversion rate error ratio (abs(real - stored) / stored) that we allow. /// @@ -47,10 +47,10 @@ impl Service for RelayService { fn spawn(bus: &Self::Bus) -> Self::Lifeline { let mut rx = bus.rx::()?; let config_pangolin: ChainInfoConfig = - Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangolin")?; + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangolin")?; let config_pangoro: ChainInfoConfig = - Config::restore_with_namespace(PangolinPangoroTask::NAME, "pangoro")?; - let config_relay: RelayConfig = Config::restore(PangolinPangoroTask::NAME)?; + Config::restore_with_namespace_unwrap(PangolinPangoroTask::NAME, "pangoro")?; + let config_relay: RelayConfig = Config::restore_unwrap(PangolinPangoroTask::NAME)?; let _greet = Self::try_task( &format!("{}-relay", PangolinPangoroTask::NAME), @@ -74,10 +74,6 @@ impl Service for RelayService { target: target_chain, lanes: config_relay.lanes.clone(), prometheus_params: config_relay.prometheus_params.clone(), - relayer_mode: config_relay - .relayer_mode - .unwrap_or(WrapperRelayerMode::Rational) - .into(), create_relayers_fund_accounts: config_relay.create_relayers_fund_accounts, only_mandatory_headers: config_relay.only_mandatory_headers, pangolin_messages_pallet_owner_signing: MessagesPalletOwnerSigningParams { @@ -103,6 +99,8 @@ impl Service for RelayService { }) .join() .map_err(|_| anyhow::Error::msg("Failed to join thread handle"))??; + + // bridge_relay(relay_info).await?; } Ok(()) }, @@ -114,7 +112,6 @@ impl Service for RelayService { async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result<()> { let pangolin_chain = relay_info.source; let pangoro_chain = relay_info.target; - let relayer_mode = relay_info.relayer_mode; let pangolin_client = pangolin_chain .to_substrate_relay_chain::() @@ -293,12 +290,15 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result source_to_target_headers_relay: Some(pangolin_to_pangoro_on_demand_headers.clone()), target_to_source_headers_relay: Some(pangoro_to_pangolin_on_demand_headers.clone()), lane_id: lane, - relayer_mode, metrics_params: metrics_params.clone().disable().metrics_prefix( messages_relay::message_lane_loop::metrics_prefix::< ::MessageLane, >(&lane), ), + relay_strategy: PangolinRelayStrategy::new( + pangolin_client.clone(), + AccountId::from(pangolin_sign.public().0), + ), }) .map_err(|e| anyhow::format_err!("{}", e)) .boxed(); @@ -312,12 +312,15 @@ async fn bridge_relay(relay_info: RelayHeadersAndMessagesInfo) -> anyhow::Result source_to_target_headers_relay: Some(pangoro_to_pangolin_on_demand_headers.clone()), target_to_source_headers_relay: Some(pangolin_to_pangoro_on_demand_headers.clone()), lane_id: lane, - relayer_mode, metrics_params: metrics_params.clone().disable().metrics_prefix( messages_relay::message_lane_loop::metrics_prefix::< ::MessageLane, >(&lane), ), + relay_strategy: PangoroRelayStrategy::new( + pangoro_client.clone(), + AccountId::from(pangoro_sign.public().0), + ), }) .map_err(|e| anyhow::format_err!("{}", e)) .boxed(); diff --git a/task/task-pangolin-pangoro/src/task.rs b/task/task-pangolin-pangoro/src/task.rs index 3f5eafbed..5b8d0909d 100644 --- a/task/task-pangolin-pangoro/src/task.rs +++ b/task/task-pangolin-pangoro/src/task.rs @@ -8,6 +8,7 @@ use bridge_traits::bridge::task::{ use crate::bus::PangolinPangoroBus; use crate::config::{PangolinPangoroConfig, RelayConfig}; use crate::message::PangolinPangoroMessageSend; +use crate::service::fee::UpdateFeeService; use crate::service::init::InitBridgeService; use crate::service::relay::RelayService; @@ -50,11 +51,12 @@ impl PangolinPangoroTask { let bus = PangolinPangoroBus::default(); let mut stack = TaskStack::new(bus); + stack.spawn_service::()?; stack.spawn_service::()?; stack.spawn_service::()?; let mut sender = stack.bus().tx::()?; - let relay_config: RelayConfig = Config::restore(Self::NAME)?; + let relay_config: RelayConfig = Config::restore_unwrap(Self::NAME)?; if relay_config.auto_start { sender.send(PangolinPangoroMessageSend::Relay).await?; } diff --git a/task/task-pangolin-pangoro/src/types.rs b/task/task-pangolin-pangoro/src/types.rs index d099ea340..b2fe98f4d 100644 --- a/task/task-pangolin-pangoro/src/types.rs +++ b/task/task-pangolin-pangoro/src/types.rs @@ -2,7 +2,6 @@ use std::fmt::{Display, Formatter}; use std::str::FromStr; use bp_messages::LaneId; -use messages_relay::message_lane_loop::RelayerMode; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use sp_core::crypto::Pair; @@ -150,26 +149,6 @@ impl From for relay_utils::metrics::MetricsParams { } } -/// Relayer operating mode. -#[derive(Debug, Clone, Copy, Eq, PartialEq, Deserialize, Serialize, strum::EnumString)] -pub enum WrapperRelayerMode { - /// The relayer doesn't care about rewards. - #[strum(serialize = "altruistic")] - Altruistic, - /// The relayer will deliver all messages and confirmations as long as he's not losing any funds. default value - #[strum(serialize = "rational")] - Rational, -} - -impl From for RelayerMode { - fn from(wrm: WrapperRelayerMode) -> Self { - match wrm { - WrapperRelayerMode::Altruistic => RelayerMode::Altruistic, - WrapperRelayerMode::Rational => RelayerMode::Rational, - } - } -} - #[derive(Debug, Clone)] pub struct RelayHeadersAndMessagesInfo { pub source: ChainInfo, @@ -177,7 +156,6 @@ pub struct RelayHeadersAndMessagesInfo { pub lanes: Vec, pub prometheus_params: PrometheusParamsInfo, - pub relayer_mode: RelayerMode, pub create_relayers_fund_accounts: bool, pub only_mandatory_headers: bool, diff --git a/task/task-pangolin-ropsten/src/service/affirm/mod.rs b/task/task-pangolin-ropsten/src/service/affirm/mod.rs index 02c10fd82..ad6674e88 100644 --- a/task/task-pangolin-ropsten/src/service/affirm/mod.rs +++ b/task/task-pangolin-ropsten/src/service/affirm/mod.rs @@ -117,7 +117,7 @@ async fn handle_affirm_relay( sender_to_extrinsics: broadcast::Sender, ) -> anyhow::Result<()> { // Config - let task_config: TaskConfig = Config::restore(PangolinRopstenTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; let mut handler = AffirmHandler::new(microkv.clone(), sender_to_extrinsics.clone()).await; loop { if let Err(err) = handler.affirm().await { @@ -152,7 +152,7 @@ async fn run_scan( microkv: NamespaceMicroKV, sender_to_extrinsics: broadcast::Sender, ) -> anyhow::Result<()> { - let task_config: TaskConfig = Config::restore(PangolinRopstenTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; // the graph let component_thegraph_liketh = TheGraphLikeEthComponent::restore::()?; diff --git a/task/task-pangolin-ropsten/src/service/check.rs b/task/task-pangolin-ropsten/src/service/check.rs index 9df49661a..4ece61f12 100644 --- a/task/task-pangolin-ropsten/src/service/check.rs +++ b/task/task-pangolin-ropsten/src/service/check.rs @@ -66,7 +66,7 @@ async fn run(tracker: &Tracker) -> anyhow::Result<()> { let component_thegraph_liketh = TheGraphLikeEthComponent::restore::()?; let thegraph_liketh = component_thegraph_liketh.component().await?; - let task_config: TaskConfig = Config::restore(PangolinRopstenTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; let component_pangolin_subxt = DarwiniaSubxtComponent::restore::()?; // Darwinia client diff --git a/task/task-pangolin-ropsten/src/service/extrinsics/handler.rs b/task/task-pangolin-ropsten/src/service/extrinsics/handler.rs index 47535e897..945fe5243 100644 --- a/task/task-pangolin-ropsten/src/service/extrinsics/handler.rs +++ b/task/task-pangolin-ropsten/src/service/extrinsics/handler.rs @@ -55,8 +55,9 @@ impl ExtrinsicsHandler { let component_darwinia = DarwiniaSubxtComponent::restore::()?; // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(PangolinRopstenTask::NAME)?; - let config_web3: Web3Config = Config::restore(PangolinRopstenTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = + Config::restore_unwrap(PangolinRopstenTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(PangolinRopstenTask::NAME)?; // Darwinia client & accounts let darwinia = component_darwinia.component().await?; diff --git a/task/task-pangolin-ropsten/src/service/guard.rs b/task/task-pangolin-ropsten/src/service/guard.rs index 3c1284a93..62a066db4 100644 --- a/task/task-pangolin-ropsten/src/service/guard.rs +++ b/task/task-pangolin-ropsten/src/service/guard.rs @@ -70,8 +70,8 @@ async fn run(sender_to_extrinsics: &mut impl Sender) -> any let component_shadow = ShadowComponent::restore::()?; // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(PangolinRopstenTask::NAME)?; - let servce_config: TaskConfig = Config::restore(PangolinRopstenTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; + let servce_config: TaskConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; // Darwinia client & account let darwinia = component_pangolin_subxt.component().await?; diff --git a/task/task-pangolin-ropsten/src/service/pangolin/mod.rs b/task/task-pangolin-ropsten/src/service/pangolin/mod.rs index 76b2fc77d..1157ca344 100644 --- a/task/task-pangolin-ropsten/src/service/pangolin/mod.rs +++ b/task/task-pangolin-ropsten/src/service/pangolin/mod.rs @@ -83,8 +83,8 @@ async fn run( let delayed_extrinsics: HashMap = HashMap::new(); // Config - let config_darwinia: DarwiniaSubxtConfig = Config::restore(PangolinRopstenTask::NAME)?; - let config_web3: Web3Config = Config::restore(PangolinRopstenTask::NAME)?; + let config_darwinia: DarwiniaSubxtConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; + let config_web3: Web3Config = Config::restore_unwrap(PangolinRopstenTask::NAME)?; // Components let component_ethereum = EthereumComponent::restore::()?; diff --git a/task/task-pangolin-ropsten/src/service/redeem/mod.rs b/task/task-pangolin-ropsten/src/service/redeem/mod.rs index e4c5628d2..c0a25ae77 100644 --- a/task/task-pangolin-ropsten/src/service/redeem/mod.rs +++ b/task/task-pangolin-ropsten/src/service/redeem/mod.rs @@ -136,7 +136,7 @@ async fn run_scan( let thegraph_liketh = component_thegraph_liketh.component().await?; // task config - let task_config: TaskConfig = Config::restore(PangolinRopstenTask::NAME)?; + let task_config: TaskConfig = Config::restore_unwrap(PangolinRopstenTask::NAME)?; let mut handler = RedeemHandler::new(sender_to_extrinsics.clone(), sender_to_redeem.clone()).await; diff --git a/traits/src/bridge/config.rs b/traits/src/bridge/config.rs index 45266e9b4..1afd7c387 100644 --- a/traits/src/bridge/config.rs +++ b/traits/src/bridge/config.rs @@ -73,10 +73,16 @@ impl Config { pub fn restore, B: BridgeConfig + DeserializeOwned>( sand_name: S, - ) -> BridgeResult { + ) -> BridgeResult> { Self::restore_with_namespace(sand_name, DEFAULT_NAMESPACE) } + pub fn restore_unwrap, B: BridgeConfig + DeserializeOwned>( + sand_name: S, + ) -> BridgeResult { + Self::restore_with_namespace_unwrap(sand_name, DEFAULT_NAMESPACE) + } + pub fn restore_with_namespace< S: AsRef, B: BridgeConfig + DeserializeOwned, @@ -84,7 +90,7 @@ impl Config { >( sand_name: S, namespace: N, - ) -> BridgeResult { + ) -> BridgeResult> { let config_marker = B::marker(); let key = format!( "{}:{}@{}", @@ -93,16 +99,37 @@ impl Config { namespace.as_ref() ); match INSTANCE.lock().unwrap().get(&key) { - Some(v) => serde_json::from_str(v).map_err(|e| { + Some(v) => Ok(Some(serde_json::from_str(v).map_err(|e| { StandardError::Other(format!( "The config cannot be deserialize, please check it. [{}] {:?}", key, e )) - }), - None => Err(StandardError::NotSupport(format!( + })?)), + None => Ok(None), + } + } + + pub fn restore_with_namespace_unwrap< + S: AsRef, + B: BridgeConfig + DeserializeOwned, + N: AsRef, + >( + sand_name: S, + namespace: N, + ) -> BridgeResult { + let key = format!( + "{}:{}@{}", + sand_name.as_ref(), + B::marker(), + namespace.as_ref() + ); + match Self::restore_with_namespace(sand_name, namespace) { + Ok(Some(v)) => Ok(v), + Ok(None) => Err(StandardError::NotSupport(format!( "Not support this config, please init this config after create task -> [{}]", key ))), + Err(e) => Err(e), } }