Skip to content
Snippets Groups Projects
Unverified Commit 9e02251a authored by Ricardo Rius's avatar Ricardo Rius Committed by GitHub
Browse files

Update to 3e65111 (#18)

parent 8fea1dc6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Cargo.lock
+ 1173
− 1130
View file @ 9e02251a
source diff could not be displayed: it is too large. Options to address this: view the blob.
Cargo.toml
+ 54
− 35
View file @ 9e02251a
[workspace]
members = ['runtime']
[profile.release]
panic = 'unwind'
[package]
authors = ['Anonymous']
build = 'build.rs'
edition = '2018'
name = 'node-template'
version = '2.0.0'
[build-dependencies]
vergen = '3.0.4'
[build-dependencies.build-script-utils]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-build-script-utils'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies]
futures = '0.3.1'
......@@ -23,93 +39,96 @@ version = '0.1.29'
[dependencies.grandpa]
git = 'https://github.com/paritytech/substrate.git'
package = 'sc-finality-grandpa'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.grandpa-primitives]
git = 'https://github.com/paritytech/substrate.git'
package = 'sp-finality-grandpa'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.node-template-runtime]
path = 'runtime'
version = '2.0.0'
[dependencies.sc-basic-authority]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
[dependencies.sc-cli]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sc-client]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sc-consensus-aura]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '0.8'
[dependencies.sc-executor]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sc-network]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '0.8'
[dependencies.sc-service]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sc-transaction-pool]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-consensus]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '0.8'
[dependencies.sp-consensus-aura]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '0.8'
[dependencies.sp-core]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-inherents]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-io]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-runtime]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-transaction-pool]
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
[package]
authors = ['Anonymous']
build = 'build.rs'
edition = '2018'
name = 'node-template'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[workspace]
members = ['runtime']
[[bin]]
name = 'node-template'
path = 'src/main.rs'
[profile.release]
panic = 'unwind'
[build-dependencies]
vergen = '3.0.4'
[build-dependencies.build-script-utils]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-build-script-utils'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
README.md
+ 2
− 2
View file @ 9e02251a
# Substrate Node Template
A new SRML-based Substrate node, ready for hacking.
A new FRAME-based Substrate node, ready for hacking.
## Build
......@@ -26,7 +26,7 @@ cargo build --release
### Single node development chain
Purge any existing development chain state:
Purge any existing developer chain state:
```bash
./target/release/node-template purge-chain --dev
......
runtime/Cargo.toml
+ 86
− 64
View file @ 9e02251a
[package]
authors = ['Anonymous']
edition = '2018'
name = 'node-template-runtime'
version = '2.0.0'
[features]
default = ['std']
std = [
'aura/std',
'balances/std',
'codec/std',
'frame-executive/std',
'frame-support/std',
'grandpa/std',
'indices/std',
'randomness-collective-flip/std',
'safe-mix/std',
'serde',
'sp-api/std',
'sp-block-builder/std',
'sp-consensus-aura/std',
'sp-core/std',
'sp-inherents/std',
'sp-io/std',
'sp-offchain/std',
'sp-runtime/std',
'sp-session/std',
'sp-std/std',
'sp-transaction-pool/std',
'sp-version/std',
'sudo/std',
'system/std',
'timestamp/std',
'transaction-payment/std',
]
[build-dependencies.wasm-builder-runner]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-wasm-builder-runner'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
version = '1.0.4'
[dependencies.aura]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-aura'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.balances]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-balances'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.codec]
default-features = false
......@@ -60,30 +21,35 @@ version = '1.0.0'
[dependencies.frame-executive]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.frame-support]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.grandpa]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-grandpa'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.indices]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-indices'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.randomness-collective-flip]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-randomness-collective-flip'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.safe-mix]
default-features = false
......@@ -97,83 +63,139 @@ version = '1.0.101'
[dependencies.sp-api]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-block-builder]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
[dependencies.sp-consensus-aura]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '0.8'
[dependencies.sp-core]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-inherents]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
[dependencies.sp-io]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-offchain]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-runtime]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-session]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-std]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-transaction-pool]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sp-version]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.sudo]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-sudo'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.system]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'frame-system'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.timestamp]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-timestamp'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[dependencies.transaction-payment]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'pallet-transaction-payment'
rev = '40a16efefc070faf5a25442bc3ae1d0ea2478eee'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '2.0.0'
[features]
default = ['std']
std = [
'aura/std',
'balances/std',
'codec/std',
'frame-executive/std',
'frame-support/std',
'grandpa/std',
'indices/std',
'randomness-collective-flip/std',
'safe-mix/std',
'serde',
'sp-api/std',
'sp-block-builder/std',
'sp-consensus-aura/std',
'sp-core/std',
'sp-inherents/std',
'sp-io/std',
'sp-offchain/std',
'sp-runtime/std',
'sp-session/std',
'sp-std/std',
'sp-transaction-pool/std',
'sp-version/std',
'sudo/std',
'system/std',
'timestamp/std',
'transaction-payment/std',
]
[package]
authors = ['Anonymous']
edition = '2018'
name = 'node-template-runtime'
version = '2.0.0'
[build-dependencies.wasm-builder-runner]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-wasm-builder-runner'
rev = '3e651110aa06aa835790df63410a29676243fc54'
version = '1.0.4'
runtime/build.rs
+ 1
− 1
View file @ 9e02251a
// Copyright 2019 Parity Technologies (UK) Ltd.
// Copyright 2019-2020 Parity Technologies (UK) Ltd.
// This file is part of Substrate.
// Substrate is free software: you can redistribute it and/or modify
......
runtime/src/lib.rs
+ 5
− 1
View file @ 9e02251a
......@@ -157,6 +157,10 @@ impl system::Trait for Runtime {
type AvailableBlockRatio = AvailableBlockRatio;
/// Version of the runtime.
type Version = Version;
/// Converts a module to the index of the module in `construct_runtime!`.
///
/// This type is being generated by `construct_runtime!`.
type ModuleToIndex = ModuleToIndex;
}
impl aura::Trait for Runtime {
......@@ -247,7 +251,7 @@ construct_runtime!(
Aura: aura::{Module, Config<T>, Inherent(Timestamp)},
Grandpa: grandpa::{Module, Call, Storage, Config, Event},
Indices: indices,
Balances: balances::{default, Error},
Balances: balances,
TransactionPayment: transaction_payment::{Module, Storage},
Sudo: sudo,
// Used for the module template in `./template.rs`
......
runtime/src/template.rs
+ 3
− 2
View file @ 9e02251a
......@@ -8,7 +8,7 @@
/// For more guidance on Substrate modules, see the example module
/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs
use frame_support::{decl_module, decl_storage, decl_event, dispatch};
use frame_support::{decl_module, decl_storage, decl_event, dispatch::DispatchResult};
use system::ensure_signed;
/// The module's configuration trait.
......@@ -40,7 +40,7 @@ decl_module! {
// Just a dummy entry point.
// function that can be called by the external world as an extrinsics call
// takes a parameter of the type `AccountId`, stores it and emits an event
pub fn do_something(origin, something: u32) -> dispatch::Result {
pub fn do_something(origin, something: u32) -> DispatchResult {
// TODO: You only need this if you want to check it was signed.
let who = ensure_signed(origin)?;
......@@ -106,6 +106,7 @@ mod tests {
type MaximumBlockLength = MaximumBlockLength;
type AvailableBlockRatio = AvailableBlockRatio;
type Version = ();
type ModuleToIndex = ();
}
impl Trait for Test {
type Event = ();
......
src/service.rs
+ 8
− 4
View file @ 9e02251a
......@@ -56,9 +56,13 @@ macro_rules! new_full_start {
client.clone(), &*client, select_chain
)?;
let import_queue = sc_consensus_aura::import_queue::<_, _, AuraPair, _>(
let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(
grandpa_block_import.clone(), client.clone(),
);
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, _>(
sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
Box::new(grandpa_block_import.clone()),
aura_block_import,
Some(Box::new(grandpa_block_import.clone())),
None,
client,
......@@ -220,9 +224,9 @@ pub fn new_light<C: Send + Default + 'static>(config: Configuration<C, GenesisCo
let finality_proof_request_builder =
finality_proof_import.create_finality_proof_request_builder();
let import_queue = sc_consensus_aura::import_queue::<_, _, AuraPair, ()>(
let import_queue = sc_consensus_aura::import_queue::<_, _, _, AuraPair, ()>(
sc_consensus_aura::SlotDuration::get_or_compute(&*client)?,
Box::new(grandpa_block_import),
grandpa_block_import,
None,
Some(Box::new(finality_proof_import)),
client,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment