bump: xcm stuff

centrifuge · Oct 4, 2023 · 430d462 · 430d462
1 parent 859f088
commit 430d462
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/runtime/altair/src/xcm.rs b/runtime/altair/src/xcm.rs
@@ -25,6 +25,7 @@ use frame_support::{
 	sp_std::marker::PhantomData,
 	traits::{fungibles, fungibles::Mutate},
 };
+use frame_system::EnsureRoot;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
 use orml_xcm_support::MultiNativeAsset;
@@ -291,6 +292,9 @@ impl pallet_xcm::Config for Runtime {
 	type XcmTeleportFilter = Everything;
 
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 parameter_types! {

diff --git a/runtime/centrifuge/src/xcm.rs b/runtime/centrifuge/src/xcm.rs
@@ -27,6 +27,7 @@ use frame_support::{
 	sp_std::marker::PhantomData,
 	traits::{fungibles, fungibles::Mutate},
 };
+use frame_system::EnsureRoot;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
 use orml_xcm_support::MultiNativeAsset;
@@ -293,6 +294,9 @@ impl pallet_xcm::Config for Runtime {
 	type XcmTeleportFilter = Everything;
 
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 parameter_types! {

diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs
@@ -2440,14 +2440,14 @@ impl_runtime_apis! {
 			let is_transactional = false;
 			let validate = true;
 			let mut estimated_transaction_len = data.len() +
-						// from: 20
-						// value: 32
-						// gas_limit: 32
-						// nonce: 32
-						// 1 byte transaction action variant
-						// chain id 8 bytes
-						// 65 bytes signature
-						190;
+				// from: 20
+				// value: 32
+				// gas_limit: 32
+				// nonce: 32
+				// 1 byte transaction action variant
+				// chain id 8 bytes
+				// 65 bytes signature
+				190;
 
 					if max_fee_per_gas.is_some() {
 						estimated_transaction_len += 32;
@@ -2458,8 +2458,8 @@ impl_runtime_apis! {
 					if access_list.is_some() {
 						estimated_transaction_len += access_list.encoded_size();
 					}
-
 			let gas_limit = gas_limit.min(u64::MAX.into()).low_u64(); let without_base_extrinsic_weight = true; let (weight_limit, proof_size_base_cost) =
+
 				match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
 					gas_limit,
 					without_base_extrinsic_weight

diff --git a/runtime/development/src/xcm.rs b/runtime/development/src/xcm.rs
@@ -26,6 +26,7 @@ use frame_support::{
 	sp_std::marker::PhantomData,
 	traits::{fungibles, fungibles::Mutate},
 };
+use frame_system::EnsureRoot;
 use orml_asset_registry::{AssetRegistryTrader, FixedRateAssetRegistryTrader};
 use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
 use orml_xcm_support::MultiNativeAsset;
@@ -294,6 +295,9 @@ impl pallet_xcm::Config for Runtime {
 	type XcmTeleportFilter = Everything;
 
 	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
 }
 
 parameter_types! {