From 01acc2a72aff289232b63d3e29b574328ea96dda Mon Sep 17 00:00:00 2001 From: ron Date: Thu, 30 Nov 2023 08:48:08 +0800 Subject: [PATCH] Rename control to system --- Cargo.lock | 74 +++++++++---------- .../bridges/bridge-hub-rococo/Cargo.toml | 2 +- .../bridges/bridge-hub-rococo/src/lib.rs | 2 +- .../bridges/bridge-hub-rococo/Cargo.toml | 2 +- .../bridge-hub-rococo/src/tests/snowbridge.rs | 6 +- .../bridge-hubs/bridge-hub-rococo/Cargo.toml | 10 +-- .../bridge-hubs/bridge-hub-rococo/src/lib.rs | 16 ++-- .../bridge-hub-rococo/src/weights/mod.rs | 2 +- ...bridge_control.rs => snowbridge_system.rs} | 38 +++++----- .../bridge-hub-rococo/src/xcm_config.rs | 2 +- .../src/chain_spec/bridge_hubs.rs | 2 +- 11 files changed, 78 insertions(+), 78 deletions(-) rename cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/{snowbridge_control.rs => snowbridge_system.rs} (89%) diff --git a/Cargo.lock b/Cargo.lock index c9b2265c1923..9c9818e5ab76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2300,11 +2300,11 @@ dependencies = [ "frame-support", "parachains-common", "serde_json", - "snowbridge-control", "snowbridge-core", "snowbridge-inbound-queue", "snowbridge-outbound-queue", "snowbridge-router-primitives", + "snowbridge-system", "sp-core", "sp-runtime", ] @@ -2336,11 +2336,11 @@ dependencies = [ "rococo-system-emulated-network", "rococo-westend-system-emulated-network", "scale-info", - "snowbridge-control", "snowbridge-core", "snowbridge-inbound-queue", "snowbridge-outbound-queue", "snowbridge-router-primitives", + "snowbridge-system", "sp-core", "staging-xcm", "staging-xcm-executor", @@ -2409,8 +2409,6 @@ dependencies = [ "serde", "smallvec", "snowbridge-beacon-primitives", - "snowbridge-control", - "snowbridge-control-runtime-api", "snowbridge-core", "snowbridge-ethereum-beacon-client", "snowbridge-inbound-queue", @@ -2418,6 +2416,8 @@ dependencies = [ "snowbridge-outbound-queue-runtime-api", "snowbridge-router-primitives", "snowbridge-runtime-common", + "snowbridge-system", + "snowbridge-system-runtime-api", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -17577,39 +17577,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "snowbridge-control" -version = "4.0.0-dev" -dependencies = [ - "ethabi-decode", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "snowbridge-core", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", -] - -[[package]] -name = "snowbridge-control-runtime-api" -version = "0.1.0" -dependencies = [ - "parity-scale-codec", - "snowbridge-core", - "sp-api", - "sp-core", - "sp-std 8.0.0", - "staging-xcm", -] - [[package]] name = "snowbridge-core" version = "0.1.1" @@ -17793,6 +17760,39 @@ dependencies = [ "staging-xcm-executor", ] +[[package]] +name = "snowbridge-system" +version = "0.1.1" +dependencies = [ + "ethabi-decode", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "snowbridge-core", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "snowbridge-system-runtime-api" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "snowbridge-core", + "sp-api", + "sp-core", + "sp-std 8.0.0", + "staging-xcm", +] + [[package]] name = "socket2" version = "0.4.9" diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml index 9ccc6b5ec335..4e92078ed310 100644 --- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml @@ -27,7 +27,7 @@ bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", de # Snowbridge snowbridge-core = { path = "../../../../../../../../../parachain/primitives/core", default-features = false } snowbridge-router-primitives = { path = "../../../../../../../../../parachain/primitives/router", default-features = false } -snowbridge-control = { path = "../../../../../../../../../parachain/pallets/control", default-features = false } +snowbridge-system = { path = "../../../../../../../../../parachain/pallets/system", default-features = false } snowbridge-inbound-queue = { path = "../../../../../../../../../parachain/pallets/inbound-queue", default-features = false } snowbridge-outbound-queue = { path = "../../../../../../../../../parachain/pallets/outbound-queue", default-features = false } diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs index 6eb14969eda9..51fe088cebc4 100644 --- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/src/lib.rs @@ -41,7 +41,7 @@ decl_test_parachains! { pallets = { PolkadotXcm: bridge_hub_rococo_runtime::PolkadotXcm, Balances: bridge_hub_rococo_runtime::Balances, - EthereumControl: bridge_hub_rococo_runtime::EthereumControl, + EthereumSystem: bridge_hub_rococo_runtime::EthereumSystem, EthereumInboundQueue: bridge_hub_rococo_runtime::EthereumInboundQueue, EthereumOutboundQueue: bridge_hub_rococo_runtime::EthereumOutboundQueue, } diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml index 24d1f1308b42..64d5c8e62de3 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml @@ -46,6 +46,6 @@ rococo-system-emulated-network ={ path = "../../../networks/rococo-system" } # Snowbridge snowbridge-core = { path = "../../../../../../../../parachain/primitives/core", default-features = false } snowbridge-router-primitives = { path = "../../../../../../../../parachain/primitives/router", default-features = false } -snowbridge-control = { path = "../../../../../../../../parachain/pallets/control", default-features = false } +snowbridge-system = { path = "../../../../../../../../parachain/pallets/system", default-features = false } snowbridge-inbound-queue = { path = "../../../../../../../../parachain/pallets/inbound-queue", default-features = false } snowbridge-outbound-queue = { path = "../../../../../../../../parachain/pallets/outbound-queue", default-features = false } diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs index 2849ca6045ca..ebba932c1af2 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs @@ -18,9 +18,9 @@ use bridge_hub_rococo_emulated_chain::BridgeHubRococoParaPallet as BridgeHubRoco use codec::{Decode, Encode}; use frame_support::pallet_prelude::TypeInfo; use hex_literal::hex; -use snowbridge_control; use snowbridge_core::outbound::OperatingMode; use snowbridge_router_primitives::inbound::{Command, Destination, MessageV1, VersionedMessage}; +use snowbridge_system; use sp_core::H256; const INITIAL_FUND: u128 = 5_000_000_000 * ROCOCO_ED; @@ -98,7 +98,7 @@ fn create_agent() { assert_expected_events!( BridgeHubRococo, vec![ - RuntimeEvent::EthereumControl(snowbridge_control::Event::CreateAgent { + RuntimeEvent::EthereumSystem(snowbridge_system::Event::CreateAgent { .. }) => {}, ] @@ -179,7 +179,7 @@ fn create_channel() { assert_expected_events!( BridgeHubRococo, vec![ - RuntimeEvent::EthereumControl(snowbridge_control::Event::CreateChannel { + RuntimeEvent::EthereumSystem(snowbridge_system::Event::CreateChannel { .. }) => {}, ] 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 9b3bbb3593f0..fa65f3034483 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -95,8 +95,8 @@ bridge-runtime-common = { path = "../../../../../bridges/bin/runtime-common", de # Ethereum Bridge (Snowbridge) snowbridge-beacon-primitives = { path = "../../../../../../parachain/primitives/beacon", default-features = false } -snowbridge-control = { path = "../../../../../../parachain/pallets/control", default-features = false } -snowbridge-control-runtime-api = { path = "../../../../../../parachain/pallets/control/runtime-api", default-features = false } +snowbridge-system = { path = "../../../../../../parachain/pallets/system", default-features = false } +snowbridge-system-runtime-api = { path = "../../../../../../parachain/pallets/system/runtime-api", default-features = false } snowbridge-core = { path = "../../../../../../parachain/primitives/core", default-features = false } snowbridge-ethereum-beacon-client = { path = "../../../../../../parachain/pallets/ethereum-beacon-client", default-features = false } snowbridge-inbound-queue = { path = "../../../../../../parachain/pallets/inbound-queue", default-features = false } @@ -191,8 +191,8 @@ std = [ "xcm-executor/std", "xcm/std", "snowbridge-beacon-primitives/std", - "snowbridge-control-runtime-api/std", - "snowbridge-control/std", + "snowbridge-system-runtime-api/std", + "snowbridge-system/std", "snowbridge-core/std", "snowbridge-ethereum-beacon-client/std", "snowbridge-inbound-queue/std", @@ -233,7 +233,7 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "snowbridge-control/runtime-benchmarks", + "snowbridge-system/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "snowbridge-ethereum-beacon-client/runtime-benchmarks", "snowbridge-inbound-queue/runtime-benchmarks", diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 0cb2ae9a307f..356c04f09151 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -526,7 +526,7 @@ impl snowbridge_inbound_queue::Config for Runtime { type XcmSender = XcmRouter; #[cfg(feature = "runtime-benchmarks")] type XcmSender = DoNothingRouter; - type ChannelLookup = EthereumControl; + type ChannelLookup = EthereumSystem; type GatewayAddress = GatewayAddress; #[cfg(feature = "runtime-benchmarks")] type Helper = Runtime; @@ -609,20 +609,20 @@ impl snowbridge_ethereum_beacon_client::Config for Runtime { } #[cfg(feature = "runtime-benchmarks")] -impl snowbridge_control::BenchmarkHelper for () { +impl snowbridge_system::BenchmarkHelper for () { fn make_xcm_origin(location: xcm::latest::MultiLocation) -> RuntimeOrigin { RuntimeOrigin::from(pallet_xcm::Origin::Xcm(location)) } } -impl snowbridge_control::Config for Runtime { +impl snowbridge_system::Config for Runtime { type RuntimeEvent = RuntimeEvent; type OutboundQueue = EthereumOutboundQueue; type SiblingOrigin = EnsureXcm; type AgentIdOf = xcm_config::AgentIdOf; type TreasuryAccount = TreasuryAccount; type Token = Balances; - type WeightInfo = weights::snowbridge_control::WeightInfo; + type WeightInfo = weights::snowbridge_system::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type Helper = (); } @@ -680,7 +680,7 @@ construct_runtime!( EthereumInboundQueue: snowbridge_inbound_queue::{Pallet, Call, Storage, Event} = 80, EthereumOutboundQueue: snowbridge_outbound_queue::{Pallet, Call, Storage, Event} = 81, EthereumBeaconClient: snowbridge_ethereum_beacon_client::{Pallet, Call, Storage, Event} = 82, - EthereumControl: snowbridge_control::{Pallet, Call, Storage, Config, Event} = 83, + EthereumSystem: snowbridge_system::{Pallet, Call, Storage, Config, Event} = 83, // Message Queue. Importantly, is registered last so that messages are processed after // the `on_initialize` hooks of bridging pallets. @@ -725,7 +725,7 @@ mod benches { // Ethereum Bridge [snowbridge_inbound_queue, EthereumInboundQueue] [snowbridge_outbound_queue, EthereumOutboundQueue] - [snowbridge_control, EthereumControl] + [snowbridge_system, EthereumSystem] [snowbridge_ethereum_beacon_client, EthereumBeaconClient] ); } @@ -929,9 +929,9 @@ impl_runtime_apis! { } } - impl snowbridge_control_runtime_api::ControlApi for Runtime { + impl snowbridge_system_runtime_api::ControlApi for Runtime { fn agent_id(location: VersionedMultiLocation) -> Option { - snowbridge_control::api::agent_id::(location) + snowbridge_system::api::agent_id::(location) } } diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs index 2e12f6c5e7e1..e27c4689e16c 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs @@ -40,10 +40,10 @@ pub mod pallet_utility; pub mod pallet_xcm; pub mod paritydb_weights; pub mod rocksdb_weights; -pub mod snowbridge_control; pub mod snowbridge_ethereum_beacon_client; pub mod snowbridge_inbound_queue; pub mod snowbridge_outbound_queue; +pub mod snowbridge_system; pub mod xcm; pub use block_weights::constants::BlockExecutionWeight; diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_control.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_system.rs similarity index 89% rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_control.rs rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_system.rs index 23939297366e..8b710ef03180 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_control.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_system.rs @@ -1,5 +1,5 @@ -//! Autogenerated weights for `snowbridge_control` +//! Autogenerated weights for `snowbridge_system` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! DATE: 2023-10-09, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -13,12 +13,12 @@ // pallet // --chain // bridge-hub-rococo-dev -// --pallet=snowbridge_control +// --pallet=snowbridge_system // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --output -// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_control.rs +// parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_system.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -28,9 +28,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `snowbridge_control`. +/// Weight functions for `snowbridge_system`. pub struct WeightInfo(PhantomData); -impl snowbridge_control::WeightInfo for WeightInfo { +impl snowbridge_system::WeightInfo for WeightInfo { /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) @@ -51,8 +51,8 @@ impl snowbridge_control::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - /// Storage: EthereumControl Agents (r:1 w:1) - /// Proof: EthereumControl Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) + /// Storage: EthereumSystem Agents (r:1 w:1) + /// Proof: EthereumSystem Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) /// Storage: System Account (r:2 w:2) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -77,10 +77,10 @@ impl snowbridge_control::WeightInfo for WeightInfo { } /// Storage: System Account (r:2 w:2) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - /// Storage: EthereumControl Agents (r:1 w:0) - /// Proof: EthereumControl Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) - /// Storage: EthereumControl Channels (r:1 w:1) - /// Proof: EthereumControl Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) + /// Storage: EthereumSystem Agents (r:1 w:0) + /// Proof: EthereumSystem Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) + /// Storage: EthereumSystem Channels (r:1 w:1) + /// Proof: EthereumSystem Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) @@ -99,8 +99,8 @@ impl snowbridge_control::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().writes(5)) } - /// Storage: EthereumControl Channels (r:1 w:0) - /// Proof: EthereumControl Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) + /// Storage: EthereumSystem Channels (r:1 w:0) + /// Proof: EthereumSystem Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) /// Proof: EthereumOutboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: MessageQueue BookStateFor (r:2 w:2) @@ -119,8 +119,8 @@ impl snowbridge_control::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(3)) } - /// Storage: EthereumControl Channels (r:1 w:0) - /// Proof: EthereumControl Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) + /// Storage: EthereumSystem Channels (r:1 w:0) + /// Proof: EthereumSystem Channels (max_values: None, max_size: Some(12), added: 2487, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) /// Proof: EthereumOutboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: MessageQueue BookStateFor (r:2 w:2) @@ -159,8 +159,8 @@ impl snowbridge_control::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - /// Storage: EthereumControl Agents (r:1 w:0) - /// Proof: EthereumControl Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) + /// Storage: EthereumSystem Agents (r:1 w:0) + /// Proof: EthereumSystem Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) /// Proof: EthereumOutboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: MessageQueue BookStateFor (r:2 w:2) @@ -179,8 +179,8 @@ impl snowbridge_control::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(3)) } - /// Storage: EthereumControl Agents (r:1 w:0) - /// Proof: EthereumControl Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) + /// Storage: EthereumSystem Agents (r:1 w:0) + /// Proof: EthereumSystem Agents (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) /// Storage: EthereumOutboundQueue PalletOperatingMode (r:1 w:0) /// Proof: EthereumOutboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: MessageQueue BookStateFor (r:2 w:2) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs index 32d9615b5c8d..c5a03eb86a20 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs @@ -197,7 +197,7 @@ impl Contains for SafeCallFilter { snowbridge_inbound_queue::Call::set_operating_mode { .. }, ) | RuntimeCall::EthereumOutboundQueue( snowbridge_outbound_queue::Call::set_operating_mode { .. }, - ) | RuntimeCall::EthereumControl(..) + ) | RuntimeCall::EthereumSystem(..) ) } } diff --git a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs index 184466eb4229..65ef9af72764 100644 --- a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs +++ b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs @@ -297,7 +297,7 @@ pub mod rococo { "bridgeWestendMessages": { "owner": bridges_pallet_owner.clone(), }, - "ethereumControl": { + "ethereumSystem": { "paraId": id, "assetHubParaId": 1000 }