Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Chain ID to 11155111 #1042

Merged
merged 6 commits into from
Dec 5, 2023
Merged

Set Chain ID to 11155111 #1042

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01b7052
add network ID 5
Dec 4, 2023
d5261c3
updated chain id and sovereign account
Dec 4, 2023
55f688b
fix unit tests
Dec 5, 2023
533cb82
fix last few chain ids
Dec 5, 2023
19eedc2
update polkadot-sdk
Dec 5, 2023
dcfcd18
changes change ID to Sepolia
Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion parachain/pallets/inbound-queue/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl Verifier for MockVerifier {
const GATEWAY_ADDRESS: [u8; 20] = hex!["eda338e4dc46038493b885327842fd3e301cab39"];

parameter_types! {
pub const EthereumNetwork: xcm::v3::NetworkId = xcm::v3::NetworkId::Ethereum { chain_id: 15 };
pub const EthereumNetwork: xcm::v3::NetworkId = xcm::v3::NetworkId::Ethereum { chain_id: 5 };
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok to hardcode the chain ID in tests? Do we want to use the constant here? I am not sure about adding the rococo-common crate here as a dependency just to use the chain ID.

pub const GatewayAddress: H160 = H160(GATEWAY_ADDRESS);
pub const CreateAssetCall: [u8;2] = [53, 0];
pub const CreateAssetExecutionFee: u128 = 2_000_000_000;
Expand Down
6 changes: 3 additions & 3 deletions parachain/primitives/router/src/inbound/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ use sp_core::crypto::Ss58Codec;
use xcm::v3::prelude::*;
use xcm_executor::traits::ConvertLocation;

const NETWORK: NetworkId = Ethereum { chain_id: 15 };
const NETWORK: NetworkId = Ethereum { chain_id: 5 };
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as https://github.com/Snowfork/snowbridge/pull/1042/files#r1415273254.

const SS58_FORMAT: u16 = 2;
const EXPECTED_SOVEREIGN_KEY: [u8; 32] =
hex!("da4d66c3651dc151264eee5460493210338e41a7bbfca91a520e438daf180bf5");
const EXPECTED_SOVEREIGN_ADDRESS: &'static str = "HWYx2xgcdpSjJQicUUZFRR1EJNPVEQoUDSUB29rfxF617nv";
hex!("a0141059b224a45521038f88bd0bf13535b8d2ca7dac8c6777f1ef61f52166a2");
const EXPECTED_SOVEREIGN_ADDRESS: &'static str = "GCD93hwu7urSNspa3UTm6sk5AXfFLyeYR8PiXSXFLyFsXcs";

parameter_types! {
pub EthereumNetwork: NetworkId = NETWORK;
Expand Down
2 changes: 1 addition & 1 deletion parachain/runtime/rococo-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ pub const INBOUND_QUEUE_MESSAGES_PALLET_INDEX: u8 = 80;

parameter_types! {
// Network and location for the Ethereum chain.
pub EthereumNetwork: NetworkId = NetworkId::Ethereum { chain_id: 15 };
pub EthereumNetwork: NetworkId = NetworkId::Ethereum { chain_id: 5 };
}
4 changes: 2 additions & 2 deletions parachain/runtime/tests/src/test_cases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ where
let xcm = Xcm(vec![
WithdrawAsset(MultiAssets::from(vec![fee.clone()])),
BuyExecution { fees: fee, weight_limit: Unlimited },
ExportMessage { network: Ethereum { chain_id: 15 }, destination: Here, xcm: inner_xcm },
ExportMessage { network: Ethereum { chain_id: 5 }, destination: Here, xcm: inner_xcm },
]);

// execute XCM
Expand Down Expand Up @@ -220,7 +220,7 @@ pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>(
let xcm = Xcm(vec![
UnpaidExecution { weight_limit: Unlimited, check_origin: None },
ExportMessage {
network: Ethereum { chain_id: 15 },
network: Ethereum { chain_id: 5 },
destination: Here,
xcm: inner_xcm,
},
Expand Down
2 changes: 1 addition & 1 deletion polkadot-sdk
Open in desktop
Submodule polkadot-sdk updated 41 files
+3,427 −2,569 Cargo.lock
+0 −25 bridges/zombienet/tests/0001-asset-transfer-works-rococo-to-wococo.zndsl
+0 −25 bridges/zombienet/tests/0001-asset-transfer-works-wococo-to-rococo.zndsl
+9 −2 cumulus/pallets/xcmp-queue/src/tests.rs
+0 −26 cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/Cargo.toml
+0 −54 cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-wococo/src/lib.rs
+1 −0 cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
+0 −25 cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/Cargo.toml
+0 −48 cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-wococo/src/lib.rs
+0 −30 cumulus/parachains/integration-tests/emulated/chains/relays/wococo/Cargo.toml
+0 −46 cumulus/parachains/integration-tests/emulated/chains/relays/wococo/src/lib.rs
+0 −19 cumulus/parachains/integration-tests/emulated/networks/rococo-wococo-system/Cargo.toml
+0 −98 cumulus/parachains/integration-tests/emulated/networks/rococo-wococo-system/src/lib.rs
+0 −16 cumulus/parachains/integration-tests/emulated/networks/wococo-system/Cargo.toml
+0 −50 cumulus/parachains/integration-tests/emulated/networks/wococo-system/src/lib.rs
+13 −13 cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
+6 −6 cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs
+0 −74 cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/example.rs
+0 −130 cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_xcm_bridge_hub_router_to_westend.rs
+1 −1 cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
+2 −3 cumulus/parachains/runtimes/assets/common/src/matching.rs
+0 −3 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml
+0 −3 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/Cargo.toml
+42 −42 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+13 −12 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa.rs
+0 −83 ...lus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_westend_finality.rs
+13 −12 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages.rs
+0 −245 ...s/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_rococo_to_westend.rs
+13 −12 cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains.rs
+0 −116 ...us/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_within_westend.rs
+54 −54 cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml
+4 −4 polkadot/runtime/parachains/src/ump_tests.rs
+0 −2 substrate/frame/message-queue/Cargo.toml
+3 −4 substrate/frame/message-queue/src/benchmarking.rs
+6 −76 substrate/frame/message-queue/src/integration_test.rs
+50 −177 substrate/frame/message-queue/src/lib.rs
+1 −29 substrate/frame/message-queue/src/mock.rs
+0 −4 substrate/frame/message-queue/src/mock_helpers.rs
+7 −178 substrate/frame/message-queue/src/tests.rs
+0 −1 substrate/frame/nomination-pools/src/lib.rs
+0 −2 substrate/frame/support/src/traits/messages.rs
4 changes: 2 additions & 2 deletions smoketest/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub const PENPAL_WS_URL: &str = "ws://127.0.0.1:13144";
pub const RELAY_CHAIN_WS_URL: &str = "ws://127.0.0.1:9944";
pub const TEMPLATE_NODE_WS_URL: &str = "ws://127.0.0.1:13144";

pub const ETHEREUM_CHAIN_ID: u64 = 15;
pub const ETHEREUM_CHAIN_ID: u64 = 5;
pub const ETHEREUM_KEY: &str = "0x5e002a1af63fd31f1c25258f3082dc889762664cb8f218d86da85dff8b07b342";
pub const ETHEREUM_ADDRESS: [u8; 20] = hex!("90A987B944Cb1dCcE5564e5FDeCD7a54D3de27Fe");

Expand All @@ -38,7 +38,7 @@ pub const SIBLING_AGENT_ID: [u8; 32] =
pub const ASSET_HUB_SOVEREIGN: [u8; 32] =
hex!("7369626ce8030000000000000000000000000000000000000000000000000000");
pub const SNOWBRIDGE_SOVEREIGN: [u8; 32] =
hex!("da4d66c3651dc151264eee5460493210338e41a7bbfca91a520e438daf180bf5");
hex!("a0141059b224a45521038f88bd0bf13535b8d2ca7dac8c6777f1ef61f52166a2");
pub const PENPAL_SOVEREIGN: [u8; 32] =
hex!("7369626cd0070000000000000000000000000000000000000000000000000000");

Expand Down
2 changes: 1 addition & 1 deletion web/packages/test/config/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"config": {
"chainId": 15,
"chainId": 5,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can config the chain ID too but not sure it's worth the effort because it's unlikely to change.

"homesteadBlock": 0,
"eip150Block": 0,
"eip155Block": 0,
Expand Down
4 changes: 3 additions & 1 deletion web/packages/test/scripts/deploy-ethereum.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ start_geth() {
geth init --datadir "$ethereum_data_dir" "$output_dir/genesis.json"
geth account import --datadir "$ethereum_data_dir" --password /dev/null config/dev-example-key0.prv
geth account import --datadir "$ethereum_data_dir" --password /dev/null config/dev-example-key1.prv
geth --vmdebug --datadir "$ethereum_data_dir" --networkid 15 \
geth --vmdebug --datadir "$ethereum_data_dir" --networkid 5 \
--http --http.api debug,personal,eth,net,web3,txpool,engine,miner --ws --ws.api debug,eth,net,web3 \
--rpc.allow-unprotected-txs --mine \
--miner.etherbase=0xBe68fC2d8249eb60bfCf0e71D5A0d2F2e292c4eD \
Expand Down Expand Up @@ -60,6 +60,8 @@ start_lodestar() {
--params.ALTAIR_FORK_EPOCH 0 \
--params.BELLATRIX_FORK_EPOCH 0 \
--params.CAPELLA_FORK_EPOCH 0 \
--params.DEPOSIT_CHAIN_ID 5 \
--params.DEPOSIT_NETWORK_ID 5 \
--eth1=true \
--rest.namespace="*" \
--jwt-secret config/jwtsecret \
Expand Down