merge ron's work in

bridges/snowbridge/pallets/inbound-queue-v2/src/lib.rs

@@ -47,6 +47,7 @@ use xcm::{
 	prelude::{send_xcm, Junction::*, Location, SendError as XcmpSendError, SendXcm, Xcm},
 	VersionedXcm, MAX_XCM_DECODE_DEPTH,
 };
+use snowbridge_core::rewards::RewardLedger;
 
 use snowbridge_core::{
 	inbound::{Message, VerificationError, Verifier},
@@ -98,6 +99,8 @@ pub mod pallet {
 
 		#[cfg(feature = "runtime-benchmarks")]
 		type Helper: BenchmarkHelper<Self>;
+		/// To keep track of relayer rewards.
+		type RewardLedger: RewardLedger<Self>;
 	}
 
 	#[pallet::hooks]

bridges/snowbridge/pallets/outbound-queue-v2/src/lib.rs

@@ -126,6 +126,7 @@ use sp_runtime::{
 use sp_std::prelude::*;
 pub use types::{CommittedMessage, FeeWithBlockNumber, ProcessMessageOriginOf};
 pub use weights::WeightInfo;
+use snowbridge_core::rewards::RewardLedger;
 
 pub use pallet::*;
 
@@ -173,6 +174,8 @@ pub mod pallet {
 		/// Address of the Gateway contract
 		#[pallet::constant]
 		type GatewayAddress: Get<H160>;
+		/// To keep track of relayer rewards.
+		type RewardLedger: RewardLedger<Self>;
 	}
 
 	#[pallet::event]

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

@@ -50,7 +50,6 @@ decl_test_parachains! {
 			EthereumSystem: bridge_hub_rococo_runtime::EthereumSystem,
 			EthereumInboundQueue: bridge_hub_rococo_runtime::EthereumInboundQueue,
 			EthereumOutboundQueue: bridge_hub_rococo_runtime::EthereumOutboundQueue,
-			EthereumRewards: bridge_hub_rococo_runtime::EthereumRewards,
 		}
 	},
 }

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

@@ -47,6 +47,7 @@ decl_test_parachains! {
 			PolkadotXcm: bridge_hub_westend_runtime::PolkadotXcm,
 			Balances: bridge_hub_westend_runtime::Balances,
 			EthereumSystem: bridge_hub_westend_runtime::EthereumSystem,
+			EthereumRewards: bridge_hub_rococo_runtime::EthereumRewards,
 		}
 	},
 }

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

@@ -46,6 +46,5 @@ testnet-parachains-constants = { features = ["rococo", "westend"], workspace = t
 snowbridge-core = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-pallet-system = { workspace = true }
-snowbridge-pallet-rewards = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true, default-features = true }

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

@@ -52,3 +52,4 @@ snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true }
 snowbridge-pallet-outbound-queue-v2 = { workspace = true }
+snowbridge-pallet-rewards = { workspace = true }

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

@@ -586,3 +586,29 @@ fn transfer_ah_token() {
 		);
 	});
 }
+
+#[test]
+fn claim_rewards(
+) {
+	BridgeHubWestend::execute_with(|| {
+		type RuntimeEvent = <BridgeHubWestend as Chain>::RuntimeEvent;
+
+		let relayer = BridgeHubWestendSender::get();
+		let reward_address = AssetHubWestendReceiver::get();
+		type EthereumRewards =
+		<BridgeHubWestend as BridgeHubWestendPallet>::EthereumRewards;
+		assert_ok!(EthereumRewards::deposit(relayer.into(), 2 * ETH));
+
+		// Check that the message was sent
+		assert_expected_events!(
+			BridgeHubWestend,
+			vec![
+				RuntimeEvent::EthereumRewards(snowbridge_pallet_rewards::Event::RewardDeposited { .. }) => {},
+			]
+		);
+
+		type EthereumInboundQueue =
+		<BridgeHubWestend as BridgeHubWestendPallet>::EthereumInboundQueue;
+		let message_id = H256::random();
+	});
+}

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_ethereum_config.rs

@@ -19,7 +19,7 @@ use crate::XcmRouter;
 use crate::{
 	xcm_config, xcm_config::UniversalLocation, Balances, EthereumInboundQueue,
 	EthereumOutboundQueue, EthereumSystem, MessageQueue, Runtime, RuntimeEvent, TransactionByteFee,
-	TreasuryAccount,
+	TreasuryAccount, EthereumRewards
 };
 use parachains_common::{AccountId, Balance};
 use snowbridge_beacon_primitives::{Fork, ForkVersions};

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml

@@ -111,6 +111,7 @@ snowbridge-core = { workspace = true }
 snowbridge-pallet-ethereum-client = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
+snowbridge-pallet-rewards = { workspace = true }
 snowbridge-outbound-queue-runtime-api = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-runtime-common = { workspace = true }

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_ethereum_config.rs

@@ -20,7 +20,7 @@ use crate::{
 	xcm_config,
 	xcm_config::{TreasuryAccount, UniversalLocation},
 	Balances, EthereumInboundQueue, EthereumOutboundQueue, EthereumSystem, MessageQueue, Runtime,
-	RuntimeEvent, TransactionByteFee,
+	RuntimeEvent, TransactionByteFee, EthereumRewards,
 };
 use parachains_common::{AccountId, Balance};
 use snowbridge_beacon_primitives::{Fork, ForkVersions};
@@ -121,6 +121,7 @@ impl snowbridge_pallet_inbound_queue_v2::Config for Runtime {
 	type GatewayAddress = EthereumGatewayAddress;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = Runtime;
+	type RewardLedger = EthereumRewards;
 	type WeightInfo = crate::weights::snowbridge_pallet_inbound_queue_v2::WeightInfo<Runtime>;
 }
 
@@ -150,6 +151,7 @@ impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
 	type WeightToFee = WeightToFee;
 	type Verifier = snowbridge_pallet_ethereum_client::Pallet<Runtime>;
 	type GatewayAddress = EthereumGatewayAddress;
+	type RewardLedger = EthereumRewards;
 	type WeightInfo = crate::weights::snowbridge_pallet_outbound_queue_v2::WeightInfo<Runtime>;
 }
 
@@ -228,6 +230,24 @@ impl snowbridge_pallet_system::Config for Runtime {
 	type EthereumLocation = EthereumLocation;
 }
 
+parameter_types! {
+	pub WethAddress: H160 = H160(hex_literal::hex!("fff9976782d46cc05630d1f6ebab18b2324d6b14"));
+}
+
+pub const ASSET_HUB_ID: u32 = westend_runtime_constants::system_parachain::ASSET_HUB_ID;
+
+impl snowbridge_pallet_rewards::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type AssetHubParaId = ConstU32<ASSET_HUB_ID>;
+	type EthereumNetwork = EthereumNetwork;
+	type WethAddress = WethAddress;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type XcmSender = XcmRouter;
+	#[cfg(feature = "runtime-benchmarks")]
+	type XcmSender = DoNothingRouter;
+	type WeightInfo = (); // TODO generate weights
+}
+
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmark_helpers {
 	use crate::{EthereumBeaconClient, Runtime, RuntimeOrigin};

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -562,6 +562,7 @@ construct_runtime!(
 		EthereumSystem: snowbridge_pallet_system = 83,
 		EthereumInboundQueueV2: snowbridge_pallet_inbound_queue_v2 = 84,
 		EthereumOutboundQueueV2: snowbridge_pallet_outbound_queue_v2 = 85,
+		EthereumRewards: snowbridge_pallet_rewards = 86,
 
 		// Message Queue. Importantly, is registered last so that messages are processed after
 		// the `on_initialize` hooks of bridging pallets.