Update Substrate to rc4 (#175)

* 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
+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" }
[dependencies.sc-cli]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-rpc]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-core]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-executor]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-service]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-inherents]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-transaction-pool]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-transaction-pool]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-network]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus-aura]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus-aura]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa]
package = "sc-finality-grandpa"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa-primitives]
package = "sp-finality-grandpa"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-client-api]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-basic-authorship]
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.substrate-frame-rpc-system]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking-cli]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[build-dependencies]
@@ -131,13 +131,13 @@ vergen = "3.1.0"
[build-dependencies.build-script-utils]
package = "substrate-build-script-utils"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[build-dependencies.frame-benchmarking-cli]
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
git = "https://github.com/paritytech/substrate.git"
[features]
+8 -4
View File
@@ -92,12 +92,14 @@ macro_rules! new_full_start {
},
)?
.with_rpc_extensions(|builder| -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, _> {
use sc_rpc::DenyUnsafe;
use substrate_frame_rpc_system::{FullSystem, SystemApi};
let mut io = jsonrpc_core::IoHandler::default();
io.extend_with(SystemApi::to_delegate(FullSystem::new(
builder.client().clone(),
builder.pool(),
DenyUnsafe::No,
)));
Ok(io)
})?;
@@ -124,7 +126,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
.build()?;
.build_full()?;
if role.is_authority() {
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
// 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
@@ -195,7 +197,9 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// the GRANDPA voter task is considered infallible, i.e.
// 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 {
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<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
.build()
.build_light()
}
+52 -53
View File
@@ -23,15 +23,15 @@ features = ["derive"]
# Substrate Dependencies
[dependencies.pallet-aura]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-balances]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-bridge-eth-poa]
@@ -45,76 +45,76 @@ default-features = false
path = "../../../modules/currency-exchange"
[dependencies.frame-support]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-grandpa]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-randomness-collective-flip]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-sudo]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system-rpc-runtime-api]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-timestamp]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-transaction-payment]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-executive]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
# Substrate Primitives
[dependencies.sp-api]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-block-builder]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-bridge-eth-poa]
@@ -128,76 +128,76 @@ default-features = false
path = "../../../primitives/currency-exchange"
[dependencies.sp-consensus-aura]
version = "0.8.0-rc3"
version = "0.8.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-inherents]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-offchain]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-session]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-staking]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-transaction-pool]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-version]
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-benchmarking]
optional = true
version = "2.0.0-rc3"
version = "2.0.0-rc4"
tag = 'v2.0.0-rc4'
default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dev-dependencies.sp-bridge-eth-poa]
@@ -209,7 +209,6 @@ path = "../../../primitives/ethereum-poa"
[build-dependencies.wasm-builder-runner]
version = "1.0.5"
package = "substrate-wasm-builder-runner"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[features]
+2
View File
@@ -157,6 +157,8 @@ parameter_types! {
}
impl frame_system::Trait for Runtime {
/// The basic call filter to use in dispatchable.
type BaseCallFilter = ();
/// The identifier used to distinguish between accounts.
type AccountId = AccountId;
/// The aggregated dispatch type that is available for extrinsics.