From 3a774c28bc9bbf4020b1d95f7462c70875c00e91 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Sun, 4 Feb 2024 19:01:13 +0800 Subject: [PATCH 1/6] Update chainx-frontier dependency --- Cargo.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 543ab4428..ebe35896d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2046,7 +2046,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "async-trait", "fc-db", @@ -2065,7 +2065,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -2079,7 +2079,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fc-db", "fp-consensus", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "ethereum-types", @@ -2138,7 +2138,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "ethereum-types", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "parity-scale-codec", @@ -2257,7 +2257,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "evm", "parity-scale-codec", @@ -2269,7 +2269,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "ethereum-types", @@ -2286,7 +2286,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "frame-support", @@ -2302,7 +2302,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "parity-scale-codec", ] @@ -5278,7 +5278,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "frame-support", "frame-system", @@ -5360,7 +5360,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "ethereum", "ethereum-types", @@ -5389,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "evm", "fp-evm", @@ -5415,7 +5415,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", ] @@ -5423,7 +5423,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", "sp-core", @@ -5433,7 +5433,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", "frame-support", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", "num", @@ -5452,7 +5452,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", "tiny-keccak", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#cfef5cacf7a0aa6da1b6d4a298afaf9b07acc241" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" dependencies = [ "fp-evm", "ripemd", From a6ff097ad2566251f4b5ed67a07312a59ff67247 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Sun, 4 Feb 2024 19:08:27 +0800 Subject: [PATCH 2/6] Update bootnodes --- cli/src/res/chainx_regenesis.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cli/src/res/chainx_regenesis.json b/cli/src/res/chainx_regenesis.json index 782c3ee5c..0f67a0cec 100644 --- a/cli/src/res/chainx_regenesis.json +++ b/cli/src/res/chainx_regenesis.json @@ -3,9 +3,8 @@ "id": "chainx", "chainType": "Live", "bootNodes": [ - "/ip4/18.142.230.171/tcp/23555/ws/p2p/12D3KooWQ6GGfmvmmmsbKRmZqMA3A8rxaHz25HvA7JNBbcZhLXtk", - "/ip4/47.99.179.60/tcp/20222/ws/p2p/12D3KooWGLMfkuzy9WzbV7rTRvHk6AvHg89nT8mipNQoQw36eARc", - "/ip4/47.114.74.52/tcp/36789/ws/p2p/12D3KooWJPMUkGytfAMt3AMqm4AFn4VToXjbWZoC4Z2NxXNXvTwb" + "/ip4/18.222.166.234/tcp/9001/ws/p2p/12D3KooWMdwp2izsvRNRRSJTT2VdRu9VQfGck8jx21wX9vwresT4", + "/ip4/18.188.109.150/tcp/9001/ws/p2p/12D3KooWQdw2mmQPmHJjstKhM7q2J7Xxo86qYxDbXH7Gz3wqMznb" ], "telemetryEndpoints": [ [ From 79a3f9c72c6fefdd4949ed2889d733d2559a1d82 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Sun, 4 Feb 2024 19:11:08 +0800 Subject: [PATCH 3/6] Bump runtime version 33 -> 34 --- Cargo.toml | 2 +- cli/Cargo.toml | 2 +- executor/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- primitives/assets-registrar/Cargo.toml | 2 +- primitives/gateway/bitcoin/Cargo.toml | 2 +- primitives/gateway/common/Cargo.toml | 2 +- primitives/genesis-builder/Cargo.toml | 2 +- primitives/io/Cargo.toml | 2 +- primitives/mining/common/Cargo.toml | 2 +- primitives/mining/staking/Cargo.toml | 2 +- primitives/protocol/Cargo.toml | 2 +- primitives/rpc/Cargo.toml | 2 +- primitives/runtime/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/chainx/Cargo.toml | 2 +- runtime/chainx/src/lib.rs | 2 +- runtime/dev/Cargo.toml | 2 +- runtime/dev/src/lib.rs | 2 +- runtime/malan/Cargo.toml | 2 +- runtime/malan/src/lib.rs | 2 +- service/Cargo.toml | 2 +- xpallets/assets-bridge/Cargo.toml | 2 +- xpallets/assets-registrar/Cargo.toml | 2 +- xpallets/assets/Cargo.toml | 2 +- xpallets/assets/rpc/Cargo.toml | 2 +- xpallets/assets/rpc/runtime-api/Cargo.toml | 2 +- xpallets/btc-ledger/Cargo.toml | 2 +- xpallets/btc-ledger/rpc/Cargo.toml | 2 +- xpallets/btc-ledger/rpc/runtime-api/Cargo.toml | 2 +- xpallets/dex/spot/Cargo.toml | 2 +- xpallets/dex/spot/rpc/Cargo.toml | 2 +- xpallets/dex/spot/rpc/runtime-api/Cargo.toml | 2 +- xpallets/gateway/bitcoin/Cargo.toml | 2 +- xpallets/gateway/bitcoin/rpc/Cargo.toml | 2 +- xpallets/gateway/bitcoin/rpc/runtime-api/Cargo.toml | 2 +- xpallets/gateway/common/Cargo.toml | 2 +- xpallets/gateway/common/rpc/Cargo.toml | 2 +- xpallets/gateway/common/rpc/runtime-api/Cargo.toml | 2 +- xpallets/gateway/records/Cargo.toml | 2 +- xpallets/gateway/records/rpc/Cargo.toml | 2 +- xpallets/gateway/records/rpc/runtime-api/Cargo.toml | 2 +- xpallets/genesis-builder/Cargo.toml | 2 +- xpallets/mining/asset/Cargo.toml | 2 +- xpallets/mining/asset/rpc/Cargo.toml | 2 +- xpallets/mining/asset/rpc/runtime-api/Cargo.toml | 2 +- xpallets/mining/staking/Cargo.toml | 2 +- xpallets/mining/staking/rpc/Cargo.toml | 2 +- xpallets/mining/staking/rpc/runtime-api/Cargo.toml | 2 +- xpallets/support/Cargo.toml | 2 +- xpallets/system/Cargo.toml | 2 +- xpallets/transaction-fee/Cargo.toml | 2 +- xpallets/transaction-fee/rpc/Cargo.toml | 2 +- xpallets/transaction-fee/rpc/runtime-api/Cargo.toml | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 79e476eef..f520d6b46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8a9ef9656..edc671c01 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-cli" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] description = "Implementation of protocol https://chainx.org in Rust based on the Substrate framework." edition = "2021" diff --git a/executor/Cargo.toml b/executor/Cargo.toml index 7b973ed31..0bfe0ed7d 100644 --- a/executor/Cargo.toml +++ b/executor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-executor" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index be63d679e..5b6aa2679 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-primitives" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/assets-registrar/Cargo.toml b/primitives/assets-registrar/Cargo.toml index 6be866f83..31753157d 100644 --- a/primitives/assets-registrar/Cargo.toml +++ b/primitives/assets-registrar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-assets-registrar" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/gateway/bitcoin/Cargo.toml b/primitives/gateway/bitcoin/Cargo.toml index 8ebf1b956..8ef4a30c0 100644 --- a/primitives/gateway/bitcoin/Cargo.toml +++ b/primitives/gateway/bitcoin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-gateway-bitcoin" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/gateway/common/Cargo.toml b/primitives/gateway/common/Cargo.toml index 1e749e1a4..c2e922bc8 100644 --- a/primitives/gateway/common/Cargo.toml +++ b/primitives/gateway/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-gateway-common" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/genesis-builder/Cargo.toml b/primitives/genesis-builder/Cargo.toml index 6c332fe03..2e22f9441 100644 --- a/primitives/genesis-builder/Cargo.toml +++ b/primitives/genesis-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-genesis-builder" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/io/Cargo.toml b/primitives/io/Cargo.toml index 7c79ef4bc..2864e89a8 100644 --- a/primitives/io/Cargo.toml +++ b/primitives/io/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-io" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/mining/common/Cargo.toml b/primitives/mining/common/Cargo.toml index 47bd18bf5..c64db3a49 100644 --- a/primitives/mining/common/Cargo.toml +++ b/primitives/mining/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-mining-common" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/mining/staking/Cargo.toml b/primitives/mining/staking/Cargo.toml index a3626a908..97b73437f 100644 --- a/primitives/mining/staking/Cargo.toml +++ b/primitives/mining/staking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-mining-staking" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/protocol/Cargo.toml b/primitives/protocol/Cargo.toml index a6f6abd60..2e8b96220 100644 --- a/primitives/protocol/Cargo.toml +++ b/primitives/protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-protocol" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml index 668f56e74..f34fe6766 100644 --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml index 6ff73321a..b2cef59f4 100644 --- a/primitives/runtime/Cargo.toml +++ b/primitives/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xp-runtime" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index a1432356d..a028daa7f 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/runtime/chainx/Cargo.toml b/runtime/chainx/Cargo.toml index 027424f59..858e2c1a2 100644 --- a/runtime/chainx/Cargo.toml +++ b/runtime/chainx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-runtime" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/runtime/chainx/src/lib.rs b/runtime/chainx/src/lib.rs index ba0fee27b..72edd3503 100644 --- a/runtime/chainx/src/lib.rs +++ b/runtime/chainx/src/lib.rs @@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("chainx"), impl_name: create_runtime_str!("chainx-net"), authoring_version: 1, - spec_version: 33, + spec_version: 34, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 7, diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index 206075195..927b317ec 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dev-runtime" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index afdf19601..6dee1ad1a 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("chainx"), impl_name: create_runtime_str!("chainx-dev"), authoring_version: 1, - spec_version: 33, + spec_version: 34, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 7, diff --git a/runtime/malan/Cargo.toml b/runtime/malan/Cargo.toml index 8d798ac31..561357808 100644 --- a/runtime/malan/Cargo.toml +++ b/runtime/malan/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "malan-runtime" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/runtime/malan/src/lib.rs b/runtime/malan/src/lib.rs index 7689a8a03..fab6576f1 100644 --- a/runtime/malan/src/lib.rs +++ b/runtime/malan/src/lib.rs @@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("chainx"), impl_name: create_runtime_str!("chainx-malan"), authoring_version: 1, - spec_version: 33, + spec_version: 34, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 7, diff --git a/service/Cargo.toml b/service/Cargo.toml index 509612f9d..27753facf 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chainx-service" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/assets-bridge/Cargo.toml b/xpallets/assets-bridge/Cargo.toml index 3cc1cffc9..efb04d790 100644 --- a/xpallets/assets-bridge/Cargo.toml +++ b/xpallets/assets-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-assets-bridge" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/assets-registrar/Cargo.toml b/xpallets/assets-registrar/Cargo.toml index 3fd0ee6d1..b75e39295 100644 --- a/xpallets/assets-registrar/Cargo.toml +++ b/xpallets/assets-registrar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-assets-registrar" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/assets/Cargo.toml b/xpallets/assets/Cargo.toml index 9599fba0a..c70345f9a 100644 --- a/xpallets/assets/Cargo.toml +++ b/xpallets/assets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-assets" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/assets/rpc/Cargo.toml b/xpallets/assets/rpc/Cargo.toml index 9f0d6e3be..bdcec6cf9 100644 --- a/xpallets/assets/rpc/Cargo.toml +++ b/xpallets/assets/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-assets-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/assets/rpc/runtime-api/Cargo.toml b/xpallets/assets/rpc/runtime-api/Cargo.toml index 54a7ac4b2..1d46373df 100644 --- a/xpallets/assets/rpc/runtime-api/Cargo.toml +++ b/xpallets/assets/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-assets-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/btc-ledger/Cargo.toml b/xpallets/btc-ledger/Cargo.toml index b56f5a37c..45215b1f8 100644 --- a/xpallets/btc-ledger/Cargo.toml +++ b/xpallets/btc-ledger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-btc-ledger" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/btc-ledger/rpc/Cargo.toml b/xpallets/btc-ledger/rpc/Cargo.toml index e0ae45eb2..3a4dece56 100644 --- a/xpallets/btc-ledger/rpc/Cargo.toml +++ b/xpallets/btc-ledger/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-btc-ledger-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/btc-ledger/rpc/runtime-api/Cargo.toml b/xpallets/btc-ledger/rpc/runtime-api/Cargo.toml index d28b95e85..83686ce33 100644 --- a/xpallets/btc-ledger/rpc/runtime-api/Cargo.toml +++ b/xpallets/btc-ledger/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-btc-ledger-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/dex/spot/Cargo.toml b/xpallets/dex/spot/Cargo.toml index 168a28659..3d7336078 100644 --- a/xpallets/dex/spot/Cargo.toml +++ b/xpallets/dex/spot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-dex-spot" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/dex/spot/rpc/Cargo.toml b/xpallets/dex/spot/rpc/Cargo.toml index ec73be101..4039ff6ca 100644 --- a/xpallets/dex/spot/rpc/Cargo.toml +++ b/xpallets/dex/spot/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-dex-spot-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/dex/spot/rpc/runtime-api/Cargo.toml b/xpallets/dex/spot/rpc/runtime-api/Cargo.toml index a328bb29d..61a1247d5 100644 --- a/xpallets/dex/spot/rpc/runtime-api/Cargo.toml +++ b/xpallets/dex/spot/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-dex-spot-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/bitcoin/Cargo.toml b/xpallets/gateway/bitcoin/Cargo.toml index 10fa9829b..1965d8df0 100644 --- a/xpallets/gateway/bitcoin/Cargo.toml +++ b/xpallets/gateway/bitcoin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-bitcoin" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/bitcoin/rpc/Cargo.toml b/xpallets/gateway/bitcoin/rpc/Cargo.toml index 4ced45ee0..66496a26f 100644 --- a/xpallets/gateway/bitcoin/rpc/Cargo.toml +++ b/xpallets/gateway/bitcoin/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-bitcoin-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/bitcoin/rpc/runtime-api/Cargo.toml b/xpallets/gateway/bitcoin/rpc/runtime-api/Cargo.toml index e2d6b1c6b..a79fc77a3 100644 --- a/xpallets/gateway/bitcoin/rpc/runtime-api/Cargo.toml +++ b/xpallets/gateway/bitcoin/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-bitcoin-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/common/Cargo.toml b/xpallets/gateway/common/Cargo.toml index 0d5b3482a..b28e3a9b2 100644 --- a/xpallets/gateway/common/Cargo.toml +++ b/xpallets/gateway/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-common" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/common/rpc/Cargo.toml b/xpallets/gateway/common/rpc/Cargo.toml index 7dcaace93..7c9224727 100644 --- a/xpallets/gateway/common/rpc/Cargo.toml +++ b/xpallets/gateway/common/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-common-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/common/rpc/runtime-api/Cargo.toml b/xpallets/gateway/common/rpc/runtime-api/Cargo.toml index af5063e5a..b39e6e6f3 100644 --- a/xpallets/gateway/common/rpc/runtime-api/Cargo.toml +++ b/xpallets/gateway/common/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-common-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/records/Cargo.toml b/xpallets/gateway/records/Cargo.toml index f12592ad4..be84a1e28 100644 --- a/xpallets/gateway/records/Cargo.toml +++ b/xpallets/gateway/records/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-records" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/records/rpc/Cargo.toml b/xpallets/gateway/records/rpc/Cargo.toml index 2e3f2439f..8704627d0 100644 --- a/xpallets/gateway/records/rpc/Cargo.toml +++ b/xpallets/gateway/records/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-records-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/gateway/records/rpc/runtime-api/Cargo.toml b/xpallets/gateway/records/rpc/runtime-api/Cargo.toml index 1a8dad095..32ef8e782 100644 --- a/xpallets/gateway/records/rpc/runtime-api/Cargo.toml +++ b/xpallets/gateway/records/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-gateway-records-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/genesis-builder/Cargo.toml b/xpallets/genesis-builder/Cargo.toml index 5dad70d0d..33e8cdc66 100644 --- a/xpallets/genesis-builder/Cargo.toml +++ b/xpallets/genesis-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-genesis-builder" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/asset/Cargo.toml b/xpallets/mining/asset/Cargo.toml index 42f4435be..bc0614f0a 100644 --- a/xpallets/mining/asset/Cargo.toml +++ b/xpallets/mining/asset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-asset" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/asset/rpc/Cargo.toml b/xpallets/mining/asset/rpc/Cargo.toml index 797e338a2..a96f8f42e 100644 --- a/xpallets/mining/asset/rpc/Cargo.toml +++ b/xpallets/mining/asset/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-asset-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/asset/rpc/runtime-api/Cargo.toml b/xpallets/mining/asset/rpc/runtime-api/Cargo.toml index 66f00234c..8f1f0930d 100644 --- a/xpallets/mining/asset/rpc/runtime-api/Cargo.toml +++ b/xpallets/mining/asset/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-asset-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/staking/Cargo.toml b/xpallets/mining/staking/Cargo.toml index 99a790d9f..8724cffbb 100644 --- a/xpallets/mining/staking/Cargo.toml +++ b/xpallets/mining/staking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-staking" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/staking/rpc/Cargo.toml b/xpallets/mining/staking/rpc/Cargo.toml index 14207cd55..1c45203de 100644 --- a/xpallets/mining/staking/rpc/Cargo.toml +++ b/xpallets/mining/staking/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-staking-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/mining/staking/rpc/runtime-api/Cargo.toml b/xpallets/mining/staking/rpc/runtime-api/Cargo.toml index 21146a544..e1eeed9a7 100644 --- a/xpallets/mining/staking/rpc/runtime-api/Cargo.toml +++ b/xpallets/mining/staking/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-mining-staking-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/support/Cargo.toml b/xpallets/support/Cargo.toml index 42adc9bd1..10efe0076 100644 --- a/xpallets/support/Cargo.toml +++ b/xpallets/support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-support" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/system/Cargo.toml b/xpallets/system/Cargo.toml index abba9ac56..0ed4c8744 100644 --- a/xpallets/system/Cargo.toml +++ b/xpallets/system/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-system" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/transaction-fee/Cargo.toml b/xpallets/transaction-fee/Cargo.toml index b14d4d09a..0f278a835 100644 --- a/xpallets/transaction-fee/Cargo.toml +++ b/xpallets/transaction-fee/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-transaction-fee" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/transaction-fee/rpc/Cargo.toml b/xpallets/transaction-fee/rpc/Cargo.toml index dd71a4f99..98a235351 100644 --- a/xpallets/transaction-fee/rpc/Cargo.toml +++ b/xpallets/transaction-fee/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-transaction-fee-rpc" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" diff --git a/xpallets/transaction-fee/rpc/runtime-api/Cargo.toml b/xpallets/transaction-fee/rpc/runtime-api/Cargo.toml index ae37203dd..a607ef2e3 100644 --- a/xpallets/transaction-fee/rpc/runtime-api/Cargo.toml +++ b/xpallets/transaction-fee/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xpallet-transaction-fee-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" authors = ["The ChainX Authors"] edition = "2021" From 5836044988e8167fa4f3023f786d9889aea26f48 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Tue, 2 Jan 2024 16:58:46 +0800 Subject: [PATCH 4/6] Add bevm-finality-rpc finalized tool --- Cargo.lock | 18 ++++++ Cargo.toml | 1 + client/rpc/finality/Cargo.toml | 21 +++++++ client/rpc/finality/README.md | 16 +++++ client/rpc/finality/src/lib.rs | 105 +++++++++++++++++++++++++++++++++ rpc/Cargo.toml | 3 + rpc/src/lib.rs | 6 ++ 7 files changed, 170 insertions(+) create mode 100644 client/rpc/finality/Cargo.toml create mode 100644 client/rpc/finality/README.md create mode 100644 client/rpc/finality/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index ebe35896d..b8dd1e6ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,6 +399,23 @@ dependencies = [ "serde", ] +[[package]] +name = "bevm-finality-rpc" +version = "5.2.2" +dependencies = [ + "fc-db", + "fc-rpc", + "futures 0.3.21", + "jsonrpc-core", + "jsonrpc-derive", + "parity-scale-codec", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "tokio", +] + [[package]] name = "bimap" version = "0.6.2" @@ -861,6 +878,7 @@ dependencies = [ name = "chainx-rpc" version = "5.2.2" dependencies = [ + "bevm-finality-rpc", "chainx-primitives", "fc-db", "fc-rpc", diff --git a/Cargo.toml b/Cargo.toml index f520d6b46..ba8f78883 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ cli = { package = "chainx-cli", path = "cli", features = ["wasmtime"] } [workspace] members = [ "cli", + "client/rpc/finality", "executor", "primitives", "primitives/assets-registrar", diff --git a/client/rpc/finality/Cargo.toml b/client/rpc/finality/Cargo.toml new file mode 100644 index 000000000..59e964987 --- /dev/null +++ b/client/rpc/finality/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "bevm-finality-rpc" +description = "An experimental RPC to check for block and transaction finality in the bevm chain" +version = "5.2.2" +authors = ["The ChainX Authors"] +edition = "2021" + +[dependencies] +futures = { version = "0.3", features = [ "compat" ] } +jsonrpc-core = "18.0.0" +jsonrpc-derive = "18.0.0" +parity-scale-codec = "3.0.0" +tokio = { version = "1.12.0", features = [ "sync", "time" ] } + +fc-db = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2" } +fc-rpc = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2" } +sp-api = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix2" } +sp-blockchain = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix2" } +sp-core = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix2" } +sp-runtime = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix2" } + diff --git a/client/rpc/finality/README.md b/client/rpc/finality/README.md new file mode 100644 index 000000000..f00aff118 --- /dev/null +++ b/client/rpc/finality/README.md @@ -0,0 +1,16 @@ +# rpc + +```json +"bevm": { + "isBlockFinalized": { + "description": "Returns whether an Ethereum block is finalized", + "params": [{ "name": "blockHash", "type": "Hash" }], + "type": "bool" + }, + "isTxFinalized": { + "description": "Returns whether an Ethereum transaction is finalized", + "params": [{ "name": "txHash", "type": "Hash" }], + "type": "bool" + } +} +``` \ No newline at end of file diff --git a/client/rpc/finality/src/lib.rs b/client/rpc/finality/src/lib.rs new file mode 100644 index 000000000..866b9255c --- /dev/null +++ b/client/rpc/finality/src/lib.rs @@ -0,0 +1,105 @@ +// Copyright 2019-2023 ChainX Project Authors. Licensed under GPL-3.0. + +use fc_rpc::frontier_backend_client::{self, is_canon}; +use futures::{future::BoxFuture, FutureExt as _}; +use jsonrpc_core::Result as RpcResult; +use jsonrpc_derive::rpc; +use sp_core::H256; +use std::{marker::PhantomData, sync::Arc}; +//TODO ideally we wouldn't depend on BlockId here. Can we change frontier +// so it's load_hash helper returns an H256 instead of wrapping it in a BlockId? +use fc_db::Backend as FrontierBackend; +use sp_api::BlockId; +use sp_blockchain::HeaderBackend; +use sp_runtime::traits::Block; + +/// An RPC endpoint to check for finality of blocks and transactions in Bevm +#[rpc(server)] +pub trait BevmFinalityApi { + /// Reports whether a Substrate or Ethereum block is finalized. + /// Returns false if the block is not found. + #[rpc(name = "bevm_isBlockFinalized")] + fn is_block_finalized(&self, block_hash: H256) -> BoxFuture<'static, RpcResult>; + + /// Reports whether an Ethereum transaction is finalized. + /// Returns false if the transaction is not found + #[rpc(name = "bevm_isTxFinalized")] + fn is_tx_finalized(&self, tx_hash: H256) -> BoxFuture<'static, RpcResult>; +} + +pub struct BevmFinality { + pub backend: Arc>, + pub client: Arc, + _phdata: PhantomData, +} + +impl BevmFinality { + pub fn new(client: Arc, backend: Arc>) -> Self { + Self { + backend, + client, + _phdata: Default::default(), + } + } +} + +impl BevmFinalityApi for BevmFinality +where + B: Block, + C: HeaderBackend + Send + Sync + 'static, +{ + fn is_block_finalized(&self, raw_hash: H256) -> BoxFuture<'static, RpcResult> { + let backend = self.backend.clone(); + let client = self.client.clone(); + async move { is_block_finalized_inner::(&backend, &client, raw_hash) }.boxed() + } + + fn is_tx_finalized(&self, tx_hash: H256) -> BoxFuture<'static, RpcResult> { + let backend = self.backend.clone(); + let client = self.client.clone(); + async move { + if let Some((ethereum_block_hash, _ethereum_index)) = + frontier_backend_client::load_transactions::( + &client, + backend.as_ref(), + tx_hash, + true, + )? + { + is_block_finalized_inner::(&backend, &client, ethereum_block_hash) + } else { + Ok(false) + } + } + .boxed() + } +} + +fn is_block_finalized_inner, C: HeaderBackend + 'static>( + backend: &FrontierBackend, + client: &C, + raw_hash: H256, +) -> RpcResult { + let substrate_hash = match frontier_backend_client::load_hash::(backend, raw_hash)? { + // If we find this hash in the frontier data base, we know it is an eth hash + Some(BlockId::Hash(hash)) => hash, + Some(BlockId::Number(_)) => panic!("is_canon test only works with hashes."), + // Otherwise, we assume this is a Substrate hash. + None => raw_hash, + }; + + // First check whether the block is in the best chain + if !is_canon(client, substrate_hash) { + return Ok(false); + } + + // At this point we know the block in question is in the current best chain. + // It's just a question of whether it is in the finalized prefix or not + let query_height = client + .number(substrate_hash) + .expect("No sp_blockchain::Error should be thrown when looking up hash") + .expect("Block is already known to be canon, so it must be in the chain"); + let finalized_height = client.info().finalized_number; + + Ok(query_height <= finalized_height) +} diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index a028daa7f..5f33e8d8b 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -43,6 +43,9 @@ substrate-frame-rpc-system = { git = "https://github.com/chainx-org/substrate", chainx-primitives = { path = "../primitives" } xp-runtime = { path = "../primitives/runtime" } +# Finality-rpc +bevm-finality-rpc = { path = "../client/rpc/finality" } + # ChainX pallets xpallet-assets-rpc = { path = "../xpallets/assets/rpc" } xpallet-assets-rpc-runtime-api = { path = "../xpallets/assets/rpc/runtime-api" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 744f2e09a..dee5b11e2 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -206,6 +206,7 @@ where B::State: sc_client_api::backend::StateBackend>, A: ChainApi + 'static, { + use bevm_finality_rpc::{BevmFinality, BevmFinalityApi}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; use substrate_frame_rpc_system::{FullSystem, SystemApi}; use xpallet_assets_rpc::{Assets, XAssetsApi}; @@ -338,6 +339,11 @@ where fee_history_cache, ))); + io.extend_with(BevmFinalityApi::to_delegate(BevmFinality::new( + client.clone(), + backend.clone(), + ))); + if let Some(filter_pool) = filter_pool { io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new( client.clone(), From 4838e0ebe0fd6bf897decaa27cd3e0e1e7a73cc7 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Sun, 4 Feb 2024 19:28:21 +0800 Subject: [PATCH 5/6] Update chainx-frontier dependency --- Cargo.lock | 140 ++++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8dd1e6ba..a8e483d7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -787,14 +787,14 @@ dependencies = [ [[package]] name = "chainx" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-cli", ] [[package]] name = "chainx-cli" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-executor", "chainx-primitives", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "chainx-executor" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-runtime", "dev-runtime", @@ -862,7 +862,7 @@ dependencies = [ [[package]] name = "chainx-primitives" -version = "5.2.2" +version = "5.2.3" dependencies = [ "frame-system", "parity-scale-codec", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "chainx-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "bevm-finality-rpc", "chainx-primitives", @@ -937,7 +937,7 @@ dependencies = [ [[package]] name = "chainx-runtime" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "chainx-runtime-common", @@ -1055,7 +1055,7 @@ dependencies = [ [[package]] name = "chainx-service" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-executor", "chainx-primitives", @@ -1568,7 +1568,7 @@ dependencies = [ [[package]] name = "dev-runtime" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "chainx-runtime-common", @@ -2064,7 +2064,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "async-trait", "fc-db", @@ -2083,7 +2083,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-storage", "kvdb-rocksdb", @@ -2097,7 +2097,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fc-db", "fp-consensus", @@ -2114,7 +2114,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "ethereum-types", @@ -2156,7 +2156,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "ethereum-types", @@ -2263,7 +2263,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "parity-scale-codec", @@ -2275,7 +2275,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "evm", "parity-scale-codec", @@ -2287,7 +2287,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "ethereum-types", @@ -2304,7 +2304,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "frame-support", @@ -2320,7 +2320,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "parity-scale-codec", ] @@ -4548,7 +4548,7 @@ dependencies = [ [[package]] name = "malan-runtime" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "chainx-runtime-common", @@ -5296,7 +5296,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "frame-support", "frame-system", @@ -5378,7 +5378,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "ethereum", "ethereum-types", @@ -5407,7 +5407,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "evm", "fp-evm", @@ -5433,7 +5433,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", ] @@ -5441,7 +5441,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", "sp-core", @@ -5451,7 +5451,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", "frame-support", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", "num", @@ -5470,7 +5470,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", "tiny-keccak", @@ -5479,7 +5479,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#2b12902104b714706def55b1dff8d4a2e8c417b0" +source = "git+https://github.com/chainx-org/frontier?branch=polkadot-v0.9.18-btc-fix2#f42dbeb4013f239c07f99add4bd14b5cbe79eb58" dependencies = [ "fp-evm", "ripemd", @@ -10287,7 +10287,7 @@ dependencies = [ [[package]] name = "xp-assets-registrar" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "impl-trait-for-tuples", @@ -10300,7 +10300,7 @@ dependencies = [ [[package]] name = "xp-gateway-bitcoin" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-support", @@ -10317,7 +10317,7 @@ dependencies = [ [[package]] name = "xp-gateway-common" -version = "5.2.2" +version = "5.2.3" dependencies = [ "bs58 0.3.1", "frame-support", @@ -10330,7 +10330,7 @@ dependencies = [ [[package]] name = "xp-genesis-builder" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "serde", @@ -10339,7 +10339,7 @@ dependencies = [ [[package]] name = "xp-io" -version = "5.2.2" +version = "5.2.3" dependencies = [ "hex", "parity-scale-codec", @@ -10350,7 +10350,7 @@ dependencies = [ [[package]] name = "xp-mining-common" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "sp-arithmetic", @@ -10359,7 +10359,7 @@ dependencies = [ [[package]] name = "xp-mining-staking" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "sp-runtime", @@ -10369,7 +10369,7 @@ dependencies = [ [[package]] name = "xp-protocol" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10380,7 +10380,7 @@ dependencies = [ [[package]] name = "xp-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "hex", "jsonrpc-core", @@ -10390,7 +10390,7 @@ dependencies = [ [[package]] name = "xp-runtime" -version = "5.2.2" +version = "5.2.3" dependencies = [ "fp-rpc", "hex", @@ -10405,7 +10405,7 @@ dependencies = [ [[package]] name = "xpallet-assets" -version = "5.2.2" +version = "5.2.3" dependencies = [ "bitflags", "chainx-primitives", @@ -10428,7 +10428,7 @@ dependencies = [ [[package]] name = "xpallet-assets-bridge" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "ethabi", @@ -10451,7 +10451,7 @@ dependencies = [ [[package]] name = "xpallet-assets-registrar" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-benchmarking", @@ -10473,7 +10473,7 @@ dependencies = [ [[package]] name = "xpallet-assets-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10488,7 +10488,7 @@ dependencies = [ [[package]] name = "xpallet-assets-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10499,7 +10499,7 @@ dependencies = [ [[package]] name = "xpallet-btc-ledger" -version = "5.2.2" +version = "5.2.3" dependencies = [ "frame-benchmarking", "frame-support", @@ -10514,7 +10514,7 @@ dependencies = [ [[package]] name = "xpallet-btc-ledger-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10529,7 +10529,7 @@ dependencies = [ [[package]] name = "xpallet-btc-ledger-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "parity-scale-codec", "sp-api", @@ -10538,7 +10538,7 @@ dependencies = [ [[package]] name = "xpallet-dex-spot" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "env_logger 0.7.1", @@ -10562,7 +10562,7 @@ dependencies = [ [[package]] name = "xpallet-dex-spot-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10578,7 +10578,7 @@ dependencies = [ [[package]] name = "xpallet-dex-spot-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "parity-scale-codec", "sp-api", @@ -10599,7 +10599,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-bitcoin" -version = "5.2.2" +version = "5.2.3" dependencies = [ "bs58 0.3.1", "chainx-primitives", @@ -10638,7 +10638,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-bitcoin-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "hex", "jsonrpc-core", @@ -10655,7 +10655,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-bitcoin-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10669,7 +10669,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-common" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-benchmarking", @@ -10707,7 +10707,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-common-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "hex", "jsonrpc-core", @@ -10724,7 +10724,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-common-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10740,7 +10740,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-records" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-benchmarking", @@ -10763,7 +10763,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-records-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10779,7 +10779,7 @@ dependencies = [ [[package]] name = "xpallet-gateway-records-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10791,7 +10791,7 @@ dependencies = [ [[package]] name = "xpallet-genesis-builder" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-support", @@ -10812,7 +10812,7 @@ dependencies = [ [[package]] name = "xpallet-mining-asset" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "env_logger 0.7.1", @@ -10841,7 +10841,7 @@ dependencies = [ [[package]] name = "xpallet-mining-asset-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10856,7 +10856,7 @@ dependencies = [ [[package]] name = "xpallet-mining-asset-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "parity-scale-codec", @@ -10867,7 +10867,7 @@ dependencies = [ [[package]] name = "xpallet-mining-staking" -version = "5.2.2" +version = "5.2.3" dependencies = [ "chainx-primitives", "frame-benchmarking", @@ -10897,7 +10897,7 @@ dependencies = [ [[package]] name = "xpallet-mining-staking-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10912,7 +10912,7 @@ dependencies = [ [[package]] name = "xpallet-mining-staking-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "parity-scale-codec", "sp-api", @@ -10922,7 +10922,7 @@ dependencies = [ [[package]] name = "xpallet-support" -version = "5.2.2" +version = "5.2.3" dependencies = [ "hex", "sp-std", @@ -10930,7 +10930,7 @@ dependencies = [ [[package]] name = "xpallet-system" -version = "5.2.2" +version = "5.2.3" dependencies = [ "frame-support", "frame-system", @@ -10944,7 +10944,7 @@ dependencies = [ [[package]] name = "xpallet-transaction-fee" -version = "5.2.2" +version = "5.2.3" dependencies = [ "frame-support", "frame-system", @@ -10958,7 +10958,7 @@ dependencies = [ [[package]] name = "xpallet-transaction-fee-rpc" -version = "5.2.2" +version = "5.2.3" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10976,7 +10976,7 @@ dependencies = [ [[package]] name = "xpallet-transaction-fee-rpc-runtime-api" -version = "5.2.2" +version = "5.2.3" dependencies = [ "parity-scale-codec", "sp-api", From 02599fb1d97319116495dc2fdba09118cfb4ed23 Mon Sep 17 00:00:00 2001 From: icodezjb Date: Wed, 21 Feb 2024 12:48:15 +0700 Subject: [PATCH 6/6] Update new addresses --- contracts/uniswap-contracts/address.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/uniswap-contracts/address.json b/contracts/uniswap-contracts/address.json index 1df03b653..db1317a5b 100644 --- a/contracts/uniswap-contracts/address.json +++ b/contracts/uniswap-contracts/address.json @@ -1,19 +1,19 @@ { "chainx-testnet": { - "WETH": "0x51abb19F1ebc7B64040aFd0ef3C789d75C8707e0", - "Factory": "0xe922A087CA192ffdaA32eCB6A3ad3320bfFDd83b", + "WETH": "0xFd861b4eeA652d92a679504a8b8341655340eA5d", + "Factory": "0x9480C6Fa8768F18cc0cfe35694Ce8C1660A02B5A", "Factory Feeto": "0xcAF084133CBdBE27490d3afB0Da220a40C32E307", - "RouterV02": "0x990e95C5CddAf60785ad92caF86Dea6c83F6f867", - "Multicall": "0x784ea1566D3820DaE6aa220eA8C5a0836297fcD3", + "RouterV02": "0x054Fa299e4cFE7cDC87a5998eA4e7cfccB3bc4C2", + "Multicall": "0x5a00E2FBCBa6790b20c338DF1eE9842f584DCfdA", "ENSRegistry": "0x21b782d2357797D78D48813048033F187AAa2F9C", "init_code_hash": "0x01429e880a7972ebfbba904a5bbe32a816e78273e4b38ffa6bdeaebce8adba7c" }, "chainx-mainnet": { - "WETH": "0x09Ff8E49D0EA411A3422ed95E8f5497D4241F532", - "Factory": "0x356FD03E73ce821d5F7dFea51d1cB336EeFd67b1", + "WETH": "0x9D1dFD3a94C218B5dF3A1875157A936f99EcAA76", + "Factory": "0xc3A4f9Bab921FbEB26595659C1511e9F24647902", "Factory Feeto": "0xe4401b593DCBA4c057fccD1baa3ab9cFacfa64d8", - "RouterV02": "0xC7Dd38D6D161e2a440617508308639B2d701F633", - "Multicall": "0x79eA96a9857b3fcf7B037E5EE98D4da63Ff1934A", + "RouterV02": "0xA932608b834b3711FeECBC0e7403B5B530531E0b", + "Multicall": "0x04C3FAfaf3dBb75537c9e524835107E56130aa0A", "ENSRegistry": "0x8F8F6B104190a4A24CcFf7B4006Ea7A59baeAf81", "init_code_hash": "0x01429e880a7972ebfbba904a5bbe32a816e78273e4b38ffa6bdeaebce8adba7c" }