Revert "Update to latest substrate (#504)"

This reverts commit 89ac39fc.

availability-store/Cargo.toml

@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../primitives" }
 parking_lot = "0.9.0"
 log = "0.4.6"
 codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 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" }

cli/Cargo.toml

@@ -11,5 +11,5 @@ tokio = "0.1.7"
 futures = "0.1.17"
 exit-future = "0.1"
 structopt = "0.3.3"
-cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 service = { package = "polkadot-service", path = "../service" }

collator/Cargo.toml

@@ -8,10 +8,10 @@ edition = "2018"
 [dependencies]
 futures = "0.1.17"
 futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-cli = { path = "../cli" }
@@ -22,4 +22,4 @@ log = "0.4"
 tokio = "0.1.7"
 
 [dev-dependencies]
-keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

erasure-coding/Cargo.toml

@@ -8,5 +8,5 @@ edition = "2018"
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 reed_solomon = { package = "reed-solomon-erasure", git = "https://github.com/paritytech/reed-solomon-erasure" }
 codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+trie = { package = "substrate-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

executor/Cargo.toml

@@ -6,5 +6,5 @@ description = "Polkadot node implementation in Rust."
 edition = "2018"
 
 [dependencies]
-substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 polkadot-runtime = { path = "../runtime" }

network/Cargo.toml

@@ -12,14 +12,14 @@ av_store = { package = "polkadot-availability-store", path = "../availability-st
 polkadot-validation = { path = "../validation" }
 polkadot-primitives = { path = "../primitives" }
 codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 futures = "0.1"
 futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
 log = "0.4"
 exit-future = "0.1.4"
-substrate-client = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 
 [dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

parachain/Cargo.toml

@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.0.5", default-features =
 wasmi = { version = "0.4.3", optional = true }
 derive_more = { version = "0.14", optional = true }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff", default-features = false }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff", default-features = false }
+rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
 lazy_static = { version = "1.3.0", optional = true }
 parking_lot = { version = "0.7.1", optional = true }
 log = { version = "0.4.6", optional = true }

primitives/Cargo.toml

@@ -7,18 +7,18 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", optional = true, features = ["derive"] }
 parity-scale-codec = { version = "1.0.5", default-features = false, features = ["bit-vec", "derive"] }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
 polkadot-parachain = { path = "../parachain", default-features = false }
 bitvec = { version = "0.14.0", default-features = false, features = ["alloc"] }
-babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
+babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
 
 [dev-dependencies]
-substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 pretty_assertions = "0.5.1"
 
 [features]

rpc/Cargo.toml

@@ -5,13 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 jsonrpc-core = "13.2.0"
 polkadot-primitives = { path = "../primitives" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff"  }
-substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff"  }
-srml-system-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff"  }
-srml-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-polkadot-runtime = { path = "../runtime" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
+substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
+srml-system-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
 

rpc/src/lib.rs

@@ -20,10 +20,9 @@
 
 use std::sync::Arc;
 
-use polkadot_primitives::{Block, AccountId, Nonce, Balance};
+use polkadot_primitives::{Block, AccountId, Nonce};
 use sr_primitives::traits::ProvideRuntimeApi;
 use transaction_pool::txpool::{ChainApi, Pool};
-use polkadot_runtime::UncheckedExtrinsic;
 
 /// A type representing all RPC extensions.
 pub type RpcExtension = jsonrpc_core::IoHandler<substrate_rpc::Metadata>;
@@ -34,18 +33,13 @@ pub fn create<C, P>(client: Arc<C>, pool: Arc<Pool<P>>) -> RpcExtension where
 	C: client::blockchain::HeaderBackend<Block>,
 	C: Send + Sync + 'static,
 	C::Api: srml_system_rpc::AccountNonceApi<Block, AccountId, Nonce>,
-	C::Api: srml_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance, UncheckedExtrinsic>,
 	P: ChainApi + Sync + Send + 'static,
 {
 	use srml_system_rpc::{System, SystemApi};
-	use srml_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
 
 	let mut io = jsonrpc_core::IoHandler::default();
 	io.extend_with(
 		SystemApi::to_delegate(System::new(client.clone(), pool))
 	);
-	io.extend_with(
-		TransactionPaymentApi::to_delegate(TransactionPayment::new(client))
-	);
 	io
 }

runtime/Cargo.toml

@@ -14,47 +14,46 @@ safe-mix = { version = "1.0", default-features = false}
 serde = { version = "1.0", default-features = false }
 serde_derive = { version = "1.0", optional = true }
 
-authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-offchain-primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-sr-staking-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-substrate-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-version = { package = "sr-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
+authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+offchain-primitives = { package = "substrate-offchain-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sr-staking-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+substrate-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+version = { package = "sr-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
 
-authority-discovery = { package = "srml-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-authorship = { package = "srml-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-balances = { package = "srml-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-transaction-payment = { package = "srml-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-srml-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-collective = { package = "srml-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-democracy = { package = "srml-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-elections-phragmen = { package = "srml-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-finality-tracker = { package = "srml-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-grandpa = { package = "srml-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-indices = { package = "srml-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-membership = { package = "srml-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-nicks = { package = "srml-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-offences = { package = "srml-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-randomness-collective-flip = { package = "srml-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-session = { package = "srml-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-staking = { package = "srml-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-srml-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-sudo = { package = "srml-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-system = { package = "srml-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-system_rpc_runtime_api = { package = "srml-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-timestamp = { package = "srml-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-treasury = { package = "srml-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
+authority-discovery = { package = "srml-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authorship = { package = "srml-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+balances = { package = "srml-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+transaction-payment = { package = "srml-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+collective = { package = "srml-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+democracy = { package = "srml-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+elections-phragmen = { package = "srml-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+executive = { package = "srml-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+finality-tracker = { package = "srml-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+grandpa = { package = "srml-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+indices = { package = "srml-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+membership = { package = "srml-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+nicks = { package = "srml-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+offences = { package = "srml-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+randomness-collective-flip = { package = "srml-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+session = { package = "srml-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+staking = { package = "srml-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+srml-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sudo = { package = "srml-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+system = { package = "srml-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+system_rpc_runtime_api = { package = "srml-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+timestamp = { package = "srml-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+treasury = { package = "srml-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
 
 primitives = { package = "polkadot-primitives", path = "../primitives", default-features = false }
 polkadot-parachain = { path = "../parachain", default-features = false }
@@ -63,8 +62,8 @@ polkadot-parachain = { path = "../parachain", default-features = false }
 hex-literal = "0.2.0"
 libsecp256k1 = "0.3.1"
 tiny-keccak = "1.4.2"
-keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 trie-db = "0.15"
 serde_json = "1.0"
 
@@ -93,7 +92,6 @@ std = [
 	"authorship/std",
 	"balances/std",
 	"transaction-payment/std",
-	"srml-transaction-payment-rpc-runtime-api/std",
 	"collective/std",
 	"elections-phragmen/std",
 	"democracy/std",

runtime/src/crowdfund.rs

@@ -207,7 +207,7 @@ decl_module! {
 			let imb = T::Currency::withdraw(
 				&owner,
 				deposit,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath,
 			)?;
 
@@ -378,7 +378,7 @@ decl_module! {
 			let _ = T::Currency::resolve_into_existing(&who, T::Currency::withdraw(
 				&Self::fund_account_id(index),
 				balance,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 
@@ -407,14 +407,14 @@ decl_module! {
 			let _ = T::Currency::resolve_into_existing(&fund.owner, T::Currency::withdraw(
 				&account,
 				fund.deposit,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 
 			T::OrphanedFunds::on_unbalanced(T::Currency::withdraw(
 				&account,
 				fund.raised,
-				WithdrawReason::Transfer.into(),
+				WithdrawReason::Transfer,
 				ExistenceRequirement::AllowDeath
 			)?);
 

runtime/src/lib.rs

@@ -58,7 +58,6 @@ use srml_support::{
 };
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use system::offchain::TransactionSubmitter;
-use srml_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 
 #[cfg(feature = "std")]
 pub use staking::StakerStatus;
@@ -541,7 +540,7 @@ impl nicks::Trait for Runtime {
 	type Currency = Balances;
 	type ReservationFee = ReservationFee;
 	type Slashed = Treasury;
-	type ForceOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
+	type KillOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
 	type MinLength = MinLength;
 	type MaxLength = MaxLength;
 }
@@ -743,14 +742,4 @@ impl_runtime_apis! {
 			System::account_nonce(account)
 		}
 	}
-
-	impl srml_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
-		Block,
-		Balance,
-		UncheckedExtrinsic,
-	> for Runtime {
-		fn query_info(uxt: UncheckedExtrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-	}
 }

runtime/src/parachains.rs

@@ -94,7 +94,7 @@ impl<AccountId, T: Currency<AccountId>> ParachainCurrency<AccountId> for T where
 		let _ = T::withdraw(
 			&para_account,
 			amount.into(),
-			WithdrawReason::Fee.into(),
+			WithdrawReason::Fee,
 			ExistenceRequirement::KeepAlive,
 		)?;
 

runtime/src/slots.rs

@@ -506,7 +506,7 @@ impl<T: Trait> Module<T> {
 					if T::Currency::withdraw(
 						&bidder.who,
 						amount,
-						WithdrawReason::Fee.into(),
+						WithdrawReason::Fee,
 						ExistenceRequirement::AllowDeath
 					).is_err() {
 						continue;
@@ -543,7 +543,7 @@ impl<T: Trait> Module<T> {
 						if T::Currency::withdraw(
 							&para_id.into_account(),
 							additional,
-							WithdrawReason::Fee.into(),
+							WithdrawReason::Fee,
 							ExistenceRequirement::AllowDeath
 						).is_err() {
 							continue;

service/Cargo.toml

@@ -19,24 +19,24 @@ polkadot-runtime = { path = "../runtime" }
 polkadot-executor = { path = "../executor" }
 polkadot-network = { path = "../network"  }
 polkadot-rpc = { path = "../rpc" }
-sr-io = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-client-db = { package = "substrate-client-db", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-network = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-service = { package = "substrate-service", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-telemetry = { package = "substrate-telemetry", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-srml-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
-authority-discovery = { package = "substrate-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-babe = { package = "substrate-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
+sr-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client-db = { package = "substrate-client-db", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+grandpa = { package = "substrate-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+service = { package = "substrate-service", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+telemetry = { package = "substrate-telemetry", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+srml-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+im-online = { package = "srml-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery = { package = "substrate-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+babe = { package = "substrate-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+babe-primitives = { package = "substrate-consensus-babe-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }

statement-table/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 primitives = { package = "polkadot-primitives", path = "../primitives" }

test-parachains/adder/Cargo.toml

@@ -13,7 +13,7 @@ tiny-keccak = "1.5.0"
 dlmalloc = { version = "0.1.3", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff", default-features = false, features = [ "no_global_allocator" ] }
+rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "no_global_allocator" ] }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }

test-parachains/adder/collator/Cargo.toml

@@ -9,8 +9,8 @@ adder = { path = ".." }
 parachain = { package = "polkadot-parachain", path = "../../../parachain" }
 collator = { package = "polkadot-collator", path = "../../../collator" }
 primitives = { package = "polkadot-primitives", path = "../../../primitives" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
-client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
 parking_lot = "0.9.0"
 ctrlc = { version = "3.0", features = ["termination"] }
 futures = "0.1"