mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-14 00:31:07 +00:00
Update bridges subtree (#5165)
* Squashed 'bridges/' changes from 1602249f0a..f220d2fcca f220d2fcca Polkadot staging update (#1356) 02fd3d497c fix parse_transaction on Rialto+Millau (#1360) bc191fd9a2 update parity-scale-codec to 3.1.2 (#1359) a37226e79c update chain versions (#1358) ff5d539fcb Update Substrate/Polkadot/Cumulus references (#1353) 1581f60cd5 Support dedicated lanes for pallets (#962) 0a7ccf5c57 ignore more "increase" alerts that are sometimes signalling NoData at startup (#1351) 31165127cc added no_stack_overflow_when_decoding_nested_call_during_dispatch test (#1349) 7000619eb8 replace From<>InboundLaneApi with direct storage reads (#1348) 515df10ccc added alerts for relay balances (#1347) b56f6a87de Mortal conversion rate updater transactions (#1257) 20f2f331ec edition = "2021" (#1346) 99147d4f75 update regex to 1.5.5 (#1345) 686191f379 use DecodeLimit when decoding incoming calls (#1344) a70c276006 get rid of '[No Data] Messages from Millau to Rialto are not being delivered' warnings (#1342) 01f29b8ac1 fix conversion rate metric in dashboards (#1341) 51c3bf351f Increase rate from metric when estimating fee (#1340) 3bb9c4f68f fix generator scripts to be consistent with updatedrelay output (#1339) 0475a1667b fixed mess with conversion rates (#1338) d8fdd7d716 synchronize relay cli changes and token swap generator script (#1337) 6e928137a5 fix conversion rate override in token swap (#1336) 62d4a4811d override conversion rate in tokens swap generator (#1335) ed9e1c839c fi typo in generator script (#1334) 3254b5af7a Override conversion rate when computing message fee (#1261) 66df68b5b8 Revert "Revert "override conversion rate in estimate-message-fee RPC (#1189)" (#1275)" (#1333) 0ca6fc6ef8 fix clippy issues (#1332) 5414b2fffb Reinitialize bridge relay subcommand (#1331) a63d95ba7d removed extra *_RUNTIME_VERSION consts from relay code (#1330) 59fb18a310 fix typo in alert expression (#1329) a6267a47ee Using-same-fork metric for finality and complex relay (#1327) 88d684d37e use mortal transactions in transaction resubmitter (#1326) 8ff88b6844 impl Decode for SignedExtensions (otherwise transaction resubmitter panicks) (#1325) 1ed09854f0 Encode and estimate Rococo/Wococo/Kusama/Polkadot messages (#1322) ddb4517e13 Add some tests to check integrity of chain constants + bridge configuration (#1316) bdeedb7ab9 Fix issues from cargo deny (#1311) d3d79d01e0 expose fee multiplier metrics in messages relay (#1312) c8b3f0ea16 Endow relayer account at target chain in message benchmarks (#1310) f51ecd92b6 fix benchmarks before using it in Polkadot/Kusama/Rococo runtimes (#1309) 6935c619ad increase relay balance guard limits for Polkadot<>Kusama bridge (#1308) 7e31834c66 Fix mandatory headers scanning in on-demand relay (#1306) 92ddc3ea7a Polkadot-staging update (#1305) 3787193a31 fix session length of Rococo and Wococo (#1304) eb468d29c0 Revert nightly docker pin (#1301) e2d4c073e1 Use raw balance value if tokenDecimals property is missing (#1299) 108f4b29d1 Fix ss58 prefixes of Polkadot, Kusama and Westend used by relay (#1298) 64fbd2705e bump chain spec versions (#1297) 5707777b86 Bump Substrate/Polkadot/Cumulus refs (#1295) 29eecdf1fa Merge pull request #1294 from paritytech/polkadot-staging-update 1f0c05368e Relay balance metrics (#1291) 6356bb90b3 when messages pallet is halted, relay shall not submit messages delivery/confirmation transactions (#1289) 800dc2df8d when GRANDPA pallet is halted, relay shall not submit finality transactions (#1288) 3dd8e4f936 disable BEEFY allerts for Rialto (#1285) f58fed7380 support version mode cli options in send-message subcommand (#1284) 3aac448da3 reuse polkadot-service code (#1273) 2bdbb651e1 replace latest_confirmed_nonce runtime APIs with direct storage reads (#1282) 5f9c6d241f move "common" code of messages pallet benchmarks helpers to the common library (#1281) 173d2d8229 Merge pull request #1280 from paritytech/polkadot-staging-update 8b9c4ec16d do not start spec_version guard when version mode is set to auto (#1278) e98d682de2 removed extra messages benchmarks (#1279) c730e25b61 Move benchmarks from Rialto to Millau (#1277) 54146416e7 Merge pull request #1276 from paritytech/polkadot-staging-update df70118174 Merge branch 'master' into polkadot-staging-update ed7def64c4 Revert "override conversion rate in estimate-message-fee RPC (#1189)" (#1275) 38c6c3a49f Use "production" floating tag when uilding docker image from version git tags (#1272) ded9ff6dbb Replace InboundLaneApi::latest_received_nonce with direct storage read (#1269) f704a741ee Polkadot staging update (#1270) 8c65f0d7ab verify that GRANDPA pallet is not initialized before submitting initialization transaction (#1267) e7e83d8944 remove OutboundLaneApi::latest_received_nonce (#1262) 9f4b34acf1 bump rococo version (#1263) 82c08c5a87 read latest_generated_nonce directly from storage (#1260) 50ffb5dd08 override conversion rate in estimate-message-fee RPC (#1189) 467ca5ef59 move storage keys computation to primitivs (#1254) 4f9884066b remporary use pinned bridges-ci image in Dockerfile (#1258) edfcb74e00 Change submit transaction spec_version and transaction_version query from chain (#1248) 4009d970d0 pin bridges-ci image (#1256) 65e51b5e1c decrease startup sleep to 5s for relays and to 120s for generators + remove curl (#1251) 3bc74355d9 Add missing RPC APIs to rialto parachain node (#1250) 80c9429284 Bump relay version to 1.0.0 (#1249) 9ead06af2a runtimes: fix call_size() test (#1245) 4fc8a29357 Use same endowed accounts set on dev/local chains (#1244) fed54371c2 Refactor message relay helpers (#1234) a15b4faae7 post-merge build fix (#1243) 52232d8d54 Fix transactions mortality (#1196) c07bba931f Expose prometheus BEEFY metrics and add them to grafana dashboard (#1242) f927775bd5 Refactor finality relay helpers (#1220) 7bf76f14a8 Update Rococo/Wococo version + prepare relay for Rococo<>Wococo bridge (#1241) e860fecd04 Enable offchain indexing for Rialto/Millau nodes (#1239) 04d4d1c6b4 Enable Beefy debug logs in test deployment (#1237) cd771f1089 Fix storage parameter name computation (#1238) 816ddd2dd2 Integrate BEEFY with Rialto & Millau runtimes (#1227) d94b62b1ac update dependencies (#1229) 98eb9ee13d Add mut support (#1232) ffef6f89f9 fixed set_operational in GRANDPA pallet (#1226) bd2f8bfbd7 Add CODEOWNERS file (#1219) 6b5cf2b591 Unify metric names (#1209) d1541e797e remove abandoned exchange relay (#1217) 39140d0b34 Remove unused `relays/headers` (#1216) 9bc071d42b Remove unused PoA<>Substrate bridge (#1210) 877e8d01e3 Fix UI deployment. (#1211) 6cd5775ebe Add `AtLeast32BitUnsigned` for MessageLance::SourceChainBalance (#1207) git-subtree-dir: bridges git-subtree-split: f220d2fccabbf141101d19456ecb4e3576a1d797 * fix compilation warnings
This commit is contained in:
Svyatoslav Nikolsky
committed by
GitHub
GitHub
parent
20da356434
commit
8e01ba9c03
@@ -18,32 +18,32 @@
|
||||
|
||||
pub use self::{at_rococo::*, at_wococo::*};
|
||||
|
||||
use crate::{Balances, Runtime};
|
||||
|
||||
use bp_messages::{
|
||||
source_chain::TargetHeaderChain,
|
||||
source_chain::{SenderOrigin, TargetHeaderChain},
|
||||
target_chain::{ProvedMessages, SourceHeaderChain},
|
||||
InboundLaneData, LaneId, Message, MessageNonce,
|
||||
};
|
||||
use bp_rococo::{
|
||||
max_extrinsic_size, max_extrinsic_weight, EXTRA_STORAGE_PROOF_SIZE,
|
||||
MAXIMAL_ENCODED_ACCOUNT_ID_SIZE,
|
||||
};
|
||||
use bp_runtime::{ChainId, ROCOCO_CHAIN_ID, WOCOCO_CHAIN_ID};
|
||||
use bp_rococo::{Balance, Rococo, EXTRA_STORAGE_PROOF_SIZE, MAXIMAL_ENCODED_ACCOUNT_ID_SIZE};
|
||||
use bp_runtime::{Chain, ChainId, ROCOCO_CHAIN_ID, WOCOCO_CHAIN_ID};
|
||||
use bridge_runtime_common::messages::{
|
||||
source as messages_source, target as messages_target, BridgedChainWithMessages,
|
||||
ChainWithMessages, MessageBridge, MessageTransaction, ThisChainWithMessages,
|
||||
source as messages_source, target as messages_target, transaction_payment,
|
||||
BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
|
||||
ThisChainWithMessages,
|
||||
};
|
||||
use frame_support::{
|
||||
traits::Get,
|
||||
weights::{Weight, WeightToFeePolynomial},
|
||||
RuntimeDebug,
|
||||
};
|
||||
use sp_std::{convert::TryFrom, marker::PhantomData, ops::RangeInclusive};
|
||||
|
||||
use rococo_runtime_constants::fee::WeightToFee;
|
||||
use sp_runtime::FixedU128;
|
||||
use sp_std::{convert::TryFrom, marker::PhantomData, ops::RangeInclusive};
|
||||
|
||||
/// Maximal number of pending outbound messages.
|
||||
const MAXIMAL_PENDING_MESSAGES_AT_OUTBOUND_LANE: MessageNonce =
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE;
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
|
||||
/// Maximal weight of single message delivery confirmation transaction on Rococo/Wococo chain.
|
||||
///
|
||||
/// This value is a result of `pallet_bridge_messages::Pallet::receive_messages_delivery_proof` weight formula
|
||||
@@ -102,13 +102,14 @@ impl<B, GI> ChainWithMessages for RococoLikeChain<B, GI> {
|
||||
type Signer = primitives::v2::AccountPublic;
|
||||
type Signature = crate::Signature;
|
||||
type Weight = Weight;
|
||||
type Balance = crate::Balance;
|
||||
type Balance = Balance;
|
||||
}
|
||||
|
||||
impl<B, GI> ThisChainWithMessages for RococoLikeChain<B, GI> {
|
||||
type Origin = crate::Origin;
|
||||
type Call = crate::Call;
|
||||
|
||||
fn is_outbound_lane_enabled(lane: &LaneId) -> bool {
|
||||
fn is_message_accepted(_submitter: &crate::Origin, lane: &LaneId) -> bool {
|
||||
*lane == [0, 0, 0, 0]
|
||||
}
|
||||
|
||||
@@ -132,14 +133,14 @@ impl<B, GI> ThisChainWithMessages for RococoLikeChain<B, GI> {
|
||||
}
|
||||
}
|
||||
|
||||
fn transaction_payment(transaction: MessageTransaction<Weight>) -> crate::Balance {
|
||||
fn transaction_payment(transaction: MessageTransaction<Weight>) -> Balance {
|
||||
// current fee multiplier is used here
|
||||
bridge_runtime_common::messages::transaction_payment(
|
||||
transaction_payment(
|
||||
crate::BlockWeights::get()
|
||||
.get(frame_support::weights::DispatchClass::Normal)
|
||||
.base_extrinsic,
|
||||
crate::TransactionByteFee::get(),
|
||||
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
|
||||
pallet_transaction_payment::Pallet::<Runtime>::next_fee_multiplier(),
|
||||
|weight| WeightToFee::calc(&weight),
|
||||
transaction,
|
||||
)
|
||||
@@ -148,13 +149,14 @@ impl<B, GI> ThisChainWithMessages for RococoLikeChain<B, GI> {
|
||||
|
||||
impl<B, GI> BridgedChainWithMessages for RococoLikeChain<B, GI> {
|
||||
fn maximal_extrinsic_size() -> u32 {
|
||||
max_extrinsic_size()
|
||||
Rococo::max_extrinsic_size()
|
||||
}
|
||||
|
||||
fn message_weight_limits(_message_payload: &[u8]) -> RangeInclusive<Weight> {
|
||||
// we don't want to relay too large messages + keep reserve for future upgrades
|
||||
let upper_limit =
|
||||
messages_target::maximal_incoming_message_dispatch_weight(max_extrinsic_weight());
|
||||
let upper_limit = messages_target::maximal_incoming_message_dispatch_weight(
|
||||
Rococo::max_extrinsic_weight(),
|
||||
);
|
||||
|
||||
// we're charging for payload bytes in `With(Wococo | Rococo)MessageBridge::transaction_payment` function
|
||||
//
|
||||
@@ -189,14 +191,14 @@ impl<B, GI> BridgedChainWithMessages for RococoLikeChain<B, GI> {
|
||||
}
|
||||
}
|
||||
|
||||
fn transaction_payment(transaction: MessageTransaction<Weight>) -> crate::Balance {
|
||||
fn transaction_payment(transaction: MessageTransaction<Weight>) -> Balance {
|
||||
// current fee multiplier is used here
|
||||
bridge_runtime_common::messages::transaction_payment(
|
||||
crate::BlockWeights::get()
|
||||
.get(frame_support::weights::DispatchClass::Normal)
|
||||
.base_extrinsic,
|
||||
crate::TransactionByteFee::get(),
|
||||
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
|
||||
pallet_transaction_payment::Pallet::<Runtime>::next_fee_multiplier(),
|
||||
|weight| WeightToFee::calc(&weight),
|
||||
transaction,
|
||||
)
|
||||
@@ -210,30 +212,35 @@ where
|
||||
B::ThisChain: ChainWithMessages<AccountId = crate::AccountId>,
|
||||
B::BridgedChain: ChainWithMessages<Hash = crate::Hash>,
|
||||
GI: 'static,
|
||||
crate::Runtime: pallet_bridge_grandpa::Config<GI>,
|
||||
<<crate::Runtime as pallet_bridge_grandpa::Config<GI>>::BridgedChain as bp_runtime::Chain>::Hash: From<crate::Hash>,
|
||||
Runtime: pallet_bridge_grandpa::Config<GI>,
|
||||
<<Runtime as pallet_bridge_grandpa::Config<GI>>::BridgedChain as bp_runtime::Chain>::Hash:
|
||||
From<crate::Hash>,
|
||||
{
|
||||
type Error = &'static str;
|
||||
type MessagesDeliveryProof = messages_source::FromBridgedChainMessagesDeliveryProof<crate::Hash>;
|
||||
type MessagesDeliveryProof =
|
||||
messages_source::FromBridgedChainMessagesDeliveryProof<crate::Hash>;
|
||||
|
||||
fn verify_message(payload: &messages_source::FromThisChainMessagePayload<B>) -> Result<(), Self::Error> {
|
||||
fn verify_message(
|
||||
payload: &messages_source::FromThisChainMessagePayload<B>,
|
||||
) -> Result<(), Self::Error> {
|
||||
messages_source::verify_chain_message::<B>(payload)
|
||||
}
|
||||
|
||||
fn verify_messages_delivery_proof(
|
||||
proof: Self::MessagesDeliveryProof,
|
||||
) -> Result<(LaneId, InboundLaneData<crate::AccountId>), Self::Error> {
|
||||
messages_source::verify_messages_delivery_proof::<B, crate::Runtime, GI>(proof)
|
||||
messages_source::verify_messages_delivery_proof::<B, Runtime, GI>(proof)
|
||||
}
|
||||
}
|
||||
|
||||
impl<B, GI> SourceHeaderChain<crate::Balance> for RococoLikeChain<B, GI>
|
||||
impl<B, GI> SourceHeaderChain<Balance> for RococoLikeChain<B, GI>
|
||||
where
|
||||
B: MessageBridge,
|
||||
B::BridgedChain: ChainWithMessages<Balance = crate::Balance, Hash = crate::Hash>,
|
||||
B::BridgedChain: ChainWithMessages<Balance = Balance, Hash = crate::Hash>,
|
||||
GI: 'static,
|
||||
crate::Runtime: pallet_bridge_grandpa::Config<GI>,
|
||||
<<crate::Runtime as pallet_bridge_grandpa::Config<GI>>::BridgedChain as bp_runtime::Chain>::Hash: From<crate::Hash>,
|
||||
Runtime: pallet_bridge_grandpa::Config<GI>,
|
||||
<<Runtime as pallet_bridge_grandpa::Config<GI>>::BridgedChain as bp_runtime::Chain>::Hash:
|
||||
From<crate::Hash>,
|
||||
{
|
||||
type Error = &'static str;
|
||||
type MessagesProof = messages_target::FromBridgedChainMessagesProof<crate::Hash>;
|
||||
@@ -241,8 +248,9 @@ where
|
||||
fn verify_messages_proof(
|
||||
proof: Self::MessagesProof,
|
||||
messages_count: u32,
|
||||
) -> Result<ProvedMessages<Message<crate::Balance>>, Self::Error> {
|
||||
messages_target::verify_messages_proof::<B, crate::Runtime, GI>(proof, messages_count).and_then(verify_inbound_messages_lane)
|
||||
) -> Result<ProvedMessages<Message<Balance>>, Self::Error> {
|
||||
messages_target::verify_messages_proof::<B, Runtime, GI>(proof, messages_count)
|
||||
.and_then(verify_inbound_messages_lane)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,8 +259,8 @@ const INBOUND_LANE_DISABLED: &str = "The inbound message lane is disabled.";
|
||||
|
||||
/// Verify that lanes of inbound messages are enabled.
|
||||
fn verify_inbound_messages_lane(
|
||||
messages: ProvedMessages<Message<crate::Balance>>,
|
||||
) -> Result<ProvedMessages<Message<crate::Balance>>, &'static str> {
|
||||
messages: ProvedMessages<Message<Balance>>,
|
||||
) -> Result<ProvedMessages<Message<Balance>>, &'static str> {
|
||||
let allowed_incoming_lanes = [[0, 0, 0, 0]];
|
||||
if messages.keys().any(|lane_id| !allowed_incoming_lanes.contains(lane_id)) {
|
||||
return Err(INBOUND_LANE_DISABLED)
|
||||
@@ -263,14 +271,27 @@ fn verify_inbound_messages_lane(
|
||||
/// The cost of delivery confirmation transaction.
|
||||
pub struct GetDeliveryConfirmationTransactionFee;
|
||||
|
||||
impl Get<crate::Balance> for GetDeliveryConfirmationTransactionFee {
|
||||
fn get() -> crate::Balance {
|
||||
impl Get<Balance> for GetDeliveryConfirmationTransactionFee {
|
||||
fn get() -> Balance {
|
||||
<RococoAtRococo as ThisChainWithMessages>::transaction_payment(
|
||||
RococoAtRococo::estimate_delivery_confirmation_transaction(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl SenderOrigin<crate::AccountId> for crate::Origin {
|
||||
fn linked_account(&self) -> Option<crate::AccountId> {
|
||||
match self.caller {
|
||||
crate::OriginCaller::system(frame_system::RawOrigin::Signed(ref submitter)) =>
|
||||
Some(submitter.clone()),
|
||||
crate::OriginCaller::system(frame_system::RawOrigin::Root) |
|
||||
crate::OriginCaller::system(frame_system::RawOrigin::None) =>
|
||||
crate::RootAccountForPayments::get(),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// This module contains definitions that are used by the messages pallet instance, "deployed" at Rococo.
|
||||
mod at_rococo {
|
||||
use super::*;
|
||||
@@ -284,13 +305,14 @@ mod at_rococo {
|
||||
const BRIDGED_CHAIN_ID: ChainId = WOCOCO_CHAIN_ID;
|
||||
const RELAYER_FEE_PERCENT: u32 = 10;
|
||||
const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
|
||||
bp_wococo::WITH_ROCOCO_MESSAGES_PALLET_NAME;
|
||||
bp_rococo::WITH_ROCOCO_MESSAGES_PALLET_NAME;
|
||||
|
||||
type ThisChain = RococoAtRococo;
|
||||
type BridgedChain = WococoAtRococo;
|
||||
|
||||
fn bridged_balance_to_this_balance(
|
||||
bridged_balance: bp_wococo::Balance,
|
||||
_bridged_to_this_conversion_rate_override: Option<FixedU128>,
|
||||
) -> bp_rococo::Balance {
|
||||
bridged_balance
|
||||
}
|
||||
@@ -315,8 +337,8 @@ mod at_rococo {
|
||||
/// Call-dispatch based message dispatch for Wococo -> Rococo messages.
|
||||
pub type FromWococoMessageDispatch = messages_target::FromBridgedChainMessageDispatch<
|
||||
AtRococoWithWococoMessageBridge,
|
||||
crate::Runtime,
|
||||
pallet_balances::Pallet<crate::Runtime>,
|
||||
Runtime,
|
||||
Balances,
|
||||
crate::AtRococoFromWococoMessagesDispatch,
|
||||
>;
|
||||
}
|
||||
@@ -334,13 +356,14 @@ mod at_wococo {
|
||||
const BRIDGED_CHAIN_ID: ChainId = ROCOCO_CHAIN_ID;
|
||||
const RELAYER_FEE_PERCENT: u32 = 10;
|
||||
const BRIDGED_MESSAGES_PALLET_NAME: &'static str =
|
||||
bp_rococo::WITH_WOCOCO_MESSAGES_PALLET_NAME;
|
||||
bp_wococo::WITH_WOCOCO_MESSAGES_PALLET_NAME;
|
||||
|
||||
type ThisChain = WococoAtWococo;
|
||||
type BridgedChain = RococoAtWococo;
|
||||
|
||||
fn bridged_balance_to_this_balance(
|
||||
bridged_balance: bp_rococo::Balance,
|
||||
_bridged_to_this_conversion_rate_override: Option<FixedU128>,
|
||||
) -> bp_wococo::Balance {
|
||||
bridged_balance
|
||||
}
|
||||
@@ -365,8 +388,8 @@ mod at_wococo {
|
||||
/// Call-dispatch based message dispatch for Rococo -> Wococo messages.
|
||||
pub type FromRococoMessageDispatch = messages_target::FromBridgedChainMessageDispatch<
|
||||
AtWococoWithRococoMessageBridge,
|
||||
crate::Runtime,
|
||||
pallet_balances::Pallet<crate::Runtime>,
|
||||
Runtime,
|
||||
Balances,
|
||||
crate::AtWococoFromRococoMessagesDispatch,
|
||||
>;
|
||||
}
|
||||
@@ -390,7 +413,7 @@ mod tests {
|
||||
|
||||
// we don't have any knowledge of messages-at-Rococo weights, so we'll be using
|
||||
// weights of one of our testnets, which should be accurate enough
|
||||
type Weights = pallet_bridge_messages::weights::RialtoWeight<crate::Runtime>;
|
||||
type Weights = pallet_bridge_messages::weights::MillauWeight<Runtime>;
|
||||
|
||||
pallet_bridge_messages::ensure_weights_are_correct::<Weights>(
|
||||
DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT,
|
||||
@@ -401,30 +424,30 @@ mod tests {
|
||||
);
|
||||
|
||||
let max_incoming_message_proof_size = bp_rococo::EXTRA_STORAGE_PROOF_SIZE.saturating_add(
|
||||
messages::target::maximal_incoming_message_size(bp_rococo::max_extrinsic_size()),
|
||||
messages::target::maximal_incoming_message_size(Rococo::max_extrinsic_size()),
|
||||
);
|
||||
pallet_bridge_messages::ensure_able_to_receive_message::<Weights>(
|
||||
bp_rococo::max_extrinsic_size(),
|
||||
bp_rococo::max_extrinsic_weight(),
|
||||
Rococo::max_extrinsic_size(),
|
||||
Rococo::max_extrinsic_weight(),
|
||||
max_incoming_message_proof_size,
|
||||
messages::target::maximal_incoming_message_dispatch_weight(
|
||||
bp_rococo::max_extrinsic_weight(),
|
||||
Rococo::max_extrinsic_weight(),
|
||||
),
|
||||
);
|
||||
|
||||
let max_incoming_inbound_lane_data_proof_size =
|
||||
bp_messages::InboundLaneData::<()>::encoded_size_hint(
|
||||
bp_rococo::MAXIMAL_ENCODED_ACCOUNT_ID_SIZE,
|
||||
bp_rococo::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE as _,
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE as _,
|
||||
bp_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX as _,
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX as _,
|
||||
)
|
||||
.unwrap_or(u32::MAX);
|
||||
pallet_bridge_messages::ensure_able_to_receive_confirmation::<Weights>(
|
||||
bp_rococo::max_extrinsic_size(),
|
||||
bp_rococo::max_extrinsic_weight(),
|
||||
Rococo::max_extrinsic_size(),
|
||||
Rococo::max_extrinsic_weight(),
|
||||
max_incoming_inbound_lane_data_proof_size,
|
||||
bp_rococo::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE,
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE,
|
||||
bp_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
|
||||
crate::RocksDbWeight::get(),
|
||||
);
|
||||
}
|
||||
@@ -465,7 +488,7 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
fn proved_messages(lane_id: LaneId) -> ProvedMessages<Message<crate::Balance>> {
|
||||
fn proved_messages(lane_id: LaneId) -> ProvedMessages<Message<Balance>> {
|
||||
vec![(
|
||||
lane_id,
|
||||
ProvedLaneMessages {
|
||||
|
||||
@@ -55,7 +55,7 @@ use sp_runtime::{
|
||||
OpaqueKeys, SaturatedConversion, Verify,
|
||||
},
|
||||
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
|
||||
ApplyExtrinsicResult, KeyTypeId,
|
||||
ApplyExtrinsicResult, FixedU128, KeyTypeId,
|
||||
};
|
||||
use sp_staking::SessionIndex;
|
||||
use sp_std::{collections::btree_map::BTreeMap, prelude::*};
|
||||
@@ -735,7 +735,7 @@ impl pallet_bridge_grandpa::Config for Runtime {
|
||||
type MaxRequests = MaxRequests;
|
||||
type HeadersToKeep = HeadersToKeep;
|
||||
|
||||
type WeightInfo = pallet_bridge_grandpa::weights::RialtoWeight<Runtime>;
|
||||
type WeightInfo = pallet_bridge_grandpa::weights::MillauWeight<Runtime>;
|
||||
}
|
||||
|
||||
pub type WococoGrandpaInstance = pallet_bridge_grandpa::Instance1;
|
||||
@@ -744,7 +744,7 @@ impl pallet_bridge_grandpa::Config<WococoGrandpaInstance> for Runtime {
|
||||
type MaxRequests = MaxRequests;
|
||||
type HeadersToKeep = HeadersToKeep;
|
||||
|
||||
type WeightInfo = pallet_bridge_grandpa::weights::RialtoWeight<Runtime>;
|
||||
type WeightInfo = pallet_bridge_grandpa::weights::MillauWeight<Runtime>;
|
||||
}
|
||||
|
||||
// Instance that is "deployed" at Wococo chain. Responsible for dispatching Rococo -> Wococo messages.
|
||||
@@ -778,9 +778,9 @@ impl pallet_bridge_dispatch::Config<AtRococoFromWococoMessagesDispatch> for Runt
|
||||
parameter_types! {
|
||||
pub const MaxMessagesToPruneAtOnce: bp_messages::MessageNonce = 8;
|
||||
pub const MaxUnrewardedRelayerEntriesAtInboundLane: bp_messages::MessageNonce =
|
||||
bp_rococo::MAX_UNREWARDED_RELAYER_ENTRIES_AT_INBOUND_LANE;
|
||||
bp_rococo::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX;
|
||||
pub const MaxUnconfirmedMessagesAtInboundLane: bp_messages::MessageNonce =
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE;
|
||||
bp_rococo::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX;
|
||||
pub const RootAccountForPayments: Option<AccountId> = None;
|
||||
pub const RococoChainId: bp_runtime::ChainId = bp_runtime::ROCOCO_CHAIN_ID;
|
||||
pub const WococoChainId: bp_runtime::ChainId = bp_runtime::WOCOCO_CHAIN_ID;
|
||||
@@ -792,7 +792,7 @@ pub type AtWococoWithRococoMessagesInstance = ();
|
||||
impl pallet_bridge_messages::Config<AtWococoWithRococoMessagesInstance> for Runtime {
|
||||
type Event = Event;
|
||||
type BridgedChainId = RococoChainId;
|
||||
type WeightInfo = pallet_bridge_messages::weights::RialtoWeight<Runtime>;
|
||||
type WeightInfo = pallet_bridge_messages::weights::MillauWeight<Runtime>;
|
||||
type Parameter = ();
|
||||
type MaxMessagesToPruneAtOnce = MaxMessagesToPruneAtOnce;
|
||||
type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane;
|
||||
@@ -815,7 +815,6 @@ impl pallet_bridge_messages::Config<AtWococoWithRococoMessagesInstance> for Runt
|
||||
AtWococoWithRococoMessagesInstance,
|
||||
pallet_balances::Pallet<Runtime>,
|
||||
crate::bridge_messages::GetDeliveryConfirmationTransactionFee,
|
||||
RootAccountForPayments,
|
||||
>;
|
||||
type OnDeliveryConfirmed = ();
|
||||
type OnMessageAccepted = ();
|
||||
@@ -830,7 +829,7 @@ pub type AtRococoWithWococoMessagesInstance = pallet_bridge_messages::Instance1;
|
||||
impl pallet_bridge_messages::Config<AtRococoWithWococoMessagesInstance> for Runtime {
|
||||
type Event = Event;
|
||||
type BridgedChainId = WococoChainId;
|
||||
type WeightInfo = pallet_bridge_messages::weights::RialtoWeight<Runtime>;
|
||||
type WeightInfo = pallet_bridge_messages::weights::MillauWeight<Runtime>;
|
||||
type Parameter = ();
|
||||
type MaxMessagesToPruneAtOnce = MaxMessagesToPruneAtOnce;
|
||||
type MaxUnrewardedRelayerEntriesAtInboundLane = MaxUnrewardedRelayerEntriesAtInboundLane;
|
||||
@@ -853,7 +852,6 @@ impl pallet_bridge_messages::Config<AtRococoWithWococoMessagesInstance> for Runt
|
||||
AtRococoWithWococoMessagesInstance,
|
||||
pallet_balances::Pallet<Runtime>,
|
||||
crate::bridge_messages::GetDeliveryConfirmationTransactionFee,
|
||||
RootAccountForPayments,
|
||||
>;
|
||||
type OnDeliveryConfirmed = ();
|
||||
type OnMessageAccepted = ();
|
||||
@@ -1373,10 +1371,6 @@ sp_api::impl_runtime_apis! {
|
||||
let header = BridgeRococoGrandpa::best_finalized();
|
||||
(header.number, header.hash())
|
||||
}
|
||||
|
||||
fn is_known_header(hash: bp_rococo::Hash) -> bool {
|
||||
BridgeRococoGrandpa::is_known_header(hash)
|
||||
}
|
||||
}
|
||||
|
||||
impl bp_wococo::WococoFinalityApi<Block> for Runtime {
|
||||
@@ -1384,20 +1378,18 @@ sp_api::impl_runtime_apis! {
|
||||
let header = BridgeWococoGrandpa::best_finalized();
|
||||
(header.number, header.hash())
|
||||
}
|
||||
|
||||
fn is_known_header(hash: bp_wococo::Hash) -> bool {
|
||||
BridgeWococoGrandpa::is_known_header(hash)
|
||||
}
|
||||
}
|
||||
|
||||
impl bp_rococo::ToRococoOutboundLaneApi<Block, Balance, bridge_messages::ToRococoMessagePayload> for Runtime {
|
||||
fn estimate_message_delivery_and_dispatch_fee(
|
||||
_lane_id: bp_messages::LaneId,
|
||||
payload: bridge_messages::ToWococoMessagePayload,
|
||||
rococo_to_wococo_conversion_rate: Option<FixedU128>,
|
||||
) -> Option<Balance> {
|
||||
estimate_message_dispatch_and_delivery_fee::<bridge_messages::AtWococoWithRococoMessageBridge>(
|
||||
&payload,
|
||||
bridge_messages::AtWococoWithRococoMessageBridge::RELAYER_FEE_PERCENT,
|
||||
rococo_to_wococo_conversion_rate,
|
||||
).ok()
|
||||
}
|
||||
|
||||
@@ -1421,38 +1413,18 @@ sp_api::impl_runtime_apis! {
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn latest_received_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeRococoMessages::outbound_latest_received_nonce(lane)
|
||||
}
|
||||
|
||||
fn latest_generated_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeRococoMessages::outbound_latest_generated_nonce(lane)
|
||||
}
|
||||
}
|
||||
|
||||
impl bp_rococo::FromRococoInboundLaneApi<Block> for Runtime {
|
||||
fn latest_received_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeRococoMessages::inbound_latest_received_nonce(lane)
|
||||
}
|
||||
|
||||
fn latest_confirmed_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeRococoMessages::inbound_latest_confirmed_nonce(lane)
|
||||
}
|
||||
|
||||
fn unrewarded_relayers_state(lane: bp_messages::LaneId) -> bp_messages::UnrewardedRelayersState {
|
||||
BridgeRococoMessages::inbound_unrewarded_relayers_state(lane)
|
||||
}
|
||||
}
|
||||
|
||||
impl bp_wococo::ToWococoOutboundLaneApi<Block, Balance, bridge_messages::ToWococoMessagePayload> for Runtime {
|
||||
fn estimate_message_delivery_and_dispatch_fee(
|
||||
_lane_id: bp_messages::LaneId,
|
||||
payload: bridge_messages::ToWococoMessagePayload,
|
||||
wococo_to_rococo_conversion_rate: Option<FixedU128>,
|
||||
) -> Option<Balance> {
|
||||
estimate_message_dispatch_and_delivery_fee::<bridge_messages::AtRococoWithWococoMessageBridge>(
|
||||
&payload,
|
||||
bridge_messages::AtRococoWithWococoMessageBridge::RELAYER_FEE_PERCENT,
|
||||
wococo_to_rococo_conversion_rate,
|
||||
).ok()
|
||||
}
|
||||
|
||||
@@ -1476,28 +1448,6 @@ sp_api::impl_runtime_apis! {
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn latest_received_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeWococoMessages::outbound_latest_received_nonce(lane)
|
||||
}
|
||||
|
||||
fn latest_generated_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeWococoMessages::outbound_latest_generated_nonce(lane)
|
||||
}
|
||||
}
|
||||
|
||||
impl bp_wococo::FromWococoInboundLaneApi<Block> for Runtime {
|
||||
fn latest_received_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeWococoMessages::inbound_latest_received_nonce(lane)
|
||||
}
|
||||
|
||||
fn latest_confirmed_nonce(lane: bp_messages::LaneId) -> bp_messages::MessageNonce {
|
||||
BridgeWococoMessages::inbound_latest_confirmed_nonce(lane)
|
||||
}
|
||||
|
||||
fn unrewarded_relayers_state(lane: bp_messages::LaneId) -> bp_messages::UnrewardedRelayersState {
|
||||
BridgeWococoMessages::inbound_unrewarded_relayers_state(lane)
|
||||
}
|
||||
}
|
||||
|
||||
impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
|
||||
|
||||
Reference in New Issue
Block a user