From 07e99997e9c69f5d998c1a7b55759943240cc70c Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Thu, 11 Jun 2020 17:44:54 +0300 Subject: [PATCH] Update Substrate to latest master (rc3) (#129) * Substrate 606c56d2e2f69f68f3947551224be6a3515dff60 * update jsonrpsee --- bridges/bin/node/node/Cargo.toml | 80 +++++++------- bridges/bin/node/node/src/service.rs | 22 ++-- bridges/bin/node/runtime/Cargo.toml | 102 +++++++++--------- bridges/bin/node/runtime/src/lib.rs | 6 +- bridges/modules/currency-exchange/Cargo.toml | 24 ++--- .../ethereum-contract/builtin/Cargo.toml | 18 ++-- bridges/modules/ethereum/Cargo.toml | 20 ++-- bridges/modules/ethereum/src/mock.rs | 4 +- bridges/modules/substrate/Cargo.toml | 36 +++---- .../primitives/currency-exchange/Cargo.toml | 8 +- bridges/primitives/ethereum-poa/Cargo.toml | 16 +-- bridges/relays/ethereum/Cargo.toml | 24 ++--- bridges/relays/substrate/Cargo.toml | 12 +-- bridges/relays/substrate/src/rpc.rs | 4 +- 14 files changed, 189 insertions(+), 187 deletions(-) diff --git a/bridges/bin/node/node/Cargo.toml b/bridges/bin/node/node/Cargo.toml index 2a9ff917aad27..f209961e083f8 100644 --- a/bridges/bin/node/node/Cargo.toml +++ b/bridges/bin/node/node/Cargo.toml @@ -19,100 +19,100 @@ bridge-node-runtime = { version = "0.1.0", path = "../runtime" } sp-bridge-eth-poa = { version = "0.1.0", path = "../../../primitives/ethereum-poa" } [dependencies.sc-cli] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-rpc] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-core] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-executor] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-service] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-inherents] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-transaction-pool] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-transaction-pool] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-network] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-consensus-aura] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-consensus-aura] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-consensus] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.grandpa] package = "sc-finality-grandpa" -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.grandpa-primitives] package = "sp-finality-grandpa" -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-consensus] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-client-api] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sc-basic-authorship] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.substrate-frame-rpc-system] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [build-dependencies] @@ -120,6 +120,6 @@ vergen = "3.1.0" [build-dependencies.build-script-utils] package = "substrate-build-script-utils" -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" diff --git a/bridges/bin/node/node/src/service.rs b/bridges/bin/node/node/src/service.rs index 736cab5198989..6e09a2c902b28 100644 --- a/bridges/bin/node/node/src/service.rs +++ b/bridges/bin/node/node/src/service.rs @@ -52,12 +52,12 @@ macro_rules! new_full_start { crate::service::Executor, >($config)? .with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))? - .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { - let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); + .with_transaction_pool(|builder| { + let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone()); Ok(sc_transaction_pool::BasicPool::new( - config, + builder.config().transaction_pool.clone(), std::sync::Arc::new(pool_api), - prometheus_registry, + builder.prometheus_registry(), )) })? .with_import_queue( @@ -158,7 +158,7 @@ pub fn new_full(config: Configuration) -> Result Result(config)? .with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))? - .with_transaction_pool(|config, client, fetcher, prometheus_registry| { - let fetcher = fetcher.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; + .with_transaction_pool(|builder| { + let fetcher = builder + .fetcher() + .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; - let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); + let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher.clone()); let pool = sc_transaction_pool::BasicPool::with_revalidation_type( - config, + builder.config().transaction_pool.clone(), Arc::new(pool_api), - prometheus_registry, + builder.prometheus_registry(), sc_transaction_pool::RevalidationType::Light, ); Ok(pool) diff --git a/bridges/bin/node/runtime/Cargo.toml b/bridges/bin/node/runtime/Cargo.toml index e3cc405ee94d5..17c801e02e28d 100644 --- a/bridges/bin/node/runtime/Cargo.toml +++ b/bridges/bin/node/runtime/Cargo.toml @@ -25,15 +25,15 @@ features = ["derive"] # Substrate Dependencies [dependencies.pallet-aura] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-balances] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-bridge-eth-poa] @@ -47,76 +47,76 @@ default-features = false path = "../../../modules/currency-exchange" [dependencies.frame-support] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-grandpa] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-randomness-collective-flip] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-sudo] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-session] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-system-rpc-runtime-api] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-timestamp] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-transaction-payment] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-executive] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" # Substrate Primitives [dependencies.sp-api] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-block-builder] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-bridge-eth-poa] @@ -130,75 +130,75 @@ default-features = false path = "../../../primitives/currency-exchange" [dependencies.sp-consensus-aura] -version = "0.8.0-rc1" +version = "0.8.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-core] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-inherents] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-io] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-offchain] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-session] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-staking] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-transaction-pool] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-version] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [build-dependencies.wasm-builder-runner] version = "1.0.5" package = "substrate-wasm-builder-runner" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [features] diff --git a/bridges/bin/node/runtime/src/lib.rs b/bridges/bin/node/runtime/src/lib.rs index 2330e5c29f37d..f92a3a11b7929 100644 --- a/bridges/bin/node/runtime/src/lib.rs +++ b/bridges/bin/node/runtime/src/lib.rs @@ -146,7 +146,7 @@ parameter_types! { pub const ExtrinsicBaseWeight: Weight = 10_000_000; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); /// Assume 10% of weight for average on_initialize calls. - pub const MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() + pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get(); pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; @@ -217,8 +217,8 @@ impl pallet_aura::Trait for Runtime { parameter_types! { pub const FinalityVotesCachingInterval: Option = Some(16); - pub const KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration(); - pub const KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration(); + pub KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration(); + pub KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration(); } impl pallet_bridge_eth_poa::Trait for Runtime { diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml index cd3d11211985c..1a69a41f25167 100644 --- a/bridges/modules/currency-exchange/Cargo.toml +++ b/bridges/modules/currency-exchange/Cargo.toml @@ -12,37 +12,37 @@ sp-currency-exchange = { path = "../../primitives/currency-exchange", default-fe # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-core] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-io] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [features] diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml index 4d36fa98fb27c..e9b938ccf86e0 100644 --- a/bridges/modules/ethereum-contract/builtin/Cargo.toml +++ b/bridges/modules/ethereum-contract/builtin/Cargo.toml @@ -18,29 +18,29 @@ finality-grandpa = "0.12.3" bridge-node-runtime = { path = "../../../bin/node/runtime" } [dependencies.sp-blockchain] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-finality-grandpa] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sc-finality-grandpa] version = "0.8.0-dev" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dev-dependencies] hex = "0.4" [dev-dependencies.sp-core] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml index 667abe8d97846..818ef12d40263 100644 --- a/bridges/modules/ethereum/Cargo.toml +++ b/bridges/modules/ethereum/Cargo.toml @@ -12,33 +12,33 @@ primitives = { package = "sp-bridge-eth-poa", path = "../../primitives/ethereum- # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-std] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-io] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" # Dev Dependencies diff --git a/bridges/modules/ethereum/src/mock.rs b/bridges/modules/ethereum/src/mock.rs index a4f9e0fe4bbfc..2a004f5a25c70 100644 --- a/bridges/modules/ethereum/src/mock.rs +++ b/bridges/modules/ethereum/src/mock.rs @@ -72,8 +72,8 @@ impl frame_system::Trait for TestRuntime { parameter_types! { pub const TestFinalityVotesCachingInterval: Option = Some(16); - pub const TestAuraConfiguration: AuraConfiguration = test_aura_config(); - pub const TestValidatorsConfiguration: ValidatorsConfiguration = test_validators_config(); + pub TestAuraConfiguration: AuraConfiguration = test_aura_config(); + pub TestValidatorsConfiguration: ValidatorsConfiguration = test_validators_config(); } impl Trait for TestRuntime { diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml index 4f5f91c05b0d8..e55b0ac4b216d 100644 --- a/bridges/modules/substrate/Cargo.toml +++ b/bridges/modules/substrate/Cargo.toml @@ -13,57 +13,57 @@ hash-db = { version = "0.15.2", default-features = false } # Substrate Based Dependencies [dependencies.frame-support] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.frame-system] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-session] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-core] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-finality-grandpa] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-runtime] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-trie] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" # Dev Dependencies [dev-dependencies.sp-io] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dev-dependencies.sp-state-machine] -version = "0.8.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "0.8.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [features] diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml index eec26b3797afc..91fddf25480a9 100644 --- a/bridges/primitives/currency-exchange/Cargo.toml +++ b/bridges/primitives/currency-exchange/Cargo.toml @@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = # Substrate Based Dependencies [dependencies.sp-std] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.frame-support] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [features] diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml index e6c3c6c04aa15..96c60c3efc6f7 100644 --- a/bridges/primitives/ethereum-poa/Cargo.toml +++ b/bridges/primitives/ethereum-poa/Cargo.toml @@ -25,27 +25,27 @@ hex-literal = "0.2" # Substrate Based Dependencies [dependencies.sp-api] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-std] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-io] -version = "2.0.0-rc1" +version = "2.0.0-rc3" default-features = false -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [features] diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml index d5c97583bb7f2..9e31838b7e6a7 100644 --- a/bridges/relays/ethereum/Cargo.toml +++ b/bridges/relays/ethereum/Cargo.toml @@ -33,36 +33,36 @@ web3 = { git = "https://github.com/tomusdrw/rust-web3" } # Substrate Based Dependencies [dependencies.frame-system] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.pallet-transaction-payment] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" # I think this is used for sr-io and stuff [dependencies.node-primitives] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" # Branch used for keccack256 hasher code # Could probably move the keccack hasher stuff to our own primitives [dependencies.sp-core] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-keyring] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" [dependencies.sp-runtime] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate.git" # This should get moved to our `bin` folder diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml index 9cfeec36131e3..a60194fb5cdb2 100644 --- a/bridges/relays/substrate/Cargo.toml +++ b/bridges/relays/substrate/Cargo.toml @@ -17,16 +17,16 @@ serde_json = "1.0.53" url = "2.1.0" [dependencies.sp-core] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.sp-rpc] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" [dependencies.node-primitives] -version = "2.0.0-rc1" -rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" +version = "2.0.0-rc3" +rev = "606c56d2e2f69f68f3947551224be6a3515dff60" git = "https://github.com/paritytech/substrate/" diff --git a/bridges/relays/substrate/src/rpc.rs b/bridges/relays/substrate/src/rpc.rs index 10e41907f7654..5dfd1eb16c5ee 100644 --- a/bridges/relays/substrate/src/rpc.rs +++ b/bridges/relays/substrate/src/rpc.rs @@ -18,7 +18,7 @@ use jsonrpsee::{ raw::client::{RawClient, RawClientError}, transport::TransportClient, }; -use node_primitives::{BlockNumber, Hash, Header}; +use node_primitives::{Hash, Header}; use sp_core::Bytes; use sp_rpc::number::NumberOrHex; @@ -31,7 +31,7 @@ jsonrpsee::rpc_api! { fn chain_finalized_head() -> Hash; #[rpc(method = "chain_getBlockHash", positional_params)] - fn chain_block_hash(id: Option>) -> Option; + fn chain_block_hash(id: Option) -> Option; #[rpc(method = "chain_getHeader", positional_params)] fn chain_header(hash: Option) -> Option
;