From 775a6d5c64c23f73a0df7c909286ac0379bfe4b1 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 28 Oct 2019 19:10:35 +0100 Subject: [PATCH] Integrate fee RPC (#508) (#511) * Integrate fee RPC (#508) * Update cargo files * First round of build fixes * update lock file * Fix builds again * Revert cargo file * remove elections genesis * Fix chain spec * Remove imports * Update runtime/src/lib.rs Co-Authored-By: Gavin Wood * Update lock --- Cargo.lock | 201 ++++++++++++++++++++++---------------- rpc/Cargo.toml | 2 + rpc/src/lib.rs | 8 +- runtime/Cargo.toml | 2 + runtime/src/lib.rs | 19 +++- service/src/chain_spec.rs | 28 +----- 6 files changed, 151 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b493b0b86d8..31cdcdf931bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -849,7 +849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2784,8 +2784,10 @@ version = "0.6.5" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-primitives 0.6.5", + "polkadot-runtime 0.6.5", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-transaction-payment-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -2837,6 +2839,7 @@ dependencies = [ "srml-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-authority-discovery-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3705,7 +3708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3717,7 +3720,7 @@ dependencies = [ [[package]] name = "sr-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3730,7 +3733,7 @@ dependencies = [ [[package]] name = "sr-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3748,7 +3751,7 @@ dependencies = [ [[package]] name = "sr-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3766,7 +3769,7 @@ dependencies = [ [[package]] name = "sr-staking-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -3776,7 +3779,7 @@ dependencies = [ [[package]] name = "sr-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3784,7 +3787,7 @@ dependencies = [ [[package]] name = "sr-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3796,7 +3799,7 @@ dependencies = [ [[package]] name = "srml-authority-discovery" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3813,7 +3816,7 @@ dependencies = [ [[package]] name = "srml-authorship" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3829,7 +3832,7 @@ dependencies = [ [[package]] name = "srml-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3849,7 +3852,7 @@ dependencies = [ [[package]] name = "srml-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3864,7 +3867,7 @@ dependencies = [ [[package]] name = "srml-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3880,7 +3883,7 @@ dependencies = [ [[package]] name = "srml-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3895,7 +3898,7 @@ dependencies = [ [[package]] name = "srml-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3911,7 +3914,7 @@ dependencies = [ [[package]] name = "srml-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3925,7 +3928,7 @@ dependencies = [ [[package]] name = "srml-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3940,7 +3943,7 @@ dependencies = [ [[package]] name = "srml-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3958,7 +3961,7 @@ dependencies = [ [[package]] name = "srml-im-online" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3976,7 +3979,7 @@ dependencies = [ [[package]] name = "srml-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3993,7 +3996,7 @@ dependencies = [ [[package]] name = "srml-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4007,7 +4010,7 @@ dependencies = [ [[package]] name = "srml-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4018,7 +4021,7 @@ dependencies = [ [[package]] name = "srml-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4032,7 +4035,7 @@ dependencies = [ [[package]] name = "srml-offences" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4047,7 +4050,7 @@ dependencies = [ [[package]] name = "srml-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4060,7 +4063,7 @@ dependencies = [ [[package]] name = "srml-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4079,7 +4082,7 @@ dependencies = [ [[package]] name = "srml-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4099,7 +4102,7 @@ dependencies = [ [[package]] name = "srml-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4110,7 +4113,7 @@ dependencies = [ [[package]] name = "srml-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4124,7 +4127,7 @@ dependencies = [ [[package]] name = "srml-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4145,7 +4148,7 @@ dependencies = [ [[package]] name = "srml-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4157,7 +4160,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4169,7 +4172,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4179,7 +4182,7 @@ dependencies = [ [[package]] name = "srml-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4196,7 +4199,7 @@ dependencies = [ [[package]] name = "srml-system-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core-client 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4214,7 +4217,7 @@ dependencies = [ [[package]] name = "srml-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4223,7 +4226,7 @@ dependencies = [ [[package]] name = "srml-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4238,19 +4241,49 @@ dependencies = [ [[package]] name = "srml-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", +] + +[[package]] +name = "srml-transaction-payment-rpc" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +dependencies = [ + "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core-client 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-derive 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "srml-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-rpc-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", +] + +[[package]] +name = "srml-transaction-payment-rpc-runtime-api" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" +dependencies = [ + "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", ] [[package]] name = "srml-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4337,7 +4370,7 @@ dependencies = [ [[package]] name = "substrate-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4349,7 +4382,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4371,7 +4404,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4393,7 +4426,7 @@ dependencies = [ [[package]] name = "substrate-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4408,7 +4441,7 @@ dependencies = [ [[package]] name = "substrate-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4419,7 +4452,7 @@ dependencies = [ [[package]] name = "substrate-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4455,7 +4488,7 @@ dependencies = [ [[package]] name = "substrate-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4485,7 +4518,7 @@ dependencies = [ [[package]] name = "substrate-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", @@ -4509,7 +4542,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4547,7 +4580,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4561,7 +4594,7 @@ dependencies = [ [[package]] name = "substrate-consensus-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4580,7 +4613,7 @@ dependencies = [ [[package]] name = "substrate-consensus-slots" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4598,7 +4631,7 @@ dependencies = [ [[package]] name = "substrate-consensus-uncles" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4612,7 +4645,7 @@ dependencies = [ [[package]] name = "substrate-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4622,7 +4655,7 @@ dependencies = [ [[package]] name = "substrate-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4646,7 +4679,7 @@ dependencies = [ [[package]] name = "substrate-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4657,7 +4690,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4686,7 +4719,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4699,7 +4732,7 @@ dependencies = [ [[package]] name = "substrate-header-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4709,7 +4742,7 @@ dependencies = [ [[package]] name = "substrate-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4720,7 +4753,7 @@ dependencies = [ [[package]] name = "substrate-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4732,7 +4765,7 @@ dependencies = [ [[package]] name = "substrate-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4747,7 +4780,7 @@ dependencies = [ [[package]] name = "substrate-network" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4789,7 +4822,7 @@ dependencies = [ [[package]] name = "substrate-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4816,7 +4849,7 @@ dependencies = [ [[package]] name = "substrate-offchain-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4825,7 +4858,7 @@ dependencies = [ [[package]] name = "substrate-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4834,7 +4867,7 @@ dependencies = [ [[package]] name = "substrate-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4847,7 +4880,7 @@ dependencies = [ [[package]] name = "substrate-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4856,7 +4889,7 @@ dependencies = [ [[package]] name = "substrate-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4894,7 +4927,7 @@ dependencies = [ [[package]] name = "substrate-primitives-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4905,7 +4938,7 @@ dependencies = [ [[package]] name = "substrate-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4931,7 +4964,7 @@ dependencies = [ [[package]] name = "substrate-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4953,7 +4986,7 @@ dependencies = [ [[package]] name = "substrate-rpc-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -4962,7 +4995,7 @@ dependencies = [ [[package]] name = "substrate-rpc-servers" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4977,7 +5010,7 @@ dependencies = [ [[package]] name = "substrate-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4986,7 +5019,7 @@ dependencies = [ [[package]] name = "substrate-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5026,7 +5059,7 @@ dependencies = [ [[package]] name = "substrate-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", @@ -5037,7 +5070,7 @@ dependencies = [ [[package]] name = "substrate-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5048,7 +5081,7 @@ dependencies = [ [[package]] name = "substrate-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5067,7 +5100,7 @@ dependencies = [ [[package]] name = "substrate-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5089,7 +5122,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5103,7 +5136,7 @@ dependencies = [ [[package]] name = "substrate-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5119,7 +5152,7 @@ dependencies = [ [[package]] name = "substrate-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5138,7 +5171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "substrate-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#7389b73f98f34f142ed4e720d4917033bd03012c" dependencies = [ "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6394,6 +6427,8 @@ dependencies = [ "checksum srml-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" +"checksum srml-transaction-payment-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" +"checksum srml-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 3c66a889881a..7e4eabe9181c 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -12,4 +12,6 @@ sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "pol 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" } +srml-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } +polkadot-runtime = { path = "../runtime" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 5b86a900126c..a9cf11a6aaac 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -20,9 +20,10 @@ use std::sync::Arc; -use polkadot_primitives::{Block, AccountId, Nonce}; +use polkadot_primitives::{Block, AccountId, Nonce, Balance}; 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; @@ -33,13 +34,18 @@ pub fn create(client: Arc, pool: Arc>) -> RpcExtension where C: client::blockchain::HeaderBackend, C: Send + Sync + 'static, C::Api: srml_system_rpc::AccountNonceApi, + C::Api: srml_transaction_payment_rpc::TransactionPaymentRuntimeApi, 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 } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 511b80ecc20a..95a9247ba661 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -33,6 +33,7 @@ authorship = { package = "srml-authorship", git = "https://github.com/paritytech 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" } +srml-transaction-payment-rpc-runtime-api = { 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" } @@ -92,6 +93,7 @@ std = [ "authorship/std", "balances/std", "transaction-payment/std", + "srml-transaction-payment-rpc-runtime-api/std", "collective/std", "elections-phragmen/std", "democracy/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 0852cf804083..19502ea82cdf 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -58,6 +58,7 @@ 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; @@ -379,6 +380,9 @@ impl collective::Trait for Runtime { parameter_types! { pub const CandidacyBond: Balance = 100 * DOLLARS; pub const VotingBond: Balance = 5 * DOLLARS; + pub const TermDuration: BlockNumber = 10 * MINUTES; + pub const DesiredMembers: u32 = 13; + pub const DesiredRunnersUp: u32 = 7; } impl elections_phragmen::Trait for Runtime { @@ -388,6 +392,9 @@ impl elections_phragmen::Trait for Runtime { type CurrencyToVote = CurrencyToVoteHandler; type CandidacyBond = CandidacyBond; type VotingBond = VotingBond; + type TermDuration = TermDuration; + type DesiredMembers = DesiredMembers; + type DesiredRunnersUp = DesiredRunnersUp; type LoserCandidate = Treasury; type BadReport = Treasury; type KickedMember = Treasury; @@ -576,7 +583,7 @@ construct_runtime!( Democracy: democracy::{Module, Call, Storage, Config, Event}, Council: collective::::{Module, Call, Storage, Origin, Event, Config}, TechnicalCommittee: collective::::{Module, Call, Storage, Origin, Event, Config}, - ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event, Config}, + ElectionsPhragmen: elections_phragmen::{Module, Call, Storage, Event}, TechnicalMembership: membership::::{Module, Call, Storage, Event, Config}, Treasury: treasury::{Module, Call, Storage, Event}, @@ -742,4 +749,14 @@ 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 { + TransactionPayment::query_info(uxt, len) + } + } } diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index 68d4bd0056a4..e297b63fc9d4 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -19,12 +19,11 @@ use primitives::{Pair, Public, crypto::UncheckedInto, sr25519}; use polkadot_primitives::{AccountId, AccountPublic, parachain::ValidatorId}; use polkadot_runtime::{ - GenesisConfig, CouncilConfig, ElectionsPhragmenConfig, DemocracyConfig, SystemConfig, - SessionConfig, StakingConfig, BalancesConfig, SessionKeys, TechnicalCommitteeConfig, - SudoConfig, IndicesConfig, StakerStatus, WASM_BINARY, - ClaimsConfig, ParachainsConfig, RegistrarConfig + GenesisConfig, CouncilConfig, DemocracyConfig, SystemConfig, SessionConfig, StakingConfig, + BalancesConfig, SessionKeys, TechnicalCommitteeConfig, SudoConfig, IndicesConfig, StakerStatus, + WASM_BINARY, ClaimsConfig, ParachainsConfig, RegistrarConfig }; -use polkadot_runtime::constants::{currency::DOTS, time::*}; +use polkadot_runtime::constants::currency::DOTS; use sr_primitives::{traits::IdentifyAccount, Perbill}; use telemetry::TelemetryEndpoints; use hex_literal::hex; @@ -138,12 +137,6 @@ fn staging_testnet_config_genesis() -> GenesisConfig { members: vec![], phantom: Default::default(), }), - elections_phragmen: Some(ElectionsPhragmenConfig { - members: vec![], - term_duration: 49 * DAYS, - desired_members: 7, - desired_runners_up: 3, - }), membership_Instance1: Some(Default::default()), babe: Some(Default::default()), grandpa: Some(Default::default()), @@ -239,8 +232,6 @@ pub fn testnet_genesis( const ENDOWMENT: u128 = 1_000_000 * DOTS; const STASH: u128 = 100 * DOTS; - let desired_members = (endowed_accounts.len() / 2 - initial_authorities.len()) as u32; - GenesisConfig { system: Some(SystemConfig { code: WASM_BINARY.to_vec(), @@ -280,17 +271,6 @@ pub fn testnet_genesis( members: vec![], phantom: Default::default(), }), - elections_phragmen: Some(ElectionsPhragmenConfig { - members: endowed_accounts.iter() - .filter(|&endowed| initial_authorities.iter() - .find(|&(_, controller, _, _, _, _)| controller == endowed) - .is_none() - ).cloned() - .collect(), - term_duration: 1 * DAYS, - desired_runners_up: desired_members / 2, - desired_members, - }), membership_Instance1: Some(Default::default()), babe: Some(Default::default()), grandpa: Some(Default::default()),