Skip to content
Snippets Groups Projects
Unverified Commit 0df1dfbb authored by paritytech-cmd-bot-polkadot-sdk[bot]'s avatar paritytech-cmd-bot-polkadot-sdk[bot] Committed by GitHub
Browse files

[stable2409] Backport #6684 (#6693)


Backport #6684 into `stable2409` from bkontur.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Co-authored-by: default avatarBranislav Kontur <bkontur@gmail.com>
parent 14d22822
No related merge requests found
...@@ -126,7 +126,7 @@ pub struct BridgeRelayersSignedExtension<Runtime, Config, LaneId>( ...@@ -126,7 +126,7 @@ pub struct BridgeRelayersSignedExtension<Runtime, Config, LaneId>(
impl<R, C, LaneId> BridgeRelayersSignedExtension<R, C, LaneId> impl<R, C, LaneId> BridgeRelayersSignedExtension<R, C, LaneId>
where where
Self: 'static + Send + Sync, Self: 'static + Send + Sync,
R: RelayersConfig<LaneId = LaneId> R: RelayersConfig<C::BridgeRelayersPalletInstance, LaneId = LaneId>
+ BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId> + BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId>
+ TransactionPaymentConfig, + TransactionPaymentConfig,
C: ExtensionConfig<Runtime = R, LaneId = LaneId>, C: ExtensionConfig<Runtime = R, LaneId = LaneId>,
...@@ -250,7 +250,7 @@ where ...@@ -250,7 +250,7 @@ where
// let's also replace the weight of slashing relayer with the weight of rewarding relayer // let's also replace the weight of slashing relayer with the weight of rewarding relayer
if call_info.is_receive_messages_proof_call() { if call_info.is_receive_messages_proof_call() {
post_info_weight = post_info_weight.saturating_sub( post_info_weight = post_info_weight.saturating_sub(
<R as RelayersConfig>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(), <R as RelayersConfig<C::BridgeRelayersPalletInstance>>::WeightInfo::extra_weight_of_successful_receive_messages_proof_call(),
); );
} }
...@@ -277,7 +277,7 @@ where ...@@ -277,7 +277,7 @@ where
impl<R, C, LaneId> SignedExtension for BridgeRelayersSignedExtension<R, C, LaneId> impl<R, C, LaneId> SignedExtension for BridgeRelayersSignedExtension<R, C, LaneId>
where where
Self: 'static + Send + Sync, Self: 'static + Send + Sync,
R: RelayersConfig<LaneId = LaneId> R: RelayersConfig<C::BridgeRelayersPalletInstance, LaneId = LaneId>
+ BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId> + BridgeMessagesConfig<C::BridgeMessagesPalletInstance, LaneId = LaneId>
+ TransactionPaymentConfig, + TransactionPaymentConfig,
C: ExtensionConfig<Runtime = R, LaneId = LaneId>, C: ExtensionConfig<Runtime = R, LaneId = LaneId>,
...@@ -320,8 +320,8 @@ where ...@@ -320,8 +320,8 @@ where
}; };
// we only boost priority if relayer has staked required balance // we only boost priority if relayer has staked required balance
if !RelayersPallet::<R>::is_registration_active(who) { if !RelayersPallet::<R, C::BridgeRelayersPalletInstance>::is_registration_active(who) {
return Ok(Default::default()) return Ok(Default::default());
} }
// compute priority boost // compute priority boost
...@@ -381,7 +381,11 @@ where ...@@ -381,7 +381,11 @@ where
match call_result { match call_result {
RelayerAccountAction::None => (), RelayerAccountAction::None => (),
RelayerAccountAction::Reward(relayer, reward_account, reward) => { RelayerAccountAction::Reward(relayer, reward_account, reward) => {
RelayersPallet::<R>::register_relayer_reward(reward_account, &relayer, reward); RelayersPallet::<R, C::BridgeRelayersPalletInstance>::register_relayer_reward(
reward_account,
&relayer,
reward,
);
log::trace!( log::trace!(
target: LOG_TARGET, target: LOG_TARGET,
...@@ -393,7 +397,7 @@ where ...@@ -393,7 +397,7 @@ where
); );
}, },
RelayerAccountAction::Slash(relayer, slash_account) => RelayerAccountAction::Slash(relayer, slash_account) =>
RelayersPallet::<R>::slash_and_deregister( RelayersPallet::<R, C::BridgeRelayersPalletInstance>::slash_and_deregister(
&relayer, &relayer,
ExplicitOrAccountParams::Params(slash_account), ExplicitOrAccountParams::Params(slash_account),
), ),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment