Fix transaction payment (#613)

* Fix transaction payment * Remove CustomOnRuntimeUpgrades Co-authored-by: icodezjb <[email protected]>
chainx-org · Mar 13, 2022 · b88d151 · b88d151
1 parent 28094fa
commit b88d151
Show file tree

Hide file tree

Showing 55 changed files with 387 additions and 499 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"
@@ -11,73 +11,6 @@ cli = { package = "chainx-cli", path = "cli" }
 [target.'cfg(target_arch="x86_64")'.dependencies]
 cli = { package = "chainx-cli", path = "cli", features = ["wasmtime"] }
 
-[patch."https://github.com/paritytech/substrate"]
-
-sp-api = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-application-crypto = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-arithmetic = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-authority-discovery = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-blockchain = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-block-builder = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-consensus = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-consensus-babe = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-consensus-slots = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-consensus-vrf = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-core = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-database = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-externalities = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-finality-grandpa = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-inherents = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-io = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-keystore = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-offchain = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-runtime = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-runtime-interface = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-session = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-staking = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-state-machine = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-std = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-storage = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-timestamp = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-tracing = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-transaction-pool = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-trie = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-version = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sp-wasm-interface = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-
-sc-client-api = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sc-transaction-pool-api = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-sc-utils = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-
-
-frame-executive = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-frame-support = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-frame-system = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-frame-system-rpc-runtime-api = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-
-pallet-authorship = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-babe = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-balances = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-collective = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-democracy = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-elections-phragmen = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-grandpa = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-identity = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-im-online = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-indices = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-membership = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-multisig = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-offences = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-proxy = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-scheduler = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-session = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-sudo = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-timestamp = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-transaction-payment = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-treasury = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-pallet-utility = { git = "https://github.com/chainx-org/substrate", rev = "79f50470dadedec5c54461eea5ce7d468d054371" }
-
 [workspace]
 members = [
   "cli",

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-cli"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 description = "Implementation of protocol https://chainx.org in Rust based on the Substrate framework."
 edition = "2018"

diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-executor"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-primitives"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/assets-registrar/Cargo.toml b/primitives/assets-registrar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-assets-registrar"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/gateway/bitcoin/Cargo.toml b/primitives/gateway/bitcoin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-bitcoin"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/gateway/common/Cargo.toml b/primitives/gateway/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-common"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/genesis-builder/Cargo.toml b/primitives/genesis-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-genesis-builder"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-io"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/mining/common/Cargo.toml b/primitives/mining/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-common"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/mining/staking/Cargo.toml b/primitives/mining/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-staking"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/protocol/Cargo.toml b/primitives/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-protocol"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-rpc"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xp-runtime"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-rpc"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/runtime/chainx/Cargo.toml b/runtime/chainx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainx-runtime"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/runtime/chainx/src/constants.rs b/runtime/chainx/src/constants.rs
@@ -32,3 +32,44 @@ pub mod time {
     // 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
     pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
 }
+
+/// Fee-related.
+pub mod fee {
+    use frame_support::weights::{
+        constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
+        WeightToFeePolynomial,
+    };
+    use smallvec::smallvec;
+    pub use sp_runtime::Perbill;
+
+    use chainx_primitives::Balance;
+
+    /// The block saturation level. Fees will be updates based on this value.
+    pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
+
+    /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
+    /// node's balance type.
+    ///
+    /// This should typically create a mapping between the following ranges:
+    ///   - [0, frame_system::MaximumBlockWeight]
+    ///   - [Balance::min, Balance::max]
+    ///
+    /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
+    ///   - Setting it to `0` will essentially disable the weight fee.
+    ///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
+    pub struct WeightToFee;
+    impl WeightToFeePolynomial for WeightToFee {
+        type Balance = Balance;
+        fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+            // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+            let p = super::currency::CENTS;
+            let q = 10 * Balance::from(ExtrinsicBaseWeight::get());
+            smallvec![WeightToFeeCoefficient {
+                degree: 1,
+                negative: false,
+                coeff_frac: Perbill::from_rational(p % q, q),
+                coeff_integer: p / q,
+            }]
+        }
+    }
+}
diff --git a/runtime/chainx/src/lib.rs b/runtime/chainx/src/lib.rs
@@ -63,7 +63,7 @@ pub use frame_support::{
     },
     weights::{
         constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
-        IdentityFee, Weight,
+        Weight,
     },
     StorageValue,
 };
@@ -103,14 +103,13 @@ mod migrations;
 
 use self::constants::{currency::*, time::*};
 use self::impls::{ChargeExtraFee, DealWithFees, SlowAdjustingFeeUpdate};
-use self::migrations::*;
 
 /// This runtime version.
 pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("chainx"),
     impl_name: create_runtime_str!("chainx-net"),
     authoring_version: 1,
-    spec_version: 12,
+    spec_version: 13,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 3,
@@ -417,7 +416,7 @@ parameter_types! {
 impl pallet_transaction_payment::Config for Runtime {
     type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
     type TransactionByteFee = TransactionByteFee;
-    type WeightToFee = IdentityFee<Balance>;
+    type WeightToFee = self::constants::fee::WeightToFee;
     type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
     type OperationalFeeMultiplier = OperationalFeeMultiplier;
 }
@@ -1194,7 +1193,7 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPallets,
-    CustomOnRuntimeUpgrades,
+    (),
 >;
 
 impl_runtime_apis! {

diff --git a/runtime/chainx/src/migrations.rs b/runtime/chainx/src/migrations.rs
@@ -39,12 +39,12 @@ impl frame_support::traits::OnRuntimeUpgrade for PhragmenElectionDepositRuntimeU
     }
 }
 
-pub struct SystemToTripleRefCount;
-impl frame_support::traits::OnRuntimeUpgrade for SystemToTripleRefCount {
-    fn on_runtime_upgrade() -> frame_support::weights::Weight {
-        frame_system::migrations::migrate_from_unique_to_triple_ref_count::<Runtime>()
-    }
-}
+// pub struct SystemToTripleRefCount;
+// impl frame_support::traits::OnRuntimeUpgrade for SystemToTripleRefCount {
+//     fn on_runtime_upgrade() -> frame_support::weights::Weight {
+//         frame_system::migrations::migrate_from_unique_to_triple_ref_count::<Runtime>()
+//     }
+// }
 
 impl pallet_babe::migrations::BabePalletPrefix for Runtime {
     fn pallet_prefix() -> &'static str {
@@ -249,10 +249,10 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrades {
         weight += <PhragmenElectionDepositRuntimeUpgrade as OnRuntimeUpgrade>::on_runtime_upgrade();
         frame_support::log::info!("🚀 PhragmenElectionDepositRuntimeUpgrade end");
 
-        // 4. SystemToTripleRefCount
-        frame_support::log::info!("🔍️ SystemToTripleRefCount start");
-        weight += <SystemToTripleRefCount as OnRuntimeUpgrade>::on_runtime_upgrade();
-        frame_support::log::info!("🚀 SystemToTripleRefCount end");
+        // // 4. SystemToTripleRefCount
+        // frame_support::log::info!("🔍️ SystemToTripleRefCount start");
+        // weight += <SystemToTripleRefCount as OnRuntimeUpgrade>::on_runtime_upgrade();
+        // frame_support::log::info!("🚀 SystemToTripleRefCount end");
 
         // 5. BabeEpochConfigMigrations
         frame_support::log::info!("🔍️ BabeEpochConfigMigrations start");

diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dev-runtime"
-version = "4.0.0"
+version = "4.1.0"
 authors = ["The ChainX Authors"]
 edition = "2018"
 

diff --git a/runtime/dev/src/constants.rs b/runtime/dev/src/constants.rs
@@ -32,3 +32,44 @@ pub mod time {
     // 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
     pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
 }
+
+/// Fee-related.
+pub mod fee {
+    use frame_support::weights::{
+        constants::ExtrinsicBaseWeight, WeightToFeeCoefficient, WeightToFeeCoefficients,
+        WeightToFeePolynomial,
+    };
+    use smallvec::smallvec;
+    pub use sp_runtime::Perbill;
+
+    use chainx_primitives::Balance;
+
+    /// The block saturation level. Fees will be updates based on this value.
+    pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
+
+    /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
+    /// node's balance type.
+    ///
+    /// This should typically create a mapping between the following ranges:
+    ///   - [0, frame_system::MaximumBlockWeight]
+    ///   - [Balance::min, Balance::max]
+    ///
+    /// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
+    ///   - Setting it to `0` will essentially disable the weight fee.
+    ///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
+    pub struct WeightToFee;
+    impl WeightToFeePolynomial for WeightToFee {
+        type Balance = Balance;
+        fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+            // in Polkadot, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+            let p = super::currency::CENTS;
+            let q = 10 * Balance::from(ExtrinsicBaseWeight::get());
+            smallvec![WeightToFeeCoefficient {
+                degree: 1,
+                negative: false,
+                coeff_frac: Perbill::from_rational(p % q, q),
+                coeff_integer: p / q,
+            }]
+        }
+    }
+}