diff --git a/Cargo.lock b/Cargo.lock index 996e885b6a14..96d388f7610f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1651,8 +1651,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "scale-info", - "sp-core 28.0.0", - "staging-xcm 7.0.0", + "sp-core", + "staging-xcm", ] [[package]] @@ -1663,8 +1663,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "scale-info", - "sp-core 28.0.0", - "staging-xcm 7.0.0", + "sp-core", + "staging-xcm", ] [[package]] @@ -2059,7 +2059,7 @@ dependencies = [ "bp-rococo", "bp-runtime", "bp-westend", -<<<<<<< HEAD + "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-hub-test-utils", "bridge-runtime-common", @@ -2080,29 +2080,6 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", -======= - "bp-xcm-bridge-hub-router 0.6.0", - "bridge-hub-common 0.1.0", - "bridge-hub-test-utils 0.7.0", - "bridge-runtime-common 0.7.0", - "cumulus-pallet-aura-ext 0.7.0", - "cumulus-pallet-parachain-system 0.7.0", - "cumulus-pallet-session-benchmarking 9.0.0", - "cumulus-pallet-xcm 0.7.0", - "cumulus-pallet-xcmp-queue 0.7.0", - "cumulus-primitives-aura 0.7.0", - "cumulus-primitives-core 0.7.0", - "cumulus-primitives-storage-weight-reclaim 1.0.0", - "cumulus-primitives-utility 0.7.0", - "frame-benchmarking 28.0.0", - "frame-executive 28.0.0", - "frame-metadata-hash-extension 0.1.0", - "frame-support 28.0.0", - "frame-system 28.0.0", - "frame-system-benchmarking 28.0.0", - "frame-system-rpc-runtime-api 26.0.0", - "frame-try-runtime 0.34.0", ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) "hex-literal", "log", "pallet-aura", @@ -2275,7 +2252,7 @@ dependencies = [ "bp-rococo", "bp-runtime", "bp-westend", -<<<<<<< HEAD + "bp-xcm-bridge-hub-router", "bridge-hub-common", "bridge-hub-test-utils", "bridge-runtime-common", @@ -2296,29 +2273,6 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", -======= - "bp-xcm-bridge-hub-router 0.6.0", - "bridge-hub-common 0.1.0", - "bridge-hub-test-utils 0.7.0", - "bridge-runtime-common 0.7.0", - "cumulus-pallet-aura-ext 0.7.0", - "cumulus-pallet-parachain-system 0.7.0", - "cumulus-pallet-session-benchmarking 9.0.0", - "cumulus-pallet-xcm 0.7.0", - "cumulus-pallet-xcmp-queue 0.7.0", - "cumulus-primitives-aura 0.7.0", - "cumulus-primitives-core 0.7.0", - "cumulus-primitives-storage-weight-reclaim 1.0.0", - "cumulus-primitives-utility 0.7.0", - "frame-benchmarking 28.0.0", - "frame-executive 28.0.0", - "frame-metadata-hash-extension 0.1.0", - "frame-support 28.0.0", - "frame-system 28.0.0", - "frame-system-benchmarking 28.0.0", - "frame-system-rpc-runtime-api 26.0.0", - "frame-try-runtime 0.34.0", ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) "hex-literal", "log", "pallet-aura", @@ -12054,47 +12008,12 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "scale-info", -<<<<<<< HEAD "sp-io", "sp-runtime", "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", -======= - "sp-io 38.0.0", - "sp-runtime 39.0.2", - "staging-xcm 14.2.0", - "staging-xcm-builder 17.0.1", - "staging-xcm-executor 17.0.0", -] - -[[package]] -name = "pallet-xcm-bridge-hub" -version = "0.2.0" -dependencies = [ - "bp-header-chain 0.7.0", - "bp-messages 0.7.0", - "bp-runtime 0.7.0", - "bp-xcm-bridge-hub 0.2.0", - "bp-xcm-bridge-hub-router 0.6.0", - "frame-support 28.0.0", - "frame-system 28.0.0", - "log", - "pallet-balances 28.0.0", - "pallet-bridge-messages 0.7.0", - "pallet-xcm-bridge-hub-router 0.5.0", - "parity-scale-codec", - "polkadot-parachain-primitives 6.0.0", - "scale-info", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.1", - "sp-std 14.0.0", - "staging-xcm 7.0.0", - "staging-xcm-builder 7.0.0", - "staging-xcm-executor 7.0.0", ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) ] [[package]] @@ -12105,6 +12024,7 @@ dependencies = [ "bp-messages", "bp-runtime", "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", "frame-support", "frame-system", "log", diff --git a/bridges/chains/chain-asset-hub-rococo/Cargo.toml b/bridges/chains/chain-asset-hub-rococo/Cargo.toml index d7a6d74ff9ed..c23700c37111 100644 --- a/bridges/chains/chain-asset-hub-rococo/Cargo.toml +++ b/bridges/chains/chain-asset-hub-rococo/Cargo.toml @@ -16,21 +16,10 @@ workspace = true [dependencies] codec = { workspace = true } scale-info = { features = ["derive"], workspace = true } -<<<<<<< HEAD frame-support.workspace = true +sp-core.workspace = true bp-xcm-bridge-hub-router.workspace = true -======= - -# Substrate Dependencies -frame-support = { workspace = true } -sp-core = { workspace = true } - -# Bridge Dependencies -bp-xcm-bridge-hub-router = { workspace = true } ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) - -# Polkadot dependencies -xcm = { workspace = true } +xcm.workspace = true [features] default = ["std"] diff --git a/bridges/chains/chain-asset-hub-rococo/src/lib.rs b/bridges/chains/chain-asset-hub-rococo/src/lib.rs index 4ff7b391acd0..2f8b879226a1 100644 --- a/bridges/chains/chain-asset-hub-rococo/src/lib.rs +++ b/bridges/chains/chain-asset-hub-rococo/src/lib.rs @@ -57,7 +57,7 @@ pub fn build_congestion_message( UnpaidExecution { weight_limit: Unlimited, check_origin: None }, Transact { origin_kind: OriginKind::Xcm, - fallback_max_weight: Some(XcmBridgeHubRouterTransactCallMaxWeight::get()), + require_weight_at_most: XcmBridgeHubRouterTransactCallMaxWeight::get(), call: Call::ToWestendXcmRouter(XcmBridgeHubRouterCall::report_bridge_status { bridge_id, is_congested, diff --git a/bridges/chains/chain-asset-hub-westend/Cargo.toml b/bridges/chains/chain-asset-hub-westend/Cargo.toml index 8ae3403bc328..9187a756830f 100644 --- a/bridges/chains/chain-asset-hub-westend/Cargo.toml +++ b/bridges/chains/chain-asset-hub-westend/Cargo.toml @@ -16,21 +16,10 @@ workspace = true [dependencies] codec = { workspace = true } scale-info = { features = ["derive"], workspace = true } -<<<<<<< HEAD frame-support.workspace = true +sp-core.workspace = true bp-xcm-bridge-hub-router.workspace = true -======= - -# Substrate Dependencies -frame-support = { workspace = true } -sp-core = { workspace = true } - -# Bridge Dependencies -bp-xcm-bridge-hub-router = { workspace = true } ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) - -# Polkadot dependencies -xcm = { workspace = true } +xcm.workspace = true [features] default = ["std"] diff --git a/bridges/chains/chain-asset-hub-westend/src/lib.rs b/bridges/chains/chain-asset-hub-westend/src/lib.rs index 9d245e08f7cc..bdf350cafd10 100644 --- a/bridges/chains/chain-asset-hub-westend/src/lib.rs +++ b/bridges/chains/chain-asset-hub-westend/src/lib.rs @@ -57,7 +57,7 @@ pub fn build_congestion_message( UnpaidExecution { weight_limit: Unlimited, check_origin: None }, Transact { origin_kind: OriginKind::Xcm, - fallback_max_weight: Some(XcmBridgeHubRouterTransactCallMaxWeight::get()), + require_weight_at_most: XcmBridgeHubRouterTransactCallMaxWeight::get(), call: Call::ToRococoXcmRouter(XcmBridgeHubRouterCall::report_bridge_status { bridge_id, is_congested, diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml index ec1486f022e3..6ffb408fe195 100644 --- a/bridges/modules/xcm-bridge-hub/Cargo.toml +++ b/bridges/modules/xcm-bridge-hub/Cargo.toml @@ -28,14 +28,6 @@ xcm-builder.workspace = true xcm-executor.workspace = true [dev-dependencies] -<<<<<<< HEAD -pallet-balances = { path = "../../../substrate/frame/balances", default-features = false } -sp-io = { path = "../../../substrate/primitives/io", default-features = false } -bp-runtime = { path = "../../primitives/runtime", default-features = false } -bp-header-chain = { path = "../../primitives/header-chain", default-features = false } -pallet-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false } -polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false } -======= pallet-balances = { workspace = true } sp-io = { workspace = true } bp-runtime = { workspace = true } @@ -43,7 +35,6 @@ bp-header-chain = { workspace = true } pallet-xcm-bridge-hub-router = { workspace = true } bp-xcm-bridge-hub-router = { workspace = true } polkadot-parachain-primitives = { workspace = true } ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) [features] default = ["std"] diff --git a/bridges/modules/xcm-bridge-hub/src/mock.rs b/bridges/modules/xcm-bridge-hub/src/mock.rs index db2a9b487e32..eb8fa9842fba 100644 --- a/bridges/modules/xcm-bridge-hub/src/mock.rs +++ b/bridges/modules/xcm-bridge-hub/src/mock.rs @@ -483,7 +483,7 @@ impl TestLocalXcmChannelManager { UnpaidExecution { weight_limit: Unlimited, check_origin: None }, Transact { origin_kind: OriginKind::Xcm, - fallback_max_weight: None, + require_weight_at_most: frame_support::weights::Weight::from_parts(200_000_000, 6144), call: Call::XcmOverBridgeWrappedWithExportMessageRouter( XcmBridgeHubRouterCall::report_bridge_status { bridge_id: bridge.inner(), diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs index e3edecb8d418..7e0226f144e6 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs @@ -24,18 +24,10 @@ use asset_hub_rococo_runtime::{ ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf, LocationToAccountId, StakingPot, TokenLocation, TrustBackedAssetsPalletLocation, XcmConfig, }, -<<<<<<< HEAD AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, CollatorSelection, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, - SessionKeys, TrustBackedAssetsInstance, XcmpQueue, -======= - AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, Block, - CollatorSelection, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, - MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, - RuntimeEvent, RuntimeOrigin, SessionKeys, ToWestendXcmRouterInstance, - TrustBackedAssetsInstance, XcmpQueue, ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) + SessionKeys, ToWestendXcmRouterInstance, TrustBackedAssetsInstance, XcmpQueue, }; use asset_test_utils::{ test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys, diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index dc5b016cb2ae..bc11f8b1e7c8 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -46,13 +46,8 @@ use frame_support::{ traits::{ fungible, fungibles, tokens::{imbalance::ResolveAssetTo, nonfungibles_v2::Inspect}, -<<<<<<< HEAD - AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, InstanceFilter, - TransformOrigin, -======= AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, Equals, - InstanceFilter, Nothing, TransformOrigin, ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) + InstanceFilter, TransformOrigin, }, weights::{ConstantMultiplier, Weight, WeightToFee as _}, BoundedVec, PalletId, @@ -63,11 +58,7 @@ use frame_system::{ }; use pallet_asset_conversion_tx_payment::SwapAssetAdapter; use pallet_nfts::{DestroyWitness, PalletFeatures}; -<<<<<<< HEAD -======= -use pallet_revive::{evm::runtime::EthExtra, AddressMapper}; use pallet_xcm::EnsureXcm; ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) use parachains_common::{ impls::DealWithFees, message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, CollectionId, Hash, Header, ItemId, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO, diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index 5436a32634a5..fddbf99c65db 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -77,7 +77,6 @@ pallet-collator-selection.workspace = true parachain-info.workspace = true parachains-common.workspace = true testnet-parachains-constants = { features = ["rococo"], workspace = true } -<<<<<<< HEAD bp-asset-hub-rococo.workspace = true bp-asset-hub-westend.workspace = true bp-bridge-hub-polkadot.workspace = true @@ -92,6 +91,7 @@ bp-relayers.workspace = true bp-runtime.workspace = true bp-rococo.workspace = true bp-westend.workspace = true +bp-xcm-bridge-hub-router.workspace = true pallet-bridge-grandpa.workspace = true pallet-bridge-messages.workspace = true pallet-bridge-parachains.workspace = true @@ -109,45 +109,6 @@ snowbridge-outbound-queue-runtime-api.workspace = true snowbridge-router-primitives.workspace = true snowbridge-runtime-common.workspace = true bridge-hub-common.workspace = true -======= - -# Bridges -bp-asset-hub-rococo = { workspace = true } -bp-asset-hub-westend = { workspace = true } -bp-bridge-hub-polkadot = { workspace = true } -bp-bridge-hub-rococo = { workspace = true } -bp-bridge-hub-westend = { workspace = true } -bp-header-chain = { workspace = true } -bp-messages = { workspace = true } -bp-parachains = { workspace = true } -bp-polkadot-bulletin = { workspace = true } -bp-polkadot-core = { workspace = true } -bp-relayers = { workspace = true } -bp-runtime = { workspace = true } -bp-rococo = { workspace = true } -bp-westend = { workspace = true } -bp-xcm-bridge-hub-router = { workspace = true } -pallet-bridge-grandpa = { workspace = true } -pallet-bridge-messages = { workspace = true } -pallet-bridge-parachains = { workspace = true } -pallet-bridge-relayers = { workspace = true } -pallet-xcm-bridge-hub = { workspace = true } -bridge-runtime-common = { workspace = true } - -# Ethereum Bridge (Snowbridge) -snowbridge-beacon-primitives = { workspace = true } -snowbridge-pallet-system = { workspace = true } -snowbridge-system-runtime-api = { workspace = true } -snowbridge-core = { workspace = true } -snowbridge-pallet-ethereum-client = { workspace = true } -snowbridge-pallet-inbound-queue = { workspace = true } -snowbridge-pallet-outbound-queue = { workspace = true } -snowbridge-outbound-queue-runtime-api = { workspace = true } -snowbridge-router-primitives = { workspace = true } -snowbridge-runtime-common = { workspace = true } - -bridge-hub-common = { workspace = true } ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) [dev-dependencies] bridge-hub-test-utils = { default-features = true, path = "../test-utils" } diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml index e1942457baab..b1799608e324 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml @@ -73,7 +73,6 @@ pallet-collator-selection.workspace = true parachain-info.workspace = true parachains-common.workspace = true testnet-parachains-constants = { features = ["westend"], workspace = true } -<<<<<<< HEAD bp-asset-hub-rococo.workspace = true bp-asset-hub-westend.workspace = true bp-bridge-hub-rococo.workspace = true @@ -86,6 +85,7 @@ bp-relayers.workspace = true bp-runtime.workspace = true bp-rococo.workspace = true bp-westend.workspace = true +bp-xcm-bridge-hub-router.workspace = true pallet-bridge-grandpa.workspace = true pallet-bridge-messages.workspace = true pallet-bridge-parachains.workspace = true @@ -103,43 +103,6 @@ snowbridge-pallet-outbound-queue.workspace = true snowbridge-outbound-queue-runtime-api.workspace = true snowbridge-router-primitives.workspace = true snowbridge-runtime-common.workspace = true -======= - -# Bridges -bp-asset-hub-rococo = { workspace = true } -bp-asset-hub-westend = { workspace = true } -bp-bridge-hub-rococo = { workspace = true } -bp-bridge-hub-westend = { workspace = true } -bp-header-chain = { workspace = true } -bp-messages = { workspace = true } -bp-parachains = { workspace = true } -bp-polkadot-core = { workspace = true } -bp-relayers = { workspace = true } -bp-runtime = { workspace = true } -bp-rococo = { workspace = true } -bp-westend = { workspace = true } -bp-xcm-bridge-hub-router = { workspace = true } -pallet-bridge-grandpa = { workspace = true } -pallet-bridge-messages = { workspace = true } -pallet-bridge-parachains = { workspace = true } -pallet-bridge-relayers = { workspace = true } -pallet-xcm-bridge-hub = { workspace = true } -bridge-runtime-common = { workspace = true } -bridge-hub-common = { workspace = true } - -# Ethereum Bridge (Snowbridge) -snowbridge-beacon-primitives = { workspace = true } -snowbridge-pallet-system = { workspace = true } -snowbridge-system-runtime-api = { workspace = true } -snowbridge-core = { workspace = true } -snowbridge-pallet-ethereum-client = { workspace = true } -snowbridge-pallet-inbound-queue = { workspace = true } -snowbridge-pallet-outbound-queue = { workspace = true } -snowbridge-outbound-queue-runtime-api = { workspace = true } -snowbridge-router-primitives = { workspace = true } -snowbridge-runtime-common = { workspace = true } ->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781)) - [dev-dependencies] bridge-hub-test-utils = { default-features = true, path = "../test-utils" }