Start the equivocation detection loop from the complex relayer

bin/rialto-parachain/runtime/Cargo.toml

@@ -19,6 +19,7 @@ scale-info = { version = "2.9.0", default-features = false, features = ["derive"
 bp-header-chain = { path = "../../../primitives/header-chain", default-features = false }
 bp-messages = { path = "../../../primitives/messages", default-features = false }
 bp-millau = { path = "../../../primitives/chain-millau", default-features = false }
+bp-polkadot-core = { path = "../../../primitives/polkadot-core", default-features = false }
 bp-relayers = { path = "../../../primitives/relayers", default-features = false }
 bp-runtime = { path = "../../../primitives/runtime", default-features = false }
 bp-rialto-parachain = { path = "../../../primitives/chain-rialto-parachain", default-features = false }

bin/rialto-parachain/runtime/src/lib.rs

@@ -871,11 +871,10 @@ mod tests {
 	};
 	use bp_runtime::Chain;
 	use bp_xcm_bridge_hub::{Bridge, BridgeState};
-	use bridge_runtime_common::integrity::check_additional_signed;
 	use codec::Encode;
 	use pallet_bridge_messages::OutboundLanes;
 	use pallet_xcm_bridge_hub::Bridges;
-	use sp_runtime::generic::Era;
+	use sp_runtime::{generic::Era, traits::Zero};
 	use xcm_executor::XcmExecutor;
 
 	fn new_test_ext() -> sp_io::TestExternalities {
@@ -979,24 +978,36 @@ mod tests {
 
 	#[test]
 	fn ensure_signed_extension_definition_is_correct() {
-		let payload: SignedExtra = (
-			frame_system::CheckNonZeroSender::new(),
-			frame_system::CheckSpecVersion::new(),
-			frame_system::CheckTxVersion::new(),
-			frame_system::CheckGenesis::new(),
-			frame_system::CheckEra::from(Era::Immortal),
-			frame_system::CheckNonce::from(10),
-			frame_system::CheckWeight::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::from(10),
-			BridgeRejectObsoleteHeadersAndMessages,
-			DummyBridgeRefundMillauMessages,
-		);
-		let indirect_payload = bp_rialto_parachain::SignedExtension::new(
-			((), (), (), (), Era::Immortal, 10.into(), (), 10.into(), (), ()),
-			None,
-		);
-		assert_eq!(payload.encode(), indirect_payload.encode());
-
-		check_additional_signed::<SignedExtra, bp_rialto_parachain::SignedExtension>();
+		use bp_polkadot_core::SuffixedCommonSignedExtensionExt;
+
+		sp_io::TestExternalities::default().execute_with(|| {
+			frame_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
+			let payload: SignedExtra = (
+				frame_system::CheckNonZeroSender::new(),
+				frame_system::CheckSpecVersion::new(),
+				frame_system::CheckTxVersion::new(),
+				frame_system::CheckGenesis::new(),
+				frame_system::CheckEra::from(Era::Immortal),
+				frame_system::CheckNonce::from(10),
+				frame_system::CheckWeight::new(),
+				pallet_transaction_payment::ChargeTransactionPayment::from(10),
+				BridgeRejectObsoleteHeadersAndMessages,
+				DummyBridgeRefundMillauMessages,
+			);
+			let indirect_payload = bp_rialto_parachain::SignedExtension::from_params(
+				VERSION.spec_version,
+				VERSION.transaction_version,
+				bp_runtime::TransactionEra::Immortal,
+				System::block_hash(BlockNumber::zero()),
+				10,
+				10,
+				(((), ()), ((), ())),
+			);
+			assert_eq!(payload.encode(), indirect_payload.encode());
+			assert_eq!(
+				payload.additional_signed().unwrap().encode(),
+				indirect_payload.additional_signed().unwrap().encode()
+			)
+		});
 	}
 }

bin/runtime-common/src/integrity.rs

@@ -26,7 +26,6 @@ use codec::Encode;
 use frame_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
 use frame_system::limits;
 use pallet_bridge_messages::WeightInfoExt as _;
-use sp_runtime::traits::SignedExtension;
 
 /// Macro that ensures that the runtime configuration and chain primitives crate are sharing
 /// the same types (nonce, block number, hash, hasher, account id and header).
@@ -332,15 +331,3 @@ pub fn check_message_lane_weights<
 		);
 	}
 }
-
-/// Check that the `AdditionalSigned` type of a wrapped runtime is the same as the one of the
-/// corresponding actual runtime.
-///
-/// This method doesn't perform any `assert`. If the condition is not true it will generate a
-/// compile-time error.
-pub fn check_additional_signed<SignedExt, IndirectSignedExt: SignedExtension>()
-where
-	SignedExt: SignedExtension,
-	IndirectSignedExt: SignedExtension<AdditionalSigned = SignedExt::AdditionalSigned>,
-{
-}

deployments/bridges/rialto-millau/docker-compose.yml

@@ -72,6 +72,26 @@ services:
     depends_on:
       - relay-millau-rialto
 
+  detect-millau-to-rialto-equivocations:
+    <<: *sub-bridge-relay
+    environment:
+      RUST_LOG: bridge=trace
+    entrypoint: /entrypoints/detect-millau-to-rialto-equivocations-entrypoint.sh
+    ports:
+      - "10517:9616"
+    depends_on:
+      - relay-millau-rialto
+
+  detect-rialto-to-millau-equivocations:
+    <<: *sub-bridge-relay
+    environment:
+      RUST_LOG: bridge=trace
+    entrypoint: /entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh
+    ports:
+      - "10518:9616"
+    depends_on:
+      - relay-millau-rialto
+
   # Note: These are being overridden from the top level `monitoring` compose file.
   grafana-dashboard:
     environment:

deployments/bridges/rialto-millau/entrypoints/detect-millau-to-rialto-equivocations-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eu
+
+exec /home/user/substrate-relay detect-equivocations millau-to-rialto \
+	--source-host millau-node-alice \
+	--source-port 9944 \
+	--source-signer //Rialto.HeadersAndMessagesRelay \
+	--source-transactions-mortality=64 \
+	--target-host rialto-node-alice \
+	--target-port 9944

deployments/bridges/rialto-millau/entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eu
+
+exec /home/user/substrate-relay detect-equivocations rialto-to-millau \
+	--source-host rialto-node-alice \
+	--source-port 9944 \
+	--source-signer //Millau.HeadersAndMessagesRelay \
+	--source-transactions-mortality=64 \
+  --target-host millau-node-alice \
+  --target-port 9944

deployments/bridges/rialto-parachain-millau/docker-compose.yml

@@ -73,6 +73,26 @@ services:
     depends_on:
       - relay-messages-millau-to-rialto-parachain-generator
 
+  detect-millau-to-rialto-parachain-equivocations:
+    <<: *sub-bridge-relay
+    environment:
+      RUST_LOG: bridge=trace
+    entrypoint: /entrypoints/detect-millau-to-rialto-parachain-equivocations-entrypoint.sh
+    ports:
+      - "11019:9616"
+    depends_on:
+      - relay-millau-rialto-parachain-1
+
+  detect-rialto-to-millau-equivocations:
+    <<: *sub-bridge-relay
+    environment:
+      RUST_LOG: bridge=trace
+    entrypoint: /entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh
+    ports:
+      - "11020:9616"
+    depends_on:
+      - relay-millau-rialto-parachain-1
+
   # Note: These are being overridden from the top level `monitoring` compose file.
   grafana-dashboard:
     environment:

deployments/bridges/rialto-parachain-millau/entrypoints/detect-millau-to-rialto-parachain-equivocations-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eu
+
+exec /home/user/substrate-relay detect-equivocations millau-to-rialto-parachain \
+	--source-host millau-node-alice \
+	--source-port 9944 \
+	--source-signer //RialtoParachain.HeadersAndMessagesRelay1 \
+	--source-transactions-mortality=64 \
+	--target-host rialto-parachain-collator-charlie \
+	--target-port 9944

deployments/bridges/rialto-parachain-millau/entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eu
+
+exec /home/user/substrate-relay detect-equivocations rialto-to-millau \
+	--source-host rialto-node-alice \
+	--source-port 9944 \
+	--source-signer //Millau.HeadersAndMessagesRelay \
+	--source-transactions-mortality=64 \
+  --target-host millau-node-alice \
+  --target-port 9944

primitives/chain-bridge-hub-cumulus/src/lib.rs

@@ -26,10 +26,9 @@ pub use bp_polkadot_core::{
 };
 
 use bp_messages::*;
+use bp_polkadot_core::SuffixedCommonSignedExtension;
 use bp_runtime::extensions::{
-	BridgeRejectObsoleteHeadersAndMessages, ChargeTransactionPayment, CheckEra, CheckGenesis,
-	CheckNonZeroSender, CheckNonce, CheckSpecVersion, CheckTxVersion, CheckWeight,
-	GenericSignedExtension, RefundBridgedParachainMessagesSchema,
+	BridgeRejectObsoleteHeadersAndMessages, RefundBridgedParachainMessagesSchema,
 };
 use frame_support::{
 	dispatch::DispatchClass,
@@ -134,88 +133,8 @@ pub const MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX: MessageNonce = 1024;
 /// Maximal number of unconfirmed messages at inbound lane for Cumulus-based parachains.
 pub const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 4096;
 
-/// Extra signed extension data that is used by all bridge hubs.
-pub type SignedExtra = (
-	CheckNonZeroSender,
-	CheckSpecVersion,
-	CheckTxVersion,
-	CheckGenesis<Hash>,
-	CheckEra<Hash>,
-	CheckNonce<Nonce>,
-	CheckWeight,
-	ChargeTransactionPayment<Balance>,
+/// Signed extension that is used by all bridge hubs.
+pub type SignedExtension = SuffixedCommonSignedExtension<(
 	BridgeRejectObsoleteHeadersAndMessages,
 	RefundBridgedParachainMessagesSchema,
-);
-
-/// Signed extension that is used by all bridge hubs.
-pub type SignedExtension = GenericSignedExtension<SignedExtra>;
-
-/// Helper trait to define some extra methods on bridge hubs signed extension (and
-/// overcome Rust limitations).
-pub trait BridgeHubSignedExtension {
-	/// Create signed extension from its components.
-	fn from_params(
-		spec_version: u32,
-		transaction_version: u32,
-		era: bp_runtime::TransactionEra<BlockNumber, Hash>,
-		genesis_hash: Hash,
-		nonce: Nonce,
-		tip: Balance,
-	) -> Self;
-
-	/// Return transaction nonce.
-	fn nonce(&self) -> Nonce;
-
-	/// Return transaction tip.
-	fn tip(&self) -> Balance;
-}
-
-impl BridgeHubSignedExtension for SignedExtension {
-	/// Create signed extension from its components.
-	fn from_params(
-		spec_version: u32,
-		transaction_version: u32,
-		era: bp_runtime::TransactionEra<BlockNumber, Hash>,
-		genesis_hash: Hash,
-		nonce: Nonce,
-		tip: Balance,
-	) -> Self {
-		GenericSignedExtension::new(
-			(
-				(),              // non-zero sender
-				(),              // spec version
-				(),              // tx version
-				(),              // genesis
-				era.frame_era(), // era
-				nonce.into(),    // nonce (compact encoding)
-				(),              // Check weight
-				tip.into(),      // transaction payment / tip (compact encoding)
-				(),              // bridge reject obsolete headers and msgs
-				(),              // bridge reward to relayer for message passing
-			),
-			Some((
-				(),
-				spec_version,
-				transaction_version,
-				genesis_hash,
-				era.signed_payload(genesis_hash),
-				(),
-				(),
-				(),
-				(),
-				(),
-			)),
-		)
-	}
-
-	/// Return transaction nonce.
-	fn nonce(&self) -> Nonce {
-		self.payload.5 .0
-	}
-
-	/// Return transaction tip.
-	fn tip(&self) -> Balance {
-		self.payload.7 .0
-	}
-}
+)>;

primitives/chain-kusama/src/lib.rs

@@ -63,6 +63,9 @@ impl ChainWithGrandpa for Kusama {
 	const AVERAGE_HEADER_SIZE_IN_JUSTIFICATION: u32 = AVERAGE_HEADER_SIZE_IN_JUSTIFICATION;
 }
 
+// The SignedExtension used by Kusama.
+pub use bp_polkadot_core::CommonSignedExtension as SignedExtension;
+
 /// Name of the parachains pallet in the Kusama runtime.
 pub const PARAS_PALLET_NAME: &str = "Paras";