OneDotZero
/
solutions
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to v2.0.0-rc3

main
Dan Forbes 2020-06-10 09:47:28 -07:00
parent 93862bde52
commit 0947321e77
7 changed files with 548 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

940
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

80
node/Cargo.toml
View File

@ -1,3 +1,11 @@
[build-dependencies.substrate-build-script-utils]
git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc3'
version = '2.0.0-rc3'
[[bin]]
name = 'node-template'
[package] [package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>'] authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
build = 'build.rs' build = 'build.rs'
@ -7,7 +15,7 @@ homepage = 'https://substrate.io'
license = 'Unlicense' license = 'Unlicense'
name = 'node-template' name = 'node-template'
repository = 'https://github.com/substrate-developer-hub/substrate-node-template/' repository = 'https://github.com/substrate-developer-hub/substrate-node-template/'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[package.metadata.docs.rs] [package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu'] targets = ['x86_64-unknown-linux-gnu']
@ -20,92 +28,92 @@ structopt = '0.3.8'
[dependencies.node-template-runtime] [dependencies.node-template-runtime]
path = '../runtime' path = '../runtime'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sc-basic-authorship] [dependencies.sc-basic-authorship]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-cli] [dependencies.sc-cli]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-client-api] [dependencies.sc-client-api]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sc-consensus] [dependencies.sc-consensus]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-consensus-aura] [dependencies.sc-consensus-aura]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-executor] [dependencies.sc-executor]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-finality-grandpa] [dependencies.sc-finality-grandpa]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-network] [dependencies.sc-network]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-service] [dependencies.sc-service]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sc-transaction-pool] [dependencies.sc-transaction-pool]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-consensus] [dependencies.sp-consensus]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sp-consensus-aura] [dependencies.sp-consensus-aura]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sp-core] [dependencies.sp-core]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-finality-grandpa] [dependencies.sp-finality-grandpa]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-inherents] [dependencies.sp-inherents]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-runtime] [dependencies.sp-runtime]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-transaction-pool] [dependencies.sp-transaction-pool]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[build-dependencies.substrate-build-script-utils] [build-dependencies.substrate-build-script-utils]
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'

30
node/src/service.rs
View File

@ -34,14 +34,22 @@ macro_rules! new_full_start {
let inherent_data_providers = sp_inherents::InherentDataProviders::new(); let inherent_data_providers = sp_inherents::InherentDataProviders::new();
let builder = sc_service::ServiceBuilder::new_full::< let builder = sc_service::ServiceBuilder::new_full::<
node_template_runtime::opaque::Block, node_template_runtime::RuntimeApi, crate::service::Executor node_template_runtime::opaque::Block,
node_template_runtime::RuntimeApi,
crate::service::Executor
>($config)? >($config)?
.with_select_chain(|_config, backend| { .with_select_chain(|_config, backend| {
Ok(sc_consensus::LongestChain::new(backend.clone())) 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(
Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api), prometheus_registry)) builder.client().clone(),
);
Ok(sc_transaction_pool::BasicPool::new(
builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api),
builder.prometheus_registry(),
))
})? })?
.with_import_queue(| .with_import_queue(|
_config, _config,
@ -199,13 +207,19 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
.with_select_chain(|_config, backend| { .with_select_chain(|_config, backend| {
Ok(LongestChain::new(backend.clone())) Ok(LongestChain::new(backend.clone()))
})? })?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| { .with_transaction_pool(|builder| {
let fetcher = fetcher let fetcher = builder.fetcher()
.ok_or_else(|| "Trying to start light transaction pool without active 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, Arc::new(pool_api), prometheus_registry, sc_transaction_pool::RevalidationType::Light, builder.config().transaction_pool.clone(),
Arc::new(pool_api),
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
); );
Ok(pool) Ok(pool)
})? })?

43
pallets/template/Cargo.toml
View File

@ -1,13 +1,3 @@
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
description = 'FRAME pallet template'
edition = '2018'
homepage = 'https://substrate.io'
license = 'Unlicense'
name = 'pallet-template'
repository = 'https://github.com/substrate-developer-hub/substrate-node-template/'
version = '2.0.0-rc2'
[dependencies.codec] [dependencies.codec]
default-features = false default-features = false
features = ['derive'] features = ['derive']
@ -17,32 +7,43 @@ version = '1.3.0'
[dependencies.frame-support] [dependencies.frame-support]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.frame-system] [dependencies.frame-system]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dev-dependencies.sp-core] [dev-dependencies.sp-core]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dev-dependencies.sp-io] [dev-dependencies.sp-io]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dev-dependencies.sp-runtime] [dev-dependencies.sp-runtime]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
description = 'FRAME pallet template'
edition = '2018'
homepage = 'https://substrate.io'
license = 'Unlicense'
name = 'pallet-template'
repository = 'https://github.com/substrate-developer-hub/substrate-pallet-template/'
version = '2.0.0-rc3'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
[features] [features]
default = ['std'] default = ['std']

124
runtime/Cargo.toml
View File

@ -1,28 +1,16 @@
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
edition = '2018'
homepage = 'https://substrate.io'
license = 'Unlicense'
name = 'node-template-runtime'
repository = 'https://github.com/substrate-developer-hub/substrate-node-template/'
version = '2.0.0-rc2'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
[dependencies.aura] [dependencies.aura]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-aura' package = 'pallet-aura'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.balances] [dependencies.balances]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-balances' package = 'pallet-balances'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.codec] [dependencies.codec]
default-features = false default-features = false
@ -33,28 +21,28 @@ version = '1.3.0'
[dependencies.frame-executive] [dependencies.frame-executive]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.frame-support] [dependencies.frame-support]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.grandpa] [dependencies.grandpa]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-grandpa' package = 'pallet-grandpa'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.randomness-collective-flip] [dependencies.randomness-collective-flip]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-randomness-collective-flip' package = 'pallet-randomness-collective-flip'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.serde] [dependencies.serde]
features = ['derive'] features = ['derive']
@ -64,108 +52,124 @@ version = '1.0.101'
[dependencies.sp-api] [dependencies.sp-api]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-block-builder] [dependencies.sp-block-builder]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-consensus-aura] [dependencies.sp-consensus-aura]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '0.8.0-rc2' version = '0.8.0-rc3'
[dependencies.sp-core] [dependencies.sp-core]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-inherents] [dependencies.sp-inherents]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-io] [dependencies.sp-io]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-offchain] [dependencies.sp-offchain]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-runtime] [dependencies.sp-runtime]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-session] [dependencies.sp-session]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-std] [dependencies.sp-std]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-transaction-pool] [dependencies.sp-transaction-pool]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sp-version] [dependencies.sp-version]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.sudo] [dependencies.sudo]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-sudo' package = 'pallet-sudo'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.system] [dependencies.system]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'frame-system' package = 'frame-system'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.template] [dependencies.template]
default-features = false default-features = false
package = 'pallet-template' package = 'pallet-template'
path = '../pallets/template' path = '../pallets/template'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.timestamp] [dependencies.timestamp]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-timestamp' package = 'pallet-timestamp'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[dependencies.transaction-payment] [dependencies.transaction-payment]
default-features = false default-features = false
git = 'https://github.com/paritytech/substrate.git' git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-transaction-payment' package = 'pallet-transaction-payment'
tag = 'v2.0.0-rc2' tag = 'v2.0.0-rc3'
version = '2.0.0-rc2' version = '2.0.0-rc3'
[build-dependencies.wasm-builder-runner]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-wasm-builder-runner'
tag = 'v2.0.0-rc3'
version = '1.0.5'
[package]
authors = ['Substrate DevHub <https://github.com/substrate-developer-hub>']
edition = '2018'
homepage = 'https://substrate.io'
license = 'Unlicense'
name = 'node-template-runtime'
repository = 'https://github.com/substrate-developer-hub/substrate-node-template/'
version = '2.0.0-rc3'
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
[features] [features]
default = ['std'] default = ['std']
@ -196,9 +200,3 @@ std = [
'transaction-payment/std', 'transaction-payment/std',
'template/std', 'template/std',
] ]
[build-dependencies.wasm-builder-runner]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-wasm-builder-runner'
tag = 'v2.0.0-rc2'
version = '1.0.5'

2
runtime/build.rs
View File

@ -3,7 +3,7 @@ use wasm_builder_runner::WasmBuilder;
fn main() { fn main() {
WasmBuilder::new() WasmBuilder::new()
.with_current_project() .with_current_project()
.with_wasm_builder_from_crates("1.0.9") .with_wasm_builder_from_crates("1.0.11")
.export_heap_base() .export_heap_base()
.import_memory() .import_memory()
.build() .build()

2
runtime/src/lib.rs
View File

@ -128,7 +128,7 @@ parameter_types! {
pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
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;