pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 21:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Snowbridge - Extract Ethereum Chain ID (#3501)

Browse Source 
While adding runtime tests to
https://github.com/polkadot-fellows/runtimes/pull/130, I noticed the
Ethereum chain ID was hardcoded. For Kusama + Polkadot, the Ethereum
chain ID should 1 (Mainnet), whereas on Rococo it is 11155111 (Sepolia).

This PR also updates the Snowbridge crates versions to the current
versions on crates.io.

---------

Co-authored-by: claravanstaden <Cats 4 life!>
This commit is contained in:
Clara van Staden
2024-02-28 21:42:35 +02:00
committed by GitHub
parent 426136671a
commit 576681b867
18 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+14 -14
View File
@@ -17856,7 +17856,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-beacon-primitives" name = "snowbridge-beacon-primitives"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"byte-slice-cast", "byte-slice-cast",
"frame-support", "frame-support",
@@ -17880,7 +17880,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-core" name = "snowbridge-core"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"ethabi-decode", "ethabi-decode",
"frame-support", "frame-support",
@@ -17903,7 +17903,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-ethereum" name = "snowbridge-ethereum"
version = "0.1.0" version = "0.3.0"
dependencies = [ dependencies = [
"ethabi-decode", "ethabi-decode",
"ethbloom", "ethbloom",
@@ -17942,7 +17942,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-outbound-queue-merkle-tree" name = "snowbridge-outbound-queue-merkle-tree"
version = "0.1.1" version = "0.3.0"
dependencies = [ dependencies = [
"array-bytes 4.2.0", "array-bytes 4.2.0",
"env_logger 0.9.3", "env_logger 0.9.3",
@@ -17957,7 +17957,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-outbound-queue-runtime-api" name = "snowbridge-outbound-queue-runtime-api"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"frame-support", "frame-support",
"parity-scale-codec", "parity-scale-codec",
@@ -17971,7 +17971,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-pallet-ethereum-client" name = "snowbridge-pallet-ethereum-client"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"bp-runtime", "bp-runtime",
"byte-slice-cast", "byte-slice-cast",
@@ -18017,7 +18017,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-pallet-inbound-queue" name = "snowbridge-pallet-inbound-queue"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
@@ -18050,7 +18050,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-pallet-inbound-queue-fixtures" name = "snowbridge-pallet-inbound-queue-fixtures"
version = "0.9.0" version = "0.10.0"
dependencies = [ dependencies = [
"frame-benchmarking", "frame-benchmarking",
"frame-support", "frame-support",
@@ -18064,7 +18064,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-pallet-outbound-queue" name = "snowbridge-pallet-outbound-queue"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"bridge-hub-common", "bridge-hub-common",
"ethabi-decode", "ethabi-decode",
@@ -18089,7 +18089,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-pallet-system" name = "snowbridge-pallet-system"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"ethabi-decode", "ethabi-decode",
"frame-benchmarking", "frame-benchmarking",
@@ -18117,7 +18117,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-router-primitives" name = "snowbridge-router-primitives"
version = "0.0.0" version = "0.9.0"
dependencies = [ dependencies = [
"ethabi-decode", "ethabi-decode",
"frame-support", "frame-support",
@@ -18140,7 +18140,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-runtime-common" name = "snowbridge-runtime-common"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"frame-support", "frame-support",
"frame-system", "frame-system",
@@ -18156,7 +18156,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-runtime-test-common" name = "snowbridge-runtime-test-common"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"assets-common", "assets-common",
"bridge-hub-test-utils", "bridge-hub-test-utils",
@@ -18233,7 +18233,7 @@ dependencies = [
[[package]] [[package]]
name = "snowbridge-system-runtime-api" name = "snowbridge-system-runtime-api"
version = "0.0.0" version = "0.2.0"
dependencies = [ dependencies = [
"parity-scale-codec", "parity-scale-codec",
"snowbridge-core", "snowbridge-core",
bridges/snowbridge/pallets/ethereum-client/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-pallet-ethereum-client" name = "snowbridge-pallet-ethereum-client"
description = "Snowbridge Ethereum Client Pallet" description = "Snowbridge Ethereum Client Pallet"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/inbound-queue/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-pallet-inbound-queue" name = "snowbridge-pallet-inbound-queue"
description = "Snowbridge Inbound Queue Pallet" description = "Snowbridge Inbound Queue Pallet"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-pallet-inbound-queue-fixtures" name = "snowbridge-pallet-inbound-queue-fixtures"
description = "Snowbridge Inbound Queue Test Fixtures" description = "Snowbridge Inbound Queue Test Fixtures"
version = "0.9.0" version = "0.10.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/outbound-queue/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-pallet-outbound-queue" name = "snowbridge-pallet-outbound-queue"
description = "Snowbridge Outbound Queue Pallet" description = "Snowbridge Outbound Queue Pallet"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-outbound-queue-merkle-tree" name = "snowbridge-outbound-queue-merkle-tree"
description = "Snowbridge Outbound Queue Merkle Tree" description = "Snowbridge Outbound Queue Merkle Tree"
version = "0.1.1" version = "0.3.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-outbound-queue-runtime-api" name = "snowbridge-outbound-queue-runtime-api"
description = "Snowbridge Outbound Queue Runtime API" description = "Snowbridge Outbound Queue Runtime API"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/system/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-pallet-system" name = "snowbridge-pallet-system"
description = "Snowbridge System Pallet" description = "Snowbridge System Pallet"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-system-runtime-api" name = "snowbridge-system-runtime-api"
description = "Snowbridge System Runtime API" description = "Snowbridge System Runtime API"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/primitives/beacon/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-beacon-primitives" name = "snowbridge-beacon-primitives"
description = "Snowbridge Beacon Primitives" description = "Snowbridge Beacon Primitives"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/primitives/core/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-core" name = "snowbridge-core"
description = "Snowbridge Core" description = "Snowbridge Core"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/primitives/ethereum/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-ethereum" name = "snowbridge-ethereum"
description = "Snowbridge Ethereum" description = "Snowbridge Ethereum"
version = "0.1.0" version = "0.3.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/primitives/router/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-router-primitives" name = "snowbridge-router-primitives"
description = "Snowbridge Router Primitives" description = "Snowbridge Router Primitives"
version = "0.0.0" version = "0.9.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/runtime/runtime-common/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-runtime-common" name = "snowbridge-runtime-common"
description = "Snowbridge Runtime Common" description = "Snowbridge Runtime Common"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition.workspace = true edition.workspace = true
repository.workspace = true repository.workspace = true
bridges/snowbridge/runtime/test-common/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "snowbridge-runtime-test-common" name = "snowbridge-runtime-test-common"
description = "Snowbridge Runtime Tests" description = "Snowbridge Runtime Tests"
version = "0.0.0" version = "0.2.0"
authors = ["Snowfork <contact@snowfork.com>"] authors = ["Snowfork <contact@snowfork.com>"]
edition = "2021" edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
bridges/snowbridge/runtime/test-common/src/lib.rs
+10 -2
View File
@@ -40,6 +40,7 @@ where
} }
pub fn send_transfer_token_message<Runtime, XcmConfig>( pub fn send_transfer_token_message<Runtime, XcmConfig>(
ethereum_chain_id: u64,
assethub_parachain_id: u32, assethub_parachain_id: u32,
weth_contract_address: H160, weth_contract_address: H160,
destination_address: H160, destination_address: H160,
@@ -89,7 +90,7 @@ where
WithdrawAsset(Assets::from(vec![fee.clone()])), WithdrawAsset(Assets::from(vec![fee.clone()])),
BuyExecution { fees: fee, weight_limit: Unlimited }, BuyExecution { fees: fee, weight_limit: Unlimited },
ExportMessage { ExportMessage {
network: Ethereum { chain_id: 11155111 }, network: Ethereum { chain_id: ethereum_chain_id },
destination: Here, destination: Here,
xcm: inner_xcm, xcm: inner_xcm,
}, },
@@ -107,6 +108,7 @@ where
} }
pub fn send_transfer_token_message_success<Runtime, XcmConfig>( pub fn send_transfer_token_message_success<Runtime, XcmConfig>(
ethereum_chain_id: u64,
collator_session_key: CollatorSessionKeys<Runtime>, collator_session_key: CollatorSessionKeys<Runtime>,
runtime_para_id: u32, runtime_para_id: u32,
assethub_parachain_id: u32, assethub_parachain_id: u32,
@@ -149,6 +151,7 @@ pub fn send_transfer_token_message_success<Runtime, XcmConfig>(
initial_fund::<Runtime>(assethub_parachain_id, 5_000_000_000_000); initial_fund::<Runtime>(assethub_parachain_id, 5_000_000_000_000);
let outcome = send_transfer_token_message::<Runtime, XcmConfig>( let outcome = send_transfer_token_message::<Runtime, XcmConfig>(
ethereum_chain_id,
assethub_parachain_id, assethub_parachain_id,
weth_contract_address, weth_contract_address,
destination_address, destination_address,
@@ -205,6 +208,7 @@ pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works<
XcmConfig, XcmConfig,
AllPalletsWithoutSystem, AllPalletsWithoutSystem,
>( >(
ethereum_chain_id: u64,
collator_session_key: CollatorSessionKeys<Runtime>, collator_session_key: CollatorSessionKeys<Runtime>,
runtime_para_id: u32, runtime_para_id: u32,
assethub_parachain_id: u32, assethub_parachain_id: u32,
@@ -249,6 +253,7 @@ pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works<
initial_fund::<Runtime>(assethub_parachain_id, 5_000_000_000_000); initial_fund::<Runtime>(assethub_parachain_id, 5_000_000_000_000);
let outcome = send_transfer_token_message::<Runtime, XcmConfig>( let outcome = send_transfer_token_message::<Runtime, XcmConfig>(
ethereum_chain_id,
assethub_parachain_id, assethub_parachain_id,
weth_contract_address, weth_contract_address,
destination_address, destination_address,
@@ -290,6 +295,7 @@ pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works<
} }
pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>( pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>(
ethereum_chain_id: u64,
collator_session_key: CollatorSessionKeys<Runtime>, collator_session_key: CollatorSessionKeys<Runtime>,
runtime_para_id: u32, runtime_para_id: u32,
assethub_parachain_id: u32, assethub_parachain_id: u32,
@@ -353,7 +359,7 @@ pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>(
let xcm = Xcm(vec![ let xcm = Xcm(vec![
UnpaidExecution { weight_limit: Unlimited, check_origin: None }, UnpaidExecution { weight_limit: Unlimited, check_origin: None },
ExportMessage { ExportMessage {
network: Ethereum { chain_id: 11155111 }, network: Ethereum { chain_id: ethereum_chain_id },
destination: Here, destination: Here,
xcm: inner_xcm, xcm: inner_xcm,
}, },
@@ -375,6 +381,7 @@ pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>(
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub fn send_transfer_token_message_failure<Runtime, XcmConfig>( pub fn send_transfer_token_message_failure<Runtime, XcmConfig>(
ethereum_chain_id: u64,
collator_session_key: CollatorSessionKeys<Runtime>, collator_session_key: CollatorSessionKeys<Runtime>,
runtime_para_id: u32, runtime_para_id: u32,
assethub_parachain_id: u32, assethub_parachain_id: u32,
@@ -414,6 +421,7 @@ pub fn send_transfer_token_message_failure<Runtime, XcmConfig>(
initial_fund::<Runtime>(assethub_parachain_id, initial_amount); initial_fund::<Runtime>(assethub_parachain_id, initial_amount);
let outcome = send_transfer_token_message::<Runtime, XcmConfig>( let outcome = send_transfer_token_message::<Runtime, XcmConfig>(
ethereum_chain_id,
assethub_parachain_id, assethub_parachain_id,
weth_contract_address, weth_contract_address,
destination_address, destination_address,
bridges/snowbridge/scripts/contribute-upstream.sh
+2
View File
@@ -40,10 +40,12 @@ git checkout "$branch_name"
# remove everything we think is not required for our needs # remove everything we think is not required for our needs
rm -rf rust-toolchain.toml rm -rf rust-toolchain.toml
rm -rf codecov.yml
rm -rf $SNOWBRIDGE_FOLDER/.cargo rm -rf $SNOWBRIDGE_FOLDER/.cargo
rm -rf $SNOWBRIDGE_FOLDER/.github rm -rf $SNOWBRIDGE_FOLDER/.github
rm -rf $SNOWBRIDGE_FOLDER/SECURITY.md rm -rf $SNOWBRIDGE_FOLDER/SECURITY.md
rm -rf $SNOWBRIDGE_FOLDER/.gitignore rm -rf $SNOWBRIDGE_FOLDER/.gitignore
rm -rf $SNOWBRIDGE_FOLDER/rustfmt.toml
rm -rf $SNOWBRIDGE_FOLDER/templates rm -rf $SNOWBRIDGE_FOLDER/templates
rm -rf $SNOWBRIDGE_FOLDER/pallets/ethereum-client/fuzz rm -rf $SNOWBRIDGE_FOLDER/pallets/ethereum-client/fuzz
cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/snowbridge.rs
+5
View File
@@ -51,6 +51,7 @@ fn collator_session_keys() -> bridge_hub_test_utils::CollatorSessionKeys<Runtime
#[test] #[test]
pub fn transfer_token_to_ethereum_works() { pub fn transfer_token_to_ethereum_works() {
snowbridge_runtime_test_common::send_transfer_token_message_success::<Runtime, XcmConfig>( snowbridge_runtime_test_common::send_transfer_token_message_success::<Runtime, XcmConfig>(
11155111,
collator_session_keys(), collator_session_keys(),
1013, 1013,
1000, 1000,
@@ -69,6 +70,7 @@ pub fn transfer_token_to_ethereum_works() {
#[test] #[test]
pub fn unpaid_transfer_token_to_ethereum_fails_with_barrier() { pub fn unpaid_transfer_token_to_ethereum_fails_with_barrier() {
snowbridge_runtime_test_common::send_unpaid_transfer_token_message::<Runtime, XcmConfig>( snowbridge_runtime_test_common::send_unpaid_transfer_token_message::<Runtime, XcmConfig>(
11155111,
collator_session_keys(), collator_session_keys(),
1013, 1013,
1000, 1000,
@@ -80,6 +82,7 @@ pub fn unpaid_transfer_token_to_ethereum_fails_with_barrier() {
#[test] #[test]
pub fn transfer_token_to_ethereum_fee_not_enough() { pub fn transfer_token_to_ethereum_fee_not_enough() {
snowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>( snowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>(
11155111,
collator_session_keys(), collator_session_keys(),
1013, 1013,
1000, 1000,
@@ -95,6 +98,7 @@ pub fn transfer_token_to_ethereum_fee_not_enough() {
#[test] #[test]
pub fn transfer_token_to_ethereum_insufficient_fund() { pub fn transfer_token_to_ethereum_insufficient_fund() {
snowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>( snowbridge_runtime_test_common::send_transfer_token_message_failure::<Runtime, XcmConfig>(
11155111,
collator_session_keys(), collator_session_keys(),
1013, 1013,
1000, 1000,
@@ -146,6 +150,7 @@ pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works() {
XcmConfig, XcmConfig,
AllPalletsWithoutSystem, AllPalletsWithoutSystem,
>( >(
11155111,
collator_session_keys(), collator_session_keys(),
1013, 1013,
1000, 1000,