Fix to 16x tranfer fee comparing with 0.9.10 (#434)

runtime/asgard/src/constants.rs

@@ -41,8 +41,8 @@ pub mod currency {
 		items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS
 	}
 
-	pub struct WeightToFee;
-	impl WeightToFeePolynomial for WeightToFee {
+	pub struct KsmWeightToFee;
+	impl WeightToFeePolynomial for KsmWeightToFee {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
 			let p = super::currency::RELAY_CENTS;
@@ -56,8 +56,24 @@ pub mod currency {
 		}
 	}
 
+	pub struct WeightToFee;
+	impl WeightToFeePolynomial for WeightToFee {
+		type Balance = Balance;
+		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+			// extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
+			let p = base_tx_fee();
+			let q = Balance::from(ExtrinsicBaseWeight::get());
+			smallvec![WeightToFeeCoefficient {
+				degree: 1,
+				negative: false,
+				coeff_frac: Perbill::from_rational(p % q, q),
+				coeff_integer: p / q,
+			}]
+		}
+	}
+
 	fn base_tx_fee() -> Balance {
-		CENTS / 10
+		CENTS / 5
 	}
 
 	pub fn ksm_per_second() -> u128 {

runtime/asgard/src/lib.rs

@@ -787,7 +787,8 @@ impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = FlexibleFee;
 	type TransactionByteFee = TransactionByteFee;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
-	type WeightToFee = IdentityFee<Balance>;
+	// type WeightToFee = IdentityFee<Balance>;
+	type WeightToFee = WeightToFee;
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -1255,7 +1256,7 @@ impl bifrost_flexible_fee::Config for Runtime {
 	type MiscFeeHandler = MiscFeeHandler<
 		Runtime,
 		RelayCurrencyId,
-		WeightToFee,
+		KsmWeightToFee,
 		SalpWeightHolder,
 		ContributeFeeFilter,
 	>;
@@ -1335,7 +1336,7 @@ parameter_types! {
 
 impl bifrost_salp::Config for Runtime {
 	type BancorPool = Bancor;
-	type BifrostXcmExecutor = BifrostXcmAdaptor<XcmRouter, XcmWeight, WeightToFee, SelfParaId>;
+	type BifrostXcmExecutor = BifrostXcmAdaptor<XcmRouter, XcmWeight, KsmWeightToFee, SelfParaId>;
 	type Event = Event;
 	type LeasePeriod = LeasePeriod;
 	type MinContribution = MinContribution;

runtime/bifrost/src/constants.rs

@@ -20,7 +20,7 @@
 
 /// Money matters.
 pub mod currency {
-	use bifrost_runtime_common::{cent, dollar};
+	use bifrost_runtime_common::{cent, dollar, milli};
 	use frame_support::weights::{
 		constants::{ExtrinsicBaseWeight, WEIGHT_PER_SECOND},
 		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -70,13 +70,17 @@ pub mod currency {
 	}
 
 	fn base_tx_fee() -> Balance {
-		cent(CurrencyId::Native(TokenSymbol::BNC)) / 5
+		milli(CurrencyId::Native(TokenSymbol::BNC)) / 3
+	}
+
+	fn xcm_base_tx_fee() -> Balance {
+		cent(CurrencyId::Native(TokenSymbol::BNC)) / 10
 	}
 
 	pub fn ksm_per_second() -> u128 {
 		let base_weight = Balance::from(ExtrinsicBaseWeight::get());
 		let base_tx_per_second = (WEIGHT_PER_SECOND as u128) / base_weight;
-		let fee_per_second = base_tx_per_second * base_tx_fee();
+		let fee_per_second = base_tx_per_second * xcm_base_tx_fee();
 		fee_per_second / 100
 	}
 }