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

Update Substrate to rc4 (#175)

Browse Source 
* Bump Substrate to rc4

* Add BaseCallFilter type

* Add DenyUnsafe to SystemApi extension

* Use new ServiceBuilder build functions

* Add BaseCallFilter to test runtimes

* Remove old comments

* Add `rev` and `git` fields back

Turns out that if you don't have these future release candidates will
be used if available. For instance, once `rc5` is released a fresh pull
would use that instead of `rc4` which is what we want.

* Use tag release instead of specific commit

Will make scripted updates easier in the future

* Add short script to update between `rc` versions

* Update scripts/update_rc.sh

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
This commit is contained in:
Hernando Castano
2020-07-10 05:40:46 -04:00
committed by Bastian Köcher
parent 002e18a47c
commit 3236aa8000
15 changed files with 195 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/bin/node/node/Cargo.toml
+46 -46
View File
@@ -20,110 +20,110 @@ 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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-rpc] [dependencies.sc-rpc]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-executor] [dependencies.sc-executor]
version = "0.8.0-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-service] [dependencies.sc-service]
version = "0.8.0-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-inherents] [dependencies.sp-inherents]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-network] [dependencies.sc-network]
version = "0.8.0-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus] [dependencies.sp-consensus]
version = "0.8.0-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus] [dependencies.sc-consensus]
version = "0.8.0-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking] [dependencies.frame-benchmarking]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking-cli] [dependencies.frame-benchmarking-cli]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[build-dependencies] [build-dependencies]
@@ -131,13 +131,13 @@ 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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[build-dependencies.frame-benchmarking-cli] [build-dependencies.frame-benchmarking-cli]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[features] [features]
bridges/bin/node/node/src/service.rs
+8 -4
View File
@@ -92,12 +92,14 @@ macro_rules! new_full_start {
}, },
)? )?
.with_rpc_extensions(|builder| -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, _> { .with_rpc_extensions(|builder| -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, _> {
use sc_rpc::DenyUnsafe;
use substrate_frame_rpc_system::{FullSystem, SystemApi}; use substrate_frame_rpc_system::{FullSystem, SystemApi};
let mut io = jsonrpc_core::IoHandler::default(); let mut io = jsonrpc_core::IoHandler::default();
io.extend_with(SystemApi::to_delegate(FullSystem::new( io.extend_with(SystemApi::to_delegate(FullSystem::new(
builder.client().clone(), builder.client().clone(),
builder.pool(), builder.pool(),
DenyUnsafe::No,
))); )));
Ok(io) Ok(io)
})?; })?;
@@ -124,7 +126,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>; let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})? })?
.build()?; .build_full()?;
if role.is_authority() { if role.is_authority() {
let proposer = sc_basic_authorship::ProposerFactory::new( let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -153,7 +155,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// the AURA authoring task is considered essential, i.e. if it // the AURA authoring task is considered essential, i.e. if it
// fails we take down the service with it. // fails we take down the service with it.
service.spawn_essential_task("aura", aura); service.spawn_essential_task_handle().spawn_blocking("aura", aura);
} }
// 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
@@ -195,7 +197,9 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// the GRANDPA voter task is considered infallible, i.e. // the GRANDPA voter task is considered infallible, i.e.
// if it fails we take down the service with it. // if it fails we take down the service with it.
service.spawn_essential_task("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?); service
.spawn_essential_task_handle()
.spawn_blocking("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?);
} else { } else {
grandpa::setup_disabled_grandpa(service.client(), &inherent_data_providers, service.network())?; grandpa::setup_disabled_grandpa(service.client(), &inherent_data_providers, service.network())?;
} }
@@ -255,5 +259,5 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>; let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _) Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})? })?
.build() .build_light()
} }
bridges/bin/node/runtime/Cargo.toml
+52 -53
View File
@@ -23,15 +23,15 @@ features = ["derive"]
# Substrate Dependencies # Substrate Dependencies
[dependencies.pallet-aura] [dependencies.pallet-aura]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-balances] [dependencies.pallet-balances]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-bridge-eth-poa] [dependencies.pallet-bridge-eth-poa]
@@ -45,76 +45,76 @@ default-features = false
path = "../../../modules/currency-exchange" path = "../../../modules/currency-exchange"
[dependencies.frame-support] [dependencies.frame-support]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-grandpa] [dependencies.pallet-grandpa]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-sudo] [dependencies.pallet-sudo]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session] [dependencies.pallet-session]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-timestamp] [dependencies.pallet-timestamp]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-executive] [dependencies.frame-executive]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-bridge-eth-poa] [dependencies.sp-bridge-eth-poa]
@@ -128,76 +128,76 @@ default-features = false
path = "../../../primitives/currency-exchange" path = "../../../primitives/currency-exchange"
[dependencies.sp-consensus-aura] [dependencies.sp-consensus-aura]
version = "0.8.0-rc3" version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-inherents] [dependencies.sp-inherents]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io] [dependencies.sp-io]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-offchain] [dependencies.sp-offchain]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-session] [dependencies.sp-session]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-staking] [dependencies.sp-staking]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-version] [dependencies.sp-version]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-benchmarking] [dependencies.frame-benchmarking]
optional = true optional = true
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-bridge-eth-poa] [dev-dependencies.sp-bridge-eth-poa]
@@ -209,7 +209,6 @@ path = "../../../primitives/ethereum-poa"
[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 = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/bin/node/runtime/src/lib.rs
+2
View File
@@ -157,6 +157,8 @@ parameter_types! {
} }
impl frame_system::Trait for Runtime { impl frame_system::Trait for Runtime {
/// The basic call filter to use in dispatchable.
type BaseCallFilter = ();
/// The identifier used to distinguish between accounts. /// The identifier used to distinguish between accounts.
type AccountId = AccountId; type AccountId = AccountId;
/// The aggregated dispatch type that is available for extrinsics. /// The aggregated dispatch type that is available for extrinsics.
bridges/modules/currency-exchange/Cargo.toml
+14 -14
View File
@@ -13,44 +13,44 @@ 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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-benchmarking] [dependencies.frame-benchmarking]
optional = true optional = true
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-io] [dev-dependencies.sp-io]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/modules/currency-exchange/src/lib.rs
+1
View File
@@ -312,6 +312,7 @@ mod tests {
type AccountData = (); type AccountData = ();
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = (); type OnKilledAccount = ();
type BaseCallFilter = ();
} }
impl Trait for TestRuntime { impl Trait for TestRuntime {
bridges/modules/ethereum-contract/builtin/Cargo.toml
+10 -10
View File
@@ -19,29 +19,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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-finality-grandpa] [dependencies.sp-finality-grandpa]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
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-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
bridges/modules/ethereum/Cargo.toml
+12 -12
View File
@@ -14,40 +14,40 @@ 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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std] [dependencies.sp-std]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io] [dependencies.sp-io]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-benchmarking] [dependencies.frame-benchmarking]
optional = true optional = true
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.libsecp256k1] [dependencies.libsecp256k1]
bridges/modules/ethereum/src/mock.rs
+1
View File
@@ -68,6 +68,7 @@ impl frame_system::Trait for TestRuntime {
type AccountData = (); type AccountData = ();
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = (); type OnKilledAccount = ();
type BaseCallFilter = ();
} }
parameter_types! { parameter_types! {
bridges/modules/substrate/Cargo.toml
+18 -18
View File
@@ -14,57 +14,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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session] [dependencies.pallet-session]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-trie] [dependencies.sp-trie]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "0.8.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[features] [features]
bridges/modules/substrate/src/lib.rs
+1
View File
@@ -273,6 +273,7 @@ mod tests {
type AccountData = (); type AccountData = ();
type OnNewAccount = (); type OnNewAccount = ();
type OnKilledAccount = (); type OnKilledAccount = ();
type BaseCallFilter = ();
} }
impl Trait for Test {} impl Trait for Test {}
bridges/primitives/currency-exchange/Cargo.toml
+4 -4
View File
@@ -12,15 +12,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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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
@@ -23,27 +23,27 @@ plain_hasher = { version = "0.2.2", default-features = false }
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.sp-api] [dependencies.sp-api]
version = "2.0.0-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
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-rc3" version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.libsecp256k1] [dependencies.libsecp256k1]
bridges/relays/ethereum/Cargo.toml
+12 -17
View File
@@ -40,40 +40,35 @@ features = ["http"]
# Substrate Based Dependencies # Substrate Based Dependencies
[dependencies.frame-system] [dependencies.frame-system]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-transaction-payment] [dependencies.pallet-transaction-payment]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
# I think this is used for sr-io and stuff
[dependencies.node-primitives] [dependencies.node-primitives]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" 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] [dependencies.sp-core]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-keyring] [dependencies.sp-keyring]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime] [dependencies.sp-runtime]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git" git = "https://github.com/paritytech/substrate.git"
# This should get moved to our `bin` folder
[dependencies.bridge-node-runtime] [dependencies.bridge-node-runtime]
version = "0.1.0" version = "0.1.0"
path = "../../bin/node/runtime" path = "../../bin/node/runtime"
# node-runtime = { git = "https://github.com/svyatonik/substrate.git", branch = "bridge_runtime" }
bridges/relays/substrate/Cargo.toml
+6 -6
View File
@@ -18,16 +18,16 @@ serde_json = "1.0.56"
url = "2.1.0" url = "2.1.0"
[dependencies.sp-core] [dependencies.sp-core]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.sp-rpc] [dependencies.sp-rpc]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"
[dependencies.node-primitives] [dependencies.node-primitives]
version = "2.0.0-rc3" version = "2.0.0-rc4"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60" tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate/" git = "https://github.com/paritytech/substrate/"