Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit f35a4db

Browse files
gavofyorkgavofyork
authoredOct 28, 2019
Revert "Update to latest substrate (#504)" (#505)
This reverts commit 89ac39f.
·
v1.0.0rm
1 parent f54a833 commit f35a4db

File tree

21 files changed

+984
-1038
lines changed

21 files changed

+984
-1038
lines changed
 

‎Cargo.lock

+867-900
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎availability-store/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ polkadot-primitives = { path = "../primitives" }
1010
parking_lot = "0.9.0"
1111
log = "0.4.6"
1212
codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
13-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
13+
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1414
kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1515
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
1616
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }

‎cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ tokio = "0.1.7"
1111
futures = "0.1.17"
1212
exit-future = "0.1"
1313
structopt = "0.3.3"
14-
cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
14+
cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1515
service = { package = "polkadot-service", path = "../service" }

‎collator/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ edition = "2018"
88
[dependencies]
99
futures = "0.1.17"
1010
futures03 = { package = "futures-preview", version = "0.3.0-alpha.18", features = ["compat"] }
11-
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
12-
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
13-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
14-
consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
11+
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
12+
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
13+
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
14+
consensus_common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1515
polkadot-runtime = { path = "../runtime" }
1616
polkadot-primitives = { path = "../primitives" }
1717
polkadot-cli = { path = "../cli" }
@@ -22,4 +22,4 @@ log = "0.4"
2222
tokio = "0.1.7"
2323

2424
[dev-dependencies]
25-
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
25+
keyring = { package = "substrate-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

‎erasure-coding/Cargo.toml

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

‎executor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ description = "Polkadot node implementation in Rust."
66
edition = "2018"
77

88
[dependencies]
9-
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
9+
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1010
polkadot-runtime = { path = "../runtime" }

‎network/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ av_store = { package = "polkadot-availability-store", path = "../availability-st
1212
polkadot-validation = { path = "../validation" }
1313
polkadot-primitives = { path = "../primitives" }
1414
codec = { package = "parity-scale-codec", version = "~1.0.0", default-features = false, features = ["derive"] }
15-
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
16-
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
17-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
15+
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
16+
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
17+
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1818
futures = "0.1"
1919
futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
2020
log = "0.4"
2121
exit-future = "0.1.4"
22-
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
22+
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
2323

2424
[dev-dependencies]
25-
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
25+
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }

‎parachain/Cargo.toml

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

‎primitives/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ edition = "2018"
77
[dependencies]
88
serde = { version = "1.0", optional = true, features = ["derive"] }
99
parity-scale-codec = { version = "1.0.5", default-features = false, features = ["bit-vec", "derive"] }
10-
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
11-
application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
12-
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
13-
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
14-
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
15-
runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
10+
primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
11+
application-crypto = { package = "substrate-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
12+
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
13+
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
14+
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
15+
runtime_primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
1616
polkadot-parachain = { path = "../parachain", default-features = false }
1717
bitvec = { version = "0.14.0", default-features = false, features = ["alloc"] }
18-
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "kiz-rpc-for-fee-stuff" }
18+
babe = { package = "srml-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
1919

2020
[dev-dependencies]
21-
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
21+
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
2222
pretty_assertions = "0.5.1"
2323

2424
[features]

‎rpc/Cargo.toml

+5-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2018"
66

77
[dependencies]
8-
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
8+
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
99
jsonrpc-core = "13.2.0"
1010
polkadot-primitives = { path = "../primitives" }
11-
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
12-
substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
13-
transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
14-
srml-system-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
15-
srml-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "kiz-rpc-for-fee-stuff" }
16-
polkadot-runtime = { path = "../runtime" }
11+
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
12+
substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
13+
transaction_pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
14+
srml-system-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
1715

‎rpc/src/lib.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020

2121
use std::sync::Arc;
2222

23-
use polkadot_primitives::{Block, AccountId, Nonce, Balance};
23+
use polkadot_primitives::{Block, AccountId, Nonce};
2424
use sr_primitives::traits::ProvideRuntimeApi;
2525
use transaction_pool::txpool::{ChainApi, Pool};
26-
use polkadot_runtime::UncheckedExtrinsic;
2726

2827
/// A type representing all RPC extensions.
2928
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
3433
C: client::blockchain::HeaderBackend<Block>,
3534
C: Send + Sync + 'static,
3635
C::Api: srml_system_rpc::AccountNonceApi<Block, AccountId, Nonce>,
37-
C::Api: srml_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance, UncheckedExtrinsic>,
3836
P: ChainApi + Sync + Send + 'static,
3937
{
4038
use srml_system_rpc::{System, SystemApi};
41-
use srml_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
4239

4340
let mut io = jsonrpc_core::IoHandler::default();
4441
io.extend_with(
4542
SystemApi::to_delegate(System::new(client.clone(), pool))
4643
);
47-
io.extend_with(
48-
TransactionPaymentApi::to_delegate(TransactionPayment::new(client))
49-
);
5044
io
5145
}

0 commit comments

Comments
 (0)
This repository has been archived.