mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 07:31:02 +00:00
Fix multiple parachain headers submission for single message delivery (#1916)
* switch off parachains relay when we don't need to relay parachains (temp solution) * parachains relay now only works with single parachain * fix usages of parachains relay * revert hacky fix * fixes * fixed Westmint parachain ID * fixed metrics * fixed compilation * fmt * clippy * call -> typed_state_call
This commit is contained in:
committed by
Bastian Köcher
parent
ba155f990f
commit
e7f5560951
@@ -17,7 +17,6 @@
|
||||
//! Rialto-to-Millau parachains sync entrypoint.
|
||||
|
||||
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
|
||||
use parachains_relay::ParachainsPipeline;
|
||||
use relay_millau_client::Millau;
|
||||
use relay_rialto_client::Rialto;
|
||||
use relay_rialto_parachain_client::RialtoParachain;
|
||||
@@ -29,11 +28,6 @@ use substrate_relay_helper::parachains::{
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct RialtoParachainsToMillau;
|
||||
|
||||
impl ParachainsPipeline for RialtoParachainsToMillau {
|
||||
type SourceChain = Rialto;
|
||||
type TargetChain = Millau;
|
||||
}
|
||||
|
||||
impl SubstrateParachainsPipeline for RialtoParachainsToMillau {
|
||||
type SourceParachain = RialtoParachain;
|
||||
type SourceRelayChain = Rialto;
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
|
||||
use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
|
||||
use parachains_relay::ParachainsPipeline;
|
||||
use relay_substrate_client::{CallOf, HeaderIdOf};
|
||||
use substrate_relay_helper::parachains::{
|
||||
SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
|
||||
@@ -28,11 +27,6 @@ use substrate_relay_helper::parachains::{
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct BridgeHubRococoToBridgeHubWococo;
|
||||
|
||||
impl ParachainsPipeline for BridgeHubRococoToBridgeHubWococo {
|
||||
type SourceChain = relay_rococo_client::Rococo;
|
||||
type TargetChain = relay_bridge_hub_wococo_client::BridgeHubWococo;
|
||||
}
|
||||
|
||||
impl SubstrateParachainsPipeline for BridgeHubRococoToBridgeHubWococo {
|
||||
type SourceParachain = relay_bridge_hub_rococo_client::BridgeHubRococo;
|
||||
type SourceRelayChain = relay_rococo_client::Rococo;
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
//! Westend-to-Millau parachains sync entrypoint.
|
||||
|
||||
use crate::cli::bridge::{CliBridgeBase, ParachainToRelayHeadersCliBridge};
|
||||
use parachains_relay::ParachainsPipeline;
|
||||
use relay_millau_client::Millau;
|
||||
use relay_westend_client::{Westend, Westmint};
|
||||
use substrate_relay_helper::parachains::{
|
||||
@@ -28,11 +27,6 @@ use substrate_relay_helper::parachains::{
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct WestendParachainsToMillau;
|
||||
|
||||
impl ParachainsPipeline for WestendParachainsToMillau {
|
||||
type SourceChain = Westend;
|
||||
type TargetChain = Millau;
|
||||
}
|
||||
|
||||
impl SubstrateParachainsPipeline for WestendParachainsToMillau {
|
||||
type SourceParachain = Westmint;
|
||||
type SourceRelayChain = Westend;
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
use crate::cli::bridge::{CliBridgeBase, MessagesCliBridge, ParachainToRelayHeadersCliBridge};
|
||||
use bp_polkadot_core::parachains::{ParaHash, ParaHeadsProof, ParaId};
|
||||
use parachains_relay::ParachainsPipeline;
|
||||
use relay_substrate_client::{CallOf, HeaderIdOf};
|
||||
use substrate_relay_helper::parachains::{
|
||||
SubmitParachainHeadsCallBuilder, SubstrateParachainsPipeline,
|
||||
@@ -28,11 +27,6 @@ use substrate_relay_helper::parachains::{
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct BridgeHubWococoToBridgeHubRococo;
|
||||
|
||||
impl ParachainsPipeline for BridgeHubWococoToBridgeHubRococo {
|
||||
type SourceChain = relay_wococo_client::Wococo;
|
||||
type TargetChain = relay_bridge_hub_rococo_client::BridgeHubRococo;
|
||||
}
|
||||
|
||||
impl SubstrateParachainsPipeline for BridgeHubWococoToBridgeHubRococo {
|
||||
type SourceParachain = relay_bridge_hub_wococo_client::BridgeHubWococo;
|
||||
type SourceRelayChain = relay_wococo_client::Wococo;
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
use crate::cli::CliChain;
|
||||
use pallet_bridge_parachains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber};
|
||||
use parachains_relay::ParachainsPipeline;
|
||||
use relay_substrate_client::{Chain, ChainWithTransactions, Parachain, RelayChain};
|
||||
use strum::{EnumString, EnumVariantNames};
|
||||
use substrate_relay_helper::{
|
||||
@@ -87,10 +86,10 @@ where
|
||||
+ RelayChain;
|
||||
/// Finality proofs synchronization pipeline (source parachain -> target).
|
||||
type ParachainFinality: SubstrateParachainsPipeline<
|
||||
SourceRelayChain = Self::SourceRelay,
|
||||
SourceParachain = Self::Source,
|
||||
TargetChain = Self::Target,
|
||||
> + ParachainsPipeline<SourceChain = Self::SourceRelay, TargetChain = Self::Target>;
|
||||
SourceRelayChain = Self::SourceRelay,
|
||||
SourceParachain = Self::Source,
|
||||
TargetChain = Self::Target,
|
||||
>;
|
||||
/// Finality proofs synchronization pipeline (source relay chain -> target).
|
||||
type RelayFinality: SubstrateFinalitySyncPipeline<
|
||||
SourceChain = Self::SourceRelay,
|
||||
|
||||
@@ -22,20 +22,14 @@ use crate::chains::{
|
||||
};
|
||||
use async_std::sync::Mutex;
|
||||
use async_trait::async_trait;
|
||||
use bp_polkadot_core::parachains::ParaId;
|
||||
use parachains_relay::parachains_loop::{
|
||||
AvailableHeader, ParachainSyncParams, SourceClient, TargetClient,
|
||||
};
|
||||
use relay_substrate_client::{Parachain, ParachainBase};
|
||||
use parachains_relay::parachains_loop::{AvailableHeader, SourceClient, TargetClient};
|
||||
use relay_substrate_client::Parachain;
|
||||
use relay_utils::metrics::{GlobalMetrics, StandaloneMetric};
|
||||
use std::sync::Arc;
|
||||
use structopt::StructOpt;
|
||||
use strum::{EnumString, EnumVariantNames, VariantNames};
|
||||
use substrate_relay_helper::{
|
||||
parachains::{
|
||||
source::ParachainsSource, target::ParachainsTarget, ParachainsPipelineAdapter,
|
||||
SubstrateParachainsPipeline,
|
||||
},
|
||||
parachains::{source::ParachainsSource, target::ParachainsTarget, ParachainsPipelineAdapter},
|
||||
TransactionParams,
|
||||
};
|
||||
|
||||
@@ -105,13 +99,6 @@ where
|
||||
parachains_relay::parachains_loop::run(
|
||||
source_client,
|
||||
target_client,
|
||||
ParachainSyncParams {
|
||||
parachains: vec![
|
||||
ParaId(<Self::ParachainFinality as SubstrateParachainsPipeline>::SourceParachain::PARACHAIN_ID)
|
||||
],
|
||||
stall_timeout: std::time::Duration::from_secs(60),
|
||||
strategy: parachains_relay::parachains_loop::ParachainSyncStrategy::Any,
|
||||
},
|
||||
metrics_params,
|
||||
futures::future::pending(),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user