mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-07 01:28:07 +00:00
9216b781fd
* Asynchronous backing PR (#2300) * Update substrate & polkadot * min changes to make async backing compile * (async backing) parachain-system: track limitations for unincluded blocks (#2438) * unincluded segment draft * read para head from storage proof * read_para_head -> read_included_para_head * Provide pub interface * add errors * fix unincluded segment update * BlockTracker -> Ancestor * add a dmp limit * Read para head depending on the storage switch * doc comments * storage items docs * add a sanity check on block initialize * Check watermark * append to the segment on block finalize * Move segment update into set_validation_data * Resolve para head todo * option watermark * fix comment * Drop dmq check * fix weight * doc-comments on inherent invariant * Remove TODO * add todo * primitives tests * pallet tests * doc comments * refactor unincluded segment length into a ConsensusHook (#2501) * refactor unincluded segment length into a ConsensusHook * add docs * refactor bandwidth_out calculation Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> * test for limits from impl * fmt * make tests compile * update comment * uncomment test * fix collator test by adding parent to state proof * patch HRMP watermark rules for unincluded segment * get consensus-common tests to pass, using unincluded segment * fix unincluded segment tests * get all tests passing * fmt * rustdoc CI * aura-ext: limit the number of authored blocks per slot (#2551) * aura_ext consensus hook * reverse dependency * include weight into hook * fix tests * remove stray println Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> * fix test warning * fix doc link --------- Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Chris Sosnin <chris125_@live.com> * parachain-system: ignore go ahead signal once upgrade is processed (#2594) * handle goahead signal for unincluded segment * doc comment * add test * parachain-system: drop processed messages from inherent data (#2590) * implement `drop_processed_messages` * drop messages based on relay parent number * adjust tests * drop changes to mqc * fix comment * drop test * drop more dead code * clippy * aura-ext: check slot in consensus hook and remove all `CheckInherents` logic (#2658) * aura-ext: check slot in consensus hook * convert relay chain slot * Make relay chain slot duration generic * use fixed velocity hook for pallets with aura * purge timestamp inherent * fix warning * adjust runtime tests * fix slots in tests * Make `xcm-emulator` test pass for new consensus hook (#2722) * add pallets on_initialize * tests pass * add AuraExt on_init * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <> --------- Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com> * update polkadot git refs * CollationGenerationConfig closure is now optional (#2772) * CollationGenerationConfig closure is now optional * fix test * propagate network-protocol-staging feature (#2899) * Feature Flagging Consensus Hook Type Parameter (#2911) * First pass * fmt * Added as default feature in tomls * Changed to direct dependency feature * Dealing with clippy error * Update pallets/parachain-system/src/lib.rs Co-authored-by: asynchronous rob <rphmeier@gmail.com> --------- Co-authored-by: asynchronous rob <rphmeier@gmail.com> * fmt * bump deps and remove warning * parachain-system: update RelevantMessagingState according to the unincluded segment (#2948) * mostly address 2471 with a bug introduced * adjust relevant messaging state after computing total * fmt * max -> min * fix test implementation of xcmp source * add test * fix test message sending logic * fix + test * add more to unincluded segment test * fmt --------- Co-authored-by: Chris Sosnin <chris125_@live.com> * Integrate new Aura / Parachain Consensus Logic in Parachain-Template / Polkadot-Parachain (#2864) * add a comment * refactor client/service utilities * deprecate start_collator * update parachain-template * update test-service in the same way * update polkadot-parachain crate * fmt * wire up new SubmitCollation message * some runtime utilities for implementing unincluded segment runtime APIs * allow parachains to configure their level of sybil-resistance when starting the network * make aura-ext compile * update to specify sybil resistance levels * fmt * specify relay chain slot duration in milliseconds * update Aura to explicitly produce Send futures also, make relay_chain_slot_duration a Duration * add authoring duration to basic collator and document params * integrate new basic collator into parachain-template * remove assert_send used for testing * basic-aura: only author when parent included * update polkadot-parachain-bin * fmt * some fixes * fixes * add a RelayNumberMonotonicallyIncreases * add a utility function for initializing subsystems * some logging for timestamp adjustment * fmt * some fixes for lookahead collator * add a log * update `find_potential_parents` to account for sessions * bound the loop * restore & deprecate old start_collator and start_full_node functions. * remove unnecessary await calls * fix warning * clippy * more clippy * remove unneeded logic * ci * update comment Co-authored-by: Marcin S. <marcin@bytedude.com> * (async backing) restore `CheckInherents` for backwards-compatibility (#2977) * bring back timestamp * Restore CheckInherents * revert to empty CheckInherents * make CheckInherents optional * attempt * properly end system blocks * add some more comments * ignore failing system parachain tests * update refs after main feature branch merge * comment out the offending tests because CI runs ignored tests * fix warnings * fmt * revert to polkadot master * cargo update -p polkadot-primitives -p sp-io --------- Co-authored-by: asynchronous rob <rphmeier@gmail.com> Co-authored-by: Ignacio Palacios <ignacio.palacios.santos@gmail.com> Co-authored-by: Bradley Olson <34992650+BradleyOlson64@users.noreply.github.com> Co-authored-by: Marcin S. <marcin@bytedude.com> Co-authored-by: eskimor <eskimor@users.noreply.github.com> Co-authored-by: Andronik <write@reusable.software> (cherry picked from commit6ef1117685) * Companion: restructure macro related exports (#3015) * restructure macro related exports * restructure macro related exports * wip * wip * update cargo lock * refactor RuntimeDebug on unincluded segment * fmt * Companion: restructure `benchmarking` macro related exports (#3039) * wip * wip * restructure benchmarking macro related exports * add cargo lock --------- Co-authored-by: parity-processbot <> (cherry picked from commit8349c8d18a) * Add missing workspace members (#3056) * Add dependencies Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add missing workspace members Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix more Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commit44499cf262) * Add CI for monorepo (#1145) * Add CI for monorepo * fix frame tests * Format features Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * add note for skipping tests and disable test-linux-stable-all * Fix tests and compile issues (#1152) * Fix feature dependant import Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Bump test timeout Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove feature gate Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add resolver 2 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove old lockfile Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Format features Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix check-dependency-rules Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * rm test-runtime Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Actually fix script Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * enable cargo-check-each-crate-macos * Run check-each-crate on 6 machines (#1163) --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commite49493442a) * Fix features (#1194) * Manually fix conflicting ? Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Remove duplicates Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Autofix feature propagation zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="try-runtime:frame-try-runtime" zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="runtime-benchmarks:frame-benchmarking" zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --fix zepter f f Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Bump zepter Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Add some duplicates Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Revert "Add some duplicates" This reverts commit c6ce627273881c478f5b34f23d3a67db632dbebf. * Remove default enabled features Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Bump Zepter Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Bump in correct location 🤦 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Revert "DNM: Add some mistakes" This reverts commit d469b3f0ba2aaed5f35f6ff5995f99e682da5800. * Revert "DNM: Add some mistakes" This reverts commit d892a73a35cac01e3721bdba74574b88bd04f83c. --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commit0400ed9075) * Fix build profiles (#1229) * Fix build profiles Closes https://github.com/paritytech/polkadot-sdk/issues/1155 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Manually set version to 1.0.0 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Use workspace repo Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * 'Authors and Edition from workspace Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commitdcda0e50f5) * Set test crates to nopublish (#1240) * Set test crates to nopublish * Don't publish more crates * Set even more crates to nopublish --------- Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commit1c7ef1f232) * Add missing licenses and tune the scanning workflow (#1288) * Add missing Cumulus licenses * Typo * Add missing Substrate licenses * Single job checking the sub-repos in steps * Remove dates * Remove dates * Add missing (C) * Update FRAME UI tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update more UI tests Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> (cherry picked from commitbfb241d7f3) * Restructure `dispatch` macro related exports (#1162) * restructure dispatch macro related exports * moved Dispatchable to lib.rs * fix .gitignore final newline * ".git/.scripts/commands/fmt/fmt.sh" * fix rustdocs * wip --------- Co-authored-by: Liam Aharon <liam.aharon@hotmail.com> Co-authored-by: command-bot <> Co-authored-by: ordian <write@reusable.software> (cherry picked from commitbdbe982970) * Fixes * Fix clippy --------- Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Juan <juangirini@gmail.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com> Co-authored-by: Lulu <morgan@parity.io> Co-authored-by: Przemek Rzad <roopert7@gmail.com>
159 lines
4.7 KiB
Rust
159 lines
4.7 KiB
Rust
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Bridges Common.
|
|
|
|
// Parity Bridges Common is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Bridges Common is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Code that allows relayers pallet to be used as a payment mechanism for the messages pallet.
|
|
|
|
use crate::{Config, Pallet};
|
|
|
|
use bp_messages::{
|
|
source_chain::{DeliveryConfirmationPayments, RelayersRewards},
|
|
LaneId, MessageNonce,
|
|
};
|
|
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
|
use frame_support::{sp_runtime::SaturatedConversion, traits::Get};
|
|
use sp_arithmetic::traits::{Saturating, Zero};
|
|
use sp_std::{collections::vec_deque::VecDeque, marker::PhantomData, ops::RangeInclusive};
|
|
|
|
/// Adapter that allows relayers pallet to be used as a delivery+dispatch payment mechanism
|
|
/// for the messages pallet.
|
|
pub struct DeliveryConfirmationPaymentsAdapter<T, MI, DeliveryReward>(
|
|
PhantomData<(T, MI, DeliveryReward)>,
|
|
);
|
|
|
|
impl<T, MI, DeliveryReward> DeliveryConfirmationPayments<T::AccountId>
|
|
for DeliveryConfirmationPaymentsAdapter<T, MI, DeliveryReward>
|
|
where
|
|
T: Config + pallet_bridge_messages::Config<MI>,
|
|
MI: 'static,
|
|
DeliveryReward: Get<T::Reward>,
|
|
{
|
|
type Error = &'static str;
|
|
|
|
fn pay_reward(
|
|
lane_id: LaneId,
|
|
messages_relayers: VecDeque<bp_messages::UnrewardedRelayer<T::AccountId>>,
|
|
confirmation_relayer: &T::AccountId,
|
|
received_range: &RangeInclusive<bp_messages::MessageNonce>,
|
|
) -> MessageNonce {
|
|
let relayers_rewards =
|
|
bp_messages::calc_relayers_rewards::<T::AccountId>(messages_relayers, received_range);
|
|
let rewarded_relayers = relayers_rewards.len();
|
|
|
|
register_relayers_rewards::<T>(
|
|
confirmation_relayer,
|
|
relayers_rewards,
|
|
RewardsAccountParams::new(
|
|
lane_id,
|
|
T::BridgedChainId::get(),
|
|
RewardsAccountOwner::BridgedChain,
|
|
),
|
|
DeliveryReward::get(),
|
|
);
|
|
|
|
rewarded_relayers as _
|
|
}
|
|
}
|
|
|
|
// Update rewards to given relayers, optionally rewarding confirmation relayer.
|
|
fn register_relayers_rewards<T: Config>(
|
|
confirmation_relayer: &T::AccountId,
|
|
relayers_rewards: RelayersRewards<T::AccountId>,
|
|
lane_id: RewardsAccountParams,
|
|
delivery_fee: T::Reward,
|
|
) {
|
|
// reward every relayer except `confirmation_relayer`
|
|
let mut confirmation_relayer_reward = T::Reward::zero();
|
|
for (relayer, messages) in relayers_rewards {
|
|
// sane runtime configurations guarantee that the number of messages will be below
|
|
// `u32::MAX`
|
|
let relayer_reward = T::Reward::saturated_from(messages).saturating_mul(delivery_fee);
|
|
|
|
if relayer != *confirmation_relayer {
|
|
Pallet::<T>::register_relayer_reward(lane_id, &relayer, relayer_reward);
|
|
} else {
|
|
confirmation_relayer_reward =
|
|
confirmation_relayer_reward.saturating_add(relayer_reward);
|
|
}
|
|
}
|
|
|
|
// finally - pay reward to confirmation relayer
|
|
Pallet::<T>::register_relayer_reward(
|
|
lane_id,
|
|
confirmation_relayer,
|
|
confirmation_relayer_reward,
|
|
);
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{mock::*, RelayerRewards};
|
|
|
|
const RELAYER_1: AccountId = 1;
|
|
const RELAYER_2: AccountId = 2;
|
|
const RELAYER_3: AccountId = 3;
|
|
|
|
fn relayers_rewards() -> RelayersRewards<AccountId> {
|
|
vec![(RELAYER_1, 2), (RELAYER_2, 3)].into_iter().collect()
|
|
}
|
|
|
|
#[test]
|
|
fn confirmation_relayer_is_rewarded_if_it_has_also_delivered_messages() {
|
|
run_test(|| {
|
|
register_relayers_rewards::<TestRuntime>(
|
|
&RELAYER_2,
|
|
relayers_rewards(),
|
|
TEST_REWARDS_ACCOUNT_PARAMS,
|
|
50,
|
|
);
|
|
|
|
assert_eq!(
|
|
RelayerRewards::<TestRuntime>::get(RELAYER_1, TEST_REWARDS_ACCOUNT_PARAMS),
|
|
Some(100)
|
|
);
|
|
assert_eq!(
|
|
RelayerRewards::<TestRuntime>::get(RELAYER_2, TEST_REWARDS_ACCOUNT_PARAMS),
|
|
Some(150)
|
|
);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn confirmation_relayer_is_not_rewarded_if_it_has_not_delivered_any_messages() {
|
|
run_test(|| {
|
|
register_relayers_rewards::<TestRuntime>(
|
|
&RELAYER_3,
|
|
relayers_rewards(),
|
|
TEST_REWARDS_ACCOUNT_PARAMS,
|
|
50,
|
|
);
|
|
|
|
assert_eq!(
|
|
RelayerRewards::<TestRuntime>::get(RELAYER_1, TEST_REWARDS_ACCOUNT_PARAMS),
|
|
Some(100)
|
|
);
|
|
assert_eq!(
|
|
RelayerRewards::<TestRuntime>::get(RELAYER_2, TEST_REWARDS_ACCOUNT_PARAMS),
|
|
Some(150)
|
|
);
|
|
assert_eq!(
|
|
RelayerRewards::<TestRuntime>::get(RELAYER_3, TEST_REWARDS_ACCOUNT_PARAMS),
|
|
None
|
|
);
|
|
});
|
|
}
|
|
}
|