Merge pull request #34 from paritytech/fix/adjust-fees-to-testnet

Fix: Adapt fixed rate trader to relay native token decimals

Author: gautamdhameja

runtime/mainnet/src/lib.rs

@@ -110,7 +110,7 @@ pub type Executive = frame_executive::Executive<
 >;
 
 pub mod fee {
-	use super::{Balance, ExtrinsicBaseWeight, MILLI_MYTH};
+	use super::{Balance, ExtrinsicBaseWeight, MILLI_DOT, MILLI_MYTH};
 	use frame_support::weights::{
 		constants::WEIGHT_REF_TIME_PER_SECOND, FeePolynomial, Weight, WeightToFeeCoefficient,
 		WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -183,14 +183,14 @@ pub mod fee {
 		}
 	}
 
-	pub fn base_tx_fee() -> Balance {
-		MILLI_MYTH
+	pub fn base_relay_tx_fee() -> Balance {
+		MILLI_DOT
 	}
 
 	pub fn default_fee_per_second() -> u128 {
 		let base_weight = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 		let base_tx_per_second = (WEIGHT_REF_TIME_PER_SECOND as u128) / base_weight;
-		base_tx_per_second * base_tx_fee()
+		base_tx_per_second * base_relay_tx_fee()
 	}
 }
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -233,6 +233,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 pub const MICRO_MYTH: Balance = 1_000_000_000_000;
 pub const MILLI_MYTH: Balance = 1_000 * MICRO_MYTH;
 pub const MYTH: Balance = 1_000 * MILLI_MYTH;
+// DOT has 10 decimal places
+pub const MICRO_DOT: Balance = 10_000;
+pub const MILLI_DOT: Balance = 1_000 * MICRO_DOT;
 
 pub const EXISTENTIAL_DEPOSIT: Balance = MILLI_MYTH;
 

runtime/mainnet/src/xcm_config.rs

@@ -225,7 +225,7 @@ parameter_types! {
 	pub const NativeAssetId: AssetId = AssetId(SelfReserve::get());
 	pub const NativeAssetFilter: AssetFilter = Wild(AllOf { fun: WildFungible, id: NativeAssetId::get() });
 	pub AssetHubTrustedTeleporter: (AssetFilter, Location) = (NativeAssetFilter::get(), AssetHubLocation::get());
-	pub RelayPerSecond: (AssetId, u128,u128) = (Location::new(1,Here).into(), default_fee_per_second() * 10, 1024);
+	pub RelayPerSecondAndByte: (AssetId, u128,u128) = (Location::new(1,Here).into(), default_fee_per_second() * 1, 1024);
 }
 
 pub struct OnlyAssetHubPrefix;
@@ -264,7 +264,7 @@ impl Contains<(Location, Vec<Asset>)> for OnlyTeleportNative {
 
 pub type Traders = (
 	//Relay token.
-	FixedRateOfFungible<RelayPerSecond, ()>,
+	FixedRateOfFungible<RelayPerSecondAndByte, ()>,
 	//Native asset.
 	UsingComponents<WeightToFee, SelfReserve, AccountId, Balances, DealWithFees<Runtime>>,
 );

runtime/testnet/src/lib.rs

@@ -111,7 +111,8 @@ pub type Executive = frame_executive::Executive<
 >;
 
 pub mod fee {
-	use super::{Balance, ExtrinsicBaseWeight, MILLI_MUSE};
+
+	use super::{Balance, ExtrinsicBaseWeight, MILLI_MUSE, MILLI_ROC};
 	use frame_support::weights::{
 		constants::WEIGHT_REF_TIME_PER_SECOND, FeePolynomial, Weight, WeightToFeeCoefficient,
 		WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -184,14 +185,14 @@ pub mod fee {
 		}
 	}
 
-	pub fn base_tx_fee() -> Balance {
-		MILLI_MUSE
+	pub fn base_relay_tx_fee() -> Balance {
+		MILLI_ROC
 	}
 
 	pub fn default_fee_per_second() -> u128 {
 		let base_weight = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 		let base_tx_per_second = (WEIGHT_REF_TIME_PER_SECOND as u128) / base_weight;
-		base_tx_per_second * base_tx_fee()
+		base_tx_per_second * base_relay_tx_fee()
 	}
 }
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -234,6 +235,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 pub const MICRO_MUSE: Balance = 1_000_000_000_000;
 pub const MILLI_MUSE: Balance = 1_000 * MICRO_MUSE;
 pub const MUSE: Balance = 1_000 * MILLI_MUSE;
+//ROC has 12 decimal places
+pub const MICRO_ROC: Balance = 1_000_000;
+pub const MILLI_ROC: Balance = 1_000 * MICRO_ROC;
 
 pub const EXISTENTIAL_DEPOSIT: Balance = MILLI_MUSE;
 

runtime/testnet/src/xcm_config.rs

@@ -229,7 +229,7 @@ parameter_types! {
 	pub const NativeAssetId: AssetId = AssetId(SelfReserve::get());
 	pub const NativeAssetFilter: AssetFilter = Wild(AllOf { fun: WildFungible, id: NativeAssetId::get() });
 	pub AssetHubTrustedTeleporter: (AssetFilter, Location) = (NativeAssetFilter::get(), AssetHubLocation::get());
-	pub RelayPerSecond: (AssetId, u128,u128) = (Location::new(1,Here).into(), default_fee_per_second() * 10, 1024);
+	pub RelayPerSecondAndByte: (AssetId, u128,u128) = (Location::new(1,Here).into(), default_fee_per_second() * 1, 1024);
 }
 
 pub struct OnlyAssetHubPrefix;
@@ -268,7 +268,7 @@ impl Contains<(Location, Vec<Asset>)> for OnlyTeleportNative {
 
 pub type Traders = (
 	//Relay token.
-	FixedRateOfFungible<RelayPerSecond, ()>,
+	FixedRateOfFungible<RelayPerSecondAndByte, ()>,
 	//Native asset.
 	UsingComponents<WeightToFee, SelfReserve, AccountId, Balances, DealWithFees<Runtime>>,
 );