Skip to content

Snowbridge V2: Check that the reward address matches the relayer #8184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yrong wants to merge 2 commits into from
Closed

Snowbridge V2: Check that the reward address matches the relayer #8184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab40949
Check that the reward address matches the relayer
yrong Apr 8, 2025
6697488
Credit to reward address
yrong Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions bridges/snowbridge/pallets/outbound-queue-v2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ pub mod pallet {
InvalidPendingNonce,
/// Reward payment failed
RewardPaymentFailed,
/// Invalid Reward account
InvalidRewardAccount,
}

/// Messages to be committed in the current block. This storage value is killed in
Expand Down Expand Up @@ -282,7 +284,7 @@ pub mod pallet {
origin: OriginFor<T>,
event: Box<EventProof>,
) -> DispatchResult {
let relayer = ensure_signed(origin)?;
ensure_signed(origin)?;

// submit message to verifier for verification
T::Verifier::verify(&event.event_log, &event.proof)
Expand All @@ -291,7 +293,7 @@ pub mod pallet {
let receipt = DeliveryReceipt::try_from(&event.event_log)
.map_err(|_| Error::<T>::InvalidEnvelope)?;

Self::process_delivery_receipt(relayer, receipt)
Self::process_delivery_receipt(receipt)
}
}

Expand Down Expand Up @@ -417,20 +419,24 @@ pub mod pallet {
}

/// Process a delivery receipt from a relayer, to allocate the relayer reward.
pub fn process_delivery_receipt(
relayer: <T as frame_system::Config>::AccountId,
receipt: DeliveryReceipt,
) -> DispatchResult {
pub fn process_delivery_receipt(receipt: DeliveryReceipt) -> DispatchResult {
// Verify that the message was submitted from the known Gateway contract
ensure!(T::GatewayAddress::get() == receipt.gateway, Error::<T>::InvalidGateway);

let reward_account = T::AccountId::decode(&mut receipt.reward_address.as_slice())
.map_err(|_| Error::<T>::InvalidRewardAccount)?;

let nonce = receipt.nonce;

let order = <PendingOrders<T>>::get(nonce).ok_or(Error::<T>::InvalidPendingNonce)?;

if order.fee > 0 {
// Pay relayer reward
T::RewardPayment::register_reward(&relayer, T::DefaultRewardKind::get(), order.fee);
T::RewardPayment::register_reward(
&reward_account,
T::DefaultRewardKind::get(),
order.fee,
);
}

<PendingOrders<T>>::remove(nonce);
Expand Down
14 changes: 7 additions & 7 deletions ...ation-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge_v2_outbound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn send_weth_from_asset_hub_to_ethereum() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -271,7 +271,7 @@ fn transfer_relay_token_from_ah() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -358,7 +358,7 @@ fn send_weth_and_dot_from_asset_hub_to_ethereum() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -454,7 +454,7 @@ fn transact_with_agent_from_asset_hub() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -538,7 +538,7 @@ fn transact_with_agent_from_asset_hub_without_any_asset_transfer() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -655,7 +655,7 @@ fn register_token_from_penpal() {
};

// Submit a delivery receipt
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt));
assert_ok!(EthereumOutboundQueueV2::process_delivery_receipt(receipt));

assert_expected_events!(
BridgeHubWestend,
Expand Down Expand Up @@ -820,7 +820,7 @@ fn invalid_nonce_for_delivery_receipt_fails() {
};

assert_err!(
EthereumOutboundQueueV2::process_delivery_receipt(relayer, receipt),
EthereumOutboundQueueV2::process_delivery_receipt(receipt),
Error::<Runtime>::InvalidPendingNonce
);
});
Expand Down
Loading