Merge branch 'main' into ron/sno-738

contracts/src/Gateway.sol

@@ -569,7 +569,7 @@ contract Gateway is IGateway, IInitializable {
 
         CoreStorage.Layout storage $ = CoreStorage.layout();
 
-        $.mode = OperatingMode.Normal;
+        $.mode = OperatingMode.RejectingOutboundMessages;
         $.defaultFee = defaultFee;
 
         // Initialize an agent & channel for BridgeHub

contracts/test/Gateway.t.sol

@@ -93,6 +93,9 @@ contract GatewayTest is Test {
         );
         GatewayMock(address(gateway)).setCommitmentsAreVerified(true);
 
+        Gateway.SetOperatingModeParams memory params = Gateway.SetOperatingModeParams({mode: OperatingMode.Normal});
+        GatewayMock(address(gateway)).setOperatingModePublic(abi.encode(params));
+
         bridgeHubAgent = IGateway(address(gateway)).agentOf(bridgeHubAgentID);
         assetHubAgent = IGateway(address(gateway)).agentOf(assetHubAgentID);
 

parachain/pallets/control/src/mock.rs

@@ -3,14 +3,16 @@
 use crate as snowbridge_control;
 use frame_support::{
 	parameter_types,
-	traits::{tokens::fungible::Mutate, ConstU128, ConstU16, ConstU64, ConstU8, Contains},
+	traits::{tokens::fungible::Mutate, ConstU128, ConstU16, ConstU64, ConstU8},
 	weights::IdentityFee,
 	PalletId,
 };
 use sp_core::H256;
 use xcm_executor::traits::ConvertLocation;
 
-use snowbridge_core::{outbound::ConstantGasMeter, sibling_sovereign_account, AgentId, ParaId};
+use snowbridge_core::{
+	outbound::ConstantGasMeter, sibling_sovereign_account, AgentId, AllowSiblingsOnly, ParaId,
+};
 use sp_runtime::{
 	traits::{AccountIdConversion, BlakeTwo256, IdentityLookup, Keccak256},
 	AccountId32, BuildStorage,
@@ -132,6 +134,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 
@@ -201,17 +204,6 @@ impl BenchmarkHelper<RuntimeOrigin> for () {
 	}
 }
 
-pub struct AllowSiblingsOnly;
-impl Contains<MultiLocation> for AllowSiblingsOnly {
-	fn contains(location: &MultiLocation) -> bool {
-		if let MultiLocation { parents: 1, interior: X1(Parachain(_)) } = location {
-			true
-		} else {
-			false
-		}
-	}
-}
-
 impl crate::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type OwnParaId = OwnParaId;

parachain/pallets/inbound-queue/src/test.rs

@@ -84,6 +84,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 	type MaxHolds = ();
 }
 

parachain/primitives/core/src/lib.rs

@@ -14,8 +14,11 @@ pub use polkadot_parachain_primitives::primitives::{
 	Id as ParaId, IsSystem, Sibling as SiblingParaId,
 };
 pub use ringbuffer::{RingBufferMap, RingBufferMapImpl};
+
+use frame_support::traits::Contains;
 use sp_core::H256;
 use sp_runtime::traits::AccountIdConversion;
+use xcm::prelude::{Junction::Parachain, Junctions::X1, MultiLocation};
 
 /// The ID of an agent contract
 pub type AgentId = H256;
@@ -28,6 +31,13 @@ where
 	SiblingParaId::from(para_id).into_account_truncating()
 }
 
+pub struct AllowSiblingsOnly;
+impl Contains<MultiLocation> for AllowSiblingsOnly {
+	fn contains(location: &MultiLocation) -> bool {
+		matches!(location, MultiLocation { parents: 1, interior: X1(Parachain(_)) })
+	}
+}
+
 pub const GWEI: u128 = 1_000_000_000;
 pub const METH: u128 = 1_000_000_000_000_000;
 pub const ETH: u128 = 1_000_000_000_000_000_000;

parachain/primitives/core/tests/mod.rs

@@ -0,0 +1,14 @@
+#[cfg(test)]
+mod tests {
+	use frame_support::traits::Contains;
+	use snowbridge_core::AllowSiblingsOnly;
+	use xcm::prelude::{Junction::Parachain, Junctions::X1, MultiLocation};
+
+	#[test]
+	fn allow_siblings_predicate_only_allows_siblings() {
+		let sibling = MultiLocation::new(1, X1(Parachain(1000)));
+		let child = MultiLocation::new(0, X1(Parachain(1000)));
+		assert!(AllowSiblingsOnly::contains(&sibling), "Sibling returns true.");
+		assert!(!AllowSiblingsOnly::contains(&child), "Child returns false.");
+	}
+}