Skip to content

Commit 1a1d665

Browse files
bkonturactions-useracatangiu
authored andcommitted
Multiple instances for pallet-bridge-relayers fix (paritytech#6684)
Previously, we added multi-instance pallet support for `pallet-bridge-relayers`, but missed fixing it in this one place. --------- Co-authored-by: GitHub Action <[email protected]> Co-authored-by: Adrian Catangiu <[email protected]>
1 parent 43e4d82 commit 1a1d665

File tree

1 file changed

+12
-6
lines changed
  • bridges/modules/relayers/src/extension

1 file changed

+12
-6
lines changed

bridges/modules/relayers/src/extension/mod.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub struct BridgeRelayersTransactionExtension<Runtime, Config, LaneId>(
129129
impl<R, C, LaneId> BridgeRelayersTransactionExtension<R, C, LaneId>
130130
where
131131
Self: 'static + Send + Sync,
132-
R: RelayersConfig<LaneId = LaneId>
132+
R: RelayersConfig<C::BridgeRelayersPalletInstance, LaneId = LaneId>
133133
+ BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId>
134134
+ TransactionPaymentConfig,
135135
C: ExtensionConfig<Runtime = R, LaneId = LaneId>,
@@ -250,7 +250,7 @@ where
250250
// let's also replace the weight of slashing relayer with the weight of rewarding relayer
251251
if call_info.is_receive_messages_proof_call() {
252252
post_info_weight = post_info_weight.saturating_sub(
253-
<R as RelayersConfig>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(),
253+
<R as RelayersConfig<C::BridgeRelayersPalletInstance>>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(),
254254
);
255255
}
256256

@@ -278,7 +278,7 @@ impl<R, C, LaneId> TransactionExtension<R::RuntimeCall>
278278
for BridgeRelayersTransactionExtension<R, C, LaneId>
279279
where
280280
Self: 'static + Send + Sync,
281-
R: RelayersConfig<LaneId = LaneId>
281+
R: RelayersConfig<C::BridgeRelayersPalletInstance, LaneId = LaneId>
282282
+ BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId>
283283
+ TransactionPaymentConfig,
284284
C: ExtensionConfig<Runtime = R, LaneId = LaneId>,
@@ -326,7 +326,9 @@ where
326326
};
327327

328328
// we only boost priority if relayer has staked required balance
329-
if !RelayersPallet::<R>::is_registration_active(&data.relayer) {
329+
if !RelayersPallet::<R, C::BridgeRelayersPalletInstance>::is_registration_active(
330+
&data.relayer,
331+
) {
330332
return Ok((Default::default(), Some(data), origin))
331333
}
332334

@@ -382,7 +384,11 @@ where
382384
match call_result {
383385
RelayerAccountAction::None => (),
384386
RelayerAccountAction::Reward(relayer, reward_account, reward) => {
385-
RelayersPallet::<R>::register_relayer_reward(reward_account, &relayer, reward);
387+
RelayersPallet::<R, C::BridgeRelayersPalletInstance>::register_relayer_reward(
388+
reward_account,
389+
&relayer,
390+
reward,
391+
);
386392

387393
log::trace!(
388394
target: LOG_TARGET,
@@ -394,7 +400,7 @@ where
394400
);
395401
},
396402
RelayerAccountAction::Slash(relayer, slash_account) =>
397-
RelayersPallet::<R>::slash_and_deregister(
403+
RelayersPallet::<R, C::BridgeRelayersPalletInstance>::slash_and_deregister(
398404
&relayer,
399405
ExplicitOrAccountParams::Params(slash_account),
400406
),

0 commit comments

Comments
 (0)