Commit ef451369 authored by Gavin Wood's avatar Gavin Wood Committed by Bastian Köcher
Browse files

Bump to latest Substrate (#706)

* Updates, but won't build.

* Bump version.

* Fix

* Fix test
parent 5f5b8eac
Pipeline #72711 passed with stages
in 15 minutes and 44 seconds
This diff is collapsed.
...@@ -4,7 +4,7 @@ path = "src/main.rs" ...@@ -4,7 +4,7 @@ path = "src/main.rs"
[package] [package]
name = "polkadot" name = "polkadot"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-availability-store" name = "polkadot-availability-store"
description = "Persistent database for parachain data" description = "Persistent database for parachain data"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-cli" name = "polkadot-cli"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust." description = "Polkadot node implementation in Rust."
edition = "2018" edition = "2018"
......
...@@ -79,8 +79,8 @@ enum PolkadotSubCommands { ...@@ -79,8 +79,8 @@ enum PolkadotSubCommands {
ValidationWorker(ValidationWorkerCommand), ValidationWorker(ValidationWorkerCommand),
} }
impl cli::GetLogFilter for PolkadotSubCommands { impl cli::GetSharedParams for PolkadotSubCommands {
fn get_log_filter(&self) -> Option<String> { None } fn shared_params(&self) -> Option<&cli::SharedParams> { None }
} }
#[derive(Debug, StructOpt, Clone)] #[derive(Debug, StructOpt, Clone)]
......
[package] [package]
name = "polkadot-collator" name = "polkadot-collator"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation" description = "Collator node implementation"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-erasure-coding" name = "polkadot-erasure-coding"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-executor" name = "polkadot-executor"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust." description = "Polkadot node implementation in Rust."
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-network" name = "polkadot-network"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol" description = "Polkadot-specific networking protocol"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-parachain" name = "polkadot-parachain"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains" description = "Types and utilities for creating and working with parachains"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-primitives" name = "polkadot-primitives"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-rpc" name = "polkadot-rpc"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-runtime" name = "polkadot-runtime"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
...@@ -57,6 +57,7 @@ system = { package = "frame-system", git = "https://github.com/paritytech/substr ...@@ -57,6 +57,7 @@ system = { package = "frame-system", git = "https://github.com/paritytech/substr
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
primitives = { package = "polkadot-primitives", path = "../primitives", default-features = false } primitives = { package = "polkadot-primitives", path = "../primitives", default-features = false }
polkadot-parachain = { path = "../parachain", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false }
...@@ -119,6 +120,7 @@ std = [ ...@@ -119,6 +120,7 @@ std = [
"timestamp/std", "timestamp/std",
"treasury/std", "treasury/std",
"version/std", "version/std",
"utility/std",
"serde_derive", "serde_derive",
"serde/std", "serde/std",
"log", "log",
......
...@@ -653,6 +653,7 @@ mod tests { ...@@ -653,6 +653,7 @@ mod tests {
type Treasury = treasury::Module<Test>; type Treasury = treasury::Module<Test>;
type Crowdfund = Module<Test>; type Crowdfund = Module<Test>;
type RandomnessCollectiveFlip = randomness_collective_flip::Module<Test>; type RandomnessCollectiveFlip = randomness_collective_flip::Module<Test>;
use balances::Error as BalancesError;
// This function basically just builds a genesis storage key/value store according to // This function basically just builds a genesis storage key/value store according to
// our desired mockup. // our desired mockup.
...@@ -733,7 +734,7 @@ mod tests { ...@@ -733,7 +734,7 @@ mod tests {
assert_noop!(Crowdfund::create(Origin::signed(1), 1000, 1, 5, 9), "last slot cannot be more then 3 more than first slot"); assert_noop!(Crowdfund::create(Origin::signed(1), 1000, 1, 5, 9), "last slot cannot be more then 3 more than first slot");
// Cannot create a crowdfund without some deposit funds // Cannot create a crowdfund without some deposit funds
assert_noop!(Crowdfund::create(Origin::signed(1337), 1000, 1, 3, 9), "too few free funds in account"); assert_noop!(Crowdfund::create(Origin::signed(1337), 1000, 1, 3, 9), BalancesError::<Test, _>::InsufficientBalance);
}); });
} }
......
...@@ -575,6 +575,23 @@ impl identity::Trait for Runtime { ...@@ -575,6 +575,23 @@ impl identity::Trait for Runtime {
type ForceOrigin = collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>; type ForceOrigin = collective::EnsureProportionMoreThan<_1, _2, AccountId, CouncilCollective>;
} }
parameter_types! {
// One storage item; value is size 4+4+16+32 bytes = 56 bytes.
pub const MultisigDepositBase: Balance = 30 * DOLLARS;
// Additional storage item size of 32 bytes.
pub const MultisigDepositFactor: Balance = 5 * DOLLARS;
pub const MaxSignatories: u16 = 100;
}
impl utility::Trait for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
type MultisigDepositBase = MultisigDepositBase;
type MultisigDepositFactor = MultisigDepositFactor;
type MaxSignatories = MaxSignatories;
}
construct_runtime! { construct_runtime! {
pub enum Runtime where pub enum Runtime where
Block = Block, Block = Block,
...@@ -627,6 +644,7 @@ construct_runtime! { ...@@ -627,6 +644,7 @@ construct_runtime! {
// Less simple identity module. // Less simple identity module.
Identity: identity::{Module, Call, Storage, Event<T>}, Identity: identity::{Module, Call, Storage, Event<T>},
Utility: utility::{Module, Call, Storage, Event<T>, Error},
} }
} }
......
[package] [package]
name = "polkadot-service" name = "polkadot-service"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-statement-table" name = "polkadot-statement-table"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "adder" name = "adder"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition" description = "Test parachain which adds to a number as its state transition"
edition = "2018" edition = "2018"
......
[package] [package]
name = "halt" name = "halt"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever" description = "Test parachain which executes forever"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-validation" name = "polkadot-validation"
version = "0.7.10" version = "0.7.11"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
Supports Markdown
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