Fix #72 (#79)

darwinia-network · Nov 30, 2022 · e68b051 · e68b051
1 parent f12766b
commit e68b051
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs
@@ -97,3 +97,6 @@ pub const MWEI: Balance = 1_000 * KWEI;
 pub const KWEI: Balance = 1_000 * WEI;
 /// 1 wei — 1
 pub const WEI: Balance = 1;
+
+/// Base balance required for the XCM unit weight
+pub const BASE_WEIGHT_FEE: Balance = GWEI;
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -121,7 +121,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type RuntimeCall = RuntimeCall;
 	type SubscriptionService = PolkadotXcm;
 	type Trader = UsingComponents<
-		WeightToFee,
+		ConstantMultiplier<Balance, ConstU128<{ BASE_WEIGHT_FEE }>>,
 		AnchoringSelfReserve,
 		AccountId,
 		Balances,

diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -121,7 +121,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type RuntimeCall = RuntimeCall;
 	type SubscriptionService = PolkadotXcm;
 	type Trader = UsingComponents<
-		WeightToFee,
+		ConstantMultiplier<Balance, ConstU128<{ BASE_WEIGHT_FEE }>>,
 		AnchoringSelfReserve,
 		AccountId,
 		Balances,

diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs
@@ -121,7 +121,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type RuntimeCall = RuntimeCall;
 	type SubscriptionService = PolkadotXcm;
 	type Trader = UsingComponents<
-		WeightToFee,
+		ConstantMultiplier<Balance, ConstU128<{ BASE_WEIGHT_FEE }>>,
 		AnchoringSelfReserve,
 		AccountId,
 		Balances,