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

Merge remote-tracking branch 'origin/master' into staking

Browse Source
This commit is contained in:
Demi M. Obenour
2020-07-08 15:53:04 -04:00
parent ff8e37f1d1 4265dd6a69
commit fe20eb5a59
11 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-node/Cargo.toml
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "test-node"
version = "2.0.0-rc3"
version = "2.0.0-rc4"
authors = ["Anonymous"]
description = "Substrate Node template"
edition = "2018"
@@ -19,12 +19,12 @@ structopt = "0.3.15"
parking_lot = "0.11.0"
sc-cli = { version = "0.8.0-rc4", features = ["wasmtime"] }
sp-core = { version = "2.0.0-rc4", package = "sp-core" }
sp-core = "2.0.0-rc4"
sc-executor = { version = "0.8.0-rc4", features = ["wasmtime"] }
sc-service = { version = "0.8.0-rc4", features = ["wasmtime"] }
sp-inherents = "2.0.0-rc4"
sc-transaction-pool = "2.0.0-rc4"
sp-transaction-pool = { version = "2.0.0-rc4", package = "sp-transaction-pool" }
sp-transaction-pool = "2.0.0-rc4"
sc-network = "0.8.0-rc4"
sc-consensus-aura = "0.8.0-rc4"
sp-consensus-aura = "0.8.0-rc4"
@@ -33,10 +33,10 @@ sc-consensus = "0.8.0-rc4"
sc-finality-grandpa = "0.8.0-rc4"
sp-finality-grandpa = "2.0.0-rc4"
sc-client-api = "2.0.0-rc4"
sp-runtime = { version = "2.0.0-rc4", package = "sp-runtime" }
sp-runtime = "2.0.0-rc4"
sc-basic-authorship = "0.8.0-rc4"
test-node-runtime = { version = "2.0.0-rc3", path = "runtime" }
test-node-runtime = { version = "2.0.0-rc4", path = "runtime" }
[build-dependencies]
substrate-build-script-utils = "2.0.0-rc4"
test-node/runtime/Cargo.toml
+6 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "test-node-runtime"
version = "2.0.0-rc3"
version = "2.0.0-rc4"
authors = ["Anonymous"]
edition = "2018"
license = "Unlicense"
@@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
aura = { version = "2.0.0-rc4", default-features = false, package = "pallet-aura" }
balances = { version = "2.0.0-rc4", default-features = false, package = "pallet-balances" }
frame-support = { version = "2.0.0-rc4", default-features = false, package = "frame-support" }
frame-support = { version = "2.0.0-rc4", default-features = false }
grandpa = { version = "2.0.0-rc4", default-features = false, package = "pallet-grandpa" }
randomness-collective-flip = { version = "2.0.0-rc4", default-features = false, package = "pallet-randomness-collective-flip" }
sudo = { version = "2.0.0-rc4", default-features = false, package = "pallet-sudo" }
@@ -27,15 +27,15 @@ serde = { version = "1.0.114", optional = true, features = ["derive"] }
sp-api = { version = "2.0.0-rc4", default-features = false }
sp-block-builder = { default-features = false, version = "2.0.0-rc4" }
sp-consensus-aura = { version = "0.8.0-rc4", default-features = false }
sp-core = { version = "2.0.0-rc4", default-features = false, package = "sp-core" }
sp-core = { version = "2.0.0-rc4", default-features = false }
sp-inherents = { default-features = false, version = "2.0.0-rc4" }
sp-io = { version = "2.0.0-rc4", default-features = false }
sp-offchain = { version = "2.0.0-rc4", default-features = false }
sp-runtime = { version = "2.0.0-rc4", default-features = false, package = "sp-runtime" }
sp-runtime = { version = "2.0.0-rc4", default-features = false }
sp-session = { version = "2.0.0-rc4", default-features = false }
sp-std = { version = "2.0.0-rc4", default-features = false }
sp-transaction-pool = { version = "2.0.0-rc4", default-features = false, package = "sp-transaction-pool" }
sp-version = { version = "2.0.0-rc4", default-features = false, package = "sp-version" }
sp-transaction-pool = { version = "2.0.0-rc4", default-features = false }
sp-version = { version = "2.0.0-rc4", default-features = false }
[build-dependencies]
wasm-builder-runner = { version = "1.0.6", package = "substrate-wasm-builder-runner" }
test-node/runtime/src/lib.rs
+2
View File
@@ -181,6 +181,8 @@ parameter_types! {
}
impl 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.
test-node/src/service.rs
+7 -6
View File
@@ -145,7 +145,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_light()?;
.build_full()?;
if role.is_authority() {
let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -177,19 +177,20 @@ 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_handle().spawn("aura", aura);
service
.spawn_essential_task_handle()
.spawn_blocking("aura", aura);
}
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() {
Some(service.keystore() as _)
Some(service.keystore() as sp_core::traits::BareCryptoStorePtr)
} else {
None
};
let grandpa_config = sc_finality_grandpa::Config {
// #1578 make this available through chainspec
gossip_duration: Duration::from_millis(333),
justification_period: 512,
name: Some(name),
@@ -219,7 +220,7 @@ 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_handle().spawn(
service.spawn_essential_task_handle().spawn_blocking(
"grandpa-voter",
sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
);
@@ -299,5 +300,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_light()
.build_light()
}