adjust genesis endud balance (paritytech#158)

1. adjust genesis endud balance 2. add debug log for fee 3. add type in scripts
chainx-org · Jul 27, 2020 · 42635a0 · 42635a0
1 parent 421f96a
commit 42635a0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/chain_spec.rs b/cli/src/chain_spec.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 use std::convert::TryFrom;
 
 use chainx_runtime::{
-    h256_conv_endian_from_str, trustees, AssetInfo, AssetRestriction, AssetRestrictions,
+    constants, h256_conv_endian_from_str, trustees, AssetInfo, AssetRestriction, AssetRestrictions,
     BtcCompact, BtcHeader, BtcNetwork, BtcParams, BtcTxVerifier, Chain, ContractsSchedule,
     NetworkType, TrusteeInfoConfig,
 };
@@ -77,16 +77,17 @@ macro_rules! endowed_gen {
 }
 
 pub fn development_config() -> ChainSpec {
-    let constructor = || {
+    let endowed_balance = 50 * constants::currency::DOLLARS;
+    let constructor = move || {
         testnet_genesis(
             vec![authority_keys_from_seed("Alice")],
             get_account_id_from_seed::<sr25519::Public>("Alice"),
             testnet_assets(),
             endowed_gen![
-                ("Alice", 100000),
-                ("Bob", 100000),
-                ("Alice//stash", 100000),
-                ("Bob//stash", 100000),
+                ("Alice", endowed_balance),
+                ("Bob", endowed_balance),
+                ("Alice//stash", endowed_balance),
+                ("Bob//stash", endowed_balance),
             ],
             testnet_trustees(),
             true,
@@ -106,7 +107,8 @@ pub fn development_config() -> ChainSpec {
 }
 
 pub fn local_testnet_config() -> ChainSpec {
-    let constructor = || {
+    let endowed_balance = 50 * constants::currency::DOLLARS;
+    let constructor = move || {
         testnet_genesis(
             vec![
                 authority_keys_from_seed("Alice"),
@@ -115,18 +117,18 @@ pub fn local_testnet_config() -> ChainSpec {
             get_account_id_from_seed::<sr25519::Public>("Alice"),
             testnet_assets(),
             endowed_gen![
-                ("Alice", 100000),
-                ("Bob", 100000),
-                ("Charlie", 100000),
-                ("Dave", 100000),
-                ("Eve", 100000),
-                ("Ferdie", 100000),
-                ("Alice//stash", 100000),
-                ("Bob//stash", 100000),
-                ("Charlie//stash", 100000),
-                ("Dave//stash", 100000),
-                ("Eve//stash", 100000),
-                ("Ferdie//stash", 100000),
+                ("Alice", endowed_balance),
+                ("Bob", endowed_balance),
+                ("Charlie", endowed_balance),
+                ("Dave", endowed_balance),
+                ("Eve", endowed_balance),
+                ("Ferdie", endowed_balance),
+                ("Alice//stash", endowed_balance),
+                ("Bob//stash", endowed_balance),
+                ("Charlie//stash", endowed_balance),
+                ("Dave//stash", endowed_balance),
+                ("Eve//stash", endowed_balance),
+                ("Ferdie//stash", endowed_balance),
             ],
             testnet_trustees(),
             true,

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -78,7 +78,7 @@ pub use xpallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 
 /// Constant values used within the runtime.
 pub mod constants;
-use constants::{currency::*, time::*};
+pub use constants::{currency::*, time::*};
 
 impl_opaque_keys! {
     pub struct SessionKeys {

diff --git a/scripts/chainx_types_manual.json b/scripts/chainx_types_manual.json
@@ -1,4 +1,5 @@
 {
+    "Address": "AccountId",
     "AssetInfoForRpc": {
         "token": "String",
         "token_name": "String",

diff --git a/xpallets/transaction-payment/Cargo.toml b/xpallets/transaction-payment/Cargo.toml
@@ -26,6 +26,7 @@ frame-system = { git = "https://github.com/paritytech/substrate.git", tag = "v2.
 
 # ChainX pallets
 xpallet-transaction-payment-rpc-runtime-api = { path = "./rpc/runtime-api", default-features = false }
+xpallet-support = { path = "../support", default-features = false }
 xpallet-assets = { path = "../assets", default-features = false }
 
 [dev-dependencies]
@@ -44,6 +45,8 @@ std = [
     "sp-runtime/std",
     "frame-support/std",
     "frame-system/std",
+
     "xpallet-transaction-payment-rpc-runtime-api/std",
+    "xpallet-support/std",
     "xpallet-assets/std",
 ]
diff --git a/xpallets/transaction-payment/src/lib.rs b/xpallets/transaction-payment/src/lib.rs
@@ -54,8 +54,8 @@ use sp_runtime::{
     FixedPointNumber, FixedPointOperand, FixedU128, Perquintill,
 };
 use sp_std::prelude::*;
+use xpallet_support::debug;
 use xpallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-
 /// Fee multiplier.
 pub type Multiplier = FixedU128;
 
@@ -326,11 +326,14 @@ where
             let adjusted_weight_fee = multiplier.saturating_mul_int(unadjusted_weight_fee);
 
             let base_fee = Self::weight_to_fee(T::ExtrinsicBaseWeight::get());
-            base_fee
+            let total = base_fee
                 .saturating_add(fixed_len_fee)
                 .saturating_add(adjusted_weight_fee)
-                .saturating_add(tip)
+                .saturating_add(tip);
+            debug!("[fee]|total:{:?}|base_fee:{:?}|fixed_len_fee:{:?}|adjusted_weight_fee:{:?}|tip:{:?}", total, base_fee, fixed_len_fee, adjusted_weight_fee, tip);
+            total
         } else {
+            debug!("[fee]|just tip|tip:{:?}", tip);
             tip
         }
     }