From b4ae54ee28e829274bc38452d1d23f18a5eeadb8 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 19 May 2022 11:16:43 +0200 Subject: [PATCH 01/53] point to my branch --- primitives/utility/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index 74cb8a3eb52..a1f680aa10e 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -14,10 +14,10 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../core", default-features = false } From 28553a07de440c2e95d5d13d764bba14b5857d95 Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 18 May 2022 14:52:51 +0200 Subject: [PATCH 02/53] girazoki-add-TakeFirstAssetTrader-to-utility --- primitives/utility/Cargo.toml | 5 ++ primitives/utility/src/lib.rs | 112 +++++++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index a1f680aa10e..6b4ef9e690f 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] } +log = { version = "0.4.17", default-features = false } # Substrate frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -18,6 +19,8 @@ polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", defau polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } + # Cumulus cumulus-primitives-core = { path = "../core", default-features = false } @@ -34,4 +37,6 @@ std = [ "polkadot-parachain/std", "polkadot-primitives/std", "cumulus-primitives-core/std", + "xcm-executor/std", + "xcm/std", ] diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 69397247a39..79ecc08f0d8 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -23,7 +23,18 @@ use codec::Encode; use cumulus_primitives_core::UpwardMessageSender; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; - +use frame_support::traits::{tokens::fungibles, Contains}; +use frame_support::traits::tokens::BalanceConversion; +use frame_support::weights::WeightToFeePolynomial; +use frame_support::pallet_prelude::Get; +use frame_support::weights::Weight; +use xcm_executor::traits::MatchesFungibles; +use xcm_executor::traits::WeightTrader; +use sp_runtime::traits::Zero; +use frame_support::traits::tokens::currency::Currency as CurrencyT; +use frame_support::traits::OnUnbalanced as OnUnbalancedT; +use sp_runtime::traits::Saturating; +use sp_runtime::SaturatedConversion; /// Xcm router which recognises the `Parent` destination and handles it by sending the message into /// the given UMP `UpwardMessageSender` implementation. Thus this essentially adapts an /// `UpwardMessageSender` trait impl into a `SendXcm` trait impl. @@ -51,3 +62,102 @@ impl SendXcm for ParentAsUmp { } } } + +pub struct TakeFirstAssetTrader< + WeightToFee: WeightToFeePolynomial, + AssetId: Get, + AccountId, + Currency: CurrencyT, + CON: BalanceConversion, + Matcher: MatchesFungibles, + Assets: fungibles::Mutate + fungibles::Transfer, + OnUnbalanced: OnUnbalancedT, +>( + Weight, + Assets::Balance, + Option<(MultiLocation, Assets::AssetId)>, + PhantomData<(WeightToFee, AssetId, AccountId, Currency, CON, Matcher, Assets, OnUnbalanced)>, +); +impl< + WeightToFee: WeightToFeePolynomial, + AssetId: Get, + AccountId, + Currency: CurrencyT, + CON: BalanceConversion, + Matcher: MatchesFungibles, + Assets: fungibles::Mutate + fungibles::Transfer, + OnUnbalanced: OnUnbalancedT, + > WeightTrader for TakeFirstAssetTrader +{ + + fn new() -> Self { + Self(0, Zero::zero(), None, PhantomData) + } + + // We take first asset + // TODO: do we want to be iterating over all potential assets in payments? + // Check whether we can convert fee to asset_fee (is_sufficient, min_deposit) + // If everything goes well, we charge. + fn buy_weight(&mut self, weight: Weight, payment: xcm_executor::Assets) -> Result { + log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); + // Based on weight bought, calculate how much native token fee we need to pay + let amount = WeightToFee::calc(&weight); + // We take the very first multiasset from payment + // TODO: revisit this clone + let multiassets: MultiAssets = payment.clone().into(); + let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; + // We get the local asset id in which we can pay for fees + let (local_asset_id, _) = Matcher::matches_fungibles(&first).map_err(|_| XcmError::TooExpensive)?; + // it reads the min_balance of the asset + // potential db read + // Already should have been read with WithdrawAsset in case of pallet-assets + let asset_balance = CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; + + match first { + // Not relevant match, as matches_fungibles should have already verified this above + MultiAsset { + id: xcm::latest::AssetId::Concrete(location), + fun: Fungibility::Fungible(_) + } => { + // convert asset_balance to u128 + let u128_amount: u128 = asset_balance.try_into().map_err(|_| XcmError::Overflow)?; + // Construct required payment + let required = (Concrete(location.clone()), u128_amount).into(); + // Substract payment + let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?; + // record weight + self.0 = self.0.saturating_add(weight); + // record amount + self.1 = self.1.saturating_add(asset_balance); + // record multilocation and local_asset_id + self.2 = Some((location.clone(), local_asset_id)); + Ok(unused) + } + _ => return Err(XcmError::TooExpensive) + } + } + + fn refund_weight(&mut self, weight: Weight) -> Option { + log::trace!(target: "xcm::weight", "UsingComponents::refund_weight weight: {:?}", weight); + let weight = weight.min(self.0); + let amount = WeightToFee::calc(&weight); + // If not None + if let Some((asset_location, local_asset_id)) = self.2.clone() { + // Calculate asset_balance + // This read should have already be cached in buy_weoght + let asset_balance = CON::to_asset_balance(amount, local_asset_id).ok()?; + self.0 -= weight; + self.1 = self.1.saturating_sub(asset_balance); + + let asset_balance: u128 = asset_balance.saturated_into(); + if asset_balance > 0 { + Some((asset_location, asset_balance).into()) + } else { + None + } + } + else { + None + } + } +} \ No newline at end of file From df1c4da15ac9867bdc52dd0af3d729fdc618dd9c Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 19 May 2022 11:18:17 +0200 Subject: [PATCH 03/53] Commit lock --- Cargo.lock | 2407 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 1945 insertions(+), 462 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7310f44ccd3..d8214af34c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-runtime", "finality-grandpa", @@ -707,7 +707,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-runtime", "frame-support", @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bitvec", "bp-runtime", @@ -736,7 +736,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-messages", "bp-runtime", @@ -754,7 +754,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", "hash-db", @@ -789,7 +789,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -804,7 +804,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1186,7 +1186,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", + "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "log", "pallet-aura", "pallet-authorship", @@ -1203,13 +1203,13 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-runtime-common", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "smallvec", @@ -1226,9 +1226,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1594,11 +1594,11 @@ dependencies = [ "futures 0.3.21", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-primitives", - "polkadot-node-subsystem", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "polkadot-node-subsystem-test-helpers", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-client-api", "sp-api", "sp-consensus", @@ -1649,7 +1649,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-client-api", "sc-consensus", "sp-api", @@ -1698,11 +1698,11 @@ dependencies = [ "futures-timer", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-client", - "polkadot-node-primitives", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-service", + "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "polkadot-test-client", "portpicker", "sc-cli", @@ -1732,10 +1732,10 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -1762,8 +1762,8 @@ dependencies = [ "cumulus-relay-chain-interface", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-chain-spec", "sc-client-api", "sc-consensus", @@ -1812,8 +1812,8 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", - "xcm", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1834,7 +1834,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain 0.9.22", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-client-api", "scale-info", "serde", @@ -1849,7 +1849,7 @@ dependencies = [ "sp-tracing", "sp-trie", "sp-version", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1885,7 +1885,7 @@ dependencies = [ "frame-system", "pallet-sudo", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "sp-runtime", "sp-std", @@ -1904,7 +1904,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1925,9 +1925,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1943,7 +1943,7 @@ dependencies = [ "serde", "sp-runtime", "sp-std", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -1952,9 +1952,9 @@ version = "0.1.0" dependencies = [ "frame-support", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-primitives", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sp-api", "sp-runtime", "sp-std", @@ -2006,14 +2006,16 @@ version = "0.1.0" dependencies = [ "cumulus-primitives-core", "frame-support", + "log", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-primitives", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sp-runtime", "sp-std", "sp-trie", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -2027,9 +2029,9 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parking_lot 0.12.0", - "polkadot-client", - "polkadot-primitives", - "polkadot-service", + "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "polkadot-test-client", "sc-client-api", "sc-consensus-babe", @@ -2059,8 +2061,8 @@ dependencies = [ "jsonrpsee-core", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-overseer", - "polkadot-service", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-client-api", "sc-service", "sp-api", @@ -2084,7 +2086,7 @@ dependencies = [ "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-service", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-client-api", "sc-rpc-api", "sp-api", @@ -2109,8 +2111,8 @@ dependencies = [ "pallet-balances", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-primitives", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-block-builder", "sc-consensus", "sc-executor", @@ -2133,7 +2135,7 @@ version = "0.1.0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-runtime", "sp-state-machine", "sp-std", @@ -2143,7 +2145,7 @@ dependencies = [ name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" dependencies = [ - "polkadot-node-core-pvf", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] @@ -2183,7 +2185,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 3.1.17", + "clap 3.1.18", "criterion", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -2205,10 +2207,10 @@ dependencies = [ "parachains-common", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-cli", - "polkadot-primitives", - "polkadot-service", - "polkadot-test-service", + "polkadot-cli 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-test-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "portpicker", "rand 0.8.5", "sc-basic-authorship", @@ -3904,7 +3906,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "beefy-primitives", "bitvec", @@ -3917,7 +3919,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", + "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "log", "pallet-authority-discovery", "pallet-authorship", @@ -3959,12 +3961,97 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "static_assertions", + "substrate-wasm-builder", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "kusama-runtime" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "beefy-primitives", + "bitvec", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "kusama-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-elections-phragmen", + "pallet-gilt", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-multisig", + "pallet-nicks", + "pallet-nomination-pools", + "pallet-offences", + "pallet-preimage", + "pallet-proxy", + "pallet-recovery", + "pallet-scheduler", + "pallet-session", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-fn", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rustc-hex", "scale-info", "serde", @@ -3989,9 +4076,21 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "kusama-runtime-constants" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-support", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "smallvec", + "sp-runtime", ] [[package]] @@ -4000,8 +4099,8 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "smallvec", "sp-runtime", ] @@ -4895,6 +4994,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "metered-channel" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "coarsetime", + "crossbeam-queue", + "derive_more", + "futures 0.3.21", + "futures-timer", + "nanorand", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "metered-channel" version = "0.9.22" @@ -4907,7 +5021,7 @@ dependencies = [ "futures-timer", "nanorand", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] @@ -5557,7 +5671,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5574,7 +5688,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5596,7 +5710,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bitvec", "bp-message-dispatch", @@ -6415,6 +6529,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-xcm" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "pallet-xcm" version = "0.9.22" @@ -6429,14 +6562,14 @@ dependencies = [ "sp-core", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] name = "pallet-xcm-benchmarks" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -6446,8 +6579,8 @@ dependencies = [ "scale-info", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6487,10 +6620,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parachain-template-runtime", "parity-scale-codec", - "polkadot-cli", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-service", + "polkadot-cli 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-basic-authorship", "sc-chain-spec", "sc-cli", @@ -6525,7 +6658,7 @@ dependencies = [ "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "try-runtime-cli", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6560,11 +6693,11 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-runtime-common", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "smallvec", @@ -6581,9 +6714,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6599,8 +6732,8 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "sp-consensus-aura", "sp-core", @@ -6608,8 +6741,8 @@ dependencies = [ "sp-runtime", "sp-std", "substrate-wasm-builder", - "xcm", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6946,19 +7079,48 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "polkadot-approval-distribution" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-approval-distribution" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "futures 0.3.21", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "rand 0.8.5", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-availability-bitfield-distribution" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rand 0.8.5", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6967,12 +7129,35 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "futures 0.3.21", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "rand 0.8.5", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-availability-distribution" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "derive_more", + "fatality", + "futures 0.3.21", + "lru 0.7.5", + "parity-scale-codec", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rand 0.8.5", - "tracing-gum", + "sp-core", + "sp-keystore", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -6985,17 +7170,38 @@ dependencies = [ "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sp-core", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-availability-recovery" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "fatality", + "futures 0.3.21", + "lru 0.7.5", + "parity-scale-codec", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "sc-network", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7007,16 +7213,41 @@ dependencies = [ "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sc-network", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-cli" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "clap 3.1.18", + "frame-benchmarking-cli", + "futures 0.3.21", + "log", + "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-performance-test 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-cli", + "sc-service", + "sc-sysinfo", + "sc-tracing", + "sp-core", + "sp-trie", + "substrate-build-script-utils", + "thiserror", + "try-runtime-cli", ] [[package]] @@ -7028,11 +7259,11 @@ dependencies = [ "frame-benchmarking-cli", "futures 0.3.21", "log", - "polkadot-client", - "polkadot-node-core-pvf", - "polkadot-node-metrics", - "polkadot-performance-test", - "polkadot-service", + "polkadot-client 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-performance-test 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-cli", "sc-service", "sc-sysinfo", @@ -7044,6 +7275,46 @@ dependencies = [ "try-runtime-cli", ] +[[package]] +name = "polkadot-client" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "beefy-primitives", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", + "frame-system-rpc-runtime-api", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-service", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-mmr-primitives", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-storage", + "sp-timestamp", + "sp-transaction-pool", +] + [[package]] name = "polkadot-client" version = "0.9.22" @@ -7056,11 +7327,11 @@ dependencies = [ "frame-system-rpc-runtime-api", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", + "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-client-api", "sc-consensus", "sc-executor", @@ -7084,6 +7355,27 @@ dependencies = [ "sp-transaction-pool", ] +[[package]] +name = "polkadot-collator-protocol" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "always-assert", + "fatality", + "futures 0.3.21", + "futures-timer", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-core", + "sp-keystore", + "sp-runtime", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-collator-protocol" version = "0.9.22" @@ -7093,16 +7385,29 @@ dependencies = [ "fatality", "futures 0.3.21", "futures-timer", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-core", "sp-keystore", "sp-runtime", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-core-primitives" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -7121,40 +7426,97 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "derive_more", "fatality", "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-network", "sp-application-crypto", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] -name = "polkadot-erasure-coding" +name = "polkadot-dispute-distribution" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "derive_more", + "fatality", + "futures 0.3.21", + "lru 0.7.5", + "parity-scale-codec", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "sc-network", + "sp-application-crypto", + "sp-keystore", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-erasure-coding" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "parity-scale-codec", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "reed-solomon-novelpoly", + "sp-core", + "sp-trie", + "thiserror", +] + +[[package]] +name = "polkadot-erasure-coding" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "reed-solomon-novelpoly", "sp-core", "sp-trie", "thiserror", ] +[[package]] +name = "polkadot-gossip-support" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "futures-timer", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "rand_chacha 0.3.1", + "sc-network", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-gossip-support" version = "0.9.22" @@ -7162,17 +7524,38 @@ source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3 dependencies = [ "futures 0.3.21", "futures-timer", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sp-application-crypto", "sp-core", "sp-keystore", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-network-bridge" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "always-assert", + "async-trait", + "bytes", + "futures 0.3.21", + "parity-scale-codec", + "parking_lot 0.12.0", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-network", + "sp-consensus", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7186,14 +7569,32 @@ dependencies = [ "futures 0.3.21", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-network", "sp-consensus", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-collation-generation" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "parity-scale-codec", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-core", + "sp-maybe-compressed-blob", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7203,15 +7604,44 @@ source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3 dependencies = [ "futures 0.3.21", "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-approval-voting" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitvec", + "derive_more", + "futures 0.3.21", + "futures-timer", + "kvdb", + "lru 0.7.5", + "merlin", + "parity-scale-codec", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-keystore", + "schnorrkel", + "sp-application-crypto", + "sp-consensus", + "sp-consensus-slots", + "sp-runtime", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7227,12 +7657,12 @@ dependencies = [ "lru 0.7.5", "merlin", "parity-scale-codec", - "polkadot-node-jaeger", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-keystore", "schnorrkel", "sp-application-crypto", @@ -7240,7 +7670,27 @@ dependencies = [ "sp-consensus-slots", "sp-runtime", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-av-store" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitvec", + "futures 0.3.21", + "futures-timer", + "kvdb", + "parity-scale-codec", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7253,14 +7703,33 @@ dependencies = [ "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-backing" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitvec", + "fatality", + "futures 0.3.21", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-statement-table 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7271,15 +7740,30 @@ dependencies = [ "bitvec", "fatality", "futures 0.3.21", - "polkadot-erasure-coding", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "polkadot-statement-table", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-statement-table 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "sp-keystore", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-bitfield-signing" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "wasm-timer", ] [[package]] @@ -7288,15 +7772,33 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "futures 0.3.21", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "wasm-timer", ] +[[package]] +name = "polkadot-node-core-candidate-validation" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "futures 0.3.21", + "parity-scale-codec", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-maybe-compressed-blob", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.22" @@ -7305,14 +7807,29 @@ dependencies = [ "async-trait", "futures 0.3.21", "parity-scale-codec", - "polkadot-node-core-pvf", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.22", - "polkadot-primitives", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-maybe-compressed-blob", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-chain-api" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-client-api", + "sc-consensus-babe", + "sp-blockchain", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7321,13 +7838,30 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "futures 0.3.21", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-chain-selection" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "futures-timer", + "kvdb", + "parity-scale-codec", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7339,12 +7873,31 @@ dependencies = [ "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-dispute-coordinator" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "fatality", + "futures 0.3.21", + "kvdb", + "lru 0.7.5", + "parity-scale-codec", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7357,13 +7910,30 @@ dependencies = [ "kvdb", "lru 0.7.5", "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-parachains-inherent" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-blockchain", + "sp-inherents", + "sp-runtime", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7374,13 +7944,31 @@ dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", - "polkadot-node-subsystem", - "polkadot-primitives", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-blockchain", "sp-inherents", "sp-runtime", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-provisioner" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitvec", + "fatality", + "futures 0.3.21", + "futures-timer", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7392,13 +7980,43 @@ dependencies = [ "fatality", "futures 0.3.21", "futures-timer", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-pvf" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "always-assert", + "assert_matches", + "async-process", + "async-std", + "futures 0.3.21", + "futures-timer", + "parity-scale-codec", + "pin-project 1.0.10", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "slotmap", + "sp-core", + "sp-externalities", + "sp-io", + "sp-maybe-compressed-blob", + "sp-tracing", + "sp-wasm-interface", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7414,9 +8032,9 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project 1.0.10", - "polkadot-core-primitives", - "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.22", + "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sc-executor", "sc-executor-common", @@ -7428,7 +8046,23 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-pvf-checker" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-keystore", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7437,14 +8071,32 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "futures 0.3.21", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-core-runtime-api" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "memory-lru", + "parity-util-mem", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-api", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-core", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7455,14 +8107,32 @@ dependencies = [ "futures 0.3.21", "memory-lru", "parity-util-mem", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-jaeger" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-std", + "lazy_static", + "log", + "mick-jaeger", + "parity-scale-codec", + "parking_lot 0.12.0", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-network", + "sp-core", + "thiserror", ] [[package]] @@ -7476,8 +8146,8 @@ dependencies = [ "mick-jaeger", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-network", "sp-core", "thiserror", @@ -7486,35 +8156,75 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", - "metered-channel", + "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-cli", "sc-service", "sc-tracing", "substrate-prometheus-endpoint", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] -name = "polkadot-node-network-protocol" +name = "polkadot-node-metrics" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ - "async-trait", - "derive_more", + "bs58", + "futures 0.3.21", + "futures-timer", + "log", + "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "sc-cli", + "sc-service", + "sc-tracing", + "substrate-prometheus-endpoint", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-node-network-protocol" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "derive_more", + "fatality", + "futures 0.3.21", + "parity-scale-codec", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "sc-authority-discovery", + "sc-network", + "strum 0.24.0", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "polkadot-node-network-protocol" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "async-trait", + "derive_more", "fatality", "futures 0.3.21", "parity-scale-codec", - "polkadot-node-jaeger", - "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sc-authority-discovery", "sc-network", @@ -7522,6 +8232,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polkadot-node-primitives" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bounded-vec", + "futures 0.3.21", + "parity-scale-codec", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "schnorrkel", + "serde", + "sp-application-crypto", + "sp-consensus-babe", + "sp-consensus-vrf", + "sp-core", + "sp-keystore", + "sp-maybe-compressed-blob", + "thiserror", + "zstd", +] + [[package]] name = "polkadot-node-primitives" version = "0.9.22" @@ -7530,8 +8262,8 @@ dependencies = [ "bounded-vec", "futures 0.3.21", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-primitives", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "schnorrkel", "serde", "sp-application-crypto", @@ -7544,27 +8276,37 @@ dependencies = [ "zstd", ] +[[package]] +name = "polkadot-node-subsystem" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-node-subsystem" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ - "polkadot-node-jaeger", - "polkadot-node-subsystem-types", - "polkadot-overseer", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "async-trait", "futures 0.3.21", "parking_lot 0.12.0", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-keystore", "sp-application-crypto", "sp-core", @@ -7572,6 +8314,25 @@ dependencies = [ "sp-keystore", ] +[[package]] +name = "polkadot-node-subsystem-types" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "derive_more", + "futures 0.3.21", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer-gen 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-statement-table 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-network", + "smallvec", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "polkadot-node-subsystem-types" version = "0.9.22" @@ -7579,18 +8340,51 @@ source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3 dependencies = [ "derive_more", "futures 0.3.21", - "polkadot-node-jaeger", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen", - "polkadot-primitives", - "polkadot-statement-table", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer-gen 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-statement-table 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-network", "smallvec", "substrate-prometheus-endpoint", "thiserror", ] +[[package]] +name = "polkadot-node-subsystem-util" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "derive_more", + "fatality", + "futures 0.3.21", + "itertools", + "kvdb", + "lru 0.7.5", + "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "parity-db", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.11.2", + "pin-project 1.0.10", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-node-subsystem-util" version = "0.9.22" @@ -7603,25 +8397,46 @@ dependencies = [ "itertools", "kvdb", "lru 0.7.5", - "metered-channel", + "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "parity-db", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", - "polkadot-node-jaeger", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sp-application-crypto", "sp-core", "sp-keystore", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-overseer" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "futures 0.3.21", + "futures-timer", + "lru 0.7.5", + "parity-util-mem", + "parking_lot 0.12.0", + "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer-gen 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-client-api", + "sp-api", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7634,15 +8449,32 @@ dependencies = [ "lru 0.7.5", "parity-util-mem", "parking_lot 0.12.0", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem-types", - "polkadot-overseer-gen", - "polkadot-primitives", + "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer-gen 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-client-api", "sp-api", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-overseer-gen" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pin-project 1.0.10", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer-gen-proc-macro 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -7653,13 +8485,26 @@ dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", - "metered-channel", + "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "pin-project 1.0.10", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer-gen-proc-macro 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-overseer-gen-proc-macro" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "expander 0.0.6", + "petgraph", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -7675,6 +8520,23 @@ dependencies = [ "syn", ] +[[package]] +name = "polkadot-parachain" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "derive_more", + "frame-support", + "parity-scale-codec", + "parity-util-mem", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "polkadot-parachain" version = "0.9.22" @@ -7684,7 +8546,7 @@ dependencies = [ "frame-support", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", + "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "scale-info", "serde", "sp-core", @@ -7722,10 +8584,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parachains-common", "parity-scale-codec", - "polkadot-cli", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-service", + "polkadot-cli 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rococo-parachain-runtime", "sc-basic-authorship", "sc-chain-spec", @@ -7766,7 +8628,22 @@ dependencies = [ "tempfile", "try-runtime-cli", "westmint-runtime", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "polkadot-performance-test" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "env_logger 0.9.0", + "kusama-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "log", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "quote", + "thiserror", ] [[package]] @@ -7775,15 +8652,45 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "env_logger 0.9.0", - "kusama-runtime", + "kusama-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "log", - "polkadot-erasure-coding", - "polkadot-node-core-pvf", - "polkadot-node-primitives", + "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "quote", "thiserror", ] +[[package]] +name = "polkadot-primitives" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitvec", + "frame-system", + "hex-literal", + "parity-scale-codec", + "parity-util-mem", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-trie", + "sp-version", +] + [[package]] name = "polkadot-primitives" version = "0.9.22" @@ -7794,8 +8701,8 @@ dependencies = [ "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", + "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "scale-info", "serde", "sp-api", @@ -7814,6 +8721,38 @@ dependencies = [ "sp-version", ] +[[package]] +name = "polkadot-rpc" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "beefy-gadget", + "beefy-gadget-rpc", + "jsonrpsee", + "pallet-mmr-rpc", + "pallet-transaction-payment-rpc", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sc-chain-spec", + "sc-client-api", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-epochs", + "sc-finality-grandpa", + "sc-finality-grandpa-rpc", + "sc-rpc", + "sc-sync-state-rpc", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-keystore", + "sp-runtime", + "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", +] + [[package]] name = "polkadot-rpc" version = "0.9.22" @@ -7824,7 +8763,7 @@ dependencies = [ "jsonrpsee", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -7849,7 +8788,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "beefy-primitives", "bitvec", @@ -7898,12 +8837,12 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rustc-hex", "scale-info", "serde", @@ -7927,15 +8866,95 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] -name = "polkadot-runtime-common" +name = "polkadot-runtime" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "beefy-primitives", + "bitvec", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-elections-phragmen", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-multisig", + "pallet-nicks", + "pallet-offences", + "pallet-preimage", + "pallet-proxy", + "pallet-scheduler", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "static_assertions", + "substrate-wasm-builder", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-runtime-common" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "beefy-primitives", "bitvec", @@ -7959,13 +8978,13 @@ dependencies = [ "pallet-treasury", "pallet-vesting", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-parachains", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rustc-hex", "scale-info", "serde", "serde_derive", - "slot-range-helper", + "slot-range-helper 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sp-api", "sp-core", "sp-inherents", @@ -7976,7 +8995,64 @@ dependencies = [ "sp-staking", "sp-std", "static_assertions", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "polkadot-runtime-common" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "beefy-primitives", + "bitvec", + "frame-election-provider-support", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "libsecp256k1", + "log", + "pallet-authorship", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy-mmr", + "pallet-election-provider-multi-phase", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", + "pallet-vesting", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "slot-range-helper 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "static_assertions", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-runtime-constants" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-support", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "smallvec", + "sp-runtime", ] [[package]] @@ -7985,12 +9061,24 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "smallvec", "sp-runtime", ] +[[package]] +name = "polkadot-runtime-metrics" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bs58", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-std", + "sp-tracing", +] + [[package]] name = "polkadot-runtime-metrics" version = "0.9.22" @@ -7998,7 +9086,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3 dependencies = [ "bs58", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-std", "sp-tracing", ] @@ -8006,7 +9094,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bitflags", "bitvec", @@ -8024,26 +9112,169 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-metrics", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", "serde", "sp-api", - "sp-application-crypto", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "static_assertions", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "polkadot-runtime-parachains" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "bitflags", + "bitvec", + "derive_more", + "frame-support", + "frame-system", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "pallet-vesting", + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rustc-hex", + "scale-info", + "serde", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-service" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "async-trait", + "beefy-gadget", + "beefy-primitives", + "frame-system-rpc-runtime-api", + "futures 0.3.21", + "hex-literal", + "kusama-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "kvdb", + "kvdb-rocksdb", + "lru 0.7.5", + "pallet-babe", + "pallet-im-online", + "pallet-staking", + "pallet-transaction-payment-rpc-runtime-api", + "parity-db", + "polkadot-approval-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-availability-bitfield-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-availability-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-availability-recovery 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-collator-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-dispute-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-gossip-support 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-network-bridge 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-collation-generation 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-approval-voting 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-av-store 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-backing 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-bitfield-signing 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-candidate-validation 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-chain-api 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-chain-selection 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-dispute-coordinator 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-provisioner 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-pvf-checker 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-core-runtime-api 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-rpc 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-statement-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rococo-runtime", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-consensus-slots", + "sc-consensus-uncles", + "sc-executor", + "sc-finality-grandpa", + "sc-keystore", + "sc-network", + "sc-offchain", + "sc-service", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "serde", + "serde_json", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", "sp-core", + "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keystore", + "sp-offchain", "sp-runtime", "sp-session", - "sp-staking", - "sp-std", - "static_assertions", - "xcm", - "xcm-executor", + "sp-state-machine", + "sp-storage", + "sp-timestamp", + "sp-transaction-pool", + "sp-trie", + "substrate-prometheus-endpoint", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "westend-runtime", ] [[package]] @@ -8057,7 +9288,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", "hex-literal", - "kusama-runtime", "kvdb", "kvdb-rocksdb", "lru 0.7.5", @@ -8066,42 +9296,41 @@ dependencies = [ "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", "parity-db", - "polkadot-approval-distribution", - "polkadot-availability-bitfield-distribution", - "polkadot-availability-distribution", - "polkadot-availability-recovery", - "polkadot-client", - "polkadot-collator-protocol", - "polkadot-dispute-distribution", - "polkadot-gossip-support", - "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-approval-voting", - "polkadot-node-core-av-store", - "polkadot-node-core-backing", - "polkadot-node-core-bitfield-signing", - "polkadot-node-core-candidate-validation", - "polkadot-node-core-chain-api", - "polkadot-node-core-chain-selection", - "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-parachains-inherent", - "polkadot-node-core-provisioner", - "polkadot-node-core-pvf-checker", - "polkadot-node-core-runtime-api", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-runtime", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", - "polkadot-statement-distribution", - "rococo-runtime", + "polkadot-approval-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-availability-bitfield-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-availability-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-availability-recovery 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-client 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-collator-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-dispute-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-gossip-support 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-network-bridge 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-collation-generation 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-approval-voting 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-av-store 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-backing 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-bitfield-signing 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-candidate-validation 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-chain-api 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-chain-selection 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-dispute-coordinator 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-provisioner 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-pvf-checker 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-runtime-api 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-rpc 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-statement-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", @@ -8145,8 +9374,28 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing-gum", - "westend-runtime", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-statement-distribution" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "arrayvec 0.5.2", + "fatality", + "futures 0.3.21", + "indexmap", + "parity-scale-codec", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-keystore", + "sp-staking", + "thiserror", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -8159,15 +9408,25 @@ dependencies = [ "futures 0.3.21", "indexmap", "parity-scale-codec", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-keystore", "sp-staking", "thiserror", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-statement-table" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "parity-scale-codec", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "sp-core", ] [[package]] @@ -8176,20 +9435,20 @@ version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "sp-core", ] [[package]] name = "polkadot-test-client" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "parity-scale-codec", - "polkadot-node-subsystem", - "polkadot-primitives", - "polkadot-test-runtime", - "polkadot-test-service", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-test-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-test-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "sc-block-builder", "sc-consensus", "sc-service", @@ -8205,6 +9464,68 @@ dependencies = [ "substrate-test-client", ] +[[package]] +name = "polkadot-test-runtime" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "beefy-primitives", + "bitvec", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-grandpa", + "pallet-indices", + "pallet-nicks", + "pallet-offences", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-vesting", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "parity-scale-codec", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", + "test-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "polkadot-test-runtime" version = "0.9.22" @@ -8234,12 +9555,12 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rustc-hex", "scale-info", "serde", @@ -8261,10 +9582,64 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "test-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", + "test-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "polkadot-test-service" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-benchmarking", + "frame-system", + "futures 0.1.31", + "futures 0.3.21", + "hex", + "pallet-balances", + "pallet-staking", + "pallet-transaction-payment", + "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-rpc 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-test-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "rand 0.8.5", + "sc-authority-discovery", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "sc-executor", + "sc-finality-grandpa", + "sc-network", + "sc-service", + "sc-tracing", + "sc-transaction-pool", + "sp-arithmetic", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "substrate-test-client", + "tempfile", + "test-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "tokio", + "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -8280,16 +9655,16 @@ dependencies = [ "pallet-balances", "pallet-staking", "pallet-transaction-payment", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-rpc", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "polkadot-service", - "polkadot-test-runtime", + "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-rpc 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-test-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "rand 0.8.5", "sc-authority-discovery", "sc-chain-spec", @@ -8316,9 +9691,9 @@ dependencies = [ "sp-state-machine", "substrate-test-client", "tempfile", - "test-runtime-constants", + "test-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "tokio", - "tracing-gum", + "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] @@ -8950,11 +10325,11 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-parachain 0.9.22", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "sp-api", @@ -8970,15 +10345,15 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] name = "rococo-runtime" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -9020,12 +10395,12 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rococo-runtime-constants", "scale-info", "serde", @@ -9047,19 +10422,19 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] name = "rococo-runtime-constants" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "smallvec", "sp-runtime", ] @@ -10601,9 +11976,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -10659,6 +12034,18 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +[[package]] +name = "slot-range-helper" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "enumn", + "parity-scale-codec", + "paste", + "sp-runtime", + "sp-std", +] + [[package]] name = "slot-range-helper" version = "0.9.22" @@ -11499,7 +12886,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants", + "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -11516,13 +12903,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-runtime-common", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "smallvec", @@ -11539,9 +12926,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -11582,14 +12969,14 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-runtime-common", - "polkadot-runtime-constants", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "smallvec", @@ -11606,9 +12993,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -11935,14 +13322,26 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" +[[package]] +name = "test-runtime-constants" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-support", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "smallvec", + "sp-runtime", +] + [[package]] name = "test-runtime-constants" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "smallvec", "sp-runtime", ] @@ -12213,15 +13612,38 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-gum" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "tracing", + "tracing-gum-proc-macro 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "tracing-gum" version = "0.9.22" source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" dependencies = [ - "polkadot-node-jaeger", - "polkadot-primitives", + "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "tracing", - "tracing-gum-proc-macro", + "tracing-gum-proc-macro 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "tracing-gum-proc-macro" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "expander 0.0.6", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -12936,7 +14358,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "beefy-primitives", "bitvec", @@ -12987,13 +14409,13 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain 0.9.22", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "rustc-hex", "scale-info", "serde", @@ -13017,19 +14439,19 @@ dependencies = [ "sp-version", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] name = "westend-runtime-constants" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", + "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "smallvec", "sp-runtime", ] @@ -13071,13 +14493,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain 0.9.22", - "polkadot-runtime-common", + "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", "scale-info", "serde", "smallvec", @@ -13095,9 +14517,9 @@ dependencies = [ "sp-version", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -13263,6 +14685,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xcm" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "derivative", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "xcm-procedural 0.1.0 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + [[package]] name = "xcm" version = "0.9.22" @@ -13273,7 +14708,27 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "xcm-procedural", + "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "xcm-builder" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", ] [[package]] @@ -13286,20 +14741,20 @@ dependencies = [ "log", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.22", + "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", ] [[package]] name = "xcm-executor" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-benchmarking", "frame-support", @@ -13311,7 +14766,35 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", +] + +[[package]] +name = "xcm-executor" +version = "0.9.22" +source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +dependencies = [ + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", +] + +[[package]] +name = "xcm-procedural" +version = "0.1.0" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn", ] [[package]] From 6adb10df53356e3df9890aba8ddc68b81e006d89 Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 18 May 2022 16:29:55 +0200 Subject: [PATCH 04/53] point at custom branch --- Cargo.lock | 2414 ++++------------- client/collator/Cargo.toml | 10 +- client/consensus/common/Cargo.toml | 2 +- client/network/Cargo.toml | 12 +- client/pov-recovery/Cargo.toml | 8 +- .../Cargo.toml | 8 +- client/relay-chain-interface/Cargo.toml | 4 +- client/relay-chain-rpc-interface/Cargo.toml | 2 +- client/service/Cargo.toml | 4 +- pallets/dmp-queue/Cargo.toml | 4 +- pallets/parachain-system/Cargo.toml | 4 +- pallets/solo-to-para/Cargo.toml | 2 +- pallets/xcm/Cargo.toml | 2 +- pallets/xcmp-queue/Cargo.toml | 6 +- parachain-template/node/Cargo.toml | 10 +- parachain-template/runtime/Cargo.toml | 12 +- polkadot-parachains/Cargo.toml | 10 +- .../contracts-rococo/Cargo.toml | 16 +- polkadot-parachains/pallets/ping/Cargo.toml | 2 +- .../parachains-common/Cargo.toml | 8 +- .../rococo-parachain/Cargo.toml | 10 +- polkadot-parachains/shell/Cargo.toml | 6 +- polkadot-parachains/statemine/Cargo.toml | 16 +- polkadot-parachains/statemint/Cargo.toml | 16 +- polkadot-parachains/westmint/Cargo.toml | 16 +- primitives/core/Cargo.toml | 6 +- primitives/utility/Cargo.toml | 1 + primitives/utility/src/lib.rs | 107 +- test/client/Cargo.toml | 4 +- test/relay-sproof-builder/Cargo.toml | 2 +- .../Cargo.toml | 2 +- test/service/Cargo.toml | 10 +- 32 files changed, 652 insertions(+), 2084 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8214af34c8..4ac2405aa18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1186,7 +1186,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "kusama-runtime-constants", "log", "pallet-aura", "pallet-authorship", @@ -1203,13 +1203,13 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-runtime-common", "scale-info", "serde", "smallvec", @@ -1226,9 +1226,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -1594,11 +1594,11 @@ dependencies = [ "futures 0.3.21", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer", + "polkadot-primitives", "sc-client-api", "sp-api", "sp-consensus", @@ -1649,7 +1649,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", "sc-client-api", "sc-consensus", "sp-api", @@ -1698,11 +1698,11 @@ dependencies = [ "futures-timer", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-client", + "polkadot-node-primitives", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-service", "polkadot-test-client", "portpicker", "sc-cli", @@ -1732,10 +1732,10 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -1762,8 +1762,8 @@ dependencies = [ "cumulus-relay-chain-interface", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer", + "polkadot-primitives", "sc-chain-spec", "sc-client-api", "sc-consensus", @@ -1812,8 +1812,8 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-executor", ] [[package]] @@ -1834,7 +1834,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22", "sc-client-api", "scale-info", "serde", @@ -1849,7 +1849,7 @@ dependencies = [ "sp-tracing", "sp-trie", "sp-version", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", ] [[package]] @@ -1885,7 +1885,7 @@ dependencies = [ "frame-system", "pallet-sudo", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", "scale-info", "sp-runtime", "sp-std", @@ -1904,7 +1904,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", ] [[package]] @@ -1925,9 +1925,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -1943,7 +1943,7 @@ dependencies = [ "serde", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", ] [[package]] @@ -1952,9 +1952,9 @@ version = "0.1.0" dependencies = [ "frame-support", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-primitives", "sp-api", "sp-runtime", "sp-std", @@ -2007,15 +2007,16 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "log", + "pallet-asset-tx-payment", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-primitives", "sp-runtime", "sp-std", "sp-trie", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-executor", ] [[package]] @@ -2029,9 +2030,9 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parking_lot 0.12.0", - "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-client", + "polkadot-primitives", + "polkadot-service", "polkadot-test-client", "sc-client-api", "sc-consensus-babe", @@ -2061,8 +2062,8 @@ dependencies = [ "jsonrpsee-core", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-overseer", + "polkadot-service", "sc-client-api", "sc-service", "sp-api", @@ -2086,7 +2087,7 @@ dependencies = [ "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-service", "sc-client-api", "sc-rpc-api", "sp-api", @@ -2111,8 +2112,8 @@ dependencies = [ "pallet-balances", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22", + "polkadot-primitives", "sc-block-builder", "sc-consensus", "sc-executor", @@ -2135,7 +2136,7 @@ version = "0.1.0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", "sp-runtime", "sp-state-machine", "sp-std", @@ -2145,7 +2146,7 @@ dependencies = [ name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" dependencies = [ - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-pvf", ] [[package]] @@ -2207,10 +2208,10 @@ dependencies = [ "parachains-common", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-cli 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-test-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-cli", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-service", "portpicker", "rand 0.8.5", "sc-basic-authorship", @@ -3919,7 +3920,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "kusama-runtime-constants", "log", "pallet-authority-discovery", "pallet-authorship", @@ -3961,97 +3962,12 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "kusama-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "kusama-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-elections-phragmen", - "pallet-gilt", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-multisig", - "pallet-nicks", - "pallet-nomination-pools", - "pallet-offences", - "pallet-preimage", - "pallet-proxy", - "pallet-recovery", - "pallet-scheduler", - "pallet-session", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-fn", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", @@ -4076,9 +3992,9 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -4087,20 +4003,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "kusama-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", + "polkadot-runtime-common", "smallvec", "sp-runtime", ] @@ -5006,22 +4910,7 @@ dependencies = [ "futures-timer", "nanorand", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "metered-channel" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "coarsetime", - "crossbeam-queue", - "derive_more", - "futures 0.3.21", - "futures-timer", - "nanorand", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -6543,27 +6432,9 @@ dependencies = [ "sp-core", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "pallet-xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -6579,8 +6450,8 @@ dependencies = [ "scale-info", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-executor", ] [[package]] @@ -6620,10 +6491,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parachain-template-runtime", "parity-scale-codec", - "polkadot-cli 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-cli", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-service", "sc-basic-authorship", "sc-chain-spec", "sc-cli", @@ -6658,7 +6529,7 @@ dependencies = [ "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "try-runtime-cli", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", ] [[package]] @@ -6693,11 +6564,11 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22", + "polkadot-runtime-common", "scale-info", "serde", "smallvec", @@ -6714,9 +6585,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -6732,8 +6603,8 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", + "polkadot-runtime-common", "scale-info", "sp-consensus-aura", "sp-core", @@ -6741,8 +6612,8 @@ dependencies = [ "sp-runtime", "sp-std", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-executor", ] [[package]] @@ -7085,28 +6956,13 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-approval-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7115,26 +6971,12 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-availability-bitfield-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7147,40 +6989,17 @@ dependencies = [ "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "sp-core", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-availability-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "derive_more", - "fatality", - "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", "sp-core", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7192,37 +7011,16 @@ dependencies = [ "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "sc-network", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-availability-recovery" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "fatality", - "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", "sc-network", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7234,36 +7032,11 @@ dependencies = [ "frame-benchmarking-cli", "futures 0.3.21", "log", - "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-performance-test 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-cli", - "sc-service", - "sc-sysinfo", - "sc-tracing", - "sp-core", - "sp-trie", - "substrate-build-script-utils", - "thiserror", - "try-runtime-cli", -] - -[[package]] -name = "polkadot-cli" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "clap 3.1.18", - "frame-benchmarking-cli", - "futures 0.3.21", - "log", - "polkadot-client 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-performance-test 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-client", + "polkadot-node-core-pvf", + "polkadot-node-metrics", + "polkadot-performance-test", + "polkadot-service", "sc-cli", "sc-service", "sc-sysinfo", @@ -7287,51 +7060,11 @@ dependencies = [ "frame-system-rpc-runtime-api", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", -] - -[[package]] -name = "polkadot-client" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-primitives", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-core-primitives", + "polkadot-node-core-parachains-inherent", + "polkadot-primitives", + "polkadot-runtime", + "polkadot-runtime-common", "sc-client-api", "sc-consensus", "sc-executor", @@ -7364,37 +7097,16 @@ dependencies = [ "fatality", "futures 0.3.21", "futures-timer", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-core", - "sp-keystore", - "sp-runtime", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-collator-protocol" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "always-assert", - "fatality", - "futures 0.3.21", - "futures-timer", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sp-core", "sp-keystore", "sp-runtime", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7410,19 +7122,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "polkadot-core-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "polkadot-dispute-distribution" version = "0.9.22" @@ -7433,40 +7132,17 @@ dependencies = [ "futures 0.3.21", "lru 0.7.5", "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-network", - "sp-application-crypto", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-dispute-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "derive_more", - "fatality", - "futures 0.3.21", - "lru 0.7.5", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sc-network", "sp-application-crypto", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7475,8 +7151,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-primitives", + "polkadot-primitives", "reed-solomon-novelpoly", "sp-core", "sp-trie", @@ -7484,57 +7160,23 @@ dependencies = [ ] [[package]] -name = "polkadot-erasure-coding" +name = "polkadot-gossip-support" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "reed-solomon-novelpoly", - "sp-core", - "sp-trie", - "thiserror", -] - -[[package]] -name = "polkadot-gossip-support" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" -dependencies = [ - "futures 0.3.21", - "futures-timer", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "rand_chacha 0.3.1", - "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-gossip-support" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", "futures-timer", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sp-application-crypto", "sp-core", "sp-keystore", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7548,35 +7190,14 @@ dependencies = [ "futures 0.3.21", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-network", - "sp-consensus", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-network-bridge" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "always-assert", - "async-trait", - "bytes", - "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.12.0", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", "sc-network", "sp-consensus", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7586,33 +7207,15 @@ source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-build dependencies = [ "futures 0.3.21", "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-core", - "sp-maybe-compressed-blob", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-collation-generation" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7628,41 +7231,12 @@ dependencies = [ "lru 0.7.5", "merlin", "parity-scale-codec", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-keystore", - "schnorrkel", - "sp-application-crypto", - "sp-consensus", - "sp-consensus-slots", - "sp-runtime", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-approval-voting" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitvec", - "derive_more", - "futures 0.3.21", - "futures-timer", - "kvdb", - "lru 0.7.5", - "merlin", - "parity-scale-codec", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-jaeger", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", "sc-keystore", "schnorrkel", "sp-application-crypto", @@ -7670,7 +7244,7 @@ dependencies = [ "sp-consensus-slots", "sp-runtime", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7683,34 +7257,14 @@ dependencies = [ "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-av-store" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitvec", - "futures 0.3.21", - "futures-timer", - "kvdb", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7721,34 +7275,15 @@ dependencies = [ "bitvec", "fatality", "futures 0.3.21", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-statement-table 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-backing" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitvec", - "fatality", - "futures 0.3.21", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-statement-table 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "polkadot-statement-table", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7757,27 +7292,12 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "wasm-timer", -] - -[[package]] -name = "polkadot-node-core-bitfield-signing" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", "wasm-timer", ] @@ -7789,32 +7309,14 @@ dependencies = [ "async-trait", "futures 0.3.21", "parity-scale-codec", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-maybe-compressed-blob", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-candidate-validation" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-trait", - "futures 0.3.21", - "parity-scale-codec", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-core-pvf", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-parachain 0.9.22", + "polkadot-primitives", "sp-maybe-compressed-blob", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7823,28 +7325,13 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-client-api", - "sc-consensus-babe", - "sp-blockchain", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-chain-api" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7856,29 +7343,12 @@ dependencies = [ "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-chain-selection" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "futures-timer", - "kvdb", - "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7891,32 +7361,13 @@ dependencies = [ "kvdb", "lru 0.7.5", "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-dispute-coordinator" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "fatality", - "futures 0.3.21", - "kvdb", - "lru 0.7.5", - "parity-scale-codec", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sc-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7927,30 +7378,13 @@ dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-blockchain", - "sp-inherents", - "sp-runtime", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-parachains-inherent" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem", + "polkadot-primitives", "sp-blockchain", "sp-inherents", "sp-runtime", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -7962,31 +7396,13 @@ dependencies = [ "fatality", "futures 0.3.21", "futures-timer", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-provisioner" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitvec", - "fatality", - "futures 0.3.21", - "futures-timer", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "rand 0.8.5", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8002,39 +7418,9 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project 1.0.10", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", - "slotmap", - "sp-core", - "sp-externalities", - "sp-io", - "sp-maybe-compressed-blob", - "sp-tracing", - "sp-wasm-interface", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-pvf" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "always-assert", - "assert_matches", - "async-process", - "async-std", - "futures 0.3.21", - "futures-timer", - "parity-scale-codec", - "pin-project 1.0.10", - "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-core-primitives", + "polkadot-node-subsystem-util", + "polkadot-parachain 0.9.22", "rand 0.8.5", "sc-executor", "sc-executor-common", @@ -8046,7 +7432,7 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8055,30 +7441,14 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "futures 0.3.21", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-pvf-checker" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8089,32 +7459,14 @@ dependencies = [ "futures 0.3.21", "memory-lru", "parity-util-mem", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-api", - "sp-authority-discovery", - "sp-consensus-babe", - "sp-core", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-core-runtime-api" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "memory-lru", - "parity-util-mem", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8128,26 +7480,8 @@ dependencies = [ "mick-jaeger", "parity-scale-codec", "parking_lot 0.12.0", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-network", - "sp-core", - "thiserror", -] - -[[package]] -name = "polkadot-node-jaeger" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-std", - "lazy_static", - "log", - "mick-jaeger", - "parity-scale-codec", - "parking_lot 0.12.0", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-primitives", "sc-network", "sp-core", "thiserror", @@ -8162,33 +7496,14 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-cli", - "sc-service", - "sc-tracing", - "substrate-prometheus-endpoint", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bs58", - "futures 0.3.21", - "futures-timer", - "log", - "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "metered-channel", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", "sc-cli", "sc-service", "sc-tracing", "substrate-prometheus-endpoint", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8201,69 +7516,27 @@ dependencies = [ "fatality", "futures 0.3.21", "parity-scale-codec", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-jaeger", + "polkadot-node-primitives", + "polkadot-primitives", "rand 0.8.5", "sc-authority-discovery", "sc-network", "strum 0.24.0", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "tracing-gum", ] [[package]] -name = "polkadot-node-network-protocol" +name = "polkadot-node-primitives" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-trait", - "derive_more", - "fatality", - "futures 0.3.21", - "parity-scale-codec", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "rand 0.8.5", - "sc-authority-discovery", - "sc-network", - "strum 0.24.0", - "thiserror", -] - -[[package]] -name = "polkadot-node-primitives" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "bounded-vec", "futures 0.3.21", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "schnorrkel", - "serde", - "sp-application-crypto", - "sp-consensus-babe", - "sp-consensus-vrf", - "sp-core", - "sp-keystore", - "sp-maybe-compressed-blob", - "thiserror", - "zstd", -] - -[[package]] -name = "polkadot-node-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bounded-vec", - "futures 0.3.21", - "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22", + "polkadot-primitives", "schnorrkel", "serde", "sp-application-crypto", @@ -8281,19 +7554,9 @@ name = "polkadot-node-subsystem" version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-subsystem" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-jaeger", + "polkadot-node-subsystem-types", + "polkadot-overseer", ] [[package]] @@ -8304,9 +7567,9 @@ dependencies = [ "async-trait", "futures 0.3.21", "parking_lot 0.12.0", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sc-keystore", "sp-application-crypto", "sp-core", @@ -8321,31 +7584,12 @@ source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-build dependencies = [ "derive_more", "futures 0.3.21", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer-gen 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-statement-table 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-network", - "smallvec", - "substrate-prometheus-endpoint", - "thiserror", -] - -[[package]] -name = "polkadot-node-subsystem-types" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "derive_more", - "futures 0.3.21", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer-gen 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-statement-table 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-jaeger", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-overseer-gen", + "polkadot-primitives", + "polkadot-statement-table", "sc-network", "smallvec", "substrate-prometheus-endpoint", @@ -8364,58 +7608,25 @@ dependencies = [ "itertools", "kvdb", "lru 0.7.5", - "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "parity-db", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.2", - "pin-project 1.0.10", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-node-subsystem-util" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-trait", - "derive_more", - "fatality", - "futures 0.3.21", - "itertools", - "kvdb", - "lru 0.7.5", - "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "metered-channel", "parity-db", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-jaeger", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", "rand 0.8.5", "sp-application-crypto", "sp-core", "sp-keystore", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8428,36 +7639,15 @@ dependencies = [ "lru 0.7.5", "parity-util-mem", "parking_lot 0.12.0", - "polkadot-node-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer-gen 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem-types", + "polkadot-overseer-gen", + "polkadot-primitives", "sc-client-api", "sp-api", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-overseer" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "futures 0.3.21", - "futures-timer", - "lru 0.7.5", - "parity-util-mem", - "parking_lot 0.12.0", - "polkadot-node-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer-gen 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "sc-client-api", - "sp-api", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8468,30 +7658,13 @@ dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", - "metered-channel 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "metered-channel", "pin-project 1.0.10", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer-gen-proc-macro 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-overseer-gen-proc-macro", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "metered-channel 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "pin-project 1.0.10", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer-gen-proc-macro 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -8507,19 +7680,6 @@ dependencies = [ "syn", ] -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "expander 0.0.6", - "petgraph", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-parachain" version = "0.9.22" @@ -8529,24 +7689,7 @@ dependencies = [ "frame-support", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "polkadot-parachain" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "derive_more", - "frame-support", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-core-primitives", "scale-info", "serde", "sp-core", @@ -8584,10 +7727,10 @@ dependencies = [ "pallet-transaction-payment-rpc", "parachains-common", "parity-scale-codec", - "polkadot-cli 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-cli", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-service", "rococo-parachain-runtime", "sc-basic-authorship", "sc-chain-spec", @@ -8628,7 +7771,7 @@ dependencies = [ "tempfile", "try-runtime-cli", "westmint-runtime", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", ] [[package]] @@ -8637,26 +7780,11 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "env_logger 0.9.0", - "kusama-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "log", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "quote", - "thiserror", -] - -[[package]] -name = "polkadot-performance-test" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "env_logger 0.9.0", - "kusama-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "kusama-runtime", "log", - "polkadot-erasure-coding 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-pvf 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-erasure-coding", + "polkadot-node-core-pvf", + "polkadot-node-primitives", "quote", "thiserror", ] @@ -8671,38 +7799,8 @@ dependencies = [ "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std", - "sp-trie", - "sp-version", -] - -[[package]] -name = "polkadot-primitives" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitvec", - "frame-system", - "hex-literal", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", "scale-info", "serde", "sp-api", @@ -8731,39 +7829,7 @@ dependencies = [ "jsonrpsee", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sc-chain-spec", - "sc-client-api", - "sc-consensus-babe", - "sc-consensus-babe-rpc", - "sc-consensus-epochs", - "sc-finality-grandpa", - "sc-finality-grandpa-rpc", - "sc-rpc", - "sc-sync-state-rpc", - "sc-transaction-pool-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-keystore", - "sp-runtime", - "substrate-frame-rpc-system", - "substrate-state-trie-migration-rpc", -] - -[[package]] -name = "polkadot-rpc" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-gadget", - "beefy-gadget-rpc", - "jsonrpsee", - "pallet-mmr-rpc", - "pallet-transaction-payment-rpc", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -8837,12 +7903,12 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", @@ -8866,89 +7932,9 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-elections-phragmen", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-multisig", - "pallet-nicks", - "pallet-offences", - "pallet-preimage", - "pallet-proxy", - "pallet-scheduler", - "pallet-session", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -8978,58 +7964,13 @@ dependencies = [ "pallet-treasury", "pallet-vesting", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "slot-range-helper 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", - "sp-npos-elections", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "static_assertions", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-runtime-common" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "libsecp256k1", - "log", - "pallet-authorship", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy-mmr", - "pallet-election-provider-multi-phase", - "pallet-session", - "pallet-staking", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", - "pallet-vesting", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", + "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", "serde_derive", - "slot-range-helper 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "slot-range-helper", "sp-api", "sp-core", "sp-inherents", @@ -9040,7 +7981,7 @@ dependencies = [ "sp-staking", "sp-std", "static_assertions", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", ] [[package]] @@ -9049,20 +7990,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "polkadot-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", + "polkadot-runtime-common", "smallvec", "sp-runtime", ] @@ -9074,213 +8003,58 @@ source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-build dependencies = [ "bs58", "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", "sp-std", - "sp-tracing", -] - -[[package]] -name = "polkadot-runtime-metrics" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bs58", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "sp-std", - "sp-tracing", -] - -[[package]] -name = "polkadot-runtime-parachains" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" -dependencies = [ - "bitflags", - "bitvec", - "derive_more", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-session", - "pallet-staking", - "pallet-timestamp", - "pallet-vesting", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-metrics 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rustc-hex", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "static_assertions", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-runtime-parachains" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "bitflags", - "bitvec", - "derive_more", - "frame-support", - "frame-system", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-session", - "pallet-staking", - "pallet-timestamp", - "pallet-vesting", - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-metrics 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rustc-hex", - "scale-info", - "serde", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", -] - -[[package]] -name = "polkadot-service" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" -dependencies = [ - "async-trait", - "beefy-gadget", - "beefy-primitives", - "frame-system-rpc-runtime-api", - "futures 0.3.21", - "hex-literal", - "kusama-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "kvdb", - "kvdb-rocksdb", - "lru 0.7.5", - "pallet-babe", - "pallet-im-online", - "pallet-staking", - "pallet-transaction-payment-rpc-runtime-api", - "parity-db", - "polkadot-approval-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-availability-bitfield-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-availability-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-availability-recovery 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-client 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-collator-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-dispute-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-gossip-support 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-network-bridge 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-collation-generation 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-approval-voting 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-av-store 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-backing 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-bitfield-signing 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-candidate-validation 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-chain-api 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-chain-selection 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-dispute-coordinator 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-provisioner 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-pvf-checker 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-core-runtime-api 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-rpc 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-statement-distribution 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rococo-runtime", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-slots", - "sc-consensus-uncles", - "sc-executor", - "sc-finality-grandpa", - "sc-keystore", - "sc-network", - "sc-offchain", - "sc-service", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", + "sp-tracing", +] + +[[package]] +name = "polkadot-runtime-parachains" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +dependencies = [ + "bitflags", + "bitvec", + "derive_more", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "pallet-vesting", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-metrics", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rustc-hex", + "scale-info", "serde", - "serde_json", "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", + "sp-application-crypto", "sp-core", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keystore", - "sp-offchain", "sp-runtime", "sp-session", - "sp-state-machine", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", - "sp-trie", - "substrate-prometheus-endpoint", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "westend-runtime", + "sp-staking", + "sp-std", + "static_assertions", + "xcm", + "xcm-executor", ] [[package]] name = "polkadot-service" version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "async-trait", "beefy-gadget", @@ -9288,6 +8062,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", "hex-literal", + "kusama-runtime", "kvdb", "kvdb-rocksdb", "lru 0.7.5", @@ -9296,41 +8071,42 @@ dependencies = [ "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", "parity-db", - "polkadot-approval-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-availability-bitfield-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-availability-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-availability-recovery 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-client 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-collator-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-dispute-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-gossip-support 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-network-bridge 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-collation-generation 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-approval-voting 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-av-store 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-backing 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-bitfield-signing 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-candidate-validation 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-chain-api 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-chain-selection 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-dispute-coordinator 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-parachains-inherent 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-provisioner 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-pvf-checker 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-core-runtime-api 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-types 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-rpc 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-statement-distribution 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-approval-distribution", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-client", + "polkadot-collator-protocol", + "polkadot-dispute-distribution", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", + "polkadot-node-core-av-store", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-parachains-inherent", + "polkadot-node-core-provisioner", + "polkadot-node-core-pvf-checker", + "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime", + "polkadot-runtime-constants", + "polkadot-runtime-parachains", + "polkadot-statement-distribution", + "rococo-runtime", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", @@ -9374,7 +8150,8 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", + "westend-runtime", ] [[package]] @@ -9387,36 +8164,15 @@ dependencies = [ "futures 0.3.21", "indexmap", "parity-scale-codec", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-keystore", - "sp-staking", - "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-statement-distribution" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "arrayvec 0.5.2", - "fatality", - "futures 0.3.21", - "indexmap", - "parity-scale-codec", - "polkadot-node-network-protocol 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem-util 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "sp-keystore", "sp-staking", "thiserror", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -9425,17 +8181,7 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "sp-core", -] - -[[package]] -name = "polkadot-statement-table" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "parity-scale-codec", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", "sp-core", ] @@ -9445,10 +8191,10 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "parity-scale-codec", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-test-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-test-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-node-subsystem", + "polkadot-primitives", + "polkadot-test-runtime", + "polkadot-test-service", "sc-block-builder", "sc-consensus", "sc-service", @@ -9493,74 +8239,12 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "test-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-test-runtime" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-grandpa", - "pallet-indices", - "pallet-nicks", - "pallet-offences", - "pallet-session", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "pallet-xcm", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", @@ -9582,10 +8266,10 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "test-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-builder 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "test-runtime-constants", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -9601,70 +8285,16 @@ dependencies = [ "pallet-balances", "pallet-staking", "pallet-transaction-payment", - "polkadot-node-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-overseer 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-rpc 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-service 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-test-runtime 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "rand 0.8.5", - "sc-authority-discovery", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-consensus-babe", - "sc-executor", - "sc-finality-grandpa", - "sc-network", - "sc-service", - "sc-tracing", - "sc-transaction-pool", - "sp-arithmetic", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-runtime", - "sp-state-machine", - "substrate-test-client", - "tempfile", - "test-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "tokio", - "tracing-gum 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "polkadot-test-service" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-benchmarking", - "frame-system", - "futures 0.1.31", - "futures 0.3.21", - "hex", - "pallet-balances", - "pallet-staking", - "pallet-transaction-payment", - "polkadot-node-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-node-subsystem 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-overseer 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-rpc 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-service 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-test-runtime 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "polkadot-service", + "polkadot-test-runtime", "rand 0.8.5", "sc-authority-discovery", "sc-chain-spec", @@ -9691,9 +8321,9 @@ dependencies = [ "sp-state-machine", "substrate-test-client", "tempfile", - "test-runtime-constants 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "test-runtime-constants", "tokio", - "tracing-gum 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum", ] [[package]] @@ -10325,11 +8955,11 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22", "scale-info", "serde", "sp-api", @@ -10345,9 +8975,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -10395,12 +9025,12 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", "rococo-runtime-constants", "scale-info", "serde", @@ -10422,9 +9052,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -10433,8 +9063,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", + "polkadot-runtime-common", "smallvec", "sp-runtime", ] @@ -11976,9 +10606,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -12046,18 +10676,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "slot-range-helper" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "enumn", - "parity-scale-codec", - "paste", - "sp-runtime", - "sp-std", -] - [[package]] name = "slotmap" version = "1.0.6" @@ -12886,7 +11504,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "kusama-runtime-constants", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -12903,13 +11521,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-runtime-common", "scale-info", "serde", "smallvec", @@ -12926,9 +11544,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -12969,14 +11587,14 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-constants 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-runtime-common", + "polkadot-runtime-constants", "scale-info", "serde", "smallvec", @@ -12993,9 +11611,9 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -13328,20 +11946,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "smallvec", - "sp-runtime", -] - -[[package]] -name = "test-runtime-constants" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-primitives", + "polkadot-runtime-common", "smallvec", "sp-runtime", ] @@ -13617,21 +12223,10 @@ name = "tracing-gum" version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ - "polkadot-node-jaeger 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "tracing", - "tracing-gum-proc-macro 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "tracing-gum" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "polkadot-node-jaeger 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "polkadot-primitives 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-node-jaeger", + "polkadot-primitives", "tracing", - "tracing-gum-proc-macro 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "tracing-gum-proc-macro", ] [[package]] @@ -13646,18 +12241,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tracing-gum-proc-macro" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "expander 0.0.6", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -14409,13 +12992,13 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-parachains 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-parachain 0.9.22", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", @@ -14439,9 +13022,9 @@ dependencies = [ "sp-version", "substrate-wasm-builder", "westend-runtime-constants", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -14450,8 +13033,8 @@ version = "0.9.22" source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" dependencies = [ "frame-support", - "polkadot-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-primitives", + "polkadot-runtime-common", "smallvec", "sp-runtime", ] @@ -14493,13 +13076,13 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-uniques", "pallet-utility", - "pallet-xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "pallet-xcm", "parachain-info", "parachains-common", "parity-scale-codec", - "polkadot-core-primitives 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "polkadot-runtime-common 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "polkadot-core-primitives", + "polkadot-parachain 0.9.22", + "polkadot-runtime-common", "scale-info", "serde", "smallvec", @@ -14517,9 +13100,9 @@ dependencies = [ "sp-version", "substrate-wasm-builder", "westend-runtime-constants", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-builder 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -14695,20 +13278,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "xcm-procedural 0.1.0 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "xcm" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "xcm-procedural 0.1.0 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm-procedural", ] [[package]] @@ -14721,34 +13291,14 @@ dependencies = [ "log", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", - "xcm-executor 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "xcm-builder" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "frame-system", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "polkadot-parachain 0.9.22", "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", - "xcm-executor 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", + "xcm-executor", ] [[package]] @@ -14766,24 +13316,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm 0.9.22 (git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors)", -] - -[[package]] -name = "xcm-executor" -version = "0.9.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm 0.9.22 (git+https://github.com/paritytech/polkadot?branch=master)", + "xcm", ] [[package]] @@ -14797,17 +13330,6 @@ dependencies = [ "syn", ] -[[package]] -name = "xcm-procedural" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#1a445d96bdaf3fe781ce642368d0e9d1b2ad3b39" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "yamux" version = "0.10.1" diff --git a/client/collator/Cargo.toml b/client/collator/Cargo.toml index b6c0c4eb905..666a1f00283 100644 --- a/client/collator/Cargo.toml +++ b/client/collator/Cargo.toml @@ -18,10 +18,10 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-subsystem = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-client-consensus-common = { path = "../consensus/common" } @@ -38,7 +38,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-subsystem-test-helpers = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-test-client = { path = "../../test/client" } diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index 91ab2080791..cd5a4b0092f 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-relay-chain-interface = { path = "../../relay-chain-interface" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index ef2d77e6fdc..2b496727d9b 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -24,9 +24,9 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-relay-chain-interface = { path = "../relay-chain-interface" } @@ -47,9 +47,9 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-test-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml index 9360fba4b69..148a92e3035 100644 --- a/client/pov-recovery/Cargo.toml +++ b/client/pov-recovery/Cargo.toml @@ -21,10 +21,10 @@ sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", br sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-subsystem = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml index f53b472e4d2..84cf2955166 100644 --- a/client/relay-chain-inprocess-interface/Cargo.toml +++ b/client/relay-chain-inprocess-interface/Cargo.toml @@ -27,8 +27,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } @@ -40,8 +40,8 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-test-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-test-service = { path = "../../test/service" } diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml index 81d510b3c3e..997494bccd1 100644 --- a/client/relay-chain-interface/Cargo.toml +++ b/client/relay-chain-interface/Cargo.toml @@ -5,8 +5,8 @@ version = "0.1.0" edition = "2021" [dependencies] -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml index cbb364c50b5..fab74c8436e 100644 --- a/client/relay-chain-rpc-interface/Cargo.toml +++ b/client/relay-chain-rpc-interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-relay-chain-interface = { path = "../relay-chain-interface" } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index c68d0bb79e1..8e6331f036b 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -24,8 +24,8 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-client-cli = { path = "../cli" } diff --git a/pallets/dmp-queue/Cargo.toml b/pallets/dmp-queue/Cargo.toml index 846bf801ca5..43ec9b462c4 100644 --- a/pallets/dmp-queue/Cargo.toml +++ b/pallets/dmp-queue/Cargo.toml @@ -17,8 +17,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml index 5aab22fce31..9831113700d 100644 --- a/pallets/parachain-system/Cargo.toml +++ b/pallets/parachain-system/Cargo.toml @@ -28,8 +28,8 @@ sp-trie = { git = "https://github.com/paritytech/substrate", default-features = sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, features = [ "wasm-api" ], branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false } diff --git a/pallets/solo-to-para/Cargo.toml b/pallets/solo-to-para/Cargo.toml index 6a234f49b89..0c9c5d9fb72 100644 --- a/pallets/solo-to-para/Cargo.toml +++ b/pallets/solo-to-para/Cargo.toml @@ -17,7 +17,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-parachain-system = { default-features = false, path = "../parachain-system" } diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml index 1bfee670800..417b9fa159d 100644 --- a/pallets/xcm/Cargo.toml +++ b/pallets/xcm/Cargo.toml @@ -15,7 +15,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml index 06df5006707..530099b0e36 100644 --- a/pallets/xcmp-queue/Cargo.toml +++ b/pallets/xcmp-queue/Cargo.toml @@ -17,8 +17,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } @@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-parachain-system = { path = "../parachain-system" } diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index f4ccbe786f1..fa13e9bf399 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -63,11 +63,11 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-client-cli = { path = "../../client/cli" } diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml index 63a499699c3..186c3c19f14 100644 --- a/parachain-template/runtime/Cargo.toml +++ b/parachain-template/runtime/Cargo.toml @@ -55,12 +55,12 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index f1a6e282dd5..9adeb62a6c8 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -68,11 +68,11 @@ pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrat pallet-contracts-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-client-cli = { path = "../client/cli" } diff --git a/polkadot-parachains/contracts-rococo/Cargo.toml b/polkadot-parachains/contracts-rococo/Cargo.toml index 1bea26bb981..652278212e3 100644 --- a/polkadot-parachains/contracts-rococo/Cargo.toml +++ b/polkadot-parachains/contracts-rococo/Cargo.toml @@ -54,14 +54,14 @@ pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", pallet-contracts-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +kusama-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/pallets/ping/Cargo.toml b/polkadot-parachains/pallets/ping/Cargo.toml index 36fdae0bafe..b3813f1223b 100644 --- a/polkadot-parachains/pallets/ping/Cargo.toml +++ b/polkadot-parachains/pallets/ping/Cargo.toml @@ -14,7 +14,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } cumulus-primitives-core = { path = "../../../primitives/core", default-features = false } cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false } diff --git a/polkadot-parachains/parachains-common/Cargo.toml b/polkadot-parachains/parachains-common/Cargo.toml index 57a1eaa6ce5..426e9d22e84 100644 --- a/polkadot-parachains/parachains-common/Cargo.toml +++ b/polkadot-parachains/parachains-common/Cargo.toml @@ -27,10 +27,10 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } diff --git a/polkadot-parachains/rococo-parachain/Cargo.toml b/polkadot-parachains/rococo-parachain/Cargo.toml index 1d4f605e30e..d822dcc2c1e 100644 --- a/polkadot-parachains/rococo-parachain/Cargo.toml +++ b/polkadot-parachains/rococo-parachain/Cargo.toml @@ -37,11 +37,11 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/shell/Cargo.toml b/polkadot-parachains/shell/Cargo.toml index 0d390948a12..6a748af1d06 100644 --- a/polkadot-parachains/shell/Cargo.toml +++ b/polkadot-parachains/shell/Cargo.toml @@ -28,9 +28,9 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml index eef06ae41b8..39d16f53a8b 100644 --- a/polkadot-parachains/statemine/Cargo.toml +++ b/polkadot-parachains/statemine/Cargo.toml @@ -49,14 +49,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +kusama-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml index 640d7fd2eaa..b5ae9489375 100644 --- a/polkadot-parachains/statemint/Cargo.toml +++ b/polkadot-parachains/statemint/Cargo.toml @@ -49,14 +49,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml index 986d379c6de..1e9e2b73b91 100644 --- a/polkadot-parachains/westmint/Cargo.toml +++ b/polkadot-parachains/westmint/Cargo.toml @@ -48,14 +48,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +westend-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index d9a220273d4..7cfce94660b 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -15,9 +15,9 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } [features] default = [ "std" ] diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index 6b4ef9e690f..0a9712be9fd 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -13,6 +13,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 79ecc08f0d8..484a1779e94 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -21,20 +21,19 @@ use codec::Encode; use cumulus_primitives_core::UpwardMessageSender; +use frame_support::{ + pallet_prelude::Get, + traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion}, + weights::{Weight, WeightToFeePolynomial}, +}; +use pallet_asset_tx_payment::HandleCredit as HandleCreditT; +use sp_runtime::{ + traits::{Saturating, Zero}, + SaturatedConversion, +}; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; -use frame_support::traits::{tokens::fungibles, Contains}; -use frame_support::traits::tokens::BalanceConversion; -use frame_support::weights::WeightToFeePolynomial; -use frame_support::pallet_prelude::Get; -use frame_support::weights::Weight; -use xcm_executor::traits::MatchesFungibles; -use xcm_executor::traits::WeightTrader; -use sp_runtime::traits::Zero; -use frame_support::traits::tokens::currency::Currency as CurrencyT; -use frame_support::traits::OnUnbalanced as OnUnbalancedT; -use sp_runtime::traits::Saturating; -use sp_runtime::SaturatedConversion; +use xcm_executor::traits::{MatchesFungibles, WeightTrader}; /// Xcm router which recognises the `Parent` destination and handles it by sending the message into /// the given UMP `UpwardMessageSender` implementation. Thus this essentially adapts an /// `UpwardMessageSender` trait impl into a `SendXcm` trait impl. @@ -70,13 +69,13 @@ pub struct TakeFirstAssetTrader< Currency: CurrencyT, CON: BalanceConversion, Matcher: MatchesFungibles, - Assets: fungibles::Mutate + fungibles::Transfer, - OnUnbalanced: OnUnbalancedT, + Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, + HandleCredit: HandleCreditT, >( Weight, Assets::Balance, Option<(MultiLocation, Assets::AssetId)>, - PhantomData<(WeightToFee, AssetId, AccountId, Currency, CON, Matcher, Assets, OnUnbalanced)>, + PhantomData<(WeightToFee, AssetId, AccountId, Currency, CON, Matcher, Assets, HandleCredit)>, ); impl< WeightToFee: WeightToFeePolynomial, @@ -85,11 +84,22 @@ impl< Currency: CurrencyT, CON: BalanceConversion, Matcher: MatchesFungibles, - Assets: fungibles::Mutate + fungibles::Transfer, - OnUnbalanced: OnUnbalancedT, - > WeightTrader for TakeFirstAssetTrader + Assets: fungibles::Mutate + + fungibles::Transfer + + fungibles::Balanced, + HandleCredit: HandleCreditT, + > WeightTrader + for TakeFirstAssetTrader< + WeightToFee, + AssetId, + AccountId, + Currency, + CON, + Matcher, + Assets, + HandleCredit, + > { - fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) } @@ -98,7 +108,11 @@ impl< // TODO: do we want to be iterating over all potential assets in payments? // Check whether we can convert fee to asset_fee (is_sufficient, min_deposit) // If everything goes well, we charge. - fn buy_weight(&mut self, weight: Weight, payment: xcm_executor::Assets) -> Result { + fn buy_weight( + &mut self, + weight: Weight, + payment: xcm_executor::Assets, + ) -> Result { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); // Based on weight bought, calculate how much native token fee we need to pay let amount = WeightToFee::calc(&weight); @@ -107,17 +121,19 @@ impl< let multiassets: MultiAssets = payment.clone().into(); let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; // We get the local asset id in which we can pay for fees - let (local_asset_id, _) = Matcher::matches_fungibles(&first).map_err(|_| XcmError::TooExpensive)?; + let (local_asset_id, _) = + Matcher::matches_fungibles(&first).map_err(|_| XcmError::TooExpensive)?; // it reads the min_balance of the asset // potential db read // Already should have been read with WithdrawAsset in case of pallet-assets - let asset_balance = CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; + let asset_balance = + CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; match first { // Not relevant match, as matches_fungibles should have already verified this above - MultiAsset { + MultiAsset { id: xcm::latest::AssetId::Concrete(location), - fun: Fungibility::Fungible(_) + fun: Fungibility::Fungible(_), } => { // convert asset_balance to u128 let u128_amount: u128 = asset_balance.try_into().map_err(|_| XcmError::Overflow)?; @@ -132,8 +148,8 @@ impl< // record multilocation and local_asset_id self.2 = Some((location.clone(), local_asset_id)); Ok(unused) - } - _ => return Err(XcmError::TooExpensive) + }, + _ => return Err(XcmError::TooExpensive), } } @@ -144,20 +160,49 @@ impl< // If not None if let Some((asset_location, local_asset_id)) = self.2.clone() { // Calculate asset_balance - // This read should have already be cached in buy_weoght + // This read should have already be cached in buy_weight let asset_balance = CON::to_asset_balance(amount, local_asset_id).ok()?; self.0 -= weight; self.1 = self.1.saturating_sub(asset_balance); let asset_balance: u128 = asset_balance.saturated_into(); - if asset_balance > 0 { + if asset_balance > 0 { Some((asset_location, asset_balance).into()) } else { None } - } - else { + } else { None } } -} \ No newline at end of file +} + +impl< + WeightToFee: WeightToFeePolynomial, + AssetId: Get, + AccountId, + Currency: CurrencyT, + CON: BalanceConversion, + Matcher: MatchesFungibles, + Assets: fungibles::Mutate + + fungibles::Transfer + + fungibles::Balanced, + HandleCredit: HandleCreditT, + > Drop + for TakeFirstAssetTrader< + WeightToFee, + AssetId, + AccountId, + Currency, + CON, + Matcher, + Assets, + HandleCredit, + > +{ + fn drop(&mut self) { + if let Some((_, local_asset_id)) = self.2 { + HandleCredit::handle_credit(Assets::issue(local_asset_id, self.1)); + } + } +} diff --git a/test/client/Cargo.toml b/test/client/Cargo.toml index 490730b7519..999638f4b0c 100644 --- a/test/client/Cargo.toml +++ b/test/client/Cargo.toml @@ -27,8 +27,8 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-test-runtime = { path = "../runtime" } diff --git a/test/relay-sproof-builder/Cargo.toml b/test/relay-sproof-builder/Cargo.toml index 32e12ee25cc..5a9012c34e6 100644 --- a/test/relay-sproof-builder/Cargo.toml +++ b/test/relay-sproof-builder/Cargo.toml @@ -13,7 +13,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", default-fe sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/test/relay-validation-worker-provider/Cargo.toml b/test/relay-validation-worker-provider/Cargo.toml index a80f3a718cc..8fb6a2eee94 100644 --- a/test/relay-validation-worker-provider/Cargo.toml +++ b/test/relay-validation-worker-provider/Cargo.toml @@ -8,4 +8,4 @@ build = "build.rs" [dependencies] # Polkadot -polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-core-pvf = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 8d9ddad4a5a..21035f18585 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -51,10 +51,10 @@ clap = { version = "3.1", features = ["derive"] } tracing = "0.1.25" # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-test-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Cumulus cumulus-client-cli = { path = "../../client/cli" } @@ -76,7 +76,7 @@ futures = "0.3.5" portpicker = "0.1.1" # Polkadot dependencies -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } # Substrate dependencies sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } From c9e9f8ca8f589bea9fc93c4667ba58bdcd9656f4 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 19 May 2022 12:15:31 +0200 Subject: [PATCH 05/53] add new trader to statemine runtimes --- .../statemine/src/xcm_config.rs | 21 ++++++++++++++++-- .../statemint/src/xcm_config.rs | 22 +++++++++++++++++-- .../westmint/src/xcm_config.rs | 21 ++++++++++++++++-- primitives/utility/src/lib.rs | 7 +----- 4 files changed, 59 insertions(+), 12 deletions(-) diff --git a/polkadot-parachains/statemine/src/xcm_config.rs b/polkadot-parachains/statemine/src/xcm_config.rs index 7ace1bf2b32..5a3a1588eae 100644 --- a/polkadot-parachains/statemine/src/xcm_config.rs +++ b/polkadot-parachains/statemine/src/xcm_config.rs @@ -156,6 +156,8 @@ pub type Barrier = DenyThenTry< ), >; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -167,8 +169,23 @@ impl xcm_executor::Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = ( + UsingComponents>, + cumulus_primitives_utility::TakeFirstAssetTrader< + WeightToFee, + AccountId, + Balances, + pallet_assets::BalanceToAssetBalance, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + Assets, + AssetsToBlockAuthor + >, + ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/polkadot-parachains/statemint/src/xcm_config.rs index f7f72065937..a20e25e7922 100644 --- a/polkadot-parachains/statemint/src/xcm_config.rs +++ b/polkadot-parachains/statemint/src/xcm_config.rs @@ -156,6 +156,9 @@ pub type Barrier = DenyThenTry< ), >; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -167,8 +170,23 @@ impl xcm_executor::Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = ( + UsingComponents>, + cumulus_primitives_utility::TakeFirstAssetTrader< + WeightToFee, + AccountId, + Balances, + pallet_assets::BalanceToAssetBalance, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + Assets, + AssetsToBlockAuthor + >, + ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/polkadot-parachains/westmint/src/xcm_config.rs b/polkadot-parachains/westmint/src/xcm_config.rs index c0dd1da1fd7..a37ba1f0517 100644 --- a/polkadot-parachains/westmint/src/xcm_config.rs +++ b/polkadot-parachains/westmint/src/xcm_config.rs @@ -152,6 +152,8 @@ pub type Barrier = DenyThenTry< ), >; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -163,8 +165,23 @@ impl xcm_executor::Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = ( + UsingComponents>, + cumulus_primitives_utility::TakeFirstAssetTrader< + WeightToFee, + AccountId, + Balances, + pallet_assets::BalanceToAssetBalance, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + Assets, + AssetsToBlockAuthor + >, + ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 484a1779e94..2d7f65fd83b 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -64,7 +64,6 @@ impl SendXcm for ParentAsUmp { pub struct TakeFirstAssetTrader< WeightToFee: WeightToFeePolynomial, - AssetId: Get, AccountId, Currency: CurrencyT, CON: BalanceConversion, @@ -75,11 +74,10 @@ pub struct TakeFirstAssetTrader< Weight, Assets::Balance, Option<(MultiLocation, Assets::AssetId)>, - PhantomData<(WeightToFee, AssetId, AccountId, Currency, CON, Matcher, Assets, HandleCredit)>, + PhantomData<(WeightToFee, AccountId, Currency, CON, Matcher, Assets, HandleCredit)>, ); impl< WeightToFee: WeightToFeePolynomial, - AssetId: Get, AccountId, Currency: CurrencyT, CON: BalanceConversion, @@ -91,7 +89,6 @@ impl< > WeightTrader for TakeFirstAssetTrader< WeightToFee, - AssetId, AccountId, Currency, CON, @@ -179,7 +176,6 @@ impl< impl< WeightToFee: WeightToFeePolynomial, - AssetId: Get, AccountId, Currency: CurrencyT, CON: BalanceConversion, @@ -191,7 +187,6 @@ impl< > Drop for TakeFirstAssetTrader< WeightToFee, - AssetId, AccountId, Currency, CON, From 9b8025467563fb7e94a803f5d395136ac6e35452 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 19 May 2022 16:34:44 +0200 Subject: [PATCH 06/53] compiles --- Cargo.lock | 603 +++++++++--------- .../contracts-rococo/Cargo.toml | 2 +- test/service/src/main.rs | 6 +- 3 files changed, 311 insertions(+), 300 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ac2405aa18..c7c6f3131de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "beefy-primitives", "fnv", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -495,12 +495,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-runtime", "finality-grandpa", @@ -707,7 +707,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-runtime", "frame-support", @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "bp-runtime", @@ -736,7 +736,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-messages", "bp-runtime", @@ -754,7 +754,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "hash-db", @@ -789,7 +789,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -804,7 +804,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -2800,7 +2800,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", ] @@ -2818,7 +2818,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -2840,7 +2840,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "Inflector", "chrono", @@ -2890,7 +2890,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2901,7 +2901,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2917,7 +2917,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -2945,7 +2945,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "bitflags", "frame-metadata", @@ -2975,7 +2975,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2987,7 +2987,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2999,7 +2999,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro2", "quote", @@ -3009,7 +3009,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "log", @@ -3026,7 +3026,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "sp-api", @@ -3050,7 +3050,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "sp-api", @@ -3907,7 +3907,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "bitvec", @@ -4000,7 +4000,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "polkadot-primitives", @@ -4833,6 +4833,15 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -4901,7 +4910,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "coarsetime", "crossbeam-queue", @@ -4910,7 +4919,7 @@ dependencies = [ "futures-timer", "nanorand", "thiserror", - "tracing-gum", + "tracing", ] [[package]] @@ -5339,6 +5348,35 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +[[package]] +name = "orchestra" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +dependencies = [ + "async-trait", + "dyn-clonable", + "futures 0.3.21", + "futures-timer", + "metered-channel", + "orchestra-proc-macro", + "pin-project 1.0.10", + "thiserror", + "tracing", +] + +[[package]] +name = "orchestra-proc-macro" +version = "0.9.22" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +dependencies = [ + "expander 0.0.6", + "petgraph", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ordered-float" version = "1.1.1" @@ -5366,7 +5404,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -5383,7 +5421,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5397,7 +5435,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -5413,7 +5451,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -5429,7 +5467,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -5444,7 +5482,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5468,7 +5506,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5488,7 +5526,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5503,7 +5541,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "beefy-primitives", "frame-support", @@ -5519,7 +5557,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5542,7 +5580,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5560,7 +5598,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5577,7 +5615,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5599,7 +5637,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "bp-message-dispatch", @@ -5620,7 +5658,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5665,7 +5703,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5682,7 +5720,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "bitflags", "frame-benchmarking", @@ -5709,7 +5747,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "bitflags", "parity-scale-codec", @@ -5724,7 +5762,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro2", "quote", @@ -5734,7 +5772,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "jsonrpsee", "pallet-contracts-primitives", @@ -5751,7 +5789,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -5764,7 +5802,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5780,7 +5818,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5803,7 +5841,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5816,7 +5854,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5834,7 +5872,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5849,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5872,7 +5910,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5888,7 +5926,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5908,7 +5946,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5925,7 +5963,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5942,7 +5980,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5960,7 +5998,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5975,7 +6013,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5990,7 +6028,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6004,7 +6042,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6020,7 +6058,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6039,7 +6077,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6056,7 +6094,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6079,7 +6117,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6095,7 +6133,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6110,7 +6148,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6124,7 +6162,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6139,7 +6177,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6155,7 +6193,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6176,7 +6214,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6192,7 +6230,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6206,7 +6244,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6229,7 +6267,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6240,7 +6278,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "sp-arithmetic", @@ -6249,7 +6287,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6278,7 +6316,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6296,7 +6334,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6315,7 +6353,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-support", "frame-system", @@ -6332,7 +6370,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6347,7 +6385,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6358,7 +6396,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6375,7 +6413,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6390,7 +6428,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6406,7 +6444,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6421,7 +6459,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "frame-system", @@ -6433,14 +6471,13 @@ dependencies = [ "sp-runtime", "sp-std", "xcm", - "xcm-builder", "xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-benchmarking", "frame-support", @@ -6953,7 +6990,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6968,7 +7005,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -6982,7 +7019,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "derive_more", "fatality", @@ -7005,7 +7042,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "fatality", "futures 0.3.21", @@ -7026,7 +7063,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "clap 3.1.18", "frame-benchmarking-cli", @@ -7051,7 +7088,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7091,7 +7128,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "always-assert", "fatality", @@ -7112,7 +7149,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7125,7 +7162,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "derive_more", "fatality", @@ -7148,7 +7185,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7162,7 +7199,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7182,7 +7219,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "always-assert", "async-trait", @@ -7203,7 +7240,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -7221,7 +7258,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "derive_more", @@ -7250,7 +7287,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "futures 0.3.21", @@ -7270,7 +7307,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "fatality", @@ -7289,7 +7326,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7304,7 +7341,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "futures 0.3.21", @@ -7322,7 +7359,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7337,7 +7374,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7354,7 +7391,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "fatality", "futures 0.3.21", @@ -7373,7 +7410,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "futures 0.3.21", @@ -7390,7 +7427,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "fatality", @@ -7408,7 +7445,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "always-assert", "assert_matches", @@ -7432,13 +7469,14 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", + "tempfile", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7454,7 +7492,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7465,14 +7503,13 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-std", "lazy_static", @@ -7490,7 +7527,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bs58", "futures 0.3.21", @@ -7509,7 +7546,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "derive_more", @@ -7530,7 +7567,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -7552,7 +7589,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7562,7 +7599,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "futures 0.3.21", @@ -7580,14 +7617,14 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "derive_more", "futures 0.3.21", + "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", @@ -7599,7 +7636,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "derive_more", @@ -7632,58 +7669,29 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "futures 0.3.21", "futures-timer", "lru 0.7.5", + "orchestra", "parity-util-mem", "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", "sp-api", + "sp-core", "tracing-gum", ] -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "metered-channel", - "pin-project 1.0.10", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" -dependencies = [ - "expander 0.0.6", - "petgraph", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-parachain" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "derive_more", "frame-support", @@ -7777,7 +7785,7 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -7792,7 +7800,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitvec", "frame-system", @@ -7822,7 +7830,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7854,7 +7862,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "bitvec", @@ -7940,7 +7948,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "bitvec", @@ -7987,7 +7995,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "polkadot-primitives", @@ -7999,7 +8007,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bs58", "parity-scale-codec", @@ -8011,7 +8019,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "bitflags", "bitvec", @@ -8054,7 +8062,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "async-trait", "beefy-gadget", @@ -8157,7 +8165,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8178,7 +8186,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8188,7 +8196,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -8213,7 +8221,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "bitvec", @@ -8275,7 +8283,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-benchmarking", "frame-system", @@ -8855,7 +8863,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8983,7 +8991,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -9060,7 +9068,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "polkadot-primitives", @@ -9230,7 +9238,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "sp-core", @@ -9241,7 +9249,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9268,7 +9276,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9291,7 +9299,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9307,7 +9315,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -9324,7 +9332,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9335,7 +9343,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "chrono", "clap 3.1.18", @@ -9374,7 +9382,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "fnv", "futures 0.3.21", @@ -9402,7 +9410,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "hash-db", "kvdb", @@ -9427,7 +9435,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9451,7 +9459,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9480,7 +9488,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "fork-tree", @@ -9523,7 +9531,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -9545,7 +9553,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9558,7 +9566,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9583,7 +9591,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "sc-client-api", "sp-authorship", @@ -9594,7 +9602,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "lazy_static", "lru 0.7.5", @@ -9621,7 +9629,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "environmental", "parity-scale-codec", @@ -9638,7 +9646,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "parity-scale-codec", @@ -9653,7 +9661,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9671,7 +9679,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ahash", "async-trait", @@ -9711,7 +9719,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9732,7 +9740,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9749,7 +9757,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "hex", @@ -9764,7 +9772,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "asynchronous-codec", @@ -9816,7 +9824,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "libp2p", @@ -9829,7 +9837,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ahash", "futures 0.3.21", @@ -9846,7 +9854,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "libp2p", @@ -9866,7 +9874,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "bitflags", "either", @@ -9895,7 +9903,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "bytes", "fnv", @@ -9923,7 +9931,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "libp2p", @@ -9936,7 +9944,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9945,7 +9953,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "hash-db", @@ -9975,7 +9983,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -9998,7 +10006,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -10011,7 +10019,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "directories", @@ -10076,7 +10084,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "parity-scale-codec", @@ -10090,7 +10098,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10109,7 +10117,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "libc", @@ -10128,7 +10136,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "chrono", "futures 0.3.21", @@ -10146,7 +10154,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ansi_term", "atty", @@ -10177,7 +10185,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10188,7 +10196,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10215,7 +10223,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "log", @@ -10228,7 +10236,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10240,9 +10248,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" +checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -10254,9 +10262,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" +checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10667,7 +10675,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "enumn", "parity-scale-codec", @@ -10743,7 +10751,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "hash-db", "log", @@ -10760,7 +10768,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "blake2", "proc-macro-crate", @@ -10772,7 +10780,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10785,7 +10793,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "integer-sqrt", "num-traits", @@ -10800,7 +10808,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10813,7 +10821,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10825,7 +10833,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "sp-api", @@ -10837,7 +10845,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "log", @@ -10855,7 +10863,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -10874,7 +10882,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10892,7 +10900,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "merlin", @@ -10915,7 +10923,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10929,7 +10937,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10942,7 +10950,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "base58", "bitflags", @@ -10988,7 +10996,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "blake2", "byteorder", @@ -11002,7 +11010,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro2", "quote", @@ -11013,7 +11021,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -11022,7 +11030,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro2", "quote", @@ -11032,7 +11040,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "environmental", "parity-scale-codec", @@ -11043,7 +11051,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "finality-grandpa", "log", @@ -11061,7 +11069,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11075,7 +11083,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "hash-db", @@ -11100,7 +11108,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "lazy_static", "sp-core", @@ -11111,7 +11119,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -11128,7 +11136,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "thiserror", "zstd", @@ -11137,7 +11145,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "parity-scale-codec", @@ -11152,7 +11160,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11166,7 +11174,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "sp-api", "sp-core", @@ -11176,7 +11184,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "backtrace", "lazy_static", @@ -11186,7 +11194,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "rustc-hash", "serde", @@ -11196,7 +11204,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "either", "hash256-std-hasher", @@ -11218,7 +11226,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11235,7 +11243,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "Inflector", "proc-macro-crate", @@ -11247,7 +11255,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "parity-scale-codec", @@ -11261,7 +11269,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "serde", "serde_json", @@ -11270,7 +11278,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11284,7 +11292,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "scale-info", @@ -11295,7 +11303,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "hash-db", "log", @@ -11317,12 +11325,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11335,7 +11343,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "log", "sp-core", @@ -11348,7 +11356,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures-timer", @@ -11364,7 +11372,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "sp-std", @@ -11376,7 +11384,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "sp-api", "sp-runtime", @@ -11385,7 +11393,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "log", @@ -11401,7 +11409,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "hash-db", "memory-db", @@ -11417,7 +11425,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11434,7 +11442,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11445,7 +11453,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "impl-trait-for-tuples", "log", @@ -11726,7 +11734,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "platforms", ] @@ -11734,7 +11742,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -11755,7 +11763,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures-util", "hyper", @@ -11768,7 +11776,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "jsonrpsee", "log", @@ -11789,7 +11797,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "async-trait", "futures 0.3.21", @@ -11815,7 +11823,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -11825,7 +11833,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11836,7 +11844,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "ansi_term", "build-helper", @@ -11943,7 +11951,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "polkadot-primitives", @@ -12221,7 +12229,7 @@ dependencies = [ [[package]] name = "tracing-gum" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12232,7 +12240,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -12361,7 +12369,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#8c80d3691bcc36d2bcbe105848e3639105e265a7" +source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" dependencies = [ "clap 3.1.18", "jsonrpsee", @@ -12877,6 +12885,7 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.5", @@ -12941,7 +12950,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "beefy-primitives", "bitvec", @@ -13030,7 +13039,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "polkadot-primitives", @@ -13271,7 +13280,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13284,7 +13293,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-support", "frame-system", @@ -13304,7 +13313,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "frame-benchmarking", "frame-support", @@ -13322,7 +13331,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#4459680f2b041bbe0209ead09f32c3f7aef354ab" +source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" dependencies = [ "Inflector", "proc-macro2", diff --git a/polkadot-parachains/contracts-rococo/Cargo.toml b/polkadot-parachains/contracts-rococo/Cargo.toml index 652278212e3..fe04d036f71 100644 --- a/polkadot-parachains/contracts-rococo/Cargo.toml +++ b/polkadot-parachains/contracts-rococo/Cargo.toml @@ -14,7 +14,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } hex-literal = { version = "0.3.4", optional = true } log = { version = "0.4.17", default-features = false } -scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.137", optional = true, features = ["derive"] } smallvec = "1.6.1" diff --git a/test/service/src/main.rs b/test/service/src/main.rs index 791621dafa8..9d6ca67838a 100644 --- a/test/service/src/main.rs +++ b/test/service/src/main.rs @@ -121,7 +121,7 @@ fn main() -> Result<(), sc_cli::Error> { ); let parachain_account = - AccountIdConversion::::into_account( + AccountIdConversion::::try_into_account( ¶chain_id, ); @@ -139,7 +139,9 @@ fn main() -> Result<(), sc_cli::Error> { .map_err(|err| format!("Relay chain argument error: {}", err))?; tracing::info!("Parachain id: {:?}", parachain_id); - tracing::info!("Parachain Account: {}", parachain_account); + if let Some(parachain_account) = parachain_account { + tracing::info!("Parachain Account: {}", parachain_account); + } tracing::info!("Parachain genesis state: {}", genesis_state); tracing::info!( "Is collating: {}", From 7b935964adacade02b0e49e300d3f9dc446f077c Mon Sep 17 00:00:00 2001 From: gorka Date: Fri, 20 May 2022 12:16:32 +0200 Subject: [PATCH 07/53] Back to master --- Cargo.lock | 520 +++++++++--------- client/collator/Cargo.toml | 10 +- client/consensus/common/Cargo.toml | 2 +- client/network/Cargo.toml | 12 +- client/pov-recovery/Cargo.toml | 8 +- .../Cargo.toml | 8 +- client/relay-chain-interface/Cargo.toml | 4 +- client/relay-chain-rpc-interface/Cargo.toml | 2 +- client/service/Cargo.toml | 4 +- pallets/dmp-queue/Cargo.toml | 4 +- pallets/parachain-system/Cargo.toml | 4 +- pallets/solo-to-para/Cargo.toml | 2 +- pallets/xcm/Cargo.toml | 2 +- pallets/xcmp-queue/Cargo.toml | 6 +- polkadot-parachains/Cargo.toml | 10 +- .../contracts-rococo/Cargo.toml | 16 +- polkadot-parachains/pallets/ping/Cargo.toml | 2 +- .../parachains-common/Cargo.toml | 8 +- .../rococo-parachain/Cargo.toml | 10 +- polkadot-parachains/shell/Cargo.toml | 6 +- polkadot-parachains/statemine/Cargo.toml | 16 +- polkadot-parachains/statemint/Cargo.toml | 16 +- polkadot-parachains/westmint/Cargo.toml | 16 +- primitives/core/Cargo.toml | 6 +- primitives/utility/Cargo.toml | 10 +- test/client/Cargo.toml | 4 +- test/relay-sproof-builder/Cargo.toml | 2 +- .../Cargo.toml | 2 +- test/service/Cargo.toml | 10 +- 29 files changed, 361 insertions(+), 361 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7c6f3131de..cef12491f1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "beefy-primitives", "fnv", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -495,12 +495,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-runtime", "finality-grandpa", @@ -707,7 +707,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-runtime", "frame-support", @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "bp-runtime", @@ -736,7 +736,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-messages", "bp-runtime", @@ -754,7 +754,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "hash-db", @@ -789,7 +789,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -804,7 +804,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -2800,7 +2800,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", ] @@ -2818,7 +2818,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -2840,7 +2840,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "Inflector", "chrono", @@ -2890,7 +2890,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2901,7 +2901,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2917,7 +2917,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -2945,7 +2945,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "bitflags", "frame-metadata", @@ -2975,7 +2975,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2987,7 +2987,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2999,7 +2999,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro2", "quote", @@ -3009,7 +3009,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "log", @@ -3026,7 +3026,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "sp-api", @@ -3050,7 +3050,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "sp-api", @@ -3907,7 +3907,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "bitvec", @@ -4000,7 +4000,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "polkadot-primitives", @@ -4910,7 +4910,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "coarsetime", "crossbeam-queue", @@ -5351,7 +5351,7 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "orchestra" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "dyn-clonable", @@ -5367,7 +5367,7 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "expander 0.0.6", "petgraph", @@ -5404,7 +5404,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -5421,7 +5421,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5435,7 +5435,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -5451,7 +5451,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -5467,7 +5467,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -5482,7 +5482,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5506,7 +5506,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5526,7 +5526,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5541,7 +5541,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "beefy-primitives", "frame-support", @@ -5557,7 +5557,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5580,7 +5580,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5598,7 +5598,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5637,7 +5637,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "bp-message-dispatch", @@ -5658,7 +5658,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5703,7 +5703,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5720,7 +5720,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "bitflags", "frame-benchmarking", @@ -5747,7 +5747,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "bitflags", "parity-scale-codec", @@ -5762,7 +5762,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro2", "quote", @@ -5772,7 +5772,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "jsonrpsee", "pallet-contracts-primitives", @@ -5789,7 +5789,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -5802,7 +5802,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5818,7 +5818,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5841,7 +5841,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5854,7 +5854,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5872,7 +5872,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5887,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5910,7 +5910,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5926,7 +5926,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5946,7 +5946,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5963,7 +5963,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5980,7 +5980,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5998,7 +5998,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6013,7 +6013,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6028,7 +6028,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6042,7 +6042,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6058,7 +6058,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6077,7 +6077,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6094,7 +6094,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6117,7 +6117,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6133,7 +6133,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6148,7 +6148,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6162,7 +6162,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6177,7 +6177,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6193,7 +6193,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6214,7 +6214,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6230,7 +6230,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6244,7 +6244,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6267,7 +6267,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6278,7 +6278,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "sp-arithmetic", @@ -6287,7 +6287,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6316,7 +6316,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6334,7 +6334,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6353,7 +6353,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-support", "frame-system", @@ -6370,7 +6370,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6385,7 +6385,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6396,7 +6396,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6413,7 +6413,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6428,7 +6428,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6444,7 +6444,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6459,7 +6459,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "frame-system", @@ -6477,7 +6477,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-benchmarking", "frame-support", @@ -6990,7 +6990,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7005,7 +7005,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7019,7 +7019,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "derive_more", "fatality", @@ -7042,7 +7042,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "fatality", "futures 0.3.21", @@ -7063,7 +7063,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "clap 3.1.18", "frame-benchmarking-cli", @@ -7088,7 +7088,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7128,7 +7128,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "always-assert", "fatality", @@ -7149,7 +7149,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7162,7 +7162,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "derive_more", "fatality", @@ -7185,7 +7185,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7199,7 +7199,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7219,7 +7219,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "always-assert", "async-trait", @@ -7240,7 +7240,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -7258,7 +7258,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "derive_more", @@ -7287,7 +7287,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "futures 0.3.21", @@ -7307,7 +7307,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "fatality", @@ -7326,7 +7326,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7341,7 +7341,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "futures 0.3.21", @@ -7359,7 +7359,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7374,7 +7374,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7391,7 +7391,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "fatality", "futures 0.3.21", @@ -7410,7 +7410,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "futures 0.3.21", @@ -7427,7 +7427,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "fatality", @@ -7445,7 +7445,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "always-assert", "assert_matches", @@ -7476,7 +7476,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7492,7 +7492,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7509,7 +7509,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-std", "lazy_static", @@ -7527,7 +7527,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bs58", "futures 0.3.21", @@ -7546,7 +7546,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "derive_more", @@ -7567,7 +7567,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -7589,7 +7589,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7599,7 +7599,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "futures 0.3.21", @@ -7617,7 +7617,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "derive_more", "futures 0.3.21", @@ -7636,7 +7636,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "derive_more", @@ -7669,7 +7669,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7691,7 +7691,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "derive_more", "frame-support", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitvec", "frame-system", @@ -7830,7 +7830,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7862,7 +7862,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "bitvec", @@ -7948,7 +7948,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "bitvec", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "polkadot-primitives", @@ -8007,7 +8007,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bs58", "parity-scale-codec", @@ -8019,7 +8019,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "bitflags", "bitvec", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "async-trait", "beefy-gadget", @@ -8165,7 +8165,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8186,7 +8186,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8196,7 +8196,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -8221,7 +8221,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "bitvec", @@ -8283,7 +8283,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-benchmarking", "frame-system", @@ -8863,7 +8863,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8991,7 +8991,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -9068,7 +9068,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "polkadot-primitives", @@ -9238,7 +9238,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "sp-core", @@ -9249,7 +9249,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9276,7 +9276,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9299,7 +9299,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9315,7 +9315,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -9332,7 +9332,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9343,7 +9343,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "chrono", "clap 3.1.18", @@ -9382,7 +9382,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "fnv", "futures 0.3.21", @@ -9410,7 +9410,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "hash-db", "kvdb", @@ -9435,7 +9435,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9459,7 +9459,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9488,7 +9488,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "fork-tree", @@ -9531,7 +9531,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -9553,7 +9553,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9566,7 +9566,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9591,7 +9591,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "sc-client-api", "sp-authorship", @@ -9602,7 +9602,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "lazy_static", "lru 0.7.5", @@ -9629,7 +9629,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "environmental", "parity-scale-codec", @@ -9646,7 +9646,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "parity-scale-codec", @@ -9661,7 +9661,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9679,7 +9679,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ahash", "async-trait", @@ -9719,7 +9719,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9740,7 +9740,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9757,7 +9757,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "hex", @@ -9772,7 +9772,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "asynchronous-codec", @@ -9824,7 +9824,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "libp2p", @@ -9837,7 +9837,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ahash", "futures 0.3.21", @@ -9854,7 +9854,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "libp2p", @@ -9874,7 +9874,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "bitflags", "either", @@ -9903,7 +9903,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "bytes", "fnv", @@ -9931,7 +9931,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "libp2p", @@ -9944,7 +9944,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9953,7 +9953,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "hash-db", @@ -9983,7 +9983,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -10006,7 +10006,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "jsonrpsee", @@ -10019,7 +10019,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "directories", @@ -10084,7 +10084,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "parity-scale-codec", @@ -10098,7 +10098,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10117,7 +10117,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "libc", @@ -10136,7 +10136,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "chrono", "futures 0.3.21", @@ -10154,7 +10154,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ansi_term", "atty", @@ -10185,7 +10185,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10196,7 +10196,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10223,7 +10223,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "log", @@ -10236,7 +10236,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10675,7 +10675,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "enumn", "parity-scale-codec", @@ -10751,7 +10751,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "hash-db", "log", @@ -10768,7 +10768,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "blake2", "proc-macro-crate", @@ -10780,7 +10780,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10793,7 +10793,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "integer-sqrt", "num-traits", @@ -10808,7 +10808,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10821,7 +10821,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "parity-scale-codec", @@ -10833,7 +10833,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "sp-api", @@ -10845,7 +10845,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "log", @@ -10863,7 +10863,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -10882,7 +10882,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "parity-scale-codec", @@ -10900,7 +10900,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "merlin", @@ -10923,7 +10923,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10937,7 +10937,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10950,7 +10950,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "base58", "bitflags", @@ -10996,7 +10996,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "blake2", "byteorder", @@ -11010,7 +11010,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro2", "quote", @@ -11021,7 +11021,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -11030,7 +11030,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro2", "quote", @@ -11040,7 +11040,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "environmental", "parity-scale-codec", @@ -11051,7 +11051,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "finality-grandpa", "log", @@ -11069,7 +11069,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11083,7 +11083,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "hash-db", @@ -11108,7 +11108,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "lazy_static", "sp-core", @@ -11119,7 +11119,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -11136,7 +11136,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "thiserror", "zstd", @@ -11145,7 +11145,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "parity-scale-codec", @@ -11160,7 +11160,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11174,7 +11174,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "sp-api", "sp-core", @@ -11184,7 +11184,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "backtrace", "lazy_static", @@ -11194,7 +11194,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "rustc-hash", "serde", @@ -11204,7 +11204,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "either", "hash256-std-hasher", @@ -11226,7 +11226,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11243,7 +11243,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "Inflector", "proc-macro-crate", @@ -11255,7 +11255,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "parity-scale-codec", @@ -11269,7 +11269,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "serde", "serde_json", @@ -11278,7 +11278,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11292,7 +11292,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11303,7 +11303,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "hash-db", "log", @@ -11325,12 +11325,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11343,7 +11343,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "log", "sp-core", @@ -11356,7 +11356,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures-timer", @@ -11372,7 +11372,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "sp-std", @@ -11384,7 +11384,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "sp-api", "sp-runtime", @@ -11393,7 +11393,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "log", @@ -11409,7 +11409,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "hash-db", "memory-db", @@ -11425,7 +11425,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11442,7 +11442,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11453,7 +11453,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "impl-trait-for-tuples", "log", @@ -11734,7 +11734,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "platforms", ] @@ -11742,7 +11742,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -11763,7 +11763,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures-util", "hyper", @@ -11776,7 +11776,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "jsonrpsee", "log", @@ -11797,7 +11797,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "async-trait", "futures 0.3.21", @@ -11823,7 +11823,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -11833,7 +11833,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11844,7 +11844,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "ansi_term", "build-helper", @@ -11951,7 +11951,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "polkadot-primitives", @@ -12229,7 +12229,7 @@ dependencies = [ [[package]] name = "tracing-gum" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12240,7 +12240,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -12369,7 +12369,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2916ebbc0cad448874dc4b446ee7709d7b33776b" +source = "git+https://github.com/paritytech/substrate?branch=master#57c420ca1873ebf68ca12d5194c16b1f9100fb8d" dependencies = [ "clap 3.1.18", "jsonrpsee", @@ -12950,7 +12950,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "beefy-primitives", "bitvec", @@ -13039,7 +13039,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "polkadot-primitives", @@ -13280,7 +13280,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13293,7 +13293,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-support", "frame-system", @@ -13313,7 +13313,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.22" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "frame-benchmarking", "frame-support", @@ -13331,7 +13331,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/girazoki/polkadot?branch=girazoki-fix-xcm-builder-runtime-benchmark-errors#2cd7faf64e0a77099293389c020553f0e9b94611" +source = "git+https://github.com/paritytech/polkadot?branch=master#c5457544ae1f5abedb99d3c853d1e9ba4bae0b65" dependencies = [ "Inflector", "proc-macro2", diff --git a/client/collator/Cargo.toml b/client/collator/Cargo.toml index 666a1f00283..b6c0c4eb905 100644 --- a/client/collator/Cargo.toml +++ b/client/collator/Cargo.toml @@ -18,10 +18,10 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-node-subsystem = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-client-consensus-common = { path = "../consensus/common" } @@ -38,7 +38,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-subsystem-test-helpers = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-test-client = { path = "../../test/client" } diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index cd5a4b0092f..91ab2080791 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-relay-chain-interface = { path = "../../relay-chain-interface" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 2b496727d9b..ef2d77e6fdc 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -24,9 +24,9 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-relay-chain-interface = { path = "../relay-chain-interface" } @@ -47,9 +47,9 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "maste substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-test-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml index 148a92e3035..9360fba4b69 100644 --- a/client/pov-recovery/Cargo.toml +++ b/client/pov-recovery/Cargo.toml @@ -21,10 +21,10 @@ sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", br sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-node-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-node-subsystem = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml index 84cf2955166..f53b472e4d2 100644 --- a/client/relay-chain-inprocess-interface/Cargo.toml +++ b/client/relay-chain-inprocess-interface/Cargo.toml @@ -27,8 +27,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core" } @@ -40,8 +40,8 @@ cumulus-relay-chain-interface = { path = "../relay-chain-interface" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-test-client = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-test-service = { path = "../../test/service" } diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml index 997494bccd1..81d510b3c3e 100644 --- a/client/relay-chain-interface/Cargo.toml +++ b/client/relay-chain-interface/Cargo.toml @@ -5,8 +5,8 @@ version = "0.1.0" edition = "2021" [dependencies] -polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } cumulus-primitives-core = { path = "../../primitives/core" } diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml index fab74c8436e..cbb364c50b5 100644 --- a/client/relay-chain-rpc-interface/Cargo.toml +++ b/client/relay-chain-rpc-interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-relay-chain-interface = { path = "../relay-chain-interface" } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 8e6331f036b..c68d0bb79e1 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -24,8 +24,8 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-overseer = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-client-cli = { path = "../cli" } diff --git a/pallets/dmp-queue/Cargo.toml b/pallets/dmp-queue/Cargo.toml index 43ec9b462c4..846bf801ca5 100644 --- a/pallets/dmp-queue/Cargo.toml +++ b/pallets/dmp-queue/Cargo.toml @@ -17,8 +17,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml index 9831113700d..5aab22fce31 100644 --- a/pallets/parachain-system/Cargo.toml +++ b/pallets/parachain-system/Cargo.toml @@ -28,8 +28,8 @@ sp-trie = { git = "https://github.com/paritytech/substrate", default-features = sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, features = [ "wasm-api" ], branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false } diff --git a/pallets/solo-to-para/Cargo.toml b/pallets/solo-to-para/Cargo.toml index 0c9c5d9fb72..6a234f49b89 100644 --- a/pallets/solo-to-para/Cargo.toml +++ b/pallets/solo-to-para/Cargo.toml @@ -17,7 +17,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-parachain-system = { default-features = false, path = "../parachain-system" } diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml index 417b9fa159d..1bfee670800 100644 --- a/pallets/xcm/Cargo.toml +++ b/pallets/xcm/Cargo.toml @@ -15,7 +15,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml index 530099b0e36..06df5006707 100644 --- a/pallets/xcmp-queue/Cargo.toml +++ b/pallets/xcmp-queue/Cargo.toml @@ -17,8 +17,8 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } @@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -xcm-builder = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-pallet-parachain-system = { path = "../parachain-system" } diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index 9adeb62a6c8..f1a6e282dd5 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -68,11 +68,11 @@ pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrat pallet-contracts-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-client-cli = { path = "../client/cli" } diff --git a/polkadot-parachains/contracts-rococo/Cargo.toml b/polkadot-parachains/contracts-rococo/Cargo.toml index fe04d036f71..30a268e567a 100644 --- a/polkadot-parachains/contracts-rococo/Cargo.toml +++ b/polkadot-parachains/contracts-rococo/Cargo.toml @@ -54,14 +54,14 @@ pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", pallet-contracts-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -kusama-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/pallets/ping/Cargo.toml b/polkadot-parachains/pallets/ping/Cargo.toml index b3813f1223b..36fdae0bafe 100644 --- a/polkadot-parachains/pallets/ping/Cargo.toml +++ b/polkadot-parachains/pallets/ping/Cargo.toml @@ -14,7 +14,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } cumulus-primitives-core = { path = "../../../primitives/core", default-features = false } cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false } diff --git a/polkadot-parachains/parachains-common/Cargo.toml b/polkadot-parachains/parachains-common/Cargo.toml index 426e9d22e84..57a1eaa6ce5 100644 --- a/polkadot-parachains/parachains-common/Cargo.toml +++ b/polkadot-parachains/parachains-common/Cargo.toml @@ -27,10 +27,10 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } diff --git a/polkadot-parachains/rococo-parachain/Cargo.toml b/polkadot-parachains/rococo-parachain/Cargo.toml index d822dcc2c1e..1d4f605e30e 100644 --- a/polkadot-parachains/rococo-parachain/Cargo.toml +++ b/polkadot-parachains/rococo-parachain/Cargo.toml @@ -37,11 +37,11 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/shell/Cargo.toml b/polkadot-parachains/shell/Cargo.toml index 6a748af1d06..0d390948a12 100644 --- a/polkadot-parachains/shell/Cargo.toml +++ b/polkadot-parachains/shell/Cargo.toml @@ -28,9 +28,9 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-dmp-queue = { path = "../../pallets/dmp-queue", default-features = false } diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml index 39d16f53a8b..eef06ae41b8 100644 --- a/polkadot-parachains/statemine/Cargo.toml +++ b/polkadot-parachains/statemine/Cargo.toml @@ -49,14 +49,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -kusama-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml index b5ae9489375..640d7fd2eaa 100644 --- a/polkadot-parachains/statemint/Cargo.toml +++ b/polkadot-parachains/statemint/Cargo.toml @@ -49,14 +49,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml index 1e9e2b73b91..986d379c6de 100644 --- a/polkadot-parachains/westmint/Cargo.toml +++ b/polkadot-parachains/westmint/Cargo.toml @@ -48,14 +48,14 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -westend-runtime-constants = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index 7cfce94660b..d9a220273d4 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -15,9 +15,9 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } [features] default = [ "std" ] diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index 0a9712be9fd..65a80d57c86 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -16,11 +16,11 @@ sp-trie = { git = "https://github.com/paritytech/substrate", default-features = pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-core-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus diff --git a/test/client/Cargo.toml b/test/client/Cargo.toml index 999638f4b0c..490730b7519 100644 --- a/test/client/Cargo.toml +++ b/test/client/Cargo.toml @@ -27,8 +27,8 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-test-runtime = { path = "../runtime" } diff --git a/test/relay-sproof-builder/Cargo.toml b/test/relay-sproof-builder/Cargo.toml index 5a9012c34e6..32e12ee25cc 100644 --- a/test/relay-sproof-builder/Cargo.toml +++ b/test/relay-sproof-builder/Cargo.toml @@ -13,7 +13,7 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", default-fe sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-primitives-core = { path = "../../primitives/core", default-features = false } diff --git a/test/relay-validation-worker-provider/Cargo.toml b/test/relay-validation-worker-provider/Cargo.toml index 8fb6a2eee94..a80f3a718cc 100644 --- a/test/relay-validation-worker-provider/Cargo.toml +++ b/test/relay-validation-worker-provider/Cargo.toml @@ -8,4 +8,4 @@ build = "build.rs" [dependencies] # Polkadot -polkadot-node-core-pvf = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot", branch = "master" } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 21035f18585..8d9ddad4a5a 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -51,10 +51,10 @@ clap = { version = "3.1", features = ["derive"] } tracing = "0.1.25" # Polkadot -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-test-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Cumulus cumulus-client-cli = { path = "../../client/cli" } @@ -76,7 +76,7 @@ futures = "0.3.5" portpicker = "0.1.1" # Polkadot dependencies -polkadot-test-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } # Substrate dependencies sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } From 9863c618a06ec3d4b1d49bf1caaf5245c8cdd6a6 Mon Sep 17 00:00:00 2001 From: gorka Date: Fri, 20 May 2022 12:17:48 +0200 Subject: [PATCH 08/53] Update last tomls --- parachain-template/node/Cargo.toml | 10 +++++----- parachain-template/runtime/Cargo.toml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index fa13e9bf399..f4ccbe786f1 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -63,11 +63,11 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-cli = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-primitives = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-service = { git = "https://github.com/girazoki/polkadot", branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-client-cli = { path = "../../client/cli" } diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml index 186c3c19f14..63a499699c3 100644 --- a/parachain-template/runtime/Cargo.toml +++ b/parachain-template/runtime/Cargo.toml @@ -55,12 +55,12 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot -pallet-xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-parachain = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -polkadot-runtime-common = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-builder = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } -xcm-executor = { git = "https://github.com/girazoki/polkadot", default-features = false, branch = "girazoki-fix-xcm-builder-runtime-benchmark-errors" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-pallet-aura-ext = { path = "../../pallets/aura-ext", default-features = false } From 6d0c084f554cc72f4a5b74a6a2730f98df8afc0a Mon Sep 17 00:00:00 2001 From: gorka Date: Fri, 20 May 2022 12:20:11 +0200 Subject: [PATCH 09/53] Imports up --- polkadot-parachains/statemine/src/xcm_config.rs | 4 ++-- polkadot-parachains/statemint/src/xcm_config.rs | 5 ++--- polkadot-parachains/westmint/src/xcm_config.rs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/polkadot-parachains/statemine/src/xcm_config.rs b/polkadot-parachains/statemine/src/xcm_config.rs index 5a3a1588eae..763ec2fbdcc 100644 --- a/polkadot-parachains/statemine/src/xcm_config.rs +++ b/polkadot-parachains/statemine/src/xcm_config.rs @@ -39,6 +39,8 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; parameter_types! { pub const KsmLocation: MultiLocation = MultiLocation::parent(); @@ -156,8 +158,6 @@ pub type Barrier = DenyThenTry< ), >; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/polkadot-parachains/statemint/src/xcm_config.rs index a20e25e7922..4ae51898c60 100644 --- a/polkadot-parachains/statemint/src/xcm_config.rs +++ b/polkadot-parachains/statemint/src/xcm_config.rs @@ -39,6 +39,8 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; parameter_types! { pub const DotLocation: MultiLocation = MultiLocation::parent(); @@ -156,9 +158,6 @@ pub type Barrier = DenyThenTry< ), >; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; - pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; diff --git a/polkadot-parachains/westmint/src/xcm_config.rs b/polkadot-parachains/westmint/src/xcm_config.rs index a37ba1f0517..5b5e02a5586 100644 --- a/polkadot-parachains/westmint/src/xcm_config.rs +++ b/polkadot-parachains/westmint/src/xcm_config.rs @@ -39,6 +39,8 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; +use parachains_common::impls::AssetsToBlockAuthor; +use sp_runtime::traits::ConvertInto; parameter_types! { pub const WestendLocation: MultiLocation = MultiLocation::parent(); @@ -152,8 +154,6 @@ pub type Barrier = DenyThenTry< ), >; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; From ab1103caf338e72f691cd0011bf518e2c29e0f70 Mon Sep 17 00:00:00 2001 From: gorka Date: Fri, 20 May 2022 12:24:06 +0200 Subject: [PATCH 10/53] remove non-needing imports --- primitives/utility/Cargo.toml | 1 - primitives/utility/src/lib.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index 65a80d57c86..fbe80c3aea8 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -39,5 +39,4 @@ std = [ "polkadot-primitives/std", "cumulus-primitives-core/std", "xcm-executor/std", - "xcm/std", ] diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 2d7f65fd83b..1cd9783049a 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -22,7 +22,6 @@ use codec::Encode; use cumulus_primitives_core::UpwardMessageSender; use frame_support::{ - pallet_prelude::Get, traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion}, weights::{Weight, WeightToFeePolynomial}, }; From d65b5687038037f98ee59b0c9e4406ec861a335e Mon Sep 17 00:00:00 2001 From: gorka Date: Fri, 20 May 2022 12:27:25 +0200 Subject: [PATCH 11/53] FMT --- .../statemine/src/xcm_config.rs | 9 ++++----- .../statemint/src/xcm_config.rs | 9 ++++----- .../westmint/src/xcm_config.rs | 9 ++++----- primitives/utility/src/lib.rs | 20 ++----------------- 4 files changed, 14 insertions(+), 33 deletions(-) diff --git a/polkadot-parachains/statemine/src/xcm_config.rs b/polkadot-parachains/statemine/src/xcm_config.rs index 763ec2fbdcc..53caf8796f6 100644 --- a/polkadot-parachains/statemine/src/xcm_config.rs +++ b/polkadot-parachains/statemine/src/xcm_config.rs @@ -24,10 +24,11 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::ToStakingPot, + impls::{AssetsToBlockAuthor, ToStakingPot}, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; +use sp_runtime::traits::ConvertInto; use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, @@ -39,8 +40,6 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; parameter_types! { pub const KsmLocation: MultiLocation = MultiLocation::parent(); @@ -183,8 +182,8 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor - >, + AssetsToBlockAuthor, + >, ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/polkadot-parachains/statemint/src/xcm_config.rs index 4ae51898c60..c7c89eae6ea 100644 --- a/polkadot-parachains/statemint/src/xcm_config.rs +++ b/polkadot-parachains/statemint/src/xcm_config.rs @@ -24,10 +24,11 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::ToStakingPot, + impls::{AssetsToBlockAuthor, ToStakingPot}, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; +use sp_runtime::traits::ConvertInto; use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, @@ -39,8 +40,6 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; parameter_types! { pub const DotLocation: MultiLocation = MultiLocation::parent(); @@ -183,8 +182,8 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor - >, + AssetsToBlockAuthor, + >, ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; diff --git a/polkadot-parachains/westmint/src/xcm_config.rs b/polkadot-parachains/westmint/src/xcm_config.rs index 5b5e02a5586..cccc2c17b41 100644 --- a/polkadot-parachains/westmint/src/xcm_config.rs +++ b/polkadot-parachains/westmint/src/xcm_config.rs @@ -24,10 +24,11 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::ToStakingPot, + impls::{AssetsToBlockAuthor, ToStakingPot}, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; +use sp_runtime::traits::ConvertInto; use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, @@ -39,8 +40,6 @@ use xcm_builder::{ UsingComponents, }; use xcm_executor::{traits::JustTry, XcmExecutor}; -use parachains_common::impls::AssetsToBlockAuthor; -use sp_runtime::traits::ConvertInto; parameter_types! { pub const WestendLocation: MultiLocation = MultiLocation::parent(); @@ -179,8 +178,8 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor - >, + AssetsToBlockAuthor, + >, ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 1cd9783049a..2cce3ead614 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -86,15 +86,7 @@ impl< + fungibles::Balanced, HandleCredit: HandleCreditT, > WeightTrader - for TakeFirstAssetTrader< - WeightToFee, - AccountId, - Currency, - CON, - Matcher, - Assets, - HandleCredit, - > + for TakeFirstAssetTrader { fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) @@ -184,15 +176,7 @@ impl< + fungibles::Balanced, HandleCredit: HandleCreditT, > Drop - for TakeFirstAssetTrader< - WeightToFee, - AccountId, - Currency, - CON, - Matcher, - Assets, - HandleCredit, - > + for TakeFirstAssetTrader { fn drop(&mut self) { if let Some((_, local_asset_id)) = self.2 { From 8c14940a3887208ecf6080a6c268d8bc7d79a96c Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 25 May 2022 19:09:02 +0200 Subject: [PATCH 12/53] log messages properly --- primitives/utility/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 2cce3ead614..b6fc07d97c0 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -91,7 +91,6 @@ impl< fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) } - // We take first asset // TODO: do we want to be iterating over all potential assets in payments? // Check whether we can convert fee to asset_fee (is_sufficient, min_deposit) @@ -142,7 +141,7 @@ impl< } fn refund_weight(&mut self, weight: Weight) -> Option { - log::trace!(target: "xcm::weight", "UsingComponents::refund_weight weight: {:?}", weight); + log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); let weight = weight.min(self.0); let amount = WeightToFee::calc(&weight); // If not None From ee07ca27af914b4714d4aa4532f640519ad71af0 Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Wed, 25 May 2022 15:05:50 -0600 Subject: [PATCH 13/53] Use TakeRevenue instead of HandleCredit --- .../assets/statemine/src/xcm_config.rs | 4 ++-- .../assets/statemint/src/xcm_config.rs | 4 ++-- .../assets/westmint/src/xcm_config.rs | 4 ++-- primitives/utility/Cargo.toml | 2 +- primitives/utility/src/lib.rs | 22 +++++++++++-------- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index 53caf8796f6..1e9be153d6d 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -24,7 +24,7 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::{AssetsToBlockAuthor, ToStakingPot}, + impls::ToStakingPot, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; @@ -182,7 +182,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor, + (), >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index c7c89eae6ea..c6adde0386c 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -24,7 +24,7 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::{AssetsToBlockAuthor, ToStakingPot}, + impls::ToStakingPot, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; @@ -182,7 +182,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor, + (), >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index cccc2c17b41..bb325793b8a 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -24,7 +24,7 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::{AssetsToBlockAuthor, ToStakingPot}, + impls::ToStakingPot, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; @@ -178,7 +178,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - AssetsToBlockAuthor, + (), >, ); type ResponseHandler = PolkadotXcm; diff --git a/primitives/utility/Cargo.toml b/primitives/utility/Cargo.toml index fbe80c3aea8..6a76740bde1 100644 --- a/primitives/utility/Cargo.toml +++ b/primitives/utility/Cargo.toml @@ -13,7 +13,6 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } # Polkadot polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } @@ -21,6 +20,7 @@ polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-f polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index b6fc07d97c0..371118386bc 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -25,13 +25,13 @@ use frame_support::{ traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion}, weights::{Weight, WeightToFeePolynomial}, }; -use pallet_asset_tx_payment::HandleCredit as HandleCreditT; use sp_runtime::{ traits::{Saturating, Zero}, SaturatedConversion, }; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; +use xcm_builder::TakeRevenue; use xcm_executor::traits::{MatchesFungibles, WeightTrader}; /// Xcm router which recognises the `Parent` destination and handles it by sending the message into /// the given UMP `UpwardMessageSender` implementation. Thus this essentially adapts an @@ -68,12 +68,12 @@ pub struct TakeFirstAssetTrader< CON: BalanceConversion, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, - HandleCredit: HandleCreditT, + HandleRefund: TakeRevenue, >( Weight, Assets::Balance, Option<(MultiLocation, Assets::AssetId)>, - PhantomData<(WeightToFee, AccountId, Currency, CON, Matcher, Assets, HandleCredit)>, + PhantomData<(WeightToFee, AccountId, Currency, CON, Matcher, Assets, HandleRefund)>, ); impl< WeightToFee: WeightToFeePolynomial, @@ -84,9 +84,9 @@ impl< Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, - HandleCredit: HandleCreditT, + HandleRefund: TakeRevenue, > WeightTrader - for TakeFirstAssetTrader + for TakeFirstAssetTrader { fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) @@ -173,13 +173,17 @@ impl< Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, - HandleCredit: HandleCreditT, + HandleRefund: TakeRevenue, > Drop - for TakeFirstAssetTrader + for TakeFirstAssetTrader { fn drop(&mut self) { - if let Some((_, local_asset_id)) = self.2 { - HandleCredit::handle_credit(Assets::issue(local_asset_id, self.1)); + if let Some((location, _)) = &self.2 { + let u128_amount: u128 = self.1.try_into().map_err(|_| XcmError::Overflow).unwrap(); + HandleRefund::take_revenue(MultiAsset { + id: location.clone().into(), + fun: Fungibility::Fungible(u128_amount), + }); } } } From 63fb3f2eac8273692247af24b56fff35e1b9d07e Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 10:22:02 +0200 Subject: [PATCH 14/53] Introduce xcm fee handler --- Cargo.lock | 2 +- .../assets/statemine/src/xcm_config.rs | 20 +++++++++++-- .../assets/statemint/src/xcm_config.rs | 20 +++++++++++-- .../assets/westmint/src/xcm_config.rs | 20 +++++++++++-- primitives/utility/src/lib.rs | 30 +++++++++++++++++++ 5 files changed, 85 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00286a72096..1033eec4416 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2007,7 +2007,6 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "log", - "pallet-asset-tx-payment", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain 0.9.22", @@ -2016,6 +2015,7 @@ dependencies = [ "sp-std", "sp-trie", "xcm", + "xcm-builder", "xcm-executor", ] diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index 1e9be153d6d..dc6dc96e556 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -14,7 +14,7 @@ // limitations under the License. use super::{ - AccountId, AssetId, Assets, Balance, Balances, Call, Event, Origin, ParachainInfo, + AccountId, AssetId, Assets, Authorship, Balance, Balances, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue, }; use frame_support::{ @@ -130,6 +130,7 @@ parameter_types! { // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000_000; pub const MaxInstructions: u32 = 100; + pub XcmAssetFeesReceiver: Option = Authorship::author(); } match_types! { @@ -157,6 +158,21 @@ pub type Barrier = DenyThenTry< ), >; +/// This is the struct that will handle the revenue from xcm fees +/// We do not burn anything because we want to mimic exactly what +/// the sovereign account has +pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< + Assets, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + AccountId, + XcmAssetFeesReceiver, +>; + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -182,7 +198,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - (), + XcmAssetFeesHandler, >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index c6adde0386c..c58da5d0758 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -14,7 +14,7 @@ // limitations under the License. use super::{ - AccountId, AssetId, Assets, Balance, Balances, Call, Event, Origin, ParachainInfo, + AccountId, AssetId, Assets, Authorship, Balance, Balances, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue, }; use frame_support::{ @@ -130,6 +130,7 @@ parameter_types! { // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000_000; pub const MaxInstructions: u32 = 100; + pub XcmAssetFeesReceiver: Option = Authorship::author(); } match_types! { @@ -157,6 +158,21 @@ pub type Barrier = DenyThenTry< ), >; +/// This is the struct that will handle the revenue from xcm fees +/// We do not burn anything because we want to mimic exactly what +/// the sovereign account has +pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< + Assets, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + AccountId, + XcmAssetFeesReceiver, +>; + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -182,7 +198,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - (), + XcmAssetFeesHandler, >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index bb325793b8a..f34598c0077 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -14,7 +14,7 @@ // limitations under the License. use super::{ - AccountId, AssetId, Assets, Balance, Balances, Call, Event, Origin, ParachainInfo, + AccountId, AssetId, Assets, Authorship, Balance, Balances, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue, }; use frame_support::{ @@ -130,6 +130,7 @@ parameter_types! { // One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate. pub UnitWeightCost: Weight = 1_000_000_000; pub const MaxInstructions: u32 = 100; + pub XcmAssetFeesReceiver: Option = Authorship::author(); } match_types! { @@ -153,6 +154,21 @@ pub type Barrier = DenyThenTry< ), >; +/// This is the struct that will handle the revenue from xcm fees +/// We do not burn anything because we want to mimic exactly what +/// the sovereign account has +pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< + Assets, + ConvertedConcreteAssetId< + AssetId, + Balance, + AsPrefixedGeneralIndex, + JustTry, + >, + AccountId, + XcmAssetFeesReceiver, +>; + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -178,7 +194,7 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - (), + XcmAssetFeesHandler, >, ); type ResponseHandler = PolkadotXcm; diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 371118386bc..0f4c03e430a 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -187,3 +187,33 @@ impl< } } } + +/// XCM fee depositor to which we implement the TakeRevenue trait +/// It receives a fungibles::Mutate implemented argument, a matcher to convert MultiAsset into +/// AssetId and amount, and the fee receiver account +pub struct XcmFeesToAccount( + PhantomData<(Assets, Matcher, AccountId, ReceiverAccount)>, +); +impl< + Assets: fungibles::Mutate, + Matcher: MatchesFungibles, + AccountId: Clone, + ReceiverAccount: frame_support::traits::Get>, + > TakeRevenue for XcmFeesToAccount +{ + fn take_revenue(revenue: MultiAsset) { + match Matcher::matches_fungibles(&revenue) { + Ok((asset_id, amount)) => + if let Some(receiver) = ReceiverAccount::get() { + if !amount.is_zero() { + let ok = Assets::mint_into(asset_id, &receiver, amount).is_ok(); + debug_assert!(ok, "`mint_into` cannot generally fail; qed"); + } + }, + Err(_) => log::debug!( + target: "xcm", + "take revenue failed matching fungible" + ), + } + } +} From 7efb86bbf9c7fa157536b7ead8c6bdc1ef05eb21 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 13:46:53 +0200 Subject: [PATCH 15/53] check total supply in tests --- .../runtimes/assets/statemine/tests/tests.rs | 302 +++++++++++++++++ .../runtimes/assets/statemint/tests/tests.rs | 303 ++++++++++++++++++ .../runtimes/assets/westmint/tests/tests.rs | 302 +++++++++++++++++ 3 files changed, 907 insertions(+) create mode 100644 parachains/runtimes/assets/statemine/tests/tests.rs create mode 100644 parachains/runtimes/assets/statemint/tests/tests.rs create mode 100644 parachains/runtimes/assets/westmint/tests/tests.rs diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs new file mode 100644 index 00000000000..294d1071487 --- /dev/null +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -0,0 +1,302 @@ +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use parachains_common::{AccountId, AuraId, Balance}; +use sp_consensus_aura::AURA_ENGINE_ID; +pub use statemine_runtime::{ + constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, + Runtime, SessionKeys, System, +}; +use xcm::latest::prelude::*; +use xcm_executor::traits::WeightTrader; + +pub struct ExtBuilder { + // endowed accounts with balances + balances: Vec<(AccountId, Balance)>, + // collators to test block prod + collators: Vec, +} + +impl Default for ExtBuilder { + fn default() -> ExtBuilder { + ExtBuilder { balances: vec![], collators: vec![] } + } +} +use frame_support::traits::GenesisBuild; +impl ExtBuilder { + pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { + self.balances = balances; + self + } + pub fn with_collators(mut self, collators: Vec) -> Self { + self.collators = collators; + self + } + + pub fn build(self) -> sp_io::TestExternalities { + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + + pallet_balances::GenesisConfig:: { balances: self.balances } + .assimilate_storage(&mut t) + .unwrap(); + + pallet_collator_selection::GenesisConfig:: { + invulnerables: self.collators.clone(), + candidacy_bond: Default::default(), + desired_candidates: Default::default(), + } + .assimilate_storage(&mut t) + .unwrap(); + + let keys: Vec<(AccountId, AccountId, SessionKeys)> = self + .collators + .iter() + .map(|account| { + let bytearray: &[u8; 32] = account.as_ref(); + ( + account.clone(), + account.clone(), + SessionKeys { + aura: AuraId::from(sp_core::sr25519::Public::from_raw(*bytearray)), + }, + ) + }) + .collect(); + pallet_session::GenesisConfig:: { keys } + .assimilate_storage(&mut t) + .unwrap(); + + let mut ext = sp_io::TestExternalities::new(t); + + ext.execute_with(|| { + System::set_block_number(1); + }); + + ext + } +} + +use codec::Encode; +use sp_runtime::{Digest, DigestItem}; +/// Utility function that advances the chain to the desired block number. +/// If an author is provided, that author information is injected to all the blocks in the meantime. +pub fn run_to_block(n: u32, author: Option) { + while System::block_number() < n { + // Set the new block number and author + match author { + Some(ref author) => { + let pre_digest = + Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; + System::reset_events(); + System::initialize( + &(System::block_number() + 1), + &System::parent_hash(), + &pre_digest, + ); + }, + None => { + System::set_block_number(System::block_number() + 1); + }, + } + } +} + +pub const ALICE: [u8; 32] = [1u8; 32]; + +pub fn root_origin() -> ::Origin { + ::Origin::root() +} + +pub fn origin_of(account_id: AccountId) -> ::Origin { + ::Origin::signed(account_id) +} + +#[test] +fn test_asset_xcm_trader() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + // lets calculate amount needed + let amount_needed = WeightToFee::calc(&bought); + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + amount_needed + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + amount_needed + ); + }); +} + +#[test] +fn test_asset_xcm_trader_with_refund() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + let weight_used = bought / 2; + let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + + assert_eq!( + trader.refund_weight(bought - weight_used), + Some((asset_multilocation, amount_refunded).into()) + ); + drop(trader); + + let fees_paid = WeightToFee::calc(&weight_used); + + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + fees_paid + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + fees_paid + ); + }); +} + +#[test] +fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 1_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + assert!( + amount_bought < ExistentialDeposit::get(), + "we are testing what happens when the amount does not exceed ED" + ); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + + // not credited since the ED is higher than this value + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + 0 + ); + }); +} diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs new file mode 100644 index 00000000000..df7cec7b4c9 --- /dev/null +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -0,0 +1,303 @@ +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; +use sp_consensus_aura::AURA_ENGINE_ID; +pub use statemint_runtime::{ + constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, + Runtime, SessionKeys, System, +}; +use xcm::latest::prelude::*; +use xcm_executor::traits::WeightTrader; + +pub struct ExtBuilder { + // endowed accounts with balances + balances: Vec<(AccountId, Balance)>, + // collators to test block prod + collators: Vec, +} + +impl Default for ExtBuilder { + fn default() -> ExtBuilder { + ExtBuilder { balances: vec![], collators: vec![] } + } +} +use frame_support::traits::GenesisBuild; +impl ExtBuilder { + pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { + self.balances = balances; + self + } + pub fn with_collators(mut self, collators: Vec) -> Self { + self.collators = collators; + self + } + + pub fn build(self) -> sp_io::TestExternalities { + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + + pallet_balances::GenesisConfig:: { balances: self.balances } + .assimilate_storage(&mut t) + .unwrap(); + + pallet_collator_selection::GenesisConfig:: { + invulnerables: self.collators.clone(), + candidacy_bond: Default::default(), + desired_candidates: Default::default(), + } + .assimilate_storage(&mut t) + .unwrap(); + + let keys: Vec<(AccountId, AccountId, SessionKeys)> = self + .collators + .iter() + .map(|account| { + let bytearray: &[u8; 32] = account.as_ref(); + ( + account.clone(), + account.clone(), + SessionKeys { + aura: AuraId::from(sp_core::ed25519::Public::from_raw(*bytearray)), + }, + ) + }) + .collect(); + pallet_session::GenesisConfig:: { keys } + .assimilate_storage(&mut t) + .unwrap(); + + let mut ext = sp_io::TestExternalities::new(t); + + ext.execute_with(|| { + System::set_block_number(1); + }); + + ext + } +} + +use codec::Encode; +use sp_runtime::{Digest, DigestItem}; +/// Utility function that advances the chain to the desired block number. +/// If an author is provided, that author information is injected to all the blocks in the meantime. +pub fn run_to_block(n: u32, author: Option) { + while System::block_number() < n { + // Set the new block number and author + match author { + Some(ref author) => { + let pre_digest = + Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; + System::reset_events(); + System::initialize( + &(System::block_number() + 1), + &System::parent_hash(), + &pre_digest, + ); + }, + None => { + System::set_block_number(System::block_number() + 1); + }, + } + } +} + +pub const ALICE: [u8; 32] = [1u8; 32]; + +pub fn root_origin() -> ::Origin { + ::Origin::root() +} + +pub fn origin_of(account_id: AccountId) -> ::Origin { + ::Origin::signed(account_id) +} + +#[test] +fn test_asset_xcm_trader() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + // lets calculate amount needed + let amount_needed = WeightToFee::calc(&bought); + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + amount_needed + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + amount_needed + ); + }); +} + +#[test] +fn test_asset_xcm_trader_with_refund() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + let weight_used = bought / 2; + let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + + assert_eq!( + trader.refund_weight(bought - weight_used), + Some((asset_multilocation, amount_refunded).into()) + ); + drop(trader); + + let fees_paid = WeightToFee::calc(&weight_used); + + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + fees_paid + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + fees_paid + ); + + }); +} + +#[test] +fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 1_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + assert!( + amount_bought < ExistentialDeposit::get(), + "we are testing what happens when the amount does not exceed ED" + ); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + + // not credited since the ED is higher than this value + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + 0 + ); + }); +} diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs new file mode 100644 index 00000000000..5684ad8f8e6 --- /dev/null +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -0,0 +1,302 @@ +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use parachains_common::{AccountId, AuraId, Balance}; +use sp_consensus_aura::AURA_ENGINE_ID; +pub use westmint_runtime::{ + constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, + Runtime, SessionKeys, System, +}; +use xcm::latest::prelude::*; +use xcm_executor::traits::WeightTrader; + +pub struct ExtBuilder { + // endowed accounts with balances + balances: Vec<(AccountId, Balance)>, + // collators to test block prod + collators: Vec, +} + +impl Default for ExtBuilder { + fn default() -> ExtBuilder { + ExtBuilder { balances: vec![], collators: vec![] } + } +} +use frame_support::traits::GenesisBuild; +impl ExtBuilder { + pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { + self.balances = balances; + self + } + pub fn with_collators(mut self, collators: Vec) -> Self { + self.collators = collators; + self + } + + pub fn build(self) -> sp_io::TestExternalities { + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + + pallet_balances::GenesisConfig:: { balances: self.balances } + .assimilate_storage(&mut t) + .unwrap(); + + pallet_collator_selection::GenesisConfig:: { + invulnerables: self.collators.clone(), + candidacy_bond: Default::default(), + desired_candidates: Default::default(), + } + .assimilate_storage(&mut t) + .unwrap(); + + let keys: Vec<(AccountId, AccountId, SessionKeys)> = self + .collators + .iter() + .map(|account| { + let bytearray: &[u8; 32] = account.as_ref(); + ( + account.clone(), + account.clone(), + SessionKeys { + aura: AuraId::from(sp_core::sr25519::Public::from_raw(*bytearray)), + }, + ) + }) + .collect(); + pallet_session::GenesisConfig:: { keys } + .assimilate_storage(&mut t) + .unwrap(); + + let mut ext = sp_io::TestExternalities::new(t); + + ext.execute_with(|| { + System::set_block_number(1); + }); + + ext + } +} + +use codec::Encode; +use sp_runtime::{Digest, DigestItem}; +/// Utility function that advances the chain to the desired block number. +/// If an author is provided, that author information is injected to all the blocks in the meantime. +pub fn run_to_block(n: u32, author: Option) { + while System::block_number() < n { + // Set the new block number and author + match author { + Some(ref author) => { + let pre_digest = + Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; + System::reset_events(); + System::initialize( + &(System::block_number() + 1), + &System::parent_hash(), + &pre_digest, + ); + }, + None => { + System::set_block_number(System::block_number() + 1); + }, + } + } +} + +pub const ALICE: [u8; 32] = [1u8; 32]; + +pub fn root_origin() -> ::Origin { + ::Origin::root() +} + +pub fn origin_of(account_id: AccountId) -> ::Origin { + ::Origin::signed(account_id) +} + +#[test] +fn test_asset_xcm_trader() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + // lets calculate amount needed + let amount_needed = WeightToFee::calc(&bought); + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + amount_needed + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + amount_needed + ); + }); +} + +#[test] +fn test_asset_xcm_trader_with_refund() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + // We first mint enough asset for the account to exist for assets + assert_ok!(Assets::mint( + origin_of(AccountId::from(ALICE)), + 1, + AccountId::from(ALICE).into(), + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 4_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + let weight_used = bought / 2; + let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + + assert_eq!( + trader.refund_weight(bought - weight_used), + Some((asset_multilocation, amount_refunded).into()) + ); + drop(trader); + + let fees_paid = WeightToFee::calc(&weight_used); + + assert_eq!( + Assets::balance(1, AccountId::from(ALICE)), + ExistentialDeposit::get() + fees_paid + ); + + // We also need to ensure the total supply increased + assert_eq!( + Assets::total_supply(1), + ExistentialDeposit::get() + fees_paid + ); + }); +} + +#[test] +fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are going to buy 4e9 weight + let bought = 1_000_000_000u64; + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::calc(&bought); + + assert!( + amount_bought < ExistentialDeposit::get(), + "we are testing what happens when the amount does not exceed ED" + ); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_ok!(trader.buy_weight(bought, asset.into())); + + drop(trader); + + // not credited since the ED is higher than this value + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); + + // We also need to ensure the total supply did not increase + assert_eq!( + Assets::total_supply(1), + 0 + ); + }); +} From b6d9b8d1c584d3bc2f142a9a5e43585efc52ed53 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 14:29:51 +0200 Subject: [PATCH 16/53] FMT --- .../runtimes/assets/statemine/tests/tests.rs | 15 +++------------ .../runtimes/assets/statemint/tests/tests.rs | 16 +++------------- .../runtimes/assets/westmint/tests/tests.rs | 15 +++------------ 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 294d1071487..a89c95d6d6a 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -164,10 +164,7 @@ fn test_asset_xcm_trader() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + amount_needed - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + amount_needed); }); } @@ -236,10 +233,7 @@ fn test_asset_xcm_trader_with_refund() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + fees_paid - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid); }); } @@ -294,9 +288,6 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + 0 - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + 0); }); } diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index df7cec7b4c9..36392c1243a 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -164,10 +164,7 @@ fn test_asset_xcm_trader() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + amount_needed - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + amount_needed); }); } @@ -236,11 +233,7 @@ fn test_asset_xcm_trader_with_refund() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + fees_paid - ); - + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid); }); } @@ -295,9 +288,6 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - 0 - ); + assert_eq!(Assets::total_supply(1), 0); }); } diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 5684ad8f8e6..fac3d3b92d3 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -164,10 +164,7 @@ fn test_asset_xcm_trader() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + amount_needed - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + amount_needed); }); } @@ -236,10 +233,7 @@ fn test_asset_xcm_trader_with_refund() { ); // We also need to ensure the total supply increased - assert_eq!( - Assets::total_supply(1), - ExistentialDeposit::get() + fees_paid - ); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid); }); } @@ -294,9 +288,6 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); // We also need to ensure the total supply did not increase - assert_eq!( - Assets::total_supply(1), - 0 - ); + assert_eq!(Assets::total_supply(1), 0); }); } From 916ab52a6cb58f8548f321f8b9ad75ba48fe43cd Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 15:21:06 +0200 Subject: [PATCH 17/53] fix test --- parachains/runtimes/assets/statemine/tests/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index a89c95d6d6a..4f342f969bf 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -288,6 +288,6 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); // We also need to ensure the total supply increased - assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + 0); + assert_eq!(Assets::total_supply(1), 0); }); } From a0f2d3db7f481c74f110bf558601bd08593a2178 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 16:10:53 +0200 Subject: [PATCH 18/53] Start decoupling balance calculation into different traits --- parachains/common/Cargo.toml | 2 + parachains/common/src/impls.rs | 32 +++++++++++++++- .../assets/statemine/src/xcm_config.rs | 11 ++++-- primitives/utility/src/lib.rs | 37 +++++++++---------- 4 files changed, 57 insertions(+), 25 deletions(-) diff --git a/parachains/common/Cargo.toml b/parachains/common/Cargo.toml index 57a1eaa6ce5..97c196b12e6 100644 --- a/parachains/common/Cargo.toml +++ b/parachains/common/Cargo.toml @@ -34,6 +34,7 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature # Cumulus pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } +cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false } [dev-dependencies] pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -60,4 +61,5 @@ std = [ "sp-io/std", "sp-std/std", "pallet-collator-selection/std", + "cumulus-primitives-utility/std", ] diff --git a/parachains/common/src/impls.rs b/parachains/common/src/impls.rs index 4a2411c2cf3..6d1e05964b6 100644 --- a/parachains/common/src/impls.rs +++ b/parachains/common/src/impls.rs @@ -16,10 +16,10 @@ //! Auxiliary struct/enums for parachain runtimes. //! Taken from polkadot/runtime/common (at a21cd64) and adapted for parachains. -use frame_support::traits::{ +use frame_support::{traits::{ fungibles::{self, Balanced, CreditOf}, Contains, Currency, Get, Imbalance, OnUnbalanced, -}; +}, weights::WeightToFeePolynomial}; use pallet_asset_tx_payment::HandleCredit; use sp_runtime::traits::Zero; use sp_std::marker::PhantomData; @@ -86,6 +86,34 @@ where } } +use frame_support::traits::tokens::BalanceConversion; +use frame_support::pallet_prelude::Weight; +use xcm::latest::prelude::*; +/// A `HandleCredit` implementation that naively transfers the fees to the block author. +/// Will drop and burn the assets in case the transfer fails. +pub struct AssetFeeAsExistentialDepositMultiplier(PhantomData<(R, WeightToFee, CON)>); +impl cumulus_primitives_utility::ChargeFeeInFungibles, pallet_assets::Pallet> + for AssetFeeAsExistentialDepositMultiplier +where + R: pallet_balances::Config + pallet_assets::Config, + WeightToFee: WeightToFeePolynomial as Currency>>::Balance>, + CON: BalanceConversion< + as Currency>>::Balance, + as fungibles::Inspect>>::AssetId, + as fungibles::Inspect>>::Balance + >, + AccountIdOf: + From + Into, +{ + fn charge_weight_in_asset( + asset_id: as fungibles::Inspect>>::AssetId, + weight: Weight) -> + Result< as fungibles::Inspect>>::Balance, XcmError> { + let amount = WeightToFee::calc(&weight); + CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) + } +} + /// Allow checking in assets that have issuance > 0. pub struct NonZeroIssuance(PhantomData<(AccountId, Assets)>); impl Contains<>::AssetId> diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index dc6dc96e556..8c1e8b1ed1c 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -24,8 +24,9 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::ToStakingPot, + impls::{ToStakingPot, AssetFeeAsExistentialDepositMultiplier}, xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, + }; use polkadot_parachain::primitives::Sibling; use sp_runtime::traits::ConvertInto; @@ -187,10 +188,12 @@ impl xcm_executor::Config for XcmConfig { type Trader = ( UsingComponents>, cumulus_primitives_utility::TakeFirstAssetTrader< - WeightToFee, AccountId, - Balances, - pallet_assets::BalanceToAssetBalance, + AssetFeeAsExistentialDepositMultiplier< + Runtime, + WeightToFee, + pallet_assets::BalanceToAssetBalance + >, ConvertedConcreteAssetId< AssetId, Balance, diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 0f4c03e430a..c2a48e289fb 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -22,13 +22,14 @@ use codec::Encode; use cumulus_primitives_core::UpwardMessageSender; use frame_support::{ - traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion}, + traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion, fungibles::Inspect}, weights::{Weight, WeightToFeePolynomial}, }; use sp_runtime::{ traits::{Saturating, Zero}, SaturatedConversion, }; + use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; use xcm_builder::TakeRevenue; @@ -62,10 +63,8 @@ impl SendXcm for ParentAsUmp { } pub struct TakeFirstAssetTrader< - WeightToFee: WeightToFeePolynomial, AccountId, - Currency: CurrencyT, - CON: BalanceConversion, + FeeCharger: ChargeFeeInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, @@ -73,20 +72,18 @@ pub struct TakeFirstAssetTrader< Weight, Assets::Balance, Option<(MultiLocation, Assets::AssetId)>, - PhantomData<(WeightToFee, AccountId, Currency, CON, Matcher, Assets, HandleRefund)>, + PhantomData<(AccountId, FeeCharger, Matcher, Assets, HandleRefund)>, ); -impl< - WeightToFee: WeightToFeePolynomial, +impl< AccountId, - Currency: CurrencyT, - CON: BalanceConversion, + FeeCharger: ChargeFeeInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, > WeightTrader - for TakeFirstAssetTrader + for TakeFirstAssetTrader { fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) @@ -102,7 +99,7 @@ impl< ) -> Result { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); // Based on weight bought, calculate how much native token fee we need to pay - let amount = WeightToFee::calc(&weight); + // let amount = WeightToFee::calc(&weight); // We take the very first multiasset from payment // TODO: revisit this clone let multiassets: MultiAssets = payment.clone().into(); @@ -113,8 +110,8 @@ impl< // it reads the min_balance of the asset // potential db read // Already should have been read with WithdrawAsset in case of pallet-assets - let asset_balance = - CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; + let asset_balance = FeeCharger::charge_weight_in_asset(local_asset_id, weight)?; + //CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; match first { // Not relevant match, as matches_fungibles should have already verified this above @@ -143,12 +140,12 @@ impl< fn refund_weight(&mut self, weight: Weight) -> Option { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); let weight = weight.min(self.0); - let amount = WeightToFee::calc(&weight); // If not None if let Some((asset_location, local_asset_id)) = self.2.clone() { // Calculate asset_balance // This read should have already be cached in buy_weight - let asset_balance = CON::to_asset_balance(amount, local_asset_id).ok()?; + let asset_balance = FeeCharger::charge_weight_in_asset(local_asset_id, weight).ok()?; + self.0 -= weight; self.1 = self.1.saturating_sub(asset_balance); @@ -165,17 +162,15 @@ impl< } impl< - WeightToFee: WeightToFeePolynomial, AccountId, - Currency: CurrencyT, - CON: BalanceConversion, + FeeCharger: ChargeFeeInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, > Drop - for TakeFirstAssetTrader + for TakeFirstAssetTrader { fn drop(&mut self) { if let Some((location, _)) = &self.2 { @@ -217,3 +212,7 @@ impl< } } } + +pub trait ChargeFeeInFungibles> { + fn charge_weight_in_asset(asset_id: >::AssetId, weight: Weight) -> Result<>::Balance, XcmError>; +} \ No newline at end of file From 496b8fcdf2d5bc2b774f39a9bda2f571ba65f245 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 26 May 2022 17:57:00 +0200 Subject: [PATCH 19/53] Make traits a bit more generic --- Cargo.lock | 1 + parachains/common/src/impls.rs | 32 +------------- parachains/common/src/xcm_config.rs | 36 +++++++++++++++- .../assets/statemine/src/xcm_config.rs | 9 ++-- .../runtimes/assets/statemine/tests/tests.rs | 20 ++++++++- .../assets/statemint/src/xcm_config.rs | 12 ++++-- .../runtimes/assets/statemint/tests/tests.rs | 19 +++++++- .../assets/westmint/src/xcm_config.rs | 12 ++++-- .../runtimes/assets/westmint/tests/tests.rs | 17 ++++++++ primitives/utility/src/lib.rs | 43 +++++++++---------- 10 files changed, 133 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1033eec4416..339742e4901 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6631,6 +6631,7 @@ dependencies = [ name = "parachains-common" version = "1.0.0" dependencies = [ + "cumulus-primitives-utility", "frame-executive", "frame-support", "frame-system", diff --git a/parachains/common/src/impls.rs b/parachains/common/src/impls.rs index 6d1e05964b6..4a2411c2cf3 100644 --- a/parachains/common/src/impls.rs +++ b/parachains/common/src/impls.rs @@ -16,10 +16,10 @@ //! Auxiliary struct/enums for parachain runtimes. //! Taken from polkadot/runtime/common (at a21cd64) and adapted for parachains. -use frame_support::{traits::{ +use frame_support::traits::{ fungibles::{self, Balanced, CreditOf}, Contains, Currency, Get, Imbalance, OnUnbalanced, -}, weights::WeightToFeePolynomial}; +}; use pallet_asset_tx_payment::HandleCredit; use sp_runtime::traits::Zero; use sp_std::marker::PhantomData; @@ -86,34 +86,6 @@ where } } -use frame_support::traits::tokens::BalanceConversion; -use frame_support::pallet_prelude::Weight; -use xcm::latest::prelude::*; -/// A `HandleCredit` implementation that naively transfers the fees to the block author. -/// Will drop and burn the assets in case the transfer fails. -pub struct AssetFeeAsExistentialDepositMultiplier(PhantomData<(R, WeightToFee, CON)>); -impl cumulus_primitives_utility::ChargeFeeInFungibles, pallet_assets::Pallet> - for AssetFeeAsExistentialDepositMultiplier -where - R: pallet_balances::Config + pallet_assets::Config, - WeightToFee: WeightToFeePolynomial as Currency>>::Balance>, - CON: BalanceConversion< - as Currency>>::Balance, - as fungibles::Inspect>>::AssetId, - as fungibles::Inspect>>::Balance - >, - AccountIdOf: - From + Into, -{ - fn charge_weight_in_asset( - asset_id: as fungibles::Inspect>>::AssetId, - weight: Weight) -> - Result< as fungibles::Inspect>>::Balance, XcmError> { - let amount = WeightToFee::calc(&weight); - CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) - } -} - /// Allow checking in assets that have issuance > 0. pub struct NonZeroIssuance(PhantomData<(AccountId, Assets)>); impl Contains<>::AssetId> diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index f5004c9c674..5d60e5f1a29 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -1,5 +1,10 @@ +use crate::impls::AccountIdOf; use core::marker::PhantomData; -use frame_support::{log, weights::Weight}; +use frame_support::{ + log, + traits::{fungibles::Inspect, tokens::BalanceConversion}, + weights::{Weight, WeightToFeePolynomial}, +}; use xcm::latest::prelude::*; use xcm_executor::traits::ShouldExecute; @@ -65,3 +70,32 @@ impl ShouldExecute for DenyReserveTransferToRelayChain { Ok(()) } } + +/// A `ChargeFeeInFungibles` implementation that converts the output of +/// a given WeightToFee implementation an amount charged in +/// a particular assetId from pallet-assets +pub struct AssetFeeAsExistentialDepositMultiplier( + PhantomData<(R, WeightToFee, CON)>, +); +impl + cumulus_primitives_utility::ChargeWeightInFungibles, pallet_assets::Pallet> + for AssetFeeAsExistentialDepositMultiplier +where + R: pallet_assets::Config, + WeightToFee: WeightToFeePolynomial, + CON: BalanceConversion< + CurrencyBalance, + as Inspect>>::AssetId, + as Inspect>>::Balance, + >, + AccountIdOf: + From + Into, +{ + fn charge_weight_in_fungibles( + asset_id: as Inspect>>::AssetId, + weight: Weight, + ) -> Result< as Inspect>>::Balance, XcmError> { + let amount = WeightToFee::calc(&weight); + CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) + } +} diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index 8c1e8b1ed1c..2685e1ef076 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -24,9 +24,10 @@ use frame_support::{ }; use pallet_xcm::XcmPassthrough; use parachains_common::{ - impls::{ToStakingPot, AssetFeeAsExistentialDepositMultiplier}, - xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, - + impls::ToStakingPot, + xcm_config::{ + AssetFeeAsExistentialDepositMultiplier, DenyReserveTransferToRelayChain, DenyThenTry, + }, }; use polkadot_parachain::primitives::Sibling; use sp_runtime::traits::ConvertInto; @@ -192,7 +193,7 @@ impl xcm_executor::Config for XcmConfig { AssetFeeAsExistentialDepositMultiplier< Runtime, WeightToFee, - pallet_assets::BalanceToAssetBalance + pallet_assets::BalanceToAssetBalance, >, ConvertedConcreteAssetId< AssetId, diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 4f342f969bf..be1148ca732 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -108,7 +108,6 @@ pub fn root_origin() -> ::Origin { pub fn origin_of(account_id: AccountId) -> ::Origin { ::Origin::signed(account_id) } - #[test] fn test_asset_xcm_trader() { ExtBuilder::default() @@ -140,6 +139,7 @@ fn test_asset_xcm_trader() { // We are going to buy 4e9 weight let bought = 4_000_000_000u64; + // lets calculate amount needed let amount_needed = WeightToFee::calc(&bought); @@ -155,9 +155,14 @@ fn test_asset_xcm_trader() { ); let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // Drop trader drop(trader); + + // Make sure author(Alice) has received the amount assert_eq!( Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get() + amount_needed @@ -211,20 +216,29 @@ fn test_asset_xcm_trader_with_refund() { ), ); + // lets calculate amount needed let amount_bought = WeightToFee::calc(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // We actually use half of the weight let weight_used = bought / 2; + + // Make sure refurnd works. let amount_refunded = WeightToFee::calc(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), Some((asset_multilocation, amount_refunded).into()) ); + + // Drop trader drop(trader); + // We only should have paid for half of the bought weight let fees_paid = WeightToFee::calc(&weight_used); assert_eq!( @@ -280,6 +294,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); drop(trader); @@ -287,7 +303,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { // not credited since the ED is higher than this value assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); - // We also need to ensure the total supply increased + // We also need to ensure the total supply did not increase assert_eq!(Assets::total_supply(1), 0); }); } diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index c58da5d0758..f43cfd46a8a 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -25,7 +25,9 @@ use frame_support::{ use pallet_xcm::XcmPassthrough; use parachains_common::{ impls::ToStakingPot, - xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, + xcm_config::{ + AssetFeeAsExistentialDepositMultiplier, DenyReserveTransferToRelayChain, DenyThenTry, + }, }; use polkadot_parachain::primitives::Sibling; use sp_runtime::traits::ConvertInto; @@ -187,10 +189,12 @@ impl xcm_executor::Config for XcmConfig { type Trader = ( UsingComponents>, cumulus_primitives_utility::TakeFirstAssetTrader< - WeightToFee, AccountId, - Balances, - pallet_assets::BalanceToAssetBalance, + AssetFeeAsExistentialDepositMultiplier< + Runtime, + WeightToFee, + pallet_assets::BalanceToAssetBalance, + >, ConvertedConcreteAssetId< AssetId, Balance, diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 36392c1243a..605826edef7 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -140,6 +140,7 @@ fn test_asset_xcm_trader() { // We are going to buy 4e9 weight let bought = 4_000_000_000u64; + // lets calculate amount needed let amount_needed = WeightToFee::calc(&bought); @@ -155,9 +156,14 @@ fn test_asset_xcm_trader() { ); let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // Drop trader drop(trader); + + // Make sure author(Alice) has received the amount assert_eq!( Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get() + amount_needed @@ -211,20 +217,29 @@ fn test_asset_xcm_trader_with_refund() { ), ); + // lets calculate amount needed let amount_bought = WeightToFee::calc(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // We actually use half of the weight let weight_used = bought / 2; + + // Make sure refurnd works. let amount_refunded = WeightToFee::calc(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), Some((asset_multilocation, amount_refunded).into()) ); + + // Drop trader drop(trader); + // We only should have paid for half of the bought weight let fees_paid = WeightToFee::calc(&weight_used); assert_eq!( @@ -280,6 +295,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); drop(trader); @@ -287,7 +304,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { // not credited since the ED is higher than this value assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); - // We also need to ensure the total supply increased + // We also need to ensure the total supply did not increase assert_eq!(Assets::total_supply(1), 0); }); } diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index f34598c0077..57f54df04df 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -25,7 +25,9 @@ use frame_support::{ use pallet_xcm::XcmPassthrough; use parachains_common::{ impls::ToStakingPot, - xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, + xcm_config::{ + AssetFeeAsExistentialDepositMultiplier, DenyReserveTransferToRelayChain, DenyThenTry, + }, }; use polkadot_parachain::primitives::Sibling; use sp_runtime::traits::ConvertInto; @@ -183,10 +185,12 @@ impl xcm_executor::Config for XcmConfig { type Trader = ( UsingComponents>, cumulus_primitives_utility::TakeFirstAssetTrader< - WeightToFee, AccountId, - Balances, - pallet_assets::BalanceToAssetBalance, + AssetFeeAsExistentialDepositMultiplier< + Runtime, + WeightToFee, + pallet_assets::BalanceToAssetBalance, + >, ConvertedConcreteAssetId< AssetId, Balance, diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index fac3d3b92d3..354c78dcc31 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -140,6 +140,7 @@ fn test_asset_xcm_trader() { // We are going to buy 4e9 weight let bought = 4_000_000_000u64; + // lets calculate amount needed let amount_needed = WeightToFee::calc(&bought); @@ -155,9 +156,14 @@ fn test_asset_xcm_trader() { ); let asset: MultiAsset = (asset_multilocation, amount_needed).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // Drop trader drop(trader); + + // Make sure author(Alice) has received the amount assert_eq!( Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get() + amount_needed @@ -211,20 +217,29 @@ fn test_asset_xcm_trader_with_refund() { ), ); + // lets calculate amount needed let amount_bought = WeightToFee::calc(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); + // We actually use half of the weight let weight_used = bought / 2; + + // Make sure refurnd works. let amount_refunded = WeightToFee::calc(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), Some((asset_multilocation, amount_refunded).into()) ); + + // Drop trader drop(trader); + // We only should have paid for half of the bought weight let fees_paid = WeightToFee::calc(&weight_used); assert_eq!( @@ -280,6 +295,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Make sure buy_weight does not return an error assert_ok!(trader.buy_weight(bought, asset.into())); drop(trader); diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index c2a48e289fb..ce9d7347df2 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -22,8 +22,8 @@ use codec::Encode; use cumulus_primitives_core::UpwardMessageSender; use frame_support::{ - traits::tokens::{currency::Currency as CurrencyT, fungibles, BalanceConversion, fungibles::Inspect}, - weights::{Weight, WeightToFeePolynomial}, + traits::tokens::{fungibles, fungibles::Inspect}, + weights::Weight, }; use sp_runtime::{ traits::{Saturating, Zero}, @@ -64,7 +64,7 @@ impl SendXcm for ParentAsUmp { pub struct TakeFirstAssetTrader< AccountId, - FeeCharger: ChargeFeeInFungibles, + FeeCharger: ChargeWeightInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, @@ -74,16 +74,15 @@ pub struct TakeFirstAssetTrader< Option<(MultiLocation, Assets::AssetId)>, PhantomData<(AccountId, FeeCharger, Matcher, Assets, HandleRefund)>, ); -impl< +impl< AccountId, - FeeCharger: ChargeFeeInFungibles, + FeeCharger: ChargeWeightInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, - > WeightTrader - for TakeFirstAssetTrader + > WeightTrader for TakeFirstAssetTrader { fn new() -> Self { Self(0, Zero::zero(), None, PhantomData) @@ -98,8 +97,6 @@ impl< payment: xcm_executor::Assets, ) -> Result { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); - // Based on weight bought, calculate how much native token fee we need to pay - // let amount = WeightToFee::calc(&weight); // We take the very first multiasset from payment // TODO: revisit this clone let multiassets: MultiAssets = payment.clone().into(); @@ -107,11 +104,8 @@ impl< // We get the local asset id in which we can pay for fees let (local_asset_id, _) = Matcher::matches_fungibles(&first).map_err(|_| XcmError::TooExpensive)?; - // it reads the min_balance of the asset - // potential db read - // Already should have been read with WithdrawAsset in case of pallet-assets - let asset_balance = FeeCharger::charge_weight_in_asset(local_asset_id, weight)?; - //CON::to_asset_balance(amount, local_asset_id).map_err(|_| XcmError::TooExpensive)?; + // we calculate how much we should charge in the asset_id for such amount of weight + let asset_balance = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight)?; match first { // Not relevant match, as matches_fungibles should have already verified this above @@ -140,11 +134,11 @@ impl< fn refund_weight(&mut self, weight: Weight) -> Option { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); let weight = weight.min(self.0); - // If not None if let Some((asset_location, local_asset_id)) = self.2.clone() { // Calculate asset_balance // This read should have already be cached in buy_weight - let asset_balance = FeeCharger::charge_weight_in_asset(local_asset_id, weight).ok()?; + let asset_balance = + FeeCharger::charge_weight_in_fungibles(local_asset_id, weight).ok()?; self.0 -= weight; self.1 = self.1.saturating_sub(asset_balance); @@ -163,14 +157,13 @@ impl< impl< AccountId, - FeeCharger: ChargeFeeInFungibles, + FeeCharger: ChargeWeightInFungibles, Matcher: MatchesFungibles, Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, - > Drop - for TakeFirstAssetTrader + > Drop for TakeFirstAssetTrader { fn drop(&mut self) { if let Some((location, _)) = &self.2 { @@ -213,6 +206,12 @@ impl< } } -pub trait ChargeFeeInFungibles> { - fn charge_weight_in_asset(asset_id: >::AssetId, weight: Weight) -> Result<>::Balance, XcmError>; -} \ No newline at end of file +/// ChargeWeightInFungibles trait, which converts a given amount of weight +/// and an assetId, and it returns the balance amount that should be charged +/// in such assetId for that amount of weight +pub trait ChargeWeightInFungibles> { + fn charge_weight_in_fungibles( + asset_id: >::AssetId, + weight: Weight, + ) -> Result<>::Balance, XcmError>; +} From fe020001ba806065e73ef4815d405a73f1b18049 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 6 Jun 2022 10:02:03 +0200 Subject: [PATCH 20/53] PR suggestions --- parachains/common/src/xcm_config.rs | 2 +- primitives/utility/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 3dfd9b5591a..d2a7a023dd8 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -96,7 +96,7 @@ where asset_id: as Inspect>>::AssetId, weight: Weight, ) -> Result< as Inspect>>::Balance, XcmError> { - let amount = WeightToFee::calc(&weight); + let amount = WeightToFee::weight_to_fee(&weight); CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) } } diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index ce9d7347df2..6d020c2995f 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -103,7 +103,7 @@ impl< let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; // We get the local asset id in which we can pay for fees let (local_asset_id, _) = - Matcher::matches_fungibles(&first).map_err(|_| XcmError::TooExpensive)?; + Matcher::matches_fungibles(&first).map_err(|_| XcmError::AssetNotFound)?; // we calculate how much we should charge in the asset_id for such amount of weight let asset_balance = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight)?; From a19805d6601a7e116299efa1500d085c40f523c1 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 6 Jun 2022 10:43:38 +0200 Subject: [PATCH 21/53] add import --- parachains/common/src/xcm_config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index d2a7a023dd8..7d06026169e 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -2,7 +2,7 @@ use crate::impls::AccountIdOf; use core::marker::PhantomData; use frame_support::{ log, - traits::{fungibles::Inspect, tokens::BalanceConversion}, + traits::{fungibles::Inspect, tokens::BalanceConversion, weights::WeightToFee}, weights::{Weight, WeightToFeePolynomial}, }; use xcm::latest::prelude::*; From 1d506a25ded398166b86a8616fd99c18658cde9b Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 6 Jun 2022 10:45:07 +0200 Subject: [PATCH 22/53] import well --- parachains/common/src/xcm_config.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 7d06026169e..5d8d8061c57 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -2,8 +2,8 @@ use crate::impls::AccountIdOf; use core::marker::PhantomData; use frame_support::{ log, - traits::{fungibles::Inspect, tokens::BalanceConversion, weights::WeightToFee}, - weights::{Weight, WeightToFeePolynomial}, + traits::{fungibles::Inspect, tokens::BalanceConversion}, + weights::{Weight, WeightToFeePolynomial, WeightToFee}, }; use xcm::latest::prelude::*; use xcm_executor::traits::ShouldExecute; @@ -99,4 +99,4 @@ where let amount = WeightToFee::weight_to_fee(&weight); CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) } -} +} \ No newline at end of file From 428191da8ce931296291e973d8950e63d9937cff Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 6 Jun 2022 11:37:37 +0200 Subject: [PATCH 23/53] Place xcmfeesassethandler into parachains common --- Cargo.lock | 1 + parachains/common/Cargo.toml | 2 ++ parachains/common/src/xcm_config.rs | 27 ++++++++++++++++--- .../assets/statemine/src/xcm_config.rs | 21 ++++----------- .../assets/statemint/src/xcm_config.rs | 21 ++++----------- .../assets/westmint/src/xcm_config.rs | 21 ++++----------- 6 files changed, 42 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a29b3325ee2..cd687e8d1da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6622,6 +6622,7 @@ dependencies = [ "sp-std", "substrate-wasm-builder", "xcm", + "xcm-builder", "xcm-executor", ] diff --git a/parachains/common/Cargo.toml b/parachains/common/Cargo.toml index 97c196b12e6..dd70f4436aa 100644 --- a/parachains/common/Cargo.toml +++ b/parachains/common/Cargo.toml @@ -31,6 +31,7 @@ polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default- polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false } @@ -62,4 +63,5 @@ std = [ "sp-std/std", "pallet-collator-selection/std", "cumulus-primitives-utility/std", + "xcm-builder/std" ] diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 5d8d8061c57..d0f04bbe276 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -3,10 +3,11 @@ use core::marker::PhantomData; use frame_support::{ log, traits::{fungibles::Inspect, tokens::BalanceConversion}, - weights::{Weight, WeightToFeePolynomial, WeightToFee}, + weights::{Weight, WeightToFee, WeightToFeePolynomial}, }; use xcm::latest::prelude::*; -use xcm_executor::traits::ShouldExecute; +use xcm_builder::{AsPrefixedGeneralIndex, ConvertedConcreteAssetId}; +use xcm_executor::traits::{JustTry, ShouldExecute}; //TODO: move DenyThenTry to polkadot's xcm module. /// Deny executing the XCM if it matches any of the Deny filter regardless of anything else. @@ -99,4 +100,24 @@ where let amount = WeightToFee::weight_to_fee(&weight); CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) } -} \ No newline at end of file +} + +/// This is the type that will handle the fees +/// It receives the pallet-asset location for multilocation +/// and the fees receiver +pub type XcmAssetFeesHandler = + cumulus_primitives_utility::XcmFeesToAccount< + pallet_assets::Pallet, + ConvertedConcreteAssetId< + ::AssetId, + ::Balance, + AsPrefixedGeneralIndex< + AssetsPalletLocation, + ::AssetId, + JustTry, + >, + JustTry, + >, + ::AccountId, + XcmAssetFeesReceiver, + >; diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index a1b16b71776..7fdf8fb056e 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -160,21 +160,6 @@ pub type Barrier = DenyThenTry< ), >; -/// This is the struct that will handle the revenue from xcm fees -/// We do not burn anything because we want to mimic exactly what -/// the sovereign account has -pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< - Assets, - ConvertedConcreteAssetId< - AssetId, - Balance, - AsPrefixedGeneralIndex, - JustTry, - >, - AccountId, - XcmAssetFeesReceiver, ->; - pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -205,7 +190,11 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - XcmAssetFeesHandler, + parachains_common::xcm_config::XcmAssetFeesHandler< + Runtime, + AssetsPalletLocation, + XcmAssetFeesReceiver, + >, >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index a20c2aadbe0..80803ea41f7 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -160,21 +160,6 @@ pub type Barrier = DenyThenTry< ), >; -/// This is the struct that will handle the revenue from xcm fees -/// We do not burn anything because we want to mimic exactly what -/// the sovereign account has -pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< - Assets, - ConvertedConcreteAssetId< - AssetId, - Balance, - AsPrefixedGeneralIndex, - JustTry, - >, - AccountId, - XcmAssetFeesReceiver, ->; - pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -205,7 +190,11 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - XcmAssetFeesHandler, + parachains_common::xcm_config::XcmAssetFeesHandler< + Runtime, + AssetsPalletLocation, + XcmAssetFeesReceiver, + >, >, ); type ResponseHandler = PolkadotXcm; diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index 4c024dfb7b6..a42c4651371 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -156,21 +156,6 @@ pub type Barrier = DenyThenTry< ), >; -/// This is the struct that will handle the revenue from xcm fees -/// We do not burn anything because we want to mimic exactly what -/// the sovereign account has -pub type XcmAssetFeesHandler = cumulus_primitives_utility::XcmFeesToAccount< - Assets, - ConvertedConcreteAssetId< - AssetId, - Balance, - AsPrefixedGeneralIndex, - JustTry, - >, - AccountId, - XcmAssetFeesReceiver, ->; - pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type Call = Call; @@ -201,7 +186,11 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - XcmAssetFeesHandler, + parachains_common::xcm_config::XcmAssetFeesHandler< + Runtime, + AssetsPalletLocation, + XcmAssetFeesReceiver, + >, >, ); type ResponseHandler = PolkadotXcm; From 668151c280e0f32202f48bd02ecd9118ec3db72a Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 7 Jun 2022 12:34:44 +0200 Subject: [PATCH 24/53] fix tests --- .../runtimes/assets/statemine/tests/tests.rs | 16 ++++++++-------- .../runtimes/assets/statemint/tests/tests.rs | 12 ++++++------ .../runtimes/assets/westmint/tests/tests.rs | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index be1148ca732..7421c60b198 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -1,4 +1,4 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; pub use statemine_runtime::{ @@ -141,7 +141,7 @@ fn test_asset_xcm_trader() { let bought = 4_000_000_000u64; // lets calculate amount needed - let amount_needed = WeightToFee::calc(&bought); + let amount_needed = WeightToFee::weight_to_fee(&bought); let asset_multilocation = MultiLocation::new( 0, @@ -217,7 +217,7 @@ fn test_asset_xcm_trader_with_refund() { ); // lets calculate amount needed - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); @@ -228,7 +228,7 @@ fn test_asset_xcm_trader_with_refund() { let weight_used = bought / 2; // Make sure refurnd works. - let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), @@ -239,7 +239,7 @@ fn test_asset_xcm_trader_with_refund() { drop(trader); // We only should have paid for half of the bought weight - let fees_paid = WeightToFee::calc(&weight_used); + let fees_paid = WeightToFee::weight_to_fee(&weight_used); assert_eq!( Assets::balance(1, AccountId::from(ALICE)), @@ -272,8 +272,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { // Set Alice as block author, who will receive fees run_to_block(2, Some(AccountId::from(ALICE))); - // We are going to buy 4e9 weight - let bought = 1_000_000_000u64; + // We are going to buy small amount + let bought = 500_000_000u64; let asset_multilocation = MultiLocation::new( 0, @@ -286,7 +286,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ), ); - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); assert!( amount_bought < ExistentialDeposit::get(), diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 605826edef7..3d8793d9aad 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,4 +1,4 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; use sp_consensus_aura::AURA_ENGINE_ID; pub use statemint_runtime::{ @@ -142,7 +142,7 @@ fn test_asset_xcm_trader() { let bought = 4_000_000_000u64; // lets calculate amount needed - let amount_needed = WeightToFee::calc(&bought); + let amount_needed = WeightToFee::weight_to_fee(&bought); let asset_multilocation = MultiLocation::new( 0, @@ -218,7 +218,7 @@ fn test_asset_xcm_trader_with_refund() { ); // lets calculate amount needed - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); @@ -229,7 +229,7 @@ fn test_asset_xcm_trader_with_refund() { let weight_used = bought / 2; // Make sure refurnd works. - let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), @@ -240,7 +240,7 @@ fn test_asset_xcm_trader_with_refund() { drop(trader); // We only should have paid for half of the bought weight - let fees_paid = WeightToFee::calc(&weight_used); + let fees_paid = WeightToFee::weight_to_fee(&weight_used); assert_eq!( Assets::balance(1, AccountId::from(ALICE)), @@ -287,7 +287,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ), ); - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); assert!( amount_bought < ExistentialDeposit::get(), diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 354c78dcc31..47fec5dab71 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -1,4 +1,4 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFeePolynomial}; +use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; pub use westmint_runtime::{ @@ -142,7 +142,7 @@ fn test_asset_xcm_trader() { let bought = 4_000_000_000u64; // lets calculate amount needed - let amount_needed = WeightToFee::calc(&bought); + let amount_needed = WeightToFee::weight_to_fee(&bought); let asset_multilocation = MultiLocation::new( 0, @@ -218,7 +218,7 @@ fn test_asset_xcm_trader_with_refund() { ); // lets calculate amount needed - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); @@ -229,7 +229,7 @@ fn test_asset_xcm_trader_with_refund() { let weight_used = bought / 2; // Make sure refurnd works. - let amount_refunded = WeightToFee::calc(&(bought - weight_used)); + let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used)); assert_eq!( trader.refund_weight(bought - weight_used), @@ -240,7 +240,7 @@ fn test_asset_xcm_trader_with_refund() { drop(trader); // We only should have paid for half of the bought weight - let fees_paid = WeightToFee::calc(&weight_used); + let fees_paid = WeightToFee::weight_to_fee(&weight_used); assert_eq!( Assets::balance(1, AccountId::from(ALICE)), @@ -274,7 +274,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight - let bought = 1_000_000_000u64; + let bought = 500_000_000u64; let asset_multilocation = MultiLocation::new( 0, @@ -287,7 +287,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { ), ); - let amount_bought = WeightToFee::calc(&bought); + let amount_bought = WeightToFee::weight_to_fee(&bought); assert!( amount_bought < ExistentialDeposit::get(), From 1a25deeabb6dec0bfb1a5eace92b9f9f58fe5a91 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 13 Jun 2022 10:28:41 +0200 Subject: [PATCH 25/53] config parameters --- parachains/common/src/xcm_config.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index d0f04bbe276..434218086ec 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -87,8 +87,8 @@ where WeightToFee: WeightToFeePolynomial, CON: BalanceConversion< CurrencyBalance, - as Inspect>>::AssetId, - as Inspect>>::Balance, + ::AssetId, + ::Balance, >, AccountIdOf: From + Into, From 6cbc21c12aa406e46aa1d00ba8085b0035218ac9 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 27 Jun 2022 14:49:23 +0200 Subject: [PATCH 26/53] Min amount to fee receiver --- parachains/common/src/xcm_config.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 434218086ec..13812230c7e 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -5,6 +5,7 @@ use frame_support::{ traits::{fungibles::Inspect, tokens::BalanceConversion}, weights::{Weight, WeightToFee, WeightToFeePolynomial}, }; +use sp_runtime::traits::CheckedSub; use xcm::latest::prelude::*; use xcm_builder::{AsPrefixedGeneralIndex, ConvertedConcreteAssetId}; use xcm_executor::traits::{JustTry, ShouldExecute}; @@ -98,7 +99,9 @@ where weight: Weight, ) -> Result< as Inspect>>::Balance, XcmError> { let amount = WeightToFee::weight_to_fee(&weight); - CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive) + let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); + let asset_amount = CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive)?; + Ok(asset_amount.checked_sub(&minimum_balance).unwrap_or(minimum_balance)) } } From 1e782b47e28c15616aff1c194e10982653a340b4 Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 28 Jun 2022 12:31:00 +0200 Subject: [PATCH 27/53] Make minimum amount for block author to be at least the ED --- parachains/common/src/xcm_config.rs | 7 ++--- .../runtimes/assets/statemine/tests/tests.rs | 10 +++---- .../runtimes/assets/statemint/tests/tests.rs | 27 ++++++++++++------- .../runtimes/assets/westmint/tests/tests.rs | 10 +++---- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 13812230c7e..a51e38cf5b4 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -5,7 +5,6 @@ use frame_support::{ traits::{fungibles::Inspect, tokens::BalanceConversion}, weights::{Weight, WeightToFee, WeightToFeePolynomial}, }; -use sp_runtime::traits::CheckedSub; use xcm::latest::prelude::*; use xcm_builder::{AsPrefixedGeneralIndex, ConvertedConcreteAssetId}; use xcm_executor::traits::{JustTry, ShouldExecute}; @@ -100,8 +99,10 @@ where ) -> Result< as Inspect>>::Balance, XcmError> { let amount = WeightToFee::weight_to_fee(&weight); let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); - let asset_amount = CON::to_asset_balance(amount, asset_id).map_err(|_| XcmError::TooExpensive)?; - Ok(asset_amount.checked_sub(&minimum_balance).unwrap_or(minimum_balance)) + let asset_amount = CON::to_asset_balance(amount, asset_id) + .map_err(|_| XcmError::TooExpensive) + .map(|amount| if amount < minimum_balance { minimum_balance } else { amount })?; + Ok(asset_amount) } } diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 7421c60b198..3e68b6eed45 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -1,4 +1,6 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; +use frame_support::{ + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, +}; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; pub use statemine_runtime::{ @@ -295,10 +297,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); - // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); - - drop(trader); + // Buy weight should return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); // not credited since the ED is higher than this value assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 3d8793d9aad..cd7f83a057c 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,4 +1,6 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; +use frame_support::{ + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, +}; use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; use sp_consensus_aura::AURA_ENGINE_ID; pub use statemint_runtime::{ @@ -138,8 +140,11 @@ fn test_asset_xcm_trader() { // Set Alice as block author, who will receive fees run_to_block(2, Some(AccountId::from(ALICE))); - // We are going to buy 4e9 weight - let bought = 4_000_000_000u64; + // We are going to buy 400e9 weight + // Because of the ED being higher in statemine + // and not to complicate things, we use a little + // bit more of weight + let bought = 400_000_000_000u64; // lets calculate amount needed let amount_needed = WeightToFee::weight_to_fee(&bought); @@ -203,8 +208,11 @@ fn test_asset_xcm_trader_with_refund() { // Set Alice as block author, who will receive fees run_to_block(2, Some(AccountId::from(ALICE))); - // We are going to buy 4e9 weight - let bought = 4_000_000_000u64; + // We are going to buy 400e9 weight + // Because of the ED being higher in statemine + // and not to complicate things, we use a little + // bit more of weight + let bought = 400_000_000_000u64; let asset_multilocation = MultiLocation::new( 0, @@ -273,7 +281,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { // Set Alice as block author, who will receive fees run_to_block(2, Some(AccountId::from(ALICE))); - // We are going to buy 4e9 weight + // We are going to buy 1e9 weight + // this should be sufficient with the existing ED not to be able to pay let bought = 1_000_000_000u64; let asset_multilocation = MultiLocation::new( @@ -296,10 +305,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); - // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); - - drop(trader); + // Buy weight should return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); // not credited since the ED is higher than this value assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 47fec5dab71..dd052002470 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -1,4 +1,6 @@ -use frame_support::{assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT}; +use frame_support::{ + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, +}; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; pub use westmint_runtime::{ @@ -296,10 +298,8 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); - // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); - - drop(trader); + // Buy weight should return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); // not credited since the ED is higher than this value assert_eq!(Assets::balance(1, AccountId::from(ALICE)), 0); From 86188990d931277947bb1e87ac5fabbeebc92619 Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 28 Jun 2022 12:37:39 +0200 Subject: [PATCH 28/53] Doc in AssetFeeAsExistentialDepositMultiplier --- parachains/common/src/xcm_config.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index a51e38cf5b4..95c337e7194 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -99,6 +99,8 @@ where ) -> Result< as Inspect>>::Balance, XcmError> { let amount = WeightToFee::weight_to_fee(&weight); let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); + // If the amount gotten is not at least the ED, then make it be the ED of the asset + // This is to avoid burning assets and decreasing the supply let asset_amount = CON::to_asset_balance(amount, asset_id) .map_err(|_| XcmError::TooExpensive) .map(|amount| if amount < minimum_balance { minimum_balance } else { amount })?; From 0137d32c294811eb7445c8d8b6c557abd9b7fe7f Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 6 Jul 2022 16:25:57 +0200 Subject: [PATCH 29/53] saturating sub --- primitives/utility/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 6d020c2995f..43ab0b61283 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -140,7 +140,7 @@ impl< let asset_balance = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight).ok()?; - self.0 -= weight; + self.0 = self.0.saturating_sub(weight); self.1 = self.1.saturating_sub(asset_balance); let asset_balance: u128 = asset_balance.saturated_into(); From b9b83e7adcd9a150264f858e3d6ff6d5db5d6b34 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 11 Jul 2022 09:59:24 +0200 Subject: [PATCH 30/53] make sure we dont enter twice --- primitives/utility/src/lib.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 43ab0b61283..1c02af0c5b3 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -97,6 +97,12 @@ impl< payment: xcm_executor::Assets, ) -> Result { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); + + // Make sure we dont enter twice + if self.1.is_some() { + return Err(XcmError::NotWithdrawable); + } + // We take the very first multiasset from payment // TODO: revisit this clone let multiassets: MultiAssets = payment.clone().into(); From 465aab9003f09f56e299cc5f5234c63fdfc1534c Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 11 Jul 2022 11:32:19 +0200 Subject: [PATCH 31/53] FMT --- primitives/utility/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 1c02af0c5b3..8a55f4a23b0 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -100,9 +100,9 @@ impl< // Make sure we dont enter twice if self.1.is_some() { - return Err(XcmError::NotWithdrawable); + return Err(XcmError::NotWithdrawable) } - + // We take the very first multiasset from payment // TODO: revisit this clone let multiassets: MultiAssets = payment.clone().into(); From a510288852b376fcf4c211623cf2e47c4a5067e2 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 11 Jul 2022 11:35:49 +0200 Subject: [PATCH 32/53] fmt again --- primitives/utility/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 8a55f4a23b0..f2ae6fdfe68 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -100,7 +100,7 @@ impl< // Make sure we dont enter twice if self.1.is_some() { - return Err(XcmError::NotWithdrawable) + return Err(XcmError::NotWithdrawable); } // We take the very first multiasset from payment From e5bf2191ff6862aae9d3dd4b8e1d2d038ccfe4c0 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 11 Jul 2022 12:26:09 +0200 Subject: [PATCH 33/53] adapt tests --- parachains/runtimes/assets/statemine/tests/tests.rs | 5 ++++- parachains/runtimes/assets/statemint/tests/tests.rs | 5 ++++- parachains/runtimes/assets/westmint/tests/tests.rs | 5 ++++- primitives/utility/src/lib.rs | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 3e68b6eed45..711becba7aa 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -224,7 +224,10 @@ fn test_asset_xcm_trader_with_refund() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); + assert_ok!(trader.buy_weight(bought, asset.clone().into())); + + // Make sure again buy_weight does return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable); // We actually use half of the weight let weight_used = bought / 2; diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index cd7f83a057c..7fbdf0fa347 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -231,7 +231,10 @@ fn test_asset_xcm_trader_with_refund() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); + assert_ok!(trader.buy_weight(bought, asset.clone().into())); + + // Make sure again buy_weight does return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable); // We actually use half of the weight let weight_used = bought / 2; diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index dd052002470..d64122b1cc8 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -225,7 +225,10 @@ fn test_asset_xcm_trader_with_refund() { let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); + assert_ok!(trader.buy_weight(bought, asset.clone().into())); + + // Make sure again buy_weight does return an error + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable); // We actually use half of the weight let weight_used = bought / 2; diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index f2ae6fdfe68..0b560fec0b4 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -99,8 +99,8 @@ impl< log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); // Make sure we dont enter twice - if self.1.is_some() { - return Err(XcmError::NotWithdrawable); + if self.2.is_some() { + return Err(XcmError::NotWithdrawable) } // We take the very first multiasset from payment From b4f45fa41762d0754ee315ca5caf1321611ff8e9 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 18 Jul 2022 16:23:56 +0200 Subject: [PATCH 34/53] Add doc and struct for weight refund --- primitives/utility/src/lib.rs | 76 +++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 0b560fec0b4..8132b20378b 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -62,6 +62,26 @@ impl SendXcm for ParentAsUmp { } } +/// Contains information to handle refund/payment for xcm-execution +#[derive(Clone, Eq, PartialEq, Debug)] +struct AssetTraderRefunder { + // The amount of weight bought minus the weigh already refunded + weight: Weight, + // The balance paid for the weight bought minus the balance already refunded + balance: Balance, + // The multilocation representing the fungible asset in which fees were paid + location: MultiLocation, + // The local assetId the aforementioned location corresponds to + asset: AssetId, +} + +/// Charges for exercution in the first asset of those selected for fee payment +/// First tries to convert the this MultiAsset into a local assetId +/// Then charges for this assetId as described by FeeCharger +/// Weight, paid balance, local asset Id and the multilocation is stored for +/// later refund purposes +/// Important: Errors if the Trader is being called twice by 2 BuyExecution instructions +/// Alternatively we could just return payment in the aforementioned case pub struct TakeFirstAssetTrader< AccountId, FeeCharger: ChargeWeightInFungibles, @@ -69,9 +89,7 @@ pub struct TakeFirstAssetTrader< Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, >( - Weight, - Assets::Balance, - Option<(MultiLocation, Assets::AssetId)>, + Option>, PhantomData<(AccountId, FeeCharger, Matcher, Assets, HandleRefund)>, ); impl< @@ -85,10 +103,9 @@ impl< > WeightTrader for TakeFirstAssetTrader { fn new() -> Self { - Self(0, Zero::zero(), None, PhantomData) + Self(None, PhantomData) } // We take first asset - // TODO: do we want to be iterating over all potential assets in payments? // Check whether we can convert fee to asset_fee (is_sufficient, min_deposit) // If everything goes well, we charge. fn buy_weight( @@ -99,18 +116,21 @@ impl< log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment); // Make sure we dont enter twice - if self.2.is_some() { + if self.0.is_some() { return Err(XcmError::NotWithdrawable) } // We take the very first multiasset from payment - // TODO: revisit this clone let multiassets: MultiAssets = payment.clone().into(); + + // Take the first asset from the selected MultiAssets let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; - // We get the local asset id in which we can pay for fees + + // Get the local asset id in which we can pay for fees let (local_asset_id, _) = Matcher::matches_fungibles(&first).map_err(|_| XcmError::AssetNotFound)?; - // we calculate how much we should charge in the asset_id for such amount of weight + + // Calculate how much we should charge in the asset_id for such amount of weight let asset_balance = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight)?; match first { @@ -119,18 +139,20 @@ impl< id: xcm::latest::AssetId::Concrete(location), fun: Fungibility::Fungible(_), } => { - // convert asset_balance to u128 + // Convert asset_balance to u128 let u128_amount: u128 = asset_balance.try_into().map_err(|_| XcmError::Overflow)?; // Construct required payment let required = (Concrete(location.clone()), u128_amount).into(); // Substract payment let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?; - // record weight - self.0 = self.0.saturating_add(weight); - // record amount - self.1 = self.1.saturating_add(asset_balance); - // record multilocation and local_asset_id - self.2 = Some((location.clone(), local_asset_id)); + + // record weight, balance, multilocation and assetId + self.0 = Some(AssetTraderRefunder { + weight, + balance: asset_balance, + location: location.clone(), + asset: local_asset_id, + }); Ok(unused) }, _ => return Err(XcmError::TooExpensive), @@ -139,19 +161,22 @@ impl< fn refund_weight(&mut self, weight: Weight) -> Option { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); - let weight = weight.min(self.0); - if let Some((asset_location, local_asset_id)) = self.2.clone() { + if let Some(mut asset_trader) = self.0.clone() { + let weight = weight.min(asset_trader.weight); + // Calculate asset_balance // This read should have already be cached in buy_weight let asset_balance = - FeeCharger::charge_weight_in_fungibles(local_asset_id, weight).ok()?; + FeeCharger::charge_weight_in_fungibles(asset_trader.asset, weight).ok()?; - self.0 = self.0.saturating_sub(weight); - self.1 = self.1.saturating_sub(asset_balance); + // Substract from existing weight and balance + asset_trader.weight = asset_trader.weight.saturating_sub(weight); + asset_trader.balance = asset_trader.balance.saturating_sub(asset_balance); + self.0 = Some(asset_trader.clone()); let asset_balance: u128 = asset_balance.saturated_into(); if asset_balance > 0 { - Some((asset_location, asset_balance).into()) + Some((asset_trader.location, asset_balance).into()) } else { None } @@ -172,10 +197,11 @@ impl< > Drop for TakeFirstAssetTrader { fn drop(&mut self) { - if let Some((location, _)) = &self.2 { - let u128_amount: u128 = self.1.try_into().map_err(|_| XcmError::Overflow).unwrap(); + if let Some(asset_trader) = self.0.clone() { + let u128_amount: u128 = + asset_trader.balance.try_into().map_err(|_| XcmError::Overflow).unwrap(); HandleRefund::take_revenue(MultiAsset { - id: location.clone().into(), + id: asset_trader.location.clone().into(), fun: Fungibility::Fungible(u128_amount), }); } From c6b8eaa330aaea20879a4bb0baf1e7a9f5234f59 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 18 Jul 2022 16:28:31 +0200 Subject: [PATCH 35/53] Doc --- primitives/utility/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 8132b20378b..0703f8895f0 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -75,7 +75,7 @@ struct AssetTraderRefunder { asset: AssetId, } -/// Charges for exercution in the first asset of those selected for fee payment +/// Charges for exercution in the first multiasset of those selected for fee payment /// First tries to convert the this MultiAsset into a local assetId /// Then charges for this assetId as described by FeeCharger /// Weight, paid balance, local asset Id and the multilocation is stored for @@ -105,7 +105,7 @@ impl< fn new() -> Self { Self(None, PhantomData) } - // We take first asset + // We take first multiasset // Check whether we can convert fee to asset_fee (is_sufficient, min_deposit) // If everything goes well, we charge. fn buy_weight( @@ -123,7 +123,7 @@ impl< // We take the very first multiasset from payment let multiassets: MultiAssets = payment.clone().into(); - // Take the first asset from the selected MultiAssets + // Take the first multiasset from the selected MultiAssets let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; // Get the local asset id in which we can pay for fees @@ -175,6 +175,7 @@ impl< self.0 = Some(asset_trader.clone()); let asset_balance: u128 = asset_balance.saturated_into(); + // Only refund if positive if asset_balance > 0 { Some((asset_trader.location, asset_balance).into()) } else { From 91d0878622adeaff51a32c416bda75ff3248aaa9 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 18 Jul 2022 16:30:03 +0200 Subject: [PATCH 36/53] More doc --- primitives/utility/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 0703f8895f0..9b2368b138a 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -76,6 +76,7 @@ struct AssetTraderRefunder { } /// Charges for exercution in the first multiasset of those selected for fee payment +/// Only succeeds for Concrete Fungible Assets /// First tries to convert the this MultiAsset into a local assetId /// Then charges for this assetId as described by FeeCharger /// Weight, paid balance, local asset Id and the multilocation is stored for From f882b7906a98793e0f944f30c59f5265ccc8a34c Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 19 Jul 2022 16:25:31 +0200 Subject: [PATCH 37/53] PR suggestions --- primitives/utility/src/lib.rs | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 9b2368b138a..b97fc5b2249 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -66,9 +66,9 @@ impl SendXcm for ParentAsUmp { #[derive(Clone, Eq, PartialEq, Debug)] struct AssetTraderRefunder { // The amount of weight bought minus the weigh already refunded - weight: Weight, + weight_outstanding: Weight, // The balance paid for the weight bought minus the balance already refunded - balance: Balance, + outstanding_balance: Balance, // The multilocation representing the fungible asset in which fees were paid location: MultiLocation, // The local assetId the aforementioned location corresponds to @@ -85,23 +85,23 @@ struct AssetTraderRefunder { /// Alternatively we could just return payment in the aforementioned case pub struct TakeFirstAssetTrader< AccountId, - FeeCharger: ChargeWeightInFungibles, - Matcher: MatchesFungibles, - Assets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, + FeeCharger: ChargeWeightInFungibles, + Matcher: MatchesFungibles, + ConcreteAssets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, >( - Option>, - PhantomData<(AccountId, FeeCharger, Matcher, Assets, HandleRefund)>, + Option>, + PhantomData<(AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund)>, ); impl< AccountId, - FeeCharger: ChargeWeightInFungibles, - Matcher: MatchesFungibles, - Assets: fungibles::Mutate + FeeCharger: ChargeWeightInFungibles, + Matcher: MatchesFungibles, + ConcreteAssets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, - > WeightTrader for TakeFirstAssetTrader + > WeightTrader for TakeFirstAssetTrader { fn new() -> Self { Self(None, PhantomData) @@ -149,8 +149,8 @@ impl< // record weight, balance, multilocation and assetId self.0 = Some(AssetTraderRefunder { - weight, - balance: asset_balance, + weight_outstanding: weight, + outstanding_balance: asset_balance, location: location.clone(), asset: local_asset_id, }); @@ -163,7 +163,7 @@ impl< fn refund_weight(&mut self, weight: Weight) -> Option { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); if let Some(mut asset_trader) = self.0.clone() { - let weight = weight.min(asset_trader.weight); + let weight = weight.min(asset_trader.weight_outstanding); // Calculate asset_balance // This read should have already be cached in buy_weight @@ -171,8 +171,8 @@ impl< FeeCharger::charge_weight_in_fungibles(asset_trader.asset, weight).ok()?; // Substract from existing weight and balance - asset_trader.weight = asset_trader.weight.saturating_sub(weight); - asset_trader.balance = asset_trader.balance.saturating_sub(asset_balance); + asset_trader.weight_outstanding = asset_trader.weight_outstanding.saturating_sub(weight); + asset_trader.outstanding_balance = asset_trader.outstanding_balance.saturating_sub(asset_balance); self.0 = Some(asset_trader.clone()); let asset_balance: u128 = asset_balance.saturated_into(); @@ -190,18 +190,18 @@ impl< impl< AccountId, - FeeCharger: ChargeWeightInFungibles, - Matcher: MatchesFungibles, - Assets: fungibles::Mutate + FeeCharger: ChargeWeightInFungibles, + Matcher: MatchesFungibles, + ConcreteAssets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, - > Drop for TakeFirstAssetTrader + > Drop for TakeFirstAssetTrader { fn drop(&mut self) { if let Some(asset_trader) = self.0.clone() { let u128_amount: u128 = - asset_trader.balance.try_into().map_err(|_| XcmError::Overflow).unwrap(); + asset_trader.outstanding_balance.try_into().map_err(|_| XcmError::Overflow).unwrap(); HandleRefund::take_revenue(MultiAsset { id: asset_trader.location.clone().into(), fun: Fungibility::Fungible(u128_amount), @@ -213,22 +213,22 @@ impl< /// XCM fee depositor to which we implement the TakeRevenue trait /// It receives a fungibles::Mutate implemented argument, a matcher to convert MultiAsset into /// AssetId and amount, and the fee receiver account -pub struct XcmFeesToAccount( - PhantomData<(Assets, Matcher, AccountId, ReceiverAccount)>, +pub struct XcmFeesToAccount( + PhantomData<(ConcreteAssets, Matcher, AccountId, ReceiverAccount)>, ); impl< - Assets: fungibles::Mutate, - Matcher: MatchesFungibles, +ConcreteAssets: fungibles::Mutate, + Matcher: MatchesFungibles, AccountId: Clone, ReceiverAccount: frame_support::traits::Get>, - > TakeRevenue for XcmFeesToAccount + > TakeRevenue for XcmFeesToAccount { fn take_revenue(revenue: MultiAsset) { match Matcher::matches_fungibles(&revenue) { Ok((asset_id, amount)) => if let Some(receiver) = ReceiverAccount::get() { if !amount.is_zero() { - let ok = Assets::mint_into(asset_id, &receiver, amount).is_ok(); + let ok = ConcreteAssets::mint_into(asset_id, &receiver, amount).is_ok(); debug_assert!(ok, "`mint_into` cannot generally fail; qed"); } }, From 9f745322a1f4e6ca4013b08b7aae196da0fa0a75 Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 19 Jul 2022 18:05:28 +0200 Subject: [PATCH 38/53] store all info related to asset payment as multiasset --- primitives/utility/src/lib.rs | 73 +++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index b97fc5b2249..f76ce807fc7 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -25,10 +25,7 @@ use frame_support::{ traits::tokens::{fungibles, fungibles::Inspect}, weights::Weight, }; -use sp_runtime::{ - traits::{Saturating, Zero}, - SaturatedConversion, -}; +use sp_runtime::{traits::Zero, SaturatedConversion}; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; @@ -64,15 +61,11 @@ impl SendXcm for ParentAsUmp { /// Contains information to handle refund/payment for xcm-execution #[derive(Clone, Eq, PartialEq, Debug)] -struct AssetTraderRefunder { +struct AssetTraderRefunder { // The amount of weight bought minus the weigh already refunded weight_outstanding: Weight, - // The balance paid for the weight bought minus the balance already refunded - outstanding_balance: Balance, - // The multilocation representing the fungible asset in which fees were paid - location: MultiLocation, - // The local assetId the aforementioned location corresponds to - asset: AssetId, + // The concrete asset containing the asset location and outstanding balance + outstanding_concrete_asset: MultiAsset, } /// Charges for exercution in the first multiasset of those selected for fee payment @@ -90,7 +83,7 @@ pub struct TakeFirstAssetTrader< ConcreteAssets: fungibles::Mutate + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, >( - Option>, + Option, PhantomData<(AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund)>, ); impl< @@ -101,7 +94,8 @@ impl< + fungibles::Transfer + fungibles::Balanced, HandleRefund: TakeRevenue, - > WeightTrader for TakeFirstAssetTrader + > WeightTrader + for TakeFirstAssetTrader { fn new() -> Self { Self(None, PhantomData) @@ -143,16 +137,15 @@ impl< // Convert asset_balance to u128 let u128_amount: u128 = asset_balance.try_into().map_err(|_| XcmError::Overflow)?; // Construct required payment - let required = (Concrete(location.clone()), u128_amount).into(); + let required: MultiAsset = (Concrete(location.clone()), u128_amount).into(); // Substract payment - let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?; + let unused = + payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?; // record weight, balance, multilocation and assetId self.0 = Some(AssetTraderRefunder { weight_outstanding: weight, - outstanding_balance: asset_balance, - location: location.clone(), - asset: local_asset_id, + outstanding_concrete_asset: required, }); Ok(unused) }, @@ -162,23 +155,40 @@ impl< fn refund_weight(&mut self, weight: Weight) -> Option { log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight); - if let Some(mut asset_trader) = self.0.clone() { - let weight = weight.min(asset_trader.weight_outstanding); + if let Some(AssetTraderRefunder { + mut weight_outstanding, + outstanding_concrete_asset: MultiAsset { id, fun }, + }) = self.0.clone() + { + let weight = weight.min(weight_outstanding); + + // Get the local asset id in which we can refund fees + let (local_asset_id, outstanding_balance) = + Matcher::matches_fungibles(&(id.clone(), fun).into()).ok()?; // Calculate asset_balance // This read should have already be cached in buy_weight - let asset_balance = - FeeCharger::charge_weight_in_fungibles(asset_trader.asset, weight).ok()?; + let asset_balance: u128 = + FeeCharger::charge_weight_in_fungibles(local_asset_id, weight) + .ok()? + .saturated_into(); + + // Convert into u128 outstanding_balance + let outstanding_balance: u128 = outstanding_balance.saturated_into(); + + // Construct outstanding_concrete_asset with the same location id and substracted balance + let outstanding_concrete_asset: MultiAsset = + (id.clone(), (outstanding_balance.saturating_sub(asset_balance))).into(); // Substract from existing weight and balance - asset_trader.weight_outstanding = asset_trader.weight_outstanding.saturating_sub(weight); - asset_trader.outstanding_balance = asset_trader.outstanding_balance.saturating_sub(asset_balance); - self.0 = Some(asset_trader.clone()); + weight_outstanding = weight_outstanding.saturating_sub(weight); + + // Override AssetTraderRefunder + self.0 = Some(AssetTraderRefunder { weight_outstanding, outstanding_concrete_asset }); - let asset_balance: u128 = asset_balance.saturated_into(); // Only refund if positive if asset_balance > 0 { - Some((asset_trader.location, asset_balance).into()) + Some((id, asset_balance).into()) } else { None } @@ -200,12 +210,7 @@ impl< { fn drop(&mut self) { if let Some(asset_trader) = self.0.clone() { - let u128_amount: u128 = - asset_trader.outstanding_balance.try_into().map_err(|_| XcmError::Overflow).unwrap(); - HandleRefund::take_revenue(MultiAsset { - id: asset_trader.location.clone().into(), - fun: Fungibility::Fungible(u128_amount), - }); + HandleRefund::take_revenue(asset_trader.outstanding_concrete_asset); } } } @@ -217,7 +222,7 @@ pub struct XcmFeesToAccount PhantomData<(ConcreteAssets, Matcher, AccountId, ReceiverAccount)>, ); impl< -ConcreteAssets: fungibles::Mutate, + ConcreteAssets: fungibles::Mutate, Matcher: MatchesFungibles, AccountId: Clone, ReceiverAccount: frame_support::traits::Get>, From dc7cc23adedf784aade648479217010fdfd13bef Mon Sep 17 00:00:00 2001 From: gorka Date: Tue, 19 Jul 2022 18:08:38 +0200 Subject: [PATCH 39/53] return AssetNotFound instead of TooExpensive --- primitives/utility/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index f76ce807fc7..0627d362e6f 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -119,7 +119,7 @@ impl< let multiassets: MultiAssets = payment.clone().into(); // Take the first multiasset from the selected MultiAssets - let first = multiassets.get(0).ok_or(XcmError::TooExpensive)?; + let first = multiassets.get(0).ok_or(XcmError::AssetNotFound)?; // Get the local asset id in which we can pay for fees let (local_asset_id, _) = From ad97b64849fb235991a35e7953e1d96961de96c0 Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 16:19:46 +0200 Subject: [PATCH 40/53] Use asset transactor to deposit fee --- parachains/common/src/xcm_config.rs | 23 +---------- .../assets/statemine/src/xcm_config.rs | 6 +-- .../assets/statemint/src/xcm_config.rs | 6 +-- .../assets/westmint/src/xcm_config.rs | 6 +-- primitives/utility/src/lib.rs | 39 ++++++++----------- 5 files changed, 27 insertions(+), 53 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 95c337e7194..d96450f2b56 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -6,8 +6,7 @@ use frame_support::{ weights::{Weight, WeightToFee, WeightToFeePolynomial}, }; use xcm::latest::prelude::*; -use xcm_builder::{AsPrefixedGeneralIndex, ConvertedConcreteAssetId}; -use xcm_executor::traits::{JustTry, ShouldExecute}; +use xcm_executor::traits::ShouldExecute; //TODO: move DenyThenTry to polkadot's xcm module. /// Deny executing the XCM if it matches any of the Deny filter regardless of anything else. @@ -107,23 +106,3 @@ where Ok(asset_amount) } } - -/// This is the type that will handle the fees -/// It receives the pallet-asset location for multilocation -/// and the fees receiver -pub type XcmAssetFeesHandler = - cumulus_primitives_utility::XcmFeesToAccount< - pallet_assets::Pallet, - ConvertedConcreteAssetId< - ::AssetId, - ::Balance, - AsPrefixedGeneralIndex< - AssetsPalletLocation, - ::AssetId, - JustTry, - >, - JustTry, - >, - ::AccountId, - XcmAssetFeesReceiver, - >; diff --git a/parachains/runtimes/assets/statemine/src/xcm_config.rs b/parachains/runtimes/assets/statemine/src/xcm_config.rs index 7fdf8fb056e..3875cf7901b 100644 --- a/parachains/runtimes/assets/statemine/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemine/src/xcm_config.rs @@ -190,9 +190,9 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - parachains_common::xcm_config::XcmAssetFeesHandler< - Runtime, - AssetsPalletLocation, + cumulus_primitives_utility::XcmFeesTo32ByteAccount< + FungiblesTransactor, + AccountId, XcmAssetFeesReceiver, >, >, diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index 80803ea41f7..a86353bcf4c 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -190,9 +190,9 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - parachains_common::xcm_config::XcmAssetFeesHandler< - Runtime, - AssetsPalletLocation, + cumulus_primitives_utility::XcmFeesTo32ByteAccount< + FungiblesTransactor, + AccountId, XcmAssetFeesReceiver, >, >, diff --git a/parachains/runtimes/assets/westmint/src/xcm_config.rs b/parachains/runtimes/assets/westmint/src/xcm_config.rs index b81e8ec1338..4a2daa3380e 100644 --- a/parachains/runtimes/assets/westmint/src/xcm_config.rs +++ b/parachains/runtimes/assets/westmint/src/xcm_config.rs @@ -187,9 +187,9 @@ impl xcm_executor::Config for XcmConfig { JustTry, >, Assets, - parachains_common::xcm_config::XcmAssetFeesHandler< - Runtime, - AssetsPalletLocation, + cumulus_primitives_utility::XcmFeesTo32ByteAccount< + FungiblesTransactor, + AccountId, XcmAssetFeesReceiver, >, >, diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 0627d362e6f..576d86f36c4 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -25,12 +25,12 @@ use frame_support::{ traits::tokens::{fungibles, fungibles::Inspect}, weights::Weight, }; -use sp_runtime::{traits::Zero, SaturatedConversion}; +use sp_runtime::SaturatedConversion; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; use xcm_builder::TakeRevenue; -use xcm_executor::traits::{MatchesFungibles, WeightTrader}; +use xcm_executor::traits::{MatchesFungibles, TransactAsset, WeightTrader}; /// Xcm router which recognises the `Parent` destination and handles it by sending the message into /// the given UMP `UpwardMessageSender` implementation. Thus this essentially adapts an /// `UpwardMessageSender` trait impl into a `SendXcm` trait impl. @@ -216,31 +216,26 @@ impl< } /// XCM fee depositor to which we implement the TakeRevenue trait -/// It receives a fungibles::Mutate implemented argument, a matcher to convert MultiAsset into -/// AssetId and amount, and the fee receiver account -pub struct XcmFeesToAccount( - PhantomData<(ConcreteAssets, Matcher, AccountId, ReceiverAccount)>, +/// It receives a Transact implemented argument, a 32 byte convertible acocuntId, and the fee receiver account +/// FungiblesMutateAdapter should be identical to that implemented by WithdrawAsset +pub struct XcmFeesTo32ByteAccount( + PhantomData<(FungiblesMutateAdapter, AccountId, ReceiverAccount)>, ); impl< - ConcreteAssets: fungibles::Mutate, - Matcher: MatchesFungibles, - AccountId: Clone, + FungiblesMutateAdapter: TransactAsset, + AccountId: Clone + Into<[u8; 32]>, ReceiverAccount: frame_support::traits::Get>, - > TakeRevenue for XcmFeesToAccount + > TakeRevenue for XcmFeesTo32ByteAccount { fn take_revenue(revenue: MultiAsset) { - match Matcher::matches_fungibles(&revenue) { - Ok((asset_id, amount)) => - if let Some(receiver) = ReceiverAccount::get() { - if !amount.is_zero() { - let ok = ConcreteAssets::mint_into(asset_id, &receiver, amount).is_ok(); - debug_assert!(ok, "`mint_into` cannot generally fail; qed"); - } - }, - Err(_) => log::debug!( - target: "xcm", - "take revenue failed matching fungible" - ), + if let Some(receiver) = ReceiverAccount::get() { + let ok = FungiblesMutateAdapter::deposit_asset( + &revenue, + &(X1(AccountId32 { network: Any, id: receiver.into() }).into()), + ) + .is_ok(); + + debug_assert!(ok, "`deposit_asset` cannot generally fail; qed"); } } } From 7ec61008257ad8f5f51de60dc44195eaed7aab03 Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 16:28:36 +0200 Subject: [PATCH 41/53] uninstall from statemint --- .../assets/statemint/src/xcm_config.rs | 30 +--- .../runtimes/assets/statemint/tests/tests.rs | 158 +----------------- 2 files changed, 5 insertions(+), 183 deletions(-) diff --git a/parachains/runtimes/assets/statemint/src/xcm_config.rs b/parachains/runtimes/assets/statemint/src/xcm_config.rs index a86353bcf4c..abfe9bb9865 100644 --- a/parachains/runtimes/assets/statemint/src/xcm_config.rs +++ b/parachains/runtimes/assets/statemint/src/xcm_config.rs @@ -25,12 +25,9 @@ use frame_support::{ use pallet_xcm::XcmPassthrough; use parachains_common::{ impls::ToStakingPot, - xcm_config::{ - AssetFeeAsExistentialDepositMultiplier, DenyReserveTransferToRelayChain, DenyThenTry, - }, + xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, }; use polkadot_parachain::primitives::Sibling; -use sp_runtime::traits::ConvertInto; use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, @@ -174,29 +171,8 @@ impl xcm_executor::Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = ( - UsingComponents>, - cumulus_primitives_utility::TakeFirstAssetTrader< - AccountId, - AssetFeeAsExistentialDepositMultiplier< - Runtime, - WeightToFee, - pallet_assets::BalanceToAssetBalance, - >, - ConvertedConcreteAssetId< - AssetId, - Balance, - AsPrefixedGeneralIndex, - JustTry, - >, - Assets, - cumulus_primitives_utility::XcmFeesTo32ByteAccount< - FungiblesTransactor, - AccountId, - XcmAssetFeesReceiver, - >, - >, - ); + type Trader = + UsingComponents>; type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 7fbdf0fa347..657610d3d30 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -112,7 +112,7 @@ pub fn origin_of(account_id: AccountId) -> ::Or } #[test] -fn test_asset_xcm_trader() { +fn test_asset_xcm_trader_does_not_work_in_statemine() { ExtBuilder::default() .with_collators(vec![AccountId::from(ALICE)]) .build() @@ -127,14 +127,6 @@ fn test_asset_xcm_trader() { ExistentialDeposit::get() )); - // We first mint enough asset for the account to exist for assets - assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), - 1, - AccountId::from(ALICE).into(), - ExistentialDeposit::get() - )); - let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees @@ -162,153 +154,7 @@ fn test_asset_xcm_trader() { let asset: MultiAsset = (asset_multilocation, amount_needed).into(); - // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.into())); - - // Drop trader - drop(trader); - - // Make sure author(Alice) has received the amount - assert_eq!( - Assets::balance(1, AccountId::from(ALICE)), - ExistentialDeposit::get() + amount_needed - ); - - // We also need to ensure the total supply increased - assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + amount_needed); - }); -} - -#[test] -fn test_asset_xcm_trader_with_refund() { - ExtBuilder::default() - .with_collators(vec![AccountId::from(ALICE)]) - .build() - .execute_with(|| { - // We need root origin to create a sufficient asset - // We set existential deposit to be identical to the one for Balances first - assert_ok!(Assets::force_create( - root_origin(), - 1, - AccountId::from(ALICE).into(), - true, - ExistentialDeposit::get() - )); - - // We first mint enough asset for the account to exist for assets - assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), - 1, - AccountId::from(ALICE).into(), - ExistentialDeposit::get() - )); - - let mut trader = ::Trader::new(); - - // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); - - // We are going to buy 400e9 weight - // Because of the ED being higher in statemine - // and not to complicate things, we use a little - // bit more of weight - let bought = 400_000_000_000u64; - - let asset_multilocation = MultiLocation::new( - 0, - X2( - PalletInstance( - ::PalletInfo::index::().unwrap() - as u8, - ), - GeneralIndex(1), - ), - ); - - // lets calculate amount needed - let amount_bought = WeightToFee::weight_to_fee(&bought); - - let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); - - // Make sure buy_weight does not return an error - assert_ok!(trader.buy_weight(bought, asset.clone().into())); - - // Make sure again buy_weight does return an error - assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable); - - // We actually use half of the weight - let weight_used = bought / 2; - - // Make sure refurnd works. - let amount_refunded = WeightToFee::weight_to_fee(&(bought - weight_used)); - - assert_eq!( - trader.refund_weight(bought - weight_used), - Some((asset_multilocation, amount_refunded).into()) - ); - - // Drop trader - drop(trader); - - // We only should have paid for half of the bought weight - let fees_paid = WeightToFee::weight_to_fee(&weight_used); - - assert_eq!( - Assets::balance(1, AccountId::from(ALICE)), - ExistentialDeposit::get() + fees_paid - ); - - // We also need to ensure the total supply increased - assert_eq!(Assets::total_supply(1), ExistentialDeposit::get() + fees_paid); - }); -} - -#[test] -fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { - ExtBuilder::default() - .with_collators(vec![AccountId::from(ALICE)]) - .build() - .execute_with(|| { - // We need root origin to create a sufficient asset - // We set existential deposit to be identical to the one for Balances first - assert_ok!(Assets::force_create( - root_origin(), - 1, - AccountId::from(ALICE).into(), - true, - ExistentialDeposit::get() - )); - - let mut trader = ::Trader::new(); - - // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); - - // We are going to buy 1e9 weight - // this should be sufficient with the existing ED not to be able to pay - let bought = 1_000_000_000u64; - - let asset_multilocation = MultiLocation::new( - 0, - X2( - PalletInstance( - ::PalletInfo::index::().unwrap() - as u8, - ), - GeneralIndex(1), - ), - ); - - let amount_bought = WeightToFee::weight_to_fee(&bought); - - assert!( - amount_bought < ExistentialDeposit::get(), - "we are testing what happens when the amount does not exceed ED" - ); - - let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); - - // Buy weight should return an error + // Buy weight should return an error, since asset trader not installed assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); // not credited since the ED is higher than this value From a4330355b213a744f493e4cb4d64eb1bef694e1f Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 16:33:53 +0200 Subject: [PATCH 42/53] R for RUntime and CON for BalanceConverter --- parachains/common/src/xcm_config.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index d96450f2b56..7c55e8ebb13 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -75,32 +75,32 @@ impl ShouldExecute for DenyReserveTransferToRelayChain { /// A `ChargeFeeInFungibles` implementation that converts the output of /// a given WeightToFee implementation an amount charged in /// a particular assetId from pallet-assets -pub struct AssetFeeAsExistentialDepositMultiplier( - PhantomData<(R, WeightToFee, CON)>, +pub struct AssetFeeAsExistentialDepositMultiplier( + PhantomData<(Runtime, WeightToFee, BalanceConverter)>, ); -impl - cumulus_primitives_utility::ChargeWeightInFungibles, pallet_assets::Pallet> - for AssetFeeAsExistentialDepositMultiplier +impl + cumulus_primitives_utility::ChargeWeightInFungibles, pallet_assets::Pallet> + for AssetFeeAsExistentialDepositMultiplier where - R: pallet_assets::Config, + Runtime: pallet_assets::Config, WeightToFee: WeightToFeePolynomial, - CON: BalanceConversion< + BalanceConverter: BalanceConversion< CurrencyBalance, - ::AssetId, - ::Balance, + ::AssetId, + ::Balance, >, - AccountIdOf: + AccountIdOf: From + Into, { fn charge_weight_in_fungibles( - asset_id: as Inspect>>::AssetId, + asset_id: as Inspect>>::AssetId, weight: Weight, - ) -> Result< as Inspect>>::Balance, XcmError> { + ) -> Result< as Inspect>>::Balance, XcmError> { let amount = WeightToFee::weight_to_fee(&weight); - let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); + let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); // If the amount gotten is not at least the ED, then make it be the ED of the asset // This is to avoid burning assets and decreasing the supply - let asset_amount = CON::to_asset_balance(amount, asset_id) + let asset_amount = BalanceConverter::to_asset_balance(amount, asset_id) .map_err(|_| XcmError::TooExpensive) .map(|amount| if amount < minimum_balance { minimum_balance } else { amount })?; Ok(asset_amount) From 10cb93e5b7a7d51198fcf798fd39ea6132b9da6e Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 16:52:38 +0200 Subject: [PATCH 43/53] Rework logic to avoid unnecesary match and error --- parachains/common/src/xcm_config.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 7c55e8ebb13..352832829d6 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -79,8 +79,10 @@ pub struct AssetFeeAsExistentialDepositMultiplier, ); impl - cumulus_primitives_utility::ChargeWeightInFungibles, pallet_assets::Pallet> - for AssetFeeAsExistentialDepositMultiplier + cumulus_primitives_utility::ChargeWeightInFungibles< + AccountIdOf, + pallet_assets::Pallet, + > for AssetFeeAsExistentialDepositMultiplier where Runtime: pallet_assets::Config, WeightToFee: WeightToFeePolynomial, @@ -95,7 +97,8 @@ where fn charge_weight_in_fungibles( asset_id: as Inspect>>::AssetId, weight: Weight, - ) -> Result< as Inspect>>::Balance, XcmError> { + ) -> Result< as Inspect>>::Balance, XcmError> + { let amount = WeightToFee::weight_to_fee(&weight); let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); // If the amount gotten is not at least the ED, then make it be the ED of the asset From 83f44c52ec37ac3cc2c7662660f49fb6c5eecc8d Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 19:30:22 +0200 Subject: [PATCH 44/53] Rework ED check, also in case of refund --- parachains/common/src/xcm_config.rs | 4 +- .../runtimes/assets/statemine/tests/tests.rs | 57 +++++++++++++++++ .../runtimes/assets/westmint/tests/tests.rs | 58 ++++++++++++++++- primitives/utility/src/lib.rs | 64 +++++++++++-------- 4 files changed, 153 insertions(+), 30 deletions(-) diff --git a/parachains/common/src/xcm_config.rs b/parachains/common/src/xcm_config.rs index 352832829d6..d56876d60ca 100644 --- a/parachains/common/src/xcm_config.rs +++ b/parachains/common/src/xcm_config.rs @@ -100,12 +100,10 @@ where ) -> Result< as Inspect>>::Balance, XcmError> { let amount = WeightToFee::weight_to_fee(&weight); - let minimum_balance = pallet_assets::Pallet::::minimum_balance(asset_id); // If the amount gotten is not at least the ED, then make it be the ED of the asset // This is to avoid burning assets and decreasing the supply let asset_amount = BalanceConverter::to_asset_balance(amount, asset_id) - .map_err(|_| XcmError::TooExpensive) - .map(|amount| if amount < minimum_balance { minimum_balance } else { amount })?; + .map_err(|_| XcmError::TooExpensive)?; Ok(asset_amount) } } diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 711becba7aa..cad03c6a89e 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -310,3 +310,60 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::total_supply(1), 0); }); } + +#[test] +fn test_that_buying_ed_refund_does_not_refund() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are gonna buy ED + let bought: u64 = ExistentialDeposit::get().try_into().unwrap(); + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::weight_to_fee(&bought); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Buy weight should work + assert_ok!(trader.buy_weight(bought, asset.into())); + + // Should return None. Refunding and then dropping below existential deposit + // should not be allowed + assert_eq!(trader.refund_weight(bought), None); + + // Drop trader + drop(trader); + + // Make sure author(Alice) has received the amount + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), amount_bought); + + // We also need to ensure the total supply increased + assert_eq!(Assets::total_supply(1), amount_bought); + }); +} diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index d64122b1cc8..992ee8952e8 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -207,7 +207,6 @@ fn test_asset_xcm_trader_with_refund() { // We are going to buy 4e9 weight let bought = 4_000_000_000u64; - let asset_multilocation = MultiLocation::new( 0, X2( @@ -311,3 +310,60 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { assert_eq!(Assets::total_supply(1), 0); }); } + +#[test] +fn test_that_buying_ed_refund_does_not_refund() { + ExtBuilder::default() + .with_collators(vec![AccountId::from(ALICE)]) + .build() + .execute_with(|| { + // We need root origin to create a sufficient asset + // We set existential deposit to be identical to the one for Balances first + assert_ok!(Assets::force_create( + root_origin(), + 1, + AccountId::from(ALICE).into(), + true, + ExistentialDeposit::get() + )); + + let mut trader = ::Trader::new(); + + // Set Alice as block author, who will receive fees + run_to_block(2, Some(AccountId::from(ALICE))); + + // We are gonna buy ED + let bought: u64 = ExistentialDeposit::get().try_into().unwrap(); + + let asset_multilocation = MultiLocation::new( + 0, + X2( + PalletInstance( + ::PalletInfo::index::().unwrap() + as u8, + ), + GeneralIndex(1), + ), + ); + + let amount_bought = WeightToFee::weight_to_fee(&bought); + + let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + + // Buy weight should work + assert_ok!(trader.buy_weight(bought, asset.into())); + + // Should return None. Refunding and then dropping below existential deposit + // should not be allowed + assert_eq!(trader.refund_weight(bought), None); + + // Drop trader + drop(trader); + + // Make sure author(Alice) has received the amount + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), amount_bought); + + // We also need to ensure the total supply increased + assert_eq!(Assets::total_supply(1), amount_bought); + }); +} diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 576d86f36c4..6b18e612fc6 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -126,31 +126,33 @@ impl< Matcher::matches_fungibles(&first).map_err(|_| XcmError::AssetNotFound)?; // Calculate how much we should charge in the asset_id for such amount of weight - let asset_balance = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight)?; - - match first { - // Not relevant match, as matches_fungibles should have already verified this above - MultiAsset { - id: xcm::latest::AssetId::Concrete(location), - fun: Fungibility::Fungible(_), - } => { - // Convert asset_balance to u128 - let u128_amount: u128 = asset_balance.try_into().map_err(|_| XcmError::Overflow)?; - // Construct required payment - let required: MultiAsset = (Concrete(location.clone()), u128_amount).into(); - // Substract payment - let unused = - payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?; - - // record weight, balance, multilocation and assetId - self.0 = Some(AssetTraderRefunder { - weight_outstanding: weight, - outstanding_concrete_asset: required, - }); - Ok(unused) - }, - _ => return Err(XcmError::TooExpensive), - } + // Require at least a payment of minimum_balance + // Necessary for fully collateral-backed assets + let asset_balance: u128 = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight) + .map(|amount| { + let minimum_balance = ConcreteAssets::minimum_balance(local_asset_id); + if amount < minimum_balance { + minimum_balance + } else { + amount + } + })? + .try_into() + .map_err(|_| XcmError::Overflow)?; + + // Convert to the same kind of multiasset, with the required fungible balance + let required = first.clone().id.into_multiasset(asset_balance.into()); + + // Substract payment + let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?; + + // record weight and multiasset + self.0 = Some(AssetTraderRefunder { + weight_outstanding: weight, + outstanding_concrete_asset: required, + }); + + Ok(unused) } fn refund_weight(&mut self, weight: Weight) -> Option { @@ -175,10 +177,20 @@ impl< // Convert into u128 outstanding_balance let outstanding_balance: u128 = outstanding_balance.saturated_into(); + let outstanding_minus_substrated = outstanding_balance.saturating_sub(asset_balance); + + // Guarantee that the fee payment will contain at least the minimum balance of the asset. + // Require at least a drop of minimum_balance + // Necessary for fully collateral-backed assets + if outstanding_minus_substrated < + ConcreteAssets::minimum_balance(local_asset_id).saturated_into() + { + return None + } // Construct outstanding_concrete_asset with the same location id and substracted balance let outstanding_concrete_asset: MultiAsset = - (id.clone(), (outstanding_balance.saturating_sub(asset_balance))).into(); + (id.clone(), outstanding_minus_substrated).into(); // Substract from existing weight and balance weight_outstanding = weight_outstanding.saturating_sub(weight); From 846ceaeeea7aa37b037d33204bb15c9ed76042a8 Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 20 Jul 2022 19:32:42 +0200 Subject: [PATCH 45/53] rework typo --- primitives/utility/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index 6b18e612fc6..a62865e15ab 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -177,12 +177,12 @@ impl< // Convert into u128 outstanding_balance let outstanding_balance: u128 = outstanding_balance.saturated_into(); - let outstanding_minus_substrated = outstanding_balance.saturating_sub(asset_balance); + let outstanding_minus_substracted = outstanding_balance.saturating_sub(asset_balance); // Guarantee that the fee payment will contain at least the minimum balance of the asset. // Require at least a drop of minimum_balance // Necessary for fully collateral-backed assets - if outstanding_minus_substrated < + if outstanding_minus_substracted < ConcreteAssets::minimum_balance(local_asset_id).saturated_into() { return None @@ -190,7 +190,7 @@ impl< // Construct outstanding_concrete_asset with the same location id and substracted balance let outstanding_concrete_asset: MultiAsset = - (id.clone(), outstanding_minus_substrated).into(); + (id.clone(), outstanding_minus_substracted).into(); // Substract from existing weight and balance weight_outstanding = weight_outstanding.saturating_sub(weight); From 5078b771b5f74e1c5dfd36c760c1bc7694b1eec3 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 21 Jul 2022 12:41:28 +0200 Subject: [PATCH 46/53] In case refund makes drop below ED, just refund the difference --- .../runtimes/assets/statemine/tests/tests.rs | 19 +++++++-- .../runtimes/assets/westmint/tests/tests.rs | 19 +++++++-- primitives/utility/src/lib.rs | 42 +++++++++++-------- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index cad03c6a89e..ae8cfe4c0e0 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -348,22 +348,33 @@ fn test_that_buying_ed_refund_does_not_refund() { let amount_bought = WeightToFee::weight_to_fee(&bought); + assert!( + amount_bought < ExistentialDeposit::get(), + "we are testing what happens when the amount does not exceed ED" + ); + + // We know we will have to buy at least ED, so lets make sure first it will + // fail with a payment of less than ED let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); + + // Now lets buy ED at least + let asset: MultiAsset = (asset_multilocation.clone(), ExistentialDeposit::get()).into(); // Buy weight should work assert_ok!(trader.buy_weight(bought, asset.into())); - // Should return None. Refunding and then dropping below existential deposit - // should not be allowed + // Should return None. We have a specific check making sure we dont go below ED for + // drop payment assert_eq!(trader.refund_weight(bought), None); // Drop trader drop(trader); // Make sure author(Alice) has received the amount - assert_eq!(Assets::balance(1, AccountId::from(ALICE)), amount_bought); + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get()); // We also need to ensure the total supply increased - assert_eq!(Assets::total_supply(1), amount_bought); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get()); }); } diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 992ee8952e8..d998b15d1d5 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -348,22 +348,33 @@ fn test_that_buying_ed_refund_does_not_refund() { let amount_bought = WeightToFee::weight_to_fee(&bought); + assert!( + amount_bought < ExistentialDeposit::get(), + "we are testing what happens when the amount does not exceed ED" + ); + + // We know we will have to buy at least ED, so lets make sure first it will + // fail with a payment of less than ED let asset: MultiAsset = (asset_multilocation.clone(), amount_bought).into(); + assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive); + + // Now lets buy ED at least + let asset: MultiAsset = (asset_multilocation.clone(), ExistentialDeposit::get()).into(); // Buy weight should work assert_ok!(trader.buy_weight(bought, asset.into())); - // Should return None. Refunding and then dropping below existential deposit - // should not be allowed + // Should return None. We have a specific check making sure we dont go below ED for + // drop payment assert_eq!(trader.refund_weight(bought), None); // Drop trader drop(trader); // Make sure author(Alice) has received the amount - assert_eq!(Assets::balance(1, AccountId::from(ALICE)), amount_bought); + assert_eq!(Assets::balance(1, AccountId::from(ALICE)), ExistentialDeposit::get()); // We also need to ensure the total supply increased - assert_eq!(Assets::total_supply(1), amount_bought); + assert_eq!(Assets::total_supply(1), ExistentialDeposit::get()); }); } diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index a62865e15ab..d78dbaf1b6f 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -25,7 +25,7 @@ use frame_support::{ traits::tokens::{fungibles, fungibles::Inspect}, weights::Weight, }; -use sp_runtime::SaturatedConversion; +use sp_runtime::{traits::Saturating, SaturatedConversion}; use sp_std::marker::PhantomData; use xcm::{latest::prelude::*, WrapVersion}; @@ -168,25 +168,31 @@ impl< let (local_asset_id, outstanding_balance) = Matcher::matches_fungibles(&(id.clone(), fun).into()).ok()?; + let minimum_balance = ConcreteAssets::minimum_balance(local_asset_id); + // Calculate asset_balance // This read should have already be cached in buy_weight - let asset_balance: u128 = - FeeCharger::charge_weight_in_fungibles(local_asset_id, weight) - .ok()? - .saturated_into(); - - // Convert into u128 outstanding_balance - let outstanding_balance: u128 = outstanding_balance.saturated_into(); - let outstanding_minus_substracted = outstanding_balance.saturating_sub(asset_balance); - - // Guarantee that the fee payment will contain at least the minimum balance of the asset. - // Require at least a drop of minimum_balance - // Necessary for fully collateral-backed assets - if outstanding_minus_substracted < - ConcreteAssets::minimum_balance(local_asset_id).saturated_into() - { - return None - } + let (asset_balance, outstanding_minus_substracted) = + FeeCharger::charge_weight_in_fungibles(local_asset_id, weight).ok().map( + |asset_balance| { + // Require at least a drop of minimum_balance + // Necessary for fully collateral-backed assets + if outstanding_balance.saturating_sub(asset_balance) > minimum_balance { + (asset_balance, outstanding_balance.saturating_sub(asset_balance)) + } + // If the amount to be refunded leaves the remaining balance below ED, + // we just refund the exact amount that guarantees at least ED will be + // dropped + else { + (outstanding_balance.saturating_sub(minimum_balance), minimum_balance) + } + }, + )?; + + // Convert balances into u128 + let outstanding_minus_substracted: u128 = + outstanding_minus_substracted.saturated_into(); + let asset_balance: u128 = asset_balance.saturated_into(); // Construct outstanding_concrete_asset with the same location id and substracted balance let outstanding_concrete_asset: MultiAsset = From d8a06698674f3dddfc77016400805a31562e8985 Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 21 Jul 2022 15:54:25 +0200 Subject: [PATCH 47/53] fix test westmint --- parachains/runtimes/assets/westmint/tests/tests.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index d998b15d1d5..9ca0c01d53a 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -332,8 +332,7 @@ fn test_that_buying_ed_refund_does_not_refund() { // Set Alice as block author, who will receive fees run_to_block(2, Some(AccountId::from(ALICE))); - // We are gonna buy ED - let bought: u64 = ExistentialDeposit::get().try_into().unwrap(); + let bought = 500_000_000u64; let asset_multilocation = MultiLocation::new( 0, From 77b7f2321429dba3b337e70fbfb039e178916a1b Mon Sep 17 00:00:00 2001 From: gorka Date: Thu, 21 Jul 2022 15:55:53 +0200 Subject: [PATCH 48/53] clone id --- primitives/utility/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs index d78dbaf1b6f..ea7a81f327d 100644 --- a/primitives/utility/src/lib.rs +++ b/primitives/utility/src/lib.rs @@ -141,7 +141,7 @@ impl< .map_err(|_| XcmError::Overflow)?; // Convert to the same kind of multiasset, with the required fungible balance - let required = first.clone().id.into_multiasset(asset_balance.into()); + let required = first.id.clone().into_multiasset(asset_balance.into()); // Substract payment let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?; From d316bb3603e53cf9ea87720ea443dd72b3f7edf8 Mon Sep 17 00:00:00 2001 From: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Date: Thu, 28 Jul 2022 07:58:49 +0200 Subject: [PATCH 49/53] move test imports to preamble --- parachains/runtimes/assets/statemint/tests/tests.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 657610d3d30..4b8fe1ff5c7 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,6 +1,10 @@ use frame_support::{ - assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, + traits::{GenesisBuild, PalletInfo}, + weights::WeightToFee as WeightToFeeT, }; +use codec::Encode; +use sp_runtime::{Digest, DigestItem}; use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; use sp_consensus_aura::AURA_ENGINE_ID; pub use statemint_runtime::{ @@ -22,7 +26,6 @@ impl Default for ExtBuilder { ExtBuilder { balances: vec![], collators: vec![] } } } -use frame_support::traits::GenesisBuild; impl ExtBuilder { pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { self.balances = balances; @@ -76,8 +79,6 @@ impl ExtBuilder { } } -use codec::Encode; -use sp_runtime::{Digest, DigestItem}; /// Utility function that advances the chain to the desired block number. /// If an author is provided, that author information is injected to all the blocks in the meantime. pub fn run_to_block(n: u32, author: Option) { From 0ea3471ffba08ee97b67955042f2411e55f643d4 Mon Sep 17 00:00:00 2001 From: joepetrowski Date: Thu, 28 Jul 2022 08:06:29 +0200 Subject: [PATCH 50/53] move test imports to preamble --- parachains/runtimes/assets/statemine/tests/tests.rs | 10 ++++++---- parachains/runtimes/assets/statemint/tests/tests.rs | 5 +++-- parachains/runtimes/assets/westmint/tests/tests.rs | 10 ++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index ae8cfe4c0e0..7f0f1783e5e 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -1,8 +1,12 @@ +use codec::Encode; use frame_support::{ - assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, + traits::{GenesisBuild, PalletInfo}, + weights::WeightToFee as WeightToFeeT, }; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; +use sp_runtime::{Digest, DigestItem}; pub use statemine_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, @@ -22,7 +26,7 @@ impl Default for ExtBuilder { ExtBuilder { balances: vec![], collators: vec![] } } } -use frame_support::traits::GenesisBuild; + impl ExtBuilder { pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { self.balances = balances; @@ -76,8 +80,6 @@ impl ExtBuilder { } } -use codec::Encode; -use sp_runtime::{Digest, DigestItem}; /// Utility function that advances the chain to the desired block number. /// If an author is provided, that author information is injected to all the blocks in the meantime. pub fn run_to_block(n: u32, author: Option) { diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 4b8fe1ff5c7..0577969b7f3 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,12 +1,12 @@ +use codec::Encode; use frame_support::{ assert_noop, assert_ok, traits::{GenesisBuild, PalletInfo}, weights::WeightToFee as WeightToFeeT, }; -use codec::Encode; -use sp_runtime::{Digest, DigestItem}; use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; use sp_consensus_aura::AURA_ENGINE_ID; +use sp_runtime::{Digest, DigestItem}; pub use statemint_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, @@ -26,6 +26,7 @@ impl Default for ExtBuilder { ExtBuilder { balances: vec![], collators: vec![] } } } + impl ExtBuilder { pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { self.balances = balances; diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 9ca0c01d53a..0997e1a44b6 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -1,8 +1,12 @@ +use codec::Encode; use frame_support::{ - assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, + traits::{GenesisBuild, PalletInfo}, + weights::WeightToFee as WeightToFeeT, }; use parachains_common::{AccountId, AuraId, Balance}; use sp_consensus_aura::AURA_ENGINE_ID; +use sp_runtime::{Digest, DigestItem}; pub use westmint_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, @@ -22,7 +26,7 @@ impl Default for ExtBuilder { ExtBuilder { balances: vec![], collators: vec![] } } } -use frame_support::traits::GenesisBuild; + impl ExtBuilder { pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { self.balances = balances; @@ -76,8 +80,6 @@ impl ExtBuilder { } } -use codec::Encode; -use sp_runtime::{Digest, DigestItem}; /// Utility function that advances the chain to the desired block number. /// If an author is provided, that author information is injected to all the blocks in the meantime. pub fn run_to_block(n: u32, author: Option) { From 8a7931507fa3754bd8afdbcd0bec2980bce24345 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 1 Aug 2022 16:04:50 +0200 Subject: [PATCH 51/53] test-utils with builderS --- .../runtimes/assets/statemine/Cargo.toml | 1 + .../runtimes/assets/statemine/tests/tests.rs | 155 +++++------------- .../runtimes/assets/statemint/Cargo.toml | 1 + .../runtimes/assets/statemint/tests/tests.rs | 118 ++----------- .../runtimes/assets/test-utils/Cargo.toml | 45 +++++ .../runtimes/assets/test-utils/src/lib.rs | 134 +++++++++++++++ .../runtimes/assets/westmint/Cargo.toml | 1 + .../runtimes/assets/westmint/tests/tests.rs | 155 +++++------------- 8 files changed, 267 insertions(+), 343 deletions(-) create mode 100644 parachains/runtimes/assets/test-utils/Cargo.toml create mode 100644 parachains/runtimes/assets/test-utils/src/lib.rs diff --git a/parachains/runtimes/assets/statemine/Cargo.toml b/parachains/runtimes/assets/statemine/Cargo.toml index ebd68acffa3..8ae9d1290e5 100644 --- a/parachains/runtimes/assets/statemine/Cargo.toml +++ b/parachains/runtimes/assets/statemine/Cargo.toml @@ -75,6 +75,7 @@ parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] hex-literal = "0.3.4" +asset-test-utils = { path = "../test-utils"} [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs index 7f0f1783e5e..c99debbced4 100644 --- a/parachains/runtimes/assets/statemine/tests/tests.rs +++ b/parachains/runtimes/assets/statemine/tests/tests.rs @@ -1,127 +1,31 @@ -use codec::Encode; +use asset_test_utils::{ExtBuilder, RuntimeHelper}; use frame_support::{ - assert_noop, assert_ok, - traits::{GenesisBuild, PalletInfo}, - weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, }; -use parachains_common::{AccountId, AuraId, Balance}; -use sp_consensus_aura::AURA_ENGINE_ID; -use sp_runtime::{Digest, DigestItem}; +use parachains_common::{AccountId, AuraId}; pub use statemine_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, }; use xcm::latest::prelude::*; use xcm_executor::traits::WeightTrader; - -pub struct ExtBuilder { - // endowed accounts with balances - balances: Vec<(AccountId, Balance)>, - // collators to test block prod - collators: Vec, -} - -impl Default for ExtBuilder { - fn default() -> ExtBuilder { - ExtBuilder { balances: vec![], collators: vec![] } - } -} - -impl ExtBuilder { - pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { - self.balances = balances; - self - } - pub fn with_collators(mut self, collators: Vec) -> Self { - self.collators = collators; - self - } - - pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); - - pallet_balances::GenesisConfig:: { balances: self.balances } - .assimilate_storage(&mut t) - .unwrap(); - - pallet_collator_selection::GenesisConfig:: { - invulnerables: self.collators.clone(), - candidacy_bond: Default::default(), - desired_candidates: Default::default(), - } - .assimilate_storage(&mut t) - .unwrap(); - - let keys: Vec<(AccountId, AccountId, SessionKeys)> = self - .collators - .iter() - .map(|account| { - let bytearray: &[u8; 32] = account.as_ref(); - ( - account.clone(), - account.clone(), - SessionKeys { - aura: AuraId::from(sp_core::sr25519::Public::from_raw(*bytearray)), - }, - ) - }) - .collect(); - pallet_session::GenesisConfig:: { keys } - .assimilate_storage(&mut t) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - - ext.execute_with(|| { - System::set_block_number(1); - }); - - ext - } -} - -/// Utility function that advances the chain to the desired block number. -/// If an author is provided, that author information is injected to all the blocks in the meantime. -pub fn run_to_block(n: u32, author: Option) { - while System::block_number() < n { - // Set the new block number and author - match author { - Some(ref author) => { - let pre_digest = - Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; - System::reset_events(); - System::initialize( - &(System::block_number() + 1), - &System::parent_hash(), - &pre_digest, - ); - }, - None => { - System::set_block_number(System::block_number() + 1); - }, - } - } -} - pub const ALICE: [u8; 32] = [1u8; 32]; -pub fn root_origin() -> ::Origin { - ::Origin::root() -} - -pub fn origin_of(account_id: AccountId) -> ::Origin { - ::Origin::signed(account_id) -} #[test] fn test_asset_xcm_trader() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -130,7 +34,7 @@ fn test_asset_xcm_trader() { // We first mint enough asset for the account to exist for assets assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), + RuntimeHelper::::origin_of(AccountId::from(ALICE)), 1, AccountId::from(ALICE).into(), ExistentialDeposit::get() @@ -139,7 +43,7 @@ fn test_asset_xcm_trader() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight let bought = 4_000_000_000u64; @@ -179,14 +83,19 @@ fn test_asset_xcm_trader() { #[test] fn test_asset_xcm_trader_with_refund() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -195,7 +104,7 @@ fn test_asset_xcm_trader_with_refund() { // We first mint enough asset for the account to exist for assets assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), + RuntimeHelper::::origin_of(AccountId::from(ALICE)), 1, AccountId::from(ALICE).into(), ExistentialDeposit::get() @@ -204,7 +113,7 @@ fn test_asset_xcm_trader_with_refund() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight let bought = 4_000_000_000u64; @@ -260,14 +169,19 @@ fn test_asset_xcm_trader_with_refund() { #[test] fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -277,7 +191,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy small amount let bought = 500_000_000u64; @@ -315,14 +229,19 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { #[test] fn test_that_buying_ed_refund_does_not_refund() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -332,7 +251,7 @@ fn test_that_buying_ed_refund_does_not_refund() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are gonna buy ED let bought: u64 = ExistentialDeposit::get().try_into().unwrap(); diff --git a/parachains/runtimes/assets/statemint/Cargo.toml b/parachains/runtimes/assets/statemint/Cargo.toml index 410d5d40670..2bf0efc1fd7 100644 --- a/parachains/runtimes/assets/statemint/Cargo.toml +++ b/parachains/runtimes/assets/statemint/Cargo.toml @@ -74,6 +74,7 @@ parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] hex-literal = "0.3.4" +asset-test-utils = { path = "../test-utils"} [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index 0577969b7f3..b4d69e63392 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,128 +1,32 @@ -use codec::Encode; +use asset_test_utils::{ExtBuilder, RuntimeHelper}; +use codec::Decode; use frame_support::{ - assert_noop, assert_ok, - traits::{GenesisBuild, PalletInfo}, - weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, }; use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; -use sp_consensus_aura::AURA_ENGINE_ID; -use sp_runtime::{Digest, DigestItem}; pub use statemint_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, }; use xcm::latest::prelude::*; use xcm_executor::traits::WeightTrader; - -pub struct ExtBuilder { - // endowed accounts with balances - balances: Vec<(AccountId, Balance)>, - // collators to test block prod - collators: Vec, -} - -impl Default for ExtBuilder { - fn default() -> ExtBuilder { - ExtBuilder { balances: vec![], collators: vec![] } - } -} - -impl ExtBuilder { - pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { - self.balances = balances; - self - } - pub fn with_collators(mut self, collators: Vec) -> Self { - self.collators = collators; - self - } - - pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); - - pallet_balances::GenesisConfig:: { balances: self.balances } - .assimilate_storage(&mut t) - .unwrap(); - - pallet_collator_selection::GenesisConfig:: { - invulnerables: self.collators.clone(), - candidacy_bond: Default::default(), - desired_candidates: Default::default(), - } - .assimilate_storage(&mut t) - .unwrap(); - - let keys: Vec<(AccountId, AccountId, SessionKeys)> = self - .collators - .iter() - .map(|account| { - let bytearray: &[u8; 32] = account.as_ref(); - ( - account.clone(), - account.clone(), - SessionKeys { - aura: AuraId::from(sp_core::ed25519::Public::from_raw(*bytearray)), - }, - ) - }) - .collect(); - pallet_session::GenesisConfig:: { keys } - .assimilate_storage(&mut t) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - - ext.execute_with(|| { - System::set_block_number(1); - }); - - ext - } -} - -/// Utility function that advances the chain to the desired block number. -/// If an author is provided, that author information is injected to all the blocks in the meantime. -pub fn run_to_block(n: u32, author: Option) { - while System::block_number() < n { - // Set the new block number and author - match author { - Some(ref author) => { - let pre_digest = - Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; - System::reset_events(); - System::initialize( - &(System::block_number() + 1), - &System::parent_hash(), - &pre_digest, - ); - }, - None => { - System::set_block_number(System::block_number() + 1); - }, - } - } -} - pub const ALICE: [u8; 32] = [1u8; 32]; -pub fn root_origin() -> ::Origin { - ::Origin::root() -} - -pub fn origin_of(account_id: AccountId) -> ::Origin { - ::Origin::signed(account_id) -} - #[test] fn test_asset_xcm_trader_does_not_work_in_statemine() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -132,7 +36,7 @@ fn test_asset_xcm_trader_does_not_work_in_statemine() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 400e9 weight // Because of the ED being higher in statemine diff --git a/parachains/runtimes/assets/test-utils/Cargo.toml b/parachains/runtimes/assets/test-utils/Cargo.toml new file mode 100644 index 00000000000..52ce1d2d9a8 --- /dev/null +++ b/parachains/runtimes/assets/test-utils/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "asset-test-utils" +version = "1.0.0" +authors = ["Parity Technologies "] +edition = "2021" +description = "Statemint parachain runtime" + +[dependencies] + +# Substrate + +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } + +# Cumulus +pallet-collator-selection = { path = "../../../../pallets/collator-selection", default-features = false } +parachains-common = { path = "../../../common", default-features = false } + +[dev-dependencies] +hex-literal = "0.3.4" + +[build-dependencies] +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } + +[features] +default = [ "std" ] +std = [ + "frame-support/std", + "frame-system/std", + "pallet-balances/std", + "pallet-collator-selection/std", + "pallet-session/std", + "parachains-common/std", + "sp-consensus-aura/std", + "sp-io/std", + "sp-runtime/std", + "sp-std/std", +] diff --git a/parachains/runtimes/assets/test-utils/src/lib.rs b/parachains/runtimes/assets/test-utils/src/lib.rs new file mode 100644 index 00000000000..f37465e5bd6 --- /dev/null +++ b/parachains/runtimes/assets/test-utils/src/lib.rs @@ -0,0 +1,134 @@ +use frame_support::traits::GenesisBuild; +use sp_std::marker::PhantomData; + +use frame_support::traits::OriginTrait; +use parachains_common::AccountId; +use sp_consensus_aura::AURA_ENGINE_ID; +use sp_core::Encode; +use sp_runtime::{Digest, DigestItem}; + +pub type BalanceOf = ::Balance; +pub type AccountIdOf = ::AccountId; +pub type ValidatorIdOf = ::ValidatorId; +pub type SessionKeysOf = ::Keys; + +// Basic builder based on balances, collators and pallet_sessopm +pub struct ExtBuilder< + Runtime: frame_system::Config + pallet_balances::Config + pallet_session::Config, +> { + // endowed accounts with balances + balances: Vec<(AccountIdOf, BalanceOf)>, + // collators to test block prod + collators: Vec>, + // keys added to pallet session + keys: Vec<(AccountIdOf, ValidatorIdOf, SessionKeysOf)>, + _runtime: PhantomData, +} + +impl Default + for ExtBuilder +{ + fn default() -> ExtBuilder { + ExtBuilder { balances: vec![], collators: vec![], keys: vec![], _runtime: PhantomData } + } +} + +impl + ExtBuilder +{ + pub fn with_balances( + mut self, + balances: Vec<(AccountIdOf, BalanceOf)>, + ) -> Self { + self.balances = balances; + self + } + pub fn with_collators(mut self, collators: Vec>) -> Self { + self.collators = collators; + self + } + + pub fn with_session_keys( + mut self, + keys: Vec<(AccountIdOf, ValidatorIdOf, SessionKeysOf)>, + ) -> Self { + self.keys = keys; + self + } + + pub fn build(self) -> sp_io::TestExternalities + where + Runtime: + pallet_collator_selection::Config + pallet_balances::Config + pallet_session::Config, + ValidatorIdOf: From>, + { + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + + pallet_balances::GenesisConfig:: { balances: self.balances.into() } + .assimilate_storage(&mut t) + .unwrap(); + + pallet_collator_selection::GenesisConfig:: { + invulnerables: self.collators.clone().into(), + candidacy_bond: Default::default(), + desired_candidates: Default::default(), + } + .assimilate_storage(&mut t) + .unwrap(); + + pallet_session::GenesisConfig:: { keys: self.keys } + .assimilate_storage(&mut t) + .unwrap(); + + let mut ext = sp_io::TestExternalities::new(t); + + ext.execute_with(|| { + frame_system::Pallet::::set_block_number(1u32.into()); + }); + + ext + } +} + +pub struct RuntimeHelper(PhantomData); +/// Utility function that advances the chain to the desired block number. +/// If an author is provided, that author information is injected to all the blocks in the meantime. +impl RuntimeHelper +where + AccountIdOf: + Into<<::Origin as OriginTrait>::AccountId>, +{ + pub fn run_to_block(n: u32, author: Option) { + while frame_system::Pallet::::block_number() < n.into() { + // Set the new block number and author + match author { + Some(ref author) => { + let pre_digest = Digest { + logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())], + }; + frame_system::Pallet::::reset_events(); + frame_system::Pallet::::initialize( + &(frame_system::Pallet::::block_number() + 1u32.into()), + &frame_system::Pallet::::parent_hash(), + &pre_digest, + ); + }, + None => { + frame_system::Pallet::::set_block_number( + frame_system::Pallet::::block_number() + 1u32.into(), + ); + }, + } + } + } + + pub fn root_origin() -> ::Origin { + ::Origin::root() + } + + pub fn origin_of( + account_id: AccountIdOf, + ) -> ::Origin { + ::Origin::signed(account_id.into()) + } +} diff --git a/parachains/runtimes/assets/westmint/Cargo.toml b/parachains/runtimes/assets/westmint/Cargo.toml index 4139fad9bef..ddb385870b7 100644 --- a/parachains/runtimes/assets/westmint/Cargo.toml +++ b/parachains/runtimes/assets/westmint/Cargo.toml @@ -74,6 +74,7 @@ parachains-common = { path = "../../../common", default-features = false } [dev-dependencies] hex-literal = "0.3.4" +asset-test-utils = { path = "../test-utils"} [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs index 0997e1a44b6..a967c85add3 100644 --- a/parachains/runtimes/assets/westmint/tests/tests.rs +++ b/parachains/runtimes/assets/westmint/tests/tests.rs @@ -1,12 +1,8 @@ -use codec::Encode; +use asset_test_utils::{ExtBuilder, RuntimeHelper}; use frame_support::{ - assert_noop, assert_ok, - traits::{GenesisBuild, PalletInfo}, - weights::WeightToFee as WeightToFeeT, + assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, }; -use parachains_common::{AccountId, AuraId, Balance}; -use sp_consensus_aura::AURA_ENGINE_ID; -use sp_runtime::{Digest, DigestItem}; +use parachains_common::{AccountId, AuraId}; pub use westmint_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System, @@ -14,115 +10,23 @@ pub use westmint_runtime::{ use xcm::latest::prelude::*; use xcm_executor::traits::WeightTrader; -pub struct ExtBuilder { - // endowed accounts with balances - balances: Vec<(AccountId, Balance)>, - // collators to test block prod - collators: Vec, -} - -impl Default for ExtBuilder { - fn default() -> ExtBuilder { - ExtBuilder { balances: vec![], collators: vec![] } - } -} - -impl ExtBuilder { - pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self { - self.balances = balances; - self - } - pub fn with_collators(mut self, collators: Vec) -> Self { - self.collators = collators; - self - } - - pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); - - pallet_balances::GenesisConfig:: { balances: self.balances } - .assimilate_storage(&mut t) - .unwrap(); - - pallet_collator_selection::GenesisConfig:: { - invulnerables: self.collators.clone(), - candidacy_bond: Default::default(), - desired_candidates: Default::default(), - } - .assimilate_storage(&mut t) - .unwrap(); - - let keys: Vec<(AccountId, AccountId, SessionKeys)> = self - .collators - .iter() - .map(|account| { - let bytearray: &[u8; 32] = account.as_ref(); - ( - account.clone(), - account.clone(), - SessionKeys { - aura: AuraId::from(sp_core::sr25519::Public::from_raw(*bytearray)), - }, - ) - }) - .collect(); - pallet_session::GenesisConfig:: { keys } - .assimilate_storage(&mut t) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - - ext.execute_with(|| { - System::set_block_number(1); - }); - - ext - } -} - -/// Utility function that advances the chain to the desired block number. -/// If an author is provided, that author information is injected to all the blocks in the meantime. -pub fn run_to_block(n: u32, author: Option) { - while System::block_number() < n { - // Set the new block number and author - match author { - Some(ref author) => { - let pre_digest = - Digest { logs: vec![DigestItem::PreRuntime(AURA_ENGINE_ID, author.encode())] }; - System::reset_events(); - System::initialize( - &(System::block_number() + 1), - &System::parent_hash(), - &pre_digest, - ); - }, - None => { - System::set_block_number(System::block_number() + 1); - }, - } - } -} - pub const ALICE: [u8; 32] = [1u8; 32]; -pub fn root_origin() -> ::Origin { - ::Origin::root() -} - -pub fn origin_of(account_id: AccountId) -> ::Origin { - ::Origin::signed(account_id) -} - #[test] fn test_asset_xcm_trader() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -131,7 +35,7 @@ fn test_asset_xcm_trader() { // We first mint enough asset for the account to exist for assets assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), + RuntimeHelper::::origin_of(AccountId::from(ALICE)), 1, AccountId::from(ALICE).into(), ExistentialDeposit::get() @@ -140,7 +44,7 @@ fn test_asset_xcm_trader() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight let bought = 4_000_000_000u64; @@ -180,14 +84,19 @@ fn test_asset_xcm_trader() { #[test] fn test_asset_xcm_trader_with_refund() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -196,7 +105,7 @@ fn test_asset_xcm_trader_with_refund() { // We first mint enough asset for the account to exist for assets assert_ok!(Assets::mint( - origin_of(AccountId::from(ALICE)), + RuntimeHelper::::origin_of(AccountId::from(ALICE)), 1, AccountId::from(ALICE).into(), ExistentialDeposit::get() @@ -205,7 +114,7 @@ fn test_asset_xcm_trader_with_refund() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight let bought = 4_000_000_000u64; @@ -260,14 +169,19 @@ fn test_asset_xcm_trader_with_refund() { #[test] fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -277,7 +191,7 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); // We are going to buy 4e9 weight let bought = 500_000_000u64; @@ -315,14 +229,19 @@ fn test_asset_xcm_trader_refund_not_possible_since_amount_less_than_ed() { #[test] fn test_that_buying_ed_refund_does_not_refund() { - ExtBuilder::default() + ExtBuilder::::default() .with_collators(vec![AccountId::from(ALICE)]) + .with_session_keys(vec![( + AccountId::from(ALICE), + AccountId::from(ALICE), + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, + )]) .build() .execute_with(|| { // We need root origin to create a sufficient asset // We set existential deposit to be identical to the one for Balances first assert_ok!(Assets::force_create( - root_origin(), + RuntimeHelper::::root_origin(), 1, AccountId::from(ALICE).into(), true, @@ -332,7 +251,7 @@ fn test_that_buying_ed_refund_does_not_refund() { let mut trader = ::Trader::new(); // Set Alice as block author, who will receive fees - run_to_block(2, Some(AccountId::from(ALICE))); + RuntimeHelper::::run_to_block(2, Some(AccountId::from(ALICE))); let bought = 500_000_000u64; From 7e2ea86f0e793d5a0311988d01730c390dcb58c1 Mon Sep 17 00:00:00 2001 From: gorka Date: Mon, 1 Aug 2022 16:05:42 +0200 Subject: [PATCH 52/53] lock file updated --- Cargo.lock | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index e52c6a46f3c..4d3626824eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,6 +165,25 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "asset-test-utils" +version = "1.0.0" +dependencies = [ + "frame-support", + "frame-system", + "hex-literal", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "parachains-common", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "substrate-wasm-builder", +] + [[package]] name = "async-attributes" version = "1.1.2" @@ -11397,6 +11416,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "statemine-runtime" version = "2.0.0" dependencies = [ + "asset-test-utils", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -11463,6 +11483,7 @@ dependencies = [ name = "statemint-runtime" version = "1.0.0" dependencies = [ + "asset-test-utils", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -12965,6 +12986,7 @@ dependencies = [ name = "westmint-runtime" version = "1.0.0" dependencies = [ + "asset-test-utils", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", From 20584ac0347dc2c2c0240ab4d2b33b5aefdf703a Mon Sep 17 00:00:00 2001 From: gorka Date: Wed, 3 Aug 2022 15:48:27 +0200 Subject: [PATCH 53/53] remove unused imports --- parachains/runtimes/assets/statemint/tests/tests.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs index b4d69e63392..518936210f2 100644 --- a/parachains/runtimes/assets/statemint/tests/tests.rs +++ b/parachains/runtimes/assets/statemint/tests/tests.rs @@ -1,9 +1,8 @@ use asset_test_utils::{ExtBuilder, RuntimeHelper}; -use codec::Decode; use frame_support::{ assert_noop, assert_ok, traits::PalletInfo, weights::WeightToFee as WeightToFeeT, }; -use parachains_common::{AccountId, Balance, StatemintAuraId as AuraId}; +use parachains_common::{AccountId, StatemintAuraId as AuraId}; pub use statemint_runtime::{ constants::fee::WeightToFee, xcm_config::XcmConfig, Assets, Balances, ExistentialDeposit, Runtime, SessionKeys, System,