pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 12:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Substrate to latest master (rc3) (#129)

Browse Source 
* Substrate 606c56d2e2f69f68f3947551224be6a3515dff60

* update jsonrpsee
This commit is contained in:
Svyatoslav Nikolsky
2020-06-11 17:44:54 +03:00
committed by Bastian Köcher
parent 643075f7fa
commit b701c2be8d
14 changed files with 189 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/bin/node/node/Cargo.toml
+40 -40
View File
@@ -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" } sp-bridge-eth-poa = { version = "0.1.0", path = "../../../primitives/ethereum-poa" }
[dependencies.sc-cli] [dependencies.sc-cli]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-rpc] [dependencies.sc-rpc]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-executor] [dependencies.sc-executor]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-service] [dependencies.sc-service]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-inherents] [dependencies.sp-inherents]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-transaction-pool] [dependencies.sc-transaction-pool]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-transaction-pool] [dependencies.sp-transaction-pool]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-network] [dependencies.sc-network]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus-aura] [dependencies.sc-consensus-aura]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus-aura] [dependencies.sp-consensus-aura]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus] [dependencies.sp-consensus]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa] [dependencies.grandpa]
package = "sc-finality-grandpa" package = "sc-finality-grandpa"
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa-primitives] [dependencies.grandpa-primitives]
package = "sp-finality-grandpa" package = "sp-finality-grandpa"
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus] [dependencies.sc-consensus]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-client-api] [dependencies.sc-client-api]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-basic-authorship] [dependencies.sc-basic-authorship]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.substrate-frame-rpc-system] [dependencies.substrate-frame-rpc-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[build-dependencies] [build-dependencies]
@@ -120,6 +120,6 @@ vergen = "3.1.0"
[build-dependencies.build-script-utils] [build-dependencies.build-script-utils]
package = "substrate-build-script-utils" package = "substrate-build-script-utils"
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
bridges/bin/node/node/src/service.rs
+12 -10
View File
@@ -52,12 +52,12 @@ macro_rules! new_full_start {
crate::service::Executor, crate::service::Executor,
>($config)? >($config)?
.with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))? .with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| { .with_transaction_pool(|builder| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone());
Ok(sc_transaction_pool::BasicPool::new( Ok(sc_transaction_pool::BasicPool::new(
config, builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api), std::sync::Arc::new(pool_api),
prometheus_registry, builder.prometheus_registry(),
)) ))
})? })?
.with_import_queue( .with_import_queue(
@@ -158,7 +158,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// if the node isn't actively participating in consensus then it doesn't // if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below. // need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() { let keystore = if role.is_authority() {
Some(service.keystore()) Some(service.keystore() as sp_core::traits::BareCryptoStorePtr)
} else { } else {
None None
}; };
@@ -208,14 +208,16 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)? ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?
.with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))? .with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| { .with_transaction_pool(|builder| {
let fetcher = fetcher.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; 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( let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
config, builder.config().transaction_pool.clone(),
Arc::new(pool_api), Arc::new(pool_api),
prometheus_registry, builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light, sc_transaction_pool::RevalidationType::Light,
); );
Ok(pool) Ok(pool)
bridges/bin/node/runtime/Cargo.toml
+51 -51
View File
@@ -25,15 +25,15 @@ features = ["derive"]
# Substrate Dependencies # Substrate Dependencies
[dependencies.pallet-aura] [dependencies.pallet-aura]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-balances] [dependencies.pallet-balances]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-bridge-eth-poa] [dependencies.pallet-bridge-eth-poa]
@@ -47,76 +47,76 @@ default-features = false
path = "../../../modules/currency-exchange" path = "../../../modules/currency-exchange"
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-grandpa] [dependencies.pallet-grandpa]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-randomness-collective-flip] [dependencies.pallet-randomness-collective-flip]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-sudo] [dependencies.pallet-sudo]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session] [dependencies.pallet-session]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system-rpc-runtime-api] [dependencies.frame-system-rpc-runtime-api]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-timestamp] [dependencies.pallet-timestamp]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-transaction-payment] [dependencies.pallet-transaction-payment]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-executive] [dependencies.frame-executive]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
# Substrate Primitives # Substrate Primitives
[dependencies.sp-api] [dependencies.sp-api]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-block-builder] [dependencies.sp-block-builder]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-bridge-eth-poa] [dependencies.sp-bridge-eth-poa]
@@ -130,75 +130,75 @@ default-features = false
path = "../../../primitives/currency-exchange" path = "../../../primitives/currency-exchange"
[dependencies.sp-consensus-aura] [dependencies.sp-consensus-aura]
version = "0.8.0-rc1" version = "0.8.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-inherents] [dependencies.sp-inherents]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io] [dependencies.sp-io]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-offchain] [dependencies.sp-offchain]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-session] [dependencies.sp-session]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-staking] [dependencies.sp-staking]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-transaction-pool] [dependencies.sp-transaction-pool]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-version] [dependencies.sp-version]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[build-dependencies.wasm-builder-runner] [build-dependencies.wasm-builder-runner]
version = "1.0.5" version = "1.0.5"
package = "substrate-wasm-builder-runner" package = "substrate-wasm-builder-runner"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/bin/node/runtime/src/lib.rs
+3 -3
View File
@@ -146,7 +146,7 @@ parameter_types! {
pub const ExtrinsicBaseWeight: Weight = 10_000_000; pub const ExtrinsicBaseWeight: Weight = 10_000_000;
pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
/// Assume 10% of weight for average on_initialize calls. /// 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(); .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();
pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
pub const Version: RuntimeVersion = VERSION; pub const Version: RuntimeVersion = VERSION;
@@ -217,8 +217,8 @@ impl pallet_aura::Trait for Runtime {
parameter_types! { parameter_types! {
pub const FinalityVotesCachingInterval: Option<u64> = Some(16); pub const FinalityVotesCachingInterval: Option<u64> = Some(16);
pub const KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration(); pub KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration();
pub const KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration(); pub KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration();
} }
impl pallet_bridge_eth_poa::Trait for Runtime { impl pallet_bridge_eth_poa::Trait for Runtime {
bridges/modules/currency-exchange/Cargo.toml
+12 -12
View File
@@ -12,37 +12,37 @@ sp-currency-exchange = { path = "../../primitives/currency-exchange", default-fe
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-core] [dev-dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-io] [dev-dependencies.sp-io]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/modules/ethereum-contract/builtin/Cargo.toml
+9 -9
View File
@@ -18,29 +18,29 @@ finality-grandpa = "0.12.3"
bridge-node-runtime = { path = "../../../bin/node/runtime" } bridge-node-runtime = { path = "../../../bin/node/runtime" }
[dependencies.sp-blockchain] [dependencies.sp-blockchain]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-finality-grandpa] [dependencies.sp-finality-grandpa]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sc-finality-grandpa] [dependencies.sc-finality-grandpa]
version = "0.8.0-dev" version = "0.8.0-dev"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies] [dev-dependencies]
hex = "0.4" hex = "0.4"
[dev-dependencies.sp-core] [dev-dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
bridges/modules/ethereum/Cargo.toml
+10 -10
View File
@@ -12,33 +12,33 @@ primitives = { package = "sp-bridge-eth-poa", path = "../../primitives/ethereum-
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io] [dependencies.sp-io]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
# Dev Dependencies # Dev Dependencies
bridges/modules/ethereum/src/mock.rs
+2 -2
View File
@@ -72,8 +72,8 @@ impl frame_system::Trait for TestRuntime {
parameter_types! { parameter_types! {
pub const TestFinalityVotesCachingInterval: Option<u64> = Some(16); pub const TestFinalityVotesCachingInterval: Option<u64> = Some(16);
pub const TestAuraConfiguration: AuraConfiguration = test_aura_config(); pub TestAuraConfiguration: AuraConfiguration = test_aura_config();
pub const TestValidatorsConfiguration: ValidatorsConfiguration = test_validators_config(); pub TestValidatorsConfiguration: ValidatorsConfiguration = test_validators_config();
} }
impl Trait for TestRuntime { impl Trait for TestRuntime {
bridges/modules/substrate/Cargo.toml
+18 -18
View File
@@ -13,57 +13,57 @@ hash-db = { version = "0.15.2", default-features = false }
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session] [dependencies.pallet-session]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-finality-grandpa] [dependencies.sp-finality-grandpa]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-trie] [dependencies.sp-trie]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
# Dev Dependencies # Dev Dependencies
[dev-dependencies.sp-io] [dev-dependencies.sp-io]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-state-machine] [dev-dependencies.sp-state-machine]
version = "0.8.0-rc1" version = "0.8.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/primitives/currency-exchange/Cargo.toml
+4 -4
View File
@@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[features] [features]
bridges/primitives/ethereum-poa/Cargo.toml
+8 -8
View File
@@ -25,27 +25,27 @@ hex-literal = "0.2"
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.sp-api] [dependencies.sp-api]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-io] [dependencies.sp-io]
version = "2.0.0-rc1" version = "2.0.0-rc3"
default-features = false default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[features] [features]
bridges/relays/ethereum/Cargo.toml
+12 -12
View File
@@ -33,36 +33,36 @@ web3 = { git = "https://github.com/tomusdrw/rust-web3" }
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-transaction-payment] [dependencies.pallet-transaction-payment]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
# I think this is used for sr-io and stuff # I think this is used for sr-io and stuff
[dependencies.node-primitives] [dependencies.node-primitives]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
# Branch used for keccack256 hasher code # Branch used for keccack256 hasher code
# Could probably move the keccack hasher stuff to our own primitives # Could probably move the keccack hasher stuff to our own primitives
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-keyring] [dependencies.sp-keyring]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
# This should get moved to our `bin` folder # This should get moved to our `bin` folder
bridges/relays/substrate/Cargo.toml
+6 -6
View File
@@ -17,16 +17,16 @@ serde_json = "1.0.53"
url = "2.1.0" url = "2.1.0"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-rpc] [dependencies.sp-rpc]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.node-primitives] [dependencies.node-primitives]
version = "2.0.0-rc1" version = "2.0.0-rc3"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee" rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
bridges/relays/substrate/src/rpc.rs
+2 -2
View File
@@ -18,7 +18,7 @@ use jsonrpsee::{
raw::client::{RawClient, RawClientError}, raw::client::{RawClient, RawClientError},
transport::TransportClient, transport::TransportClient,
}; };
use node_primitives::{BlockNumber, Hash, Header}; use node_primitives::{Hash, Header};
use sp_core::Bytes; use sp_core::Bytes;
use sp_rpc::number::NumberOrHex; use sp_rpc::number::NumberOrHex;
@@ -31,7 +31,7 @@ jsonrpsee::rpc_api! {
fn chain_finalized_head() -> Hash; fn chain_finalized_head() -> Hash;
#[rpc(method = "chain_getBlockHash", positional_params)] #[rpc(method = "chain_getBlockHash", positional_params)]
fn chain_block_hash(id: Option<NumberOrHex<BlockNumber>>) -> Option<Hash>; fn chain_block_hash(id: Option<NumberOrHex>) -> Option<Hash>;
#[rpc(method = "chain_getHeader", positional_params)] #[rpc(method = "chain_getHeader", positional_params)]
fn chain_header(hash: Option<Hash>) -> Option<Header>; fn chain_header(hash: Option<Hash>) -> Option<Header>;