Update Polkadot-SDK

cumulus/parachain-template/node/src/chain_spec.rs

@@ -102,7 +102,7 @@ pub fn development_config() -> ChainSpec {
 					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 				],
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				1000.into(),
+				1001.into(),
 			)
 		},
 		Vec::new(),
@@ -112,7 +112,7 @@ pub fn development_config() -> ChainSpec {
 		None,
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 1000,
+			para_id: 1001,
 		},
 	)
 }
@@ -174,7 +174,7 @@ pub fn local_testnet_config() -> ChainSpec {
 		// Extensions
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 1000,
+			para_id: 1001,
 		},
 	)
 }

cumulus/parachain-template/pallets/template/Cargo.toml

@@ -19,6 +19,10 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 frame-benchmarking = { path = "../../../../substrate/frame/benchmarking", default-features = false, optional = true}
 frame-support = { path = "../../../../substrate/frame/support", default-features = false}
 frame-system = { path = "../../../../substrate/frame/system", default-features = false}
+sp-std = { path = "../../../../substrate/primitives/std", default-features = false}
+
+pallet-xcm = { path = "../../../../polkadot/xcm/pallet-xcm", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../polkadot/xcm", default-features = false}
 
 [dev-dependencies]
 serde = { version = "1.0.188" }
@@ -45,6 +49,9 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
+	"sp-std/std",
+	"pallet-xcm/std",
+	"xcm/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",

cumulus/parachain-template/pallets/template/src/lib.rs

@@ -18,10 +18,12 @@ mod benchmarking;
 pub mod pallet {
 	use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*};
 	use frame_system::pallet_prelude::*;
+	use sp_std::boxed::Box;
+	use xcm::{v3::prelude::*, VersionedMultiLocation, VersionedXcm};
 
 	/// Configure the pallet by specifying the parameters and types on which it depends.
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
+	pub trait Config: frame_system::Config + pallet_xcm::Config {
 		/// Because this pallet emits events, it depends on the runtime's definition of an event.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 	}
@@ -45,6 +47,8 @@ pub mod pallet {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
 		SomethingStored(u32, T::AccountId),
+		/// XCM message sent. \[to, message\]
+		Sent { from: T::AccountId, to: MultiLocation, message: Xcm<()> },
 	}
 
 	// Errors inform users that something went wrong.
@@ -54,6 +58,15 @@ pub mod pallet {
 		NoneValue,
 		/// Errors should have helpful documentation associated with them.
 		StorageOverflow,
+		/// The message and destination combination was not recognized as being
+		/// reachable.
+		Unreachable,
+		/// The message and destination was recognized as being reachable but
+		/// the operation could not be completed.
+		SendFailure,
+		/// The version of the `Versioned` value used is not able to be
+		/// interpreted.
+		BadVersion,
 	}
 
 	#[pallet::hooks]
@@ -102,5 +115,27 @@ pub mod pallet {
 				},
 			}
 		}
+
+		/// Send an XCM message as parachain sovereign.
+		#[pallet::call_index(2)]
+		#[pallet::weight(Weight::from_parts(100_000_000, 0))]
+		pub fn send_xcm(
+			origin: OriginFor<T>,
+			dest: Box<VersionedMultiLocation>,
+			message: Box<VersionedXcm<()>>,
+		) -> DispatchResult {
+			let who = ensure_signed(origin)?;
+			let dest = MultiLocation::try_from(*dest).map_err(|()| Error::<T>::BadVersion)?;
+			let message: Xcm<()> = (*message).try_into().map_err(|()| Error::<T>::BadVersion)?;
+
+			pallet_xcm::Pallet::<T>::send_xcm(Here, dest, message.clone()).map_err(
+				|e| match e {
+					SendError::Unroutable => Error::<T>::Unreachable,
+					_ => Error::<T>::SendFailure,
+				},
+			)?;
+			Self::deposit_event(Event::Sent { from: who, to: dest, message });
+			Ok(())
+		}
 	}
 }

cumulus/parachain-template/runtime/src/xcm_config.rs

@@ -150,11 +150,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -180,8 +175,6 @@ impl pallet_xcm::Config for Runtime {
 	type SovereignAccountOf = LocationToAccountId;
 	type MaxLockers = ConstU32<8>;
 	type WeightInfo = pallet_xcm::TestWeightInfo;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();

cumulus/parachains/common/src/lib.rs

@@ -20,6 +20,7 @@ pub mod kusama;
 pub mod message_queue;
 pub mod polkadot;
 pub mod rococo;
+pub mod snowbridge_config;
 pub mod westend;
 pub mod wococo;
 pub mod xcm_config;

cumulus/parachains/common/src/snowbridge_config.rs

@@ -0,0 +1,6 @@
+frame_support::parameter_types! {
+	/// User fee for ERC20 token transfer back to Ethereum.
+	/// (initially was calculated by test `OutboundQueue::calculate_fees` - ETH/ROC 1/400 and fee_per_gas 15 GWEI = 22698000000 + *25%)
+	/// Needs to be more than fee calculated from DefaultFeeConfig FeeConfigRecord in snowbridge:parachain/pallets/outbound-queue/src/lib.rs
+	pub const BridgeHubEthereumBaseFeeInRocs: u128 = 28372500000;
+}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml

@@ -18,6 +18,7 @@ frame-system = { path = "../../../../../../substrate/frame/system", default-feat
 pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
 pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
 pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
+pallet-message-queue = { path = "../../../../../../substrate/frame/message-queue", default-features = false }
 
 # Polkadot
 polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
@@ -32,6 +33,9 @@ rococo-runtime = { path = "../../../../../../polkadot/runtime/rococo", default-f
 asset-test-utils = { path = "../../../../runtimes/assets/test-utils", default-features = false }
 parachains-common = { path = "../../../../common" }
 asset-hub-rococo-runtime = { path = "../../../../runtimes/assets/asset-hub-rococo" }
+penpal-runtime = { path = "../../../../runtimes/testing/penpal" }
+cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue", default-features = false}
+cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
 
 # Local
 xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs

@@ -49,18 +49,20 @@ pub const ASSET_MIN_BALANCE: u128 = 1000;
 pub const ASSETS_PALLET_ID: u8 = 50;
 
 pub type RelayToSystemParaTest = Test<Rococo, AssetHubRococo>;
+pub type RelayToParaTest = Test<Rococo, PenpalRococoA>;
 pub type SystemParaToRelayTest = Test<AssetHubRococo, Rococo>;
 pub type SystemParaToParaTest = Test<AssetHubRococo, PenpalRococoA>;
+pub type ParaToSystemParaTest = Test<PenpalRococoA, AssetHubRococo>;
 
-/// Returns a `TestArgs` instance to de used for the Relay Chain accross integraton tests
-pub fn relay_test_args(amount: Balance) -> TestArgs {
+/// Returns a `TestArgs` instance to be used for the Relay Chain across integration tests
+pub fn relay_test_args(
+	dest: MultiLocation,
+	beneficiary_id: AccountId32,
+	amount: Balance,
+) -> TestArgs {
 	TestArgs {
-		dest: Rococo::child_location_of(AssetHubRococo::para_id()),
-		beneficiary: AccountId32Junction {
-			network: None,
-			id: AssetHubRococoReceiver::get().into(),
-		}
-		.into(),
+		dest,
+		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
 		amount,
 		assets: (Here, amount).into(),
 		asset_id: None,
@@ -69,21 +71,22 @@ pub fn relay_test_args(amount: Balance) -> TestArgs {
 	}
 }
 
-/// Returns a `TestArgs` instance to de used for the System Parachain accross integraton tests
-pub fn system_para_test_args(
+/// Returns a `TestArgs` instance to be used by parachains across integration tests
+pub fn para_test_args(
 	dest: MultiLocation,
 	beneficiary_id: AccountId32,
 	amount: Balance,
 	assets: MultiAssets,
 	asset_id: Option<u32>,
+	fee_asset_item: u32,
 ) -> TestArgs {
 	TestArgs {
 		dest,
 		beneficiary: AccountId32Junction { network: None, id: beneficiary_id.into() }.into(),
 		amount,
 		assets,
 		asset_id,
-		fee_asset_item: 0,
+		fee_asset_item,
 		weight_limit: WeightLimit::Unlimited,
 	}
 }