From 83141e4b585d1dd793cb8434fdfa2295647ce775 Mon Sep 17 00:00:00 2001 From: Xavier Lau Date: Mon, 31 Aug 2020 12:23:57 +0800 Subject: [PATCH] Companion for #250 (#505) * bump: dependencies * companion: for #250 --- Cargo.lock | 146 +++++++++++++++++----------------- runtime/crab/Cargo.toml | 2 + runtime/crab/src/constants.rs | 8 +- runtime/crab/src/lib.rs | 6 +- 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e7fcbb6d..9c70fc15b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,7 +156,7 @@ checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" [[package]] name = "array-bytes" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "sp-std 2.0.0-rc5", ] @@ -216,9 +216,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43de69555a39d52918e2bc33a408d3c0a86c829b212d898f4ca25d21a6387478" +checksum = "59386c3aa61f4e14c4ddda1a6744c119b4bf278ec9f866d3c20bc5728ee0eb97" dependencies = [ "concurrent-queue", "event-listener", @@ -362,12 +362,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" @@ -475,21 +469,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake3" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4f9586c9a3151c4b49b19e82ba163dd073614dd057e53c969e1a4db5b52720" -dependencies = [ - "arrayref", - "arrayvec 0.5.1", - "cc", - "cfg-if", - "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -819,6 +798,7 @@ dependencies = [ "darwinia-header-mmr", "darwinia-header-mmr-rpc-runtime-api", "darwinia-primitives", + "darwinia-relay-primitives", "darwinia-relayer-game", "darwinia-runtime-common", "darwinia-staking", @@ -1109,7 +1089,7 @@ dependencies = [ [[package]] name = "darwinia-balances" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", @@ -1124,7 +1104,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-balances-rpc-runtime-api", "jsonrpc-core", @@ -1139,7 +1119,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1151,7 +1131,7 @@ dependencies = [ [[package]] name = "darwinia-claims" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "array-bytes", "darwinia-support", @@ -1193,7 +1173,7 @@ dependencies = [ [[package]] name = "darwinia-cli" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "sc-cli", "sc-client-api", @@ -1206,7 +1186,7 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-support", "frame-support", @@ -1221,7 +1201,7 @@ dependencies = [ [[package]] name = "darwinia-ethereum-backing" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "array-bytes", "darwinia-support", @@ -1239,12 +1219,12 @@ dependencies = [ [[package]] name = "darwinia-ethereum-relay" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "array-bytes", "blake2-rfc", "ckb-merkle-mountain-range", - "darwinia-header-mmr-rpc-runtime-api", + "darwinia-relay-primitives", "darwinia-relayer-game", "darwinia-support", "ethereum-primitives", @@ -1263,7 +1243,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "ckb-merkle-mountain-range", "darwinia-header-mmr-rpc-runtime-api", @@ -1279,7 +1259,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-header-mmr-rpc-runtime-api", "jsonrpc-core", @@ -1294,7 +1274,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1315,11 +1295,23 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "darwinia-relay-primitives" +version = "1.0.0-alpha.2" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" +dependencies = [ + "frame-support", + "parity-scale-codec", + "sp-runtime", + "sp-std 2.0.0-rc5", +] + [[package]] name = "darwinia-relayer-game" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ + "darwinia-relay-primitives", "darwinia-support", "frame-support", "frame-system", @@ -1429,7 +1421,7 @@ dependencies = [ [[package]] name = "darwinia-staking" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-staking-rpc-runtime-api", "darwinia-support", @@ -1452,7 +1444,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-staking-rpc-runtime-api", "jsonrpc-core", @@ -1467,7 +1459,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1479,7 +1471,7 @@ dependencies = [ [[package]] name = "darwinia-support" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "ethereum-primitives", "frame-support", @@ -1493,7 +1485,7 @@ dependencies = [ [[package]] name = "darwinia-treasury" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "darwinia-support", "frame-support", @@ -1749,7 +1741,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "array-bytes", "ethash", @@ -2069,9 +2061,9 @@ dependencies = [ [[package]] name = "fs_extra" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "fuchsia-cprng" @@ -2349,7 +2341,7 @@ checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -3058,9 +3050,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c341ef15cfb1f923fa3b5138bfbd2d4813a2c1640b473727a53351c7f0b0fa2" +checksum = "44947dd392f09475af614d740fe0320b66d01cb5b977f664bbbb5e45a70ea4c1" dependencies = [ "fs-swap", "kvdb", @@ -3598,7 +3590,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" version = "1.0.0-alpha.2" -source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#30f69688baaea8de7207c636b7ccea07b293ba90" +source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=master#7fd1c679747b72552c5b3c0561dae1a5902d0b8d" dependencies = [ "hashbrown 0.8.2", "keccak-hash", @@ -3711,13 +3703,12 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" [[package]] name = "multihash" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51cc1552a982658478dbc22eefb72bb1d4fd1161eb9818f7bbf4347443f07569" +checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3", "digest 0.9.0", "sha-1 0.9.1", "sha2 0.9.1", @@ -3727,9 +3718,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" +checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" @@ -5170,9 +5161,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_users" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom", "redox_syscall", @@ -5330,9 +5321,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a" +checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" dependencies = [ "libc", "librocksdb-sys", @@ -5350,11 +5341,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" dependencies = [ - "base64 0.11.0", + "base64", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -5393,7 +5384,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ - "base64 0.12.3", + "base64", "log", "ring", "sct", @@ -6679,7 +6670,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85457366ae0c6ce56bf05a958aef14cd38513c236568618edbcd9a8c52cb80b0" dependencies = [ - "base64 0.12.3", + "base64", "bytes 0.5.6", "flate2", "futures 0.3.5", @@ -7340,9 +7331,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976" +checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5" dependencies = [ "clap", "lazy_static", @@ -7351,9 +7342,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99" +checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f" dependencies = [ "heck", "proc-macro-error", @@ -7591,11 +7582,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -8227,9 +8219,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "want" @@ -8258,6 +8250,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasm-bindgen" version = "0.2.67" @@ -8423,7 +8421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f85619a94ee4034bd5bb87fc3dcf71fd2237b81c840809da1201061eec9ab3" dependencies = [ "anyhow", - "base64 0.12.3", + "base64", "bincode", "cfg-if", "cranelift-codegen", @@ -8688,9 +8686,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd37e58a1256a0b328ce9c67d8b62ecdd02f4803ba443df478835cb1a41a637c" +checksum = "053585b18bca1a3d00e4b5ef93e72d4f49a10005374c455db7177e27149c899d" dependencies = [ "futures 0.3.5", "log", diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml index 4d7fe2c9b..2e658bc7e 100644 --- a/runtime/crab/Cargo.toml +++ b/runtime/crab/Cargo.toml @@ -24,6 +24,7 @@ darwinia-ethereum-backing = { default-features = false, git = "https:/ darwinia-ethereum-relay = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } darwinia-header-mmr = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } darwinia-header-mmr-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } +darwinia-relay-primitives = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } darwinia-relayer-game = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } darwinia-staking = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } darwinia-staking-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/darwinia-common.git", branch = "master" } @@ -95,6 +96,7 @@ std = [ "darwinia-ethereum-relay/std", "darwinia-header-mmr/std", "darwinia-header-mmr-rpc-runtime-api/std", + "darwinia-relay-primitives/std", "darwinia-relayer-game/std", "darwinia-staking/std", "darwinia-staking-rpc-runtime-api/std", diff --git a/runtime/crab/src/constants.rs b/runtime/crab/src/constants.rs index 8403146e3..ab79ed743 100644 --- a/runtime/crab/src/constants.rs +++ b/runtime/crab/src/constants.rs @@ -96,13 +96,13 @@ pub mod relay { // --- darwinia --- use super::currency::*; use crate::*; - use darwinia_support::relay::*; + use darwinia_relay_primitives::*; pub struct EthereumRelayerGameAdjustor; impl AdjustableRelayerGame for EthereumRelayerGameAdjustor { type Moment = BlockNumber; type Balance = Balance; - type TcBlockNumber = ::TcBlockNumber; + type TcBlockNumber = ::BlockNumber; fn challenge_time(round: Round) -> Self::Moment { match round { @@ -113,11 +113,11 @@ pub mod relay { } } - fn round_from_chain_len(chain_len: u64) -> Round { + fn round_of_samples_count(chain_len: u64) -> Round { chain_len - 1 } - fn chain_len_from_round(round: Round) -> u64 { + fn samples_count_of_round(round: Round) -> u64 { round + 1 } diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs index a3b59ff36..fdf2ad243 100644 --- a/runtime/crab/src/lib.rs +++ b/runtime/crab/src/lib.rs @@ -670,7 +670,7 @@ impl InstanceFilter for ProxyType { Call::Multisig(..) | Call::EthereumBacking(..) | Call::EthereumRelay(..) | - Call::RelayerGame(..) | + Call::EthereumRelayerGame(..) | Call::HeaderMMR(..) ), ProxyType::Staking => matches!(c, Call::Staking(..) | Call::Utility(..)), @@ -754,7 +754,7 @@ impl darwinia_ethereum_relay::Trait for Runtime { type ModuleId = EthereumRelayModuleId; type Event = Event; type Currency = Ring; - type RelayerGame = RelayerGame; + type RelayerGame = EthereumRelayerGame; type ApproveOrigin = ApproveOrigin; type RejectOrigin = EnsureRootOrHalfCouncil; type WeightInfo = (); @@ -841,7 +841,7 @@ construct_runtime!( EthereumBacking: darwinia_ethereum_backing::{Module, Call, Storage, Config, Event}, EthereumRelay: darwinia_ethereum_relay::{Module, Call, Storage, Config, Event}, - RelayerGame: darwinia_relayer_game::::{Module, Call, Storage, Event}, + EthereumRelayerGame: darwinia_relayer_game::::{Module, Call, Storage, Event}, // Consensus support. HeaderMMR: darwinia_header_mmr::{Module, Call, Storage},