Revamp xcm for v2 (#366) (#376)

* Add salp-lite pallet * Revamp xcm for v2
bifrost-io · Oct 23, 2021 · 8c0b0d7 · 8c0b0d7
1 parent 7e1d5b1
commit 8c0b0d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/runtime/bifrost/src/constants.rs b/runtime/bifrost/src/constants.rs
@@ -31,7 +31,7 @@ pub mod currency {
 	pub const BNCS: Balance = 1_000_000_000_000;
 	pub const DOLLARS: Balance = BNCS;
 	pub const CENTS: Balance = DOLLARS / 100; // assume this is worth about a cent.
-	pub const RELAY_CENTS: Balance = DOLLARS / 30_000;
+	pub const RELAY_CENTS: Balance = DOLLARS / 10_000;
 	pub const MILLICENTS: Balance = CENTS / 1_000;
 	pub const MILLIBNC: Balance = 1_000_000_000;
 	pub const MICROBNC: Balance = 1_000_000;

diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs
@@ -1079,7 +1079,7 @@ parameter_types! {
 	pub const SlotLength: BlockNumber = 8u32 as BlockNumber;
 	pub const XcmTransferOrigin: TransferOriginType = TransferOriginType::FromRelayChain;
 	pub XcmWeight: XcmBaseWeight = XCM_WEIGHT.into();
-	pub ContributionWeight:XcmBaseWeight = 893125000.into();
+	pub ContributionWeight:XcmBaseWeight = XCM_WEIGHT.into();
 	pub AddProxyWeight:XcmBaseWeight = XCM_WEIGHT.into();
 	pub ConfirmMuitiSigAccount: AccountId = hex!["e4da05f08e89bf6c43260d96f26fffcfc7deae5b465da08669a9d008e64c2c63"].into();
 	pub RelaychainSovereignSubAccount: MultiLocation = create_x2_multilocation(ParachainDerivedProxyAccountType::Salp as u16);

diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs
@@ -103,11 +103,11 @@ impl<
 			WithdrawAsset(asset.clone().into()),
 			BuyExecution {
 				fees: asset,
-				weight_limit: Some(weight + 1 * BaseXcmWeight::get() + nonce as u64).into(),
+				weight_limit: WeightLimit::Limited(Self::transact_weight(weight, nonce)),
 			},
 			Instruction::Transact {
 				origin_type: OriginKind::SovereignAccount,
-				require_weight_at_most: 100_000_000_000,
+				require_weight_at_most: weight,
 				call,
 			},
 			DepositAsset {