Rewards refund for relaying BridgeHubRococo/BridgeHubWococo

relays/client-bridge-hub-rococo/Cargo.toml

@@ -17,6 +17,8 @@ bp-bridge-hub-wococo = { path = "../../primitives/chain-bridge-hub-wococo" }
 bp-header-chain = { path = "../../primitives/header-chain" }
 bp-messages = { path = "../../primitives/messages" }
 bp-parachains = { path = "../../primitives/parachains" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core" }
+bp-runtime = { path = "../../primitives/runtime" }
 bp-wococo = { path = "../../primitives/chain-wococo" }
 
 bridge-runtime-common = { path = "../../bin/runtime-common" }

relays/client-bridge-hub-rococo/src/lib.rs

@@ -71,7 +71,7 @@ impl ChainWithTransactions for BridgeHubRococo {
 	) -> Result<Self::SignedTransaction, SubstrateError> {
 		let raw_payload = SignedPayload::new(
 			unsigned.call,
-			bp_bridge_hub_rococo::rewarding_bridge_signed_extension::from_params(
+			runtime::rewarding_bridge_signed_extension::from_params(
 				param.spec_version,
 				param.transaction_version,
 				unsigned.era,
@@ -111,9 +111,9 @@ impl ChainWithTransactions for BridgeHubRococo {
 		Some(
 			UnsignedTransaction::new(
 				tx.function,
-				bp_bridge_hub_rococo::rewarding_bridge_signed_extension::nonce(extra),
+				runtime::rewarding_bridge_signed_extension::nonce(extra),
 			)
-			.tip(bp_bridge_hub_rococo::rewarding_bridge_signed_extension::tip(extra)),
+			.tip(runtime::rewarding_bridge_signed_extension::tip(extra)),
 		)
 	}
 }

relays/client-bridge-hub-rococo/src/runtime_wrapper.rs

@@ -27,7 +27,7 @@ pub use relay_substrate_client::calls::{SystemCall, UtilityCall};
 /// Unchecked BridgeHubRococo extrinsic.
 pub type UncheckedExtrinsic = bp_bridge_hub_rococo::UncheckedExtrinsic<
 	Call,
-	bp_bridge_hub_rococo::rewarding_bridge_signed_extension::RewardingBridgeSignedExtension,
+	rewarding_bridge_signed_extension::RewardingBridgeSignedExtension,
 >;
 
 // The indirect pallet call used to sync `Wococo` GRANDPA finality to `BHRococo`.
@@ -69,3 +69,75 @@ impl From<UtilityCall<Call>> for Call {
 		Call::Utility(call)
 	}
 }
+
+// TODO: remove this and use common from cumulus-like once fixed (/~https://github.com/paritytech/parity-bridges-common/issues/1598)
+/// Module with rewarding bridge signed extension support
+pub mod rewarding_bridge_signed_extension {
+	use bp_polkadot_core::{Balance, Hash, Nonce, PolkadotLike};
+	use bp_runtime::extensions::*;
+
+	type RewardingBridgeSignedExtra = (
+		CheckNonZeroSender,
+		CheckSpecVersion,
+		CheckTxVersion,
+		CheckGenesis<PolkadotLike>,
+		CheckEra<PolkadotLike>,
+		CheckNonce<Nonce>,
+		CheckWeight,
+		ChargeTransactionPayment<PolkadotLike>,
+		BridgeRejectObsoleteHeadersAndMessages,
+		RefundBridgedParachainMessages,
+		RefundBridgedParachainMessages,
+	);
+
+	/// The signed extension used by Cumulus and Cumulus-like parachain with bridging and rewarding.
+	pub type RewardingBridgeSignedExtension = GenericSignedExtension<RewardingBridgeSignedExtra>;
+
+	pub fn from_params(
+		spec_version: u32,
+		transaction_version: u32,
+		era: bp_runtime::TransactionEraOf<PolkadotLike>,
+		genesis_hash: Hash,
+		nonce: Nonce,
+		tip: Balance,
+	) -> RewardingBridgeSignedExtension {
+		GenericSignedExtension::<RewardingBridgeSignedExtra>::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-hub-rococo instance1 register reward for message passing
+				(),              // bridge-hub-rococo instance2 register reward for message passing
+			),
+			Some((
+				(),
+				spec_version,
+				transaction_version,
+				genesis_hash,
+				era.signed_payload(genesis_hash),
+				(),
+				(),
+				(),
+				(),
+				(),
+				(),
+			)),
+		)
+	}
+
+	/// Return signer nonce, used to craft transaction.
+	pub fn nonce(sign_ext: &RewardingBridgeSignedExtension) -> Nonce {
+		sign_ext.payload.5.into()
+	}
+
+	/// Return transaction tip.
+	pub fn tip(sign_ext: &RewardingBridgeSignedExtension) -> Balance {
+		sign_ext.payload.7.into()
+	}
+}

relays/client-bridge-hub-wococo/Cargo.toml

@@ -17,6 +17,7 @@ bp-bridge-hub-wococo = { path = "../../primitives/chain-bridge-hub-wococo" }
 bp-header-chain = { path = "../../primitives/header-chain" }
 bp-messages = { path = "../../primitives/messages" }
 bp-parachains = { path = "../../primitives/parachains" }
+bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 bp-rococo = { path = "../../primitives/chain-rococo" }
 bp-runtime = { path = "../../primitives/runtime" }
 

relays/client-bridge-hub-wococo/src/lib.rs

@@ -71,7 +71,7 @@ impl ChainWithTransactions for BridgeHubWococo {
 	) -> Result<Self::SignedTransaction, SubstrateError> {
 		let raw_payload = SignedPayload::new(
 			unsigned.call,
-			bp_bridge_hub_wococo::rewarding_bridge_signed_extension::from_params(
+			runtime::rewarding_bridge_signed_extension::from_params(
 				param.spec_version,
 				param.transaction_version,
 				unsigned.era,
@@ -111,9 +111,9 @@ impl ChainWithTransactions for BridgeHubWococo {
 		Some(
 			UnsignedTransaction::new(
 				tx.function,
-				bp_bridge_hub_wococo::rewarding_bridge_signed_extension::nonce(extra),
+				runtime::rewarding_bridge_signed_extension::nonce(extra),
 			)
-			.tip(bp_bridge_hub_wococo::rewarding_bridge_signed_extension::tip(extra)),
+			.tip(runtime::rewarding_bridge_signed_extension::tip(extra)),
 		)
 	}
 }

relays/client-bridge-hub-wococo/src/runtime_wrapper.rs

@@ -27,7 +27,7 @@ pub use relay_substrate_client::calls::{SystemCall, UtilityCall};
 /// Unchecked BridgeHubWococo extrinsic.
 pub type UncheckedExtrinsic = bp_bridge_hub_wococo::UncheckedExtrinsic<
 	Call,
-	bp_bridge_hub_wococo::rewarding_bridge_signed_extension::RewardingBridgeSignedExtension,
+	rewarding_bridge_signed_extension::RewardingBridgeSignedExtension,
 >;
 
 // The indirect pallet call used to sync `Rococo` GRANDPA finality to `BHWococo`.
@@ -70,6 +70,78 @@ impl From<UtilityCall<Call>> for Call {
 	}
 }
 
+// TODO: remove this and use common from cumulus-like once fixed (/~https://github.com/paritytech/parity-bridges-common/issues/1598)
+/// Module with rewarding bridge signed extension support
+pub mod rewarding_bridge_signed_extension {
+	use bp_polkadot_core::{Balance, Hash, Nonce, PolkadotLike};
+	use bp_runtime::extensions::*;
+
+	type RewardingBridgeSignedExtra = (
+		CheckNonZeroSender,
+		CheckSpecVersion,
+		CheckTxVersion,
+		CheckGenesis<PolkadotLike>,
+		CheckEra<PolkadotLike>,
+		CheckNonce<Nonce>,
+		CheckWeight,
+		ChargeTransactionPayment<PolkadotLike>,
+		BridgeRejectObsoleteHeadersAndMessages,
+		RefundBridgedParachainMessages,
+		RefundBridgedParachainMessages,
+	);
+
+	/// The signed extension used by Cumulus and Cumulus-like parachain with bridging and rewarding.
+	pub type RewardingBridgeSignedExtension = GenericSignedExtension<RewardingBridgeSignedExtra>;
+
+	pub fn from_params(
+		spec_version: u32,
+		transaction_version: u32,
+		era: bp_runtime::TransactionEraOf<PolkadotLike>,
+		genesis_hash: Hash,
+		nonce: Nonce,
+		tip: Balance,
+	) -> RewardingBridgeSignedExtension {
+		GenericSignedExtension::<RewardingBridgeSignedExtra>::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-hub-rococo instance1 register reward for message passing
+				(),              // bridge-hub-rococo instance2 register reward for message passing
+			),
+			Some((
+				(),
+				spec_version,
+				transaction_version,
+				genesis_hash,
+				era.signed_payload(genesis_hash),
+				(),
+				(),
+				(),
+				(),
+				(),
+				(),
+			)),
+		)
+	}
+
+	/// Return signer nonce, used to craft transaction.
+	pub fn nonce(sign_ext: &RewardingBridgeSignedExtension) -> Nonce {
+		sign_ext.payload.5.into()
+	}
+
+	/// Return transaction tip.
+	pub fn tip(sign_ext: &RewardingBridgeSignedExtension) -> Balance {
+		sign_ext.payload.7.into()
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;