Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,376 changes: 690 additions & 686 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion availability-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parking_lot = "0.4"
log = "0.3"
parity-codec = "3.0"
parity-codec-derive = "3.0"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ log = "0.3"
tokio = "0.1.7"
futures = "0.1.17"
exit-future = "0.1"
substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-cli = { git = "https://github.com/paritytech/substrate" }
polkadot-service = { path = "../service" }
4 changes: 2 additions & 2 deletions collator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ description = "Collator node implementation"

[dependencies]
futures = "0.1.17"
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-client = { git = "https://github.com/paritytech/substrate" }
parity-codec = "2.1"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
polkadot-runtime = { path = "../runtime", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" }
polkadot-cli = { path = "../cli" }
Expand Down
26 changes: 13 additions & 13 deletions consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ tokio = "0.1.7"
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
parity-codec = "3.0"
parity-codec = "3.1"
polkadot-availability-store = { path = "../availability-store" }
polkadot-parachain = { path = "../parachain" }
polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" }
polkadot-statement-table = { path = "../statement-table" }
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate" }
substrate-inherents = { git = "https://github.com/paritytech/substrate" }
substrate-consensus-common = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate" }
srml-aura = { git = "https://github.com/paritytech/substrate" }
srml-support = { git = "https://github.com/paritytech/substrate" }
substrate-client = { git = "https://github.com/paritytech/substrate" }
sr-primitives = { git = "https://github.com/paritytech/substrate" }

[dev-dependencies]
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-keyring = { git = "https://github.com/paritytech/substrate" }
4 changes: 2 additions & 2 deletions executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors = ["Parity Technologies <[email protected]>"]
description = "Polkadot node implementation in Rust."

[dependencies]
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-executor = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
polkadot-runtime = { path = "../runtime" }
6 changes: 3 additions & 3 deletions network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ polkadot-consensus = { path = "../consensus" }
polkadot-primitives = { path = "../primitives" }
parity-codec = "3.0"
parity-codec-derive = "3.0"
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-network = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
sr-primitives = { git = "https://github.com/paritytech/substrate" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
Expand Down
12 changes: 6 additions & 6 deletions primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ serde = { version = "1.0", default-features = false }
serde_derive = { version = "1.0", optional = true }
parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false}
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-std = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }

[dev-dependencies]
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-serializer = { git = "https://github.com/paritytech/substrate" }
pretty_assertions = "0.4"

[features]
Expand Down
53 changes: 27 additions & 26 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,36 @@ safe-mix = { version = "1.0", default-features = false}
polkadot-primitives = { path = "../primitives", default-features = false }
parity-codec = "3.0"
parity-codec-derive = "3.0"
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-balances = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-council = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-executive = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-indices = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-session = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-staking = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-system = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-serializer = { git = "https://github.com/paritytech/substrate" }
sr-std = { git = "https://github.com/paritytech/substrate" }
sr-io = { git = "https://github.com/paritytech/substrate" }
srml-support = { git = "https://github.com/paritytech/substrate" }
substrate-inherents = { git = "https://github.com/paritytech/substrate" }
substrate-primitives = { git = "https://github.com/paritytech/substrate" }
substrate-client = { git = "https://github.com/paritytech/substrate" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-aura = { git = "https://github.com/paritytech/substrate" }
srml-balances = { git = "https://github.com/paritytech/substrate" }
srml-consensus = { git = "https://github.com/paritytech/substrate" }
srml-council = { git = "https://github.com/paritytech/substrate" }
srml-democracy = { git = "https://github.com/paritytech/substrate" }
srml-executive = { git = "https://github.com/paritytech/substrate" }
srml-fees = { git = "https://github.com/paritytech/substrate" }
srml-grandpa = { git = "https://github.com/paritytech/substrate" }
srml-indices = { git = "https://github.com/paritytech/substrate" }
sr-primitives = { git = "https://github.com/paritytech/substrate" }
srml-session = { git = "https://github.com/paritytech/substrate" }
srml-staking = { git = "https://github.com/paritytech/substrate" }
srml-sudo = { git = "https://github.com/paritytech/substrate" }
srml-system = { git = "https://github.com/paritytech/substrate" }
srml-timestamp = { git = "https://github.com/paritytech/substrate" }
srml-treasury = { git = "https://github.com/paritytech/substrate" }
srml-upgrade-key = { git = "https://github.com/paritytech/substrate" }
sr-version = { git = "https://github.com/paritytech/substrate" }

[dev-dependencies]
hex-literal = "0.1.0"
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" }
substrate-keyring = { git = "https://github.com/paritytech/substrate" }

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/curated_grandpa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ decl_module! {
/// Changes the GRANDPA voter set.
fn set_voters(origin, voters: Vec<(T::SessionKey, u64)>) {
system::ensure_root(origin)?;
grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero())?;
grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None)?;
}

fn on_finalise(block_number: T::BlockNumber) {
Expand Down Expand Up @@ -75,7 +75,7 @@ decl_module! {
voters.swap(remaining - 1, voter_index);
}

let _ = grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero());
let _ = grandpa::Module::<T>::schedule_change(voters, T::BlockNumber::zero(), None);
}
}
}
Expand Down
16 changes: 14 additions & 2 deletions runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ extern crate srml_consensus as consensus;
extern crate srml_council as council;
extern crate srml_democracy as democracy;
extern crate srml_executive as executive;
extern crate srml_fees as fees;
extern crate srml_grandpa as grandpa;
extern crate srml_indices as indices;
extern crate srml_session as session;
Expand Down Expand Up @@ -149,7 +150,6 @@ impl balances::Trait for Runtime {
type Balance = Balance;
type OnFreeBalanceZero = Staking;
type OnNewAccount = Indices;
type EnsureAccountLiquid = Staking;
type Event = Event;
}

Expand Down Expand Up @@ -235,6 +235,11 @@ impl sudo::Trait for Runtime {
type Proposal = Call;
}

impl fees::Trait for Runtime {
type Event = Event;
type TransferAsset = Balances;
}

construct_runtime!(
pub enum Runtime with Log(InternalLog: DigestItem<Hash, SessionKey>) where
Block = Block,
Expand All @@ -261,6 +266,7 @@ construct_runtime!(
Parachains: parachains::{Module, Call, Storage, Config<T>, Inherent},
Sudo: sudo,
UpgradeKey: upgrade_key,
Fees: fees::{Module, Storage, Config<T>, Event<T>},
}
);

Expand All @@ -279,7 +285,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address,
/// Extrinsic type that has already been checked.
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>;
/// Executive: handles dispatch to the various modules.
pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Balances, AllModules>;
pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Fees, AllModules>;

impl_runtime_apis! {
impl client_api::Core<Block> for Runtime {
Expand Down Expand Up @@ -367,6 +373,12 @@ impl_runtime_apis! {
None
}

fn grandpa_forced_change(_digest: &DigestFor<Block>)
-> Option<(BlockNumber, ScheduledChange<BlockNumber>)>
{
None // disable forced changes.
}

fn grandpa_authorities() -> Vec<(SessionKey, u64)> {
Grandpa::grandpa_authorities()
}
Expand Down
4 changes: 4 additions & 0 deletions runtime/src/parachains.rs
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,10 @@ mod tests {
t.extend(session::GenesisConfig::<Test>{
session_length: 1000,
validators: authority_keys.iter().map(|k| k.to_raw_public().into()).collect(),
keys: authority_keys.iter().map(|k| (
k.to_raw_public().into(),
k.to_raw_public().into(),
)).collect(),
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test>{
parachains: parachains,
Expand Down
49 changes: 25 additions & 24 deletions runtime/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,31 @@ polkadot-primitives = { path = "../../primitives", default-features = false }
safe-mix = { version = "1.0", default-features = false }
parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-balances = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-council = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-executive = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-indices = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-session = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-staking = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-system = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
substrate-inherents = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-std = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-io = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-support = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-aura = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-balances = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-consensus = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-council = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-fees = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-indices = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-session = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-sudo = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-system = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-treasury = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-upgrade-key = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false }

[profile.release]
panic = "abort"
Expand Down
Loading