Merge branch 'snowbridge' into remove-redundant-address

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

@@ -73,7 +73,7 @@ pub fn development_config() -> ChainSpec {
 		Extensions {
 			relay_chain: "rococo-local".into(),
 			// You MUST set this to the correct network!
-			para_id: 1001,
+			para_id: 1000,
 		},
 	)
 	.with_name("Development")
@@ -106,7 +106,7 @@ pub fn development_config() -> ChainSpec {
 			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 		],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		1001.into(),
+		1000.into(),
 	))
 	.build()
 }
@@ -125,7 +125,7 @@ pub fn local_testnet_config() -> ChainSpec {
 		Extensions {
 			relay_chain: "rococo-local".into(),
 			// You MUST set this to the correct network!
-			para_id: 1001,
+			para_id: 1000,
 		},
 	)
 	.with_name("Local Testnet")
@@ -158,7 +158,7 @@ pub fn local_testnet_config() -> ChainSpec {
 			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 		],
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
-		1001.into(),
+		1000.into(),
 	))
 	.with_protocol_id("template-local")
 	.with_properties(properties)

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

@@ -19,10 +19,6 @@ 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" }
@@ -49,9 +45,6 @@ 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,12 +18,10 @@ 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 + pallet_xcm::Config {
+	pub trait Config: frame_system::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>;
 	}
@@ -47,8 +45,6 @@ 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.
@@ -58,15 +54,6 @@ 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]
@@ -115,27 +102,5 @@ 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/parachains/common/src/lib.rs

@@ -20,7 +20,6 @@ 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/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml

@@ -22,6 +22,7 @@ parachains-common = { path = "../../../../../../../parachains/common" }
 cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
 emulated-integration-tests-common = { path = "../../../../common", default-features = false }
 bridge-hub-rococo-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-rococo" }
+bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", default-features = false }
 
 # Snowbridge
 snowbridge-core = { path = "../../../../../../../../../parachain/primitives/core", default-features = false }

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs

@@ -36,7 +36,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: bridge_hub_rococo_runtime::XcmpQueue,
 			LocationToAccountId: bridge_hub_rococo_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: bridge_hub_rococo_runtime::ParachainInfo,
-			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
+			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm,

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml

@@ -22,3 +22,4 @@ parachains-common = { path = "../../../../../../../parachains/common" }
 cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
 emulated-integration-tests-common = { path = "../../../../common", default-features = false }
 bridge-hub-westend-runtime = { path = "../../../../../../runtimes/bridge-hubs/bridge-hub-westend" }
+bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", default-features = false }

cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/src/lib.rs

@@ -36,7 +36,7 @@ decl_test_parachains! {
 			XcmpMessageHandler: bridge_hub_westend_runtime::XcmpQueue,
 			LocationToAccountId: bridge_hub_westend_runtime::xcm_config::LocationToAccountId,
 			ParachainInfo: bridge_hub_westend_runtime::ParachainInfo,
-			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
+			MessageOrigin: bridge_hub_common::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml

@@ -40,6 +40,8 @@ rococo-westend-system-emulated-network = { path = "../../../networks/rococo-west
 bridge-hub-rococo-emulated-chain = { path = "../../../chains/parachains/bridges/bridge-hub-rococo"}
 asset-hub-rococo-emulated-chain = { path = "../../../chains/parachains/assets/asset-hub-rococo"}
 penpal-emulated-chain = { path = "../../../chains/parachains/testing/penpal" }
+penpal-runtime = { path = "../../../../../runtimes/testing/penpal" }
+rococo-system-emulated-network ={ path = "../../../networks/rococo-system" }
 
 # Snowbridge
 snowbridge-core = { path = "../../../../../../../../parachain/primitives/core", default-features = false }

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs

@@ -41,6 +41,11 @@ pub use emulated_integration_tests_common::{
 	PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 };
 pub use parachains_common::{AccountId, Balance};
+pub use rococo_system_emulated_network::{
+	penpal_emulated_chain::PenpalAParaPallet as PenpalAPallet,
+	BridgeHubRococoParaReceiver as BridgeHubRococoReceiver, PenpalAPara as PenpalA,
+	PenpalAParaReceiver as PenpalAReceiver, PenpalAParaSender as PenpalASender,
+};
 pub use rococo_westend_system_emulated_network::{
 	asset_hub_rococo_emulated_chain::{
 		genesis::ED as ASSET_HUB_ROCOCO_ED, AssetHubRococoParaPallet as AssetHubRococoPallet,
@@ -51,16 +56,13 @@ pub use rococo_westend_system_emulated_network::{
 	bridge_hub_rococo_emulated_chain::{
 		genesis::ED as BRIDGE_HUB_ROCOCO_ED, BridgeHubRococoParaPallet as BridgeHubRococoPallet,
 	},
-	penpal_emulated_chain::PenpalAParaPallet as PenpalAPallet,
 	rococo_emulated_chain::{genesis::ED as ROCOCO_ED, RococoRelayPallet as RococoPallet},
 	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
 	AssetHubRococoParaSender as AssetHubRococoSender, AssetHubWestendPara as AssetHubWestend,
 	AssetHubWestendParaReceiver as AssetHubWestendReceiver, BridgeHubRococoPara as BridgeHubRococo,
-	BridgeHubRococoParaReceiver as BridgeHubRococoReceiver,
 	BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWestendPara as BridgeHubWestend,
-	PenpalAPara as PenpalA, PenpalAParaReceiver as PenpalAReceiver,
-	PenpalAParaSender as PenpalASender, RococoRelay as Rococo,
-	RococoRelayReceiver as RococoReceiver, RococoRelaySender as RococoSender,
+	RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver,
+	RococoRelaySender as RococoSender,
 };
 
 pub const ASSET_ID: u32 = 1;