From 125c531a8504d7764af9c4f9f3ddeb0f85fb7308 Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Thu, 16 Oct 2025 16:42:57 +0200 Subject: [PATCH 1/9] added baltathar, charleth, dorothy, and ethan to eth-rpc and revive-dev-node --- substrate/frame/revive/dev-node/runtime/src/lib.rs | 12 ++++++++++++ substrate/frame/revive/rpc/src/cli.rs | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/substrate/frame/revive/dev-node/runtime/src/lib.rs b/substrate/frame/revive/dev-node/runtime/src/lib.rs index 0532dc1a7f8e5..5b37ce35b2965 100644 --- a/substrate/frame/revive/dev-node/runtime/src/lib.rs +++ b/substrate/frame/revive/dev-node/runtime/src/lib.rs @@ -84,6 +84,18 @@ pub mod genesis_config_presets { array_bytes::hex_n_into_unchecked( "3cd0a705a2dc65e5b1e1205896baa2be8a07c6e0eeeeeeeeeeeeeeeeeeeeeeee", ), + // subxt_signer::eth::dev::charleth() + array_bytes::hex_n_into_unchecked( + "798d4ba9baf0064ec19eb4f0a1a45785ae9d6dfceeeeeeeeeeeeeeeeeeeeeeee", + ), + // subxt_signer::eth::dev::dorothy() + array_bytes::hex_n_into_unchecked( + "773539d4ac0e786233d90a233654ccee26a613d9eeeeeeeeeeeeeeeeeeeeeeee", + ), + // subxt_signer::eth::dev::ethan() + array_bytes::hex_n_into_unchecked( + "ff64d3f6efe2317ee2807d223a0bdc4c0c49dfdbeeeeeeeeeeeeeeeeeeeeeeee", + ), ]) .collect::>() } diff --git a/substrate/frame/revive/rpc/src/cli.rs b/substrate/frame/revive/rpc/src/cli.rs index c603947e33a95..ca47f0d2964c1 100644 --- a/substrate/frame/revive/rpc/src/cli.rs +++ b/substrate/frame/revive/rpc/src/cli.rs @@ -252,7 +252,17 @@ pub fn run(cmd: CliCommand) -> anyhow::Result<()> { /// Create the JSON-RPC module. fn rpc_module(is_dev: bool, client: Client) -> Result, sc_service::Error> { let eth_api = EthRpcServerImpl::new(client.clone()) - .with_accounts(if is_dev { vec![crate::Account::default()] } else { vec![] }) + .with_accounts(if is_dev { + vec![ + crate::Account::default(), + crate::Account::from(subxt_signer::eth::dev::baltathar()), + crate::Account::from(subxt_signer::eth::dev::charleth()), + crate::Account::from(subxt_signer::eth::dev::dorothy()), + crate::Account::from(subxt_signer::eth::dev::ethan()), + ] + } else { + vec![] + }) .into_rpc(); let health_api = SystemHealthRpcServerImpl::new(client.clone()).into_rpc(); From 702ec31c2e803791d0288c086d72ec946cf3d125 Mon Sep 17 00:00:00 2001 From: 0xRVE Date: Thu, 16 Oct 2025 17:07:21 +0200 Subject: [PATCH 2/9] Update substrate/frame/revive/rpc/src/cli.rs Co-authored-by: PG Herveou --- substrate/frame/revive/rpc/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/revive/rpc/src/cli.rs b/substrate/frame/revive/rpc/src/cli.rs index ca47f0d2964c1..4272fa0f9757f 100644 --- a/substrate/frame/revive/rpc/src/cli.rs +++ b/substrate/frame/revive/rpc/src/cli.rs @@ -254,7 +254,7 @@ fn rpc_module(is_dev: bool, client: Client) -> Result, sc_service: let eth_api = EthRpcServerImpl::new(client.clone()) .with_accounts(if is_dev { vec![ - crate::Account::default(), + crate::Account::from(subxt_signer::eth::dev::alith()), crate::Account::from(subxt_signer::eth::dev::baltathar()), crate::Account::from(subxt_signer::eth::dev::charleth()), crate::Account::from(subxt_signer::eth::dev::dorothy()), From 9ddbcb5d4913353d7b2cfeadc509d91196ba578d Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Thu, 16 Oct 2025 17:09:15 +0200 Subject: [PATCH 3/9] increase funding to accounts --- substrate/frame/revive/dev-node/runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/revive/dev-node/runtime/src/lib.rs b/substrate/frame/revive/dev-node/runtime/src/lib.rs index 5b37ce35b2965..a44f181103c45 100644 --- a/substrate/frame/revive/dev-node/runtime/src/lib.rs +++ b/substrate/frame/revive/dev-node/runtime/src/lib.rs @@ -70,7 +70,7 @@ pub mod genesis_config_presets { use alloc::{vec, vec::Vec}; use serde_json::Value; - pub const ENDOWMENT: Balance = 1_001 * DOLLARS; + pub const ENDOWMENT: Balance = 1_000_000_001 * DOLLARS; fn well_known_accounts() -> Vec { Sr25519Keyring::well_known() From 8db28d0705f3c8b995ba8524782b7d85a8b877c8 Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Thu, 16 Oct 2025 17:21:31 +0200 Subject: [PATCH 4/9] format --- substrate/frame/revive/rpc/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/revive/rpc/src/cli.rs b/substrate/frame/revive/rpc/src/cli.rs index 4272fa0f9757f..d52a013520de9 100644 --- a/substrate/frame/revive/rpc/src/cli.rs +++ b/substrate/frame/revive/rpc/src/cli.rs @@ -254,7 +254,7 @@ fn rpc_module(is_dev: bool, client: Client) -> Result, sc_service: let eth_api = EthRpcServerImpl::new(client.clone()) .with_accounts(if is_dev { vec![ - crate::Account::from(subxt_signer::eth::dev::alith()), + crate::Account::from(subxt_signer::eth::dev::alith()), crate::Account::from(subxt_signer::eth::dev::baltathar()), crate::Account::from(subxt_signer::eth::dev::charleth()), crate::Account::from(subxt_signer::eth::dev::dorothy()), From 33725c26c59385c24295eb53cdb1d40a3b3cd14c Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Thu, 16 Oct 2025 17:30:54 +0200 Subject: [PATCH 5/9] format --- substrate/frame/revive/rpc/src/cli.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/revive/rpc/src/cli.rs b/substrate/frame/revive/rpc/src/cli.rs index d52a013520de9..10ee9f3c4e2ef 100644 --- a/substrate/frame/revive/rpc/src/cli.rs +++ b/substrate/frame/revive/rpc/src/cli.rs @@ -254,7 +254,7 @@ fn rpc_module(is_dev: bool, client: Client) -> Result, sc_service: let eth_api = EthRpcServerImpl::new(client.clone()) .with_accounts(if is_dev { vec![ - crate::Account::from(subxt_signer::eth::dev::alith()), + crate::Account::from(subxt_signer::eth::dev::alith()), crate::Account::from(subxt_signer::eth::dev::baltathar()), crate::Account::from(subxt_signer::eth::dev::charleth()), crate::Account::from(subxt_signer::eth::dev::dorothy()), From d9698a11fe684162c01ab29128e5f261264babaa Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Fri, 17 Oct 2025 14:24:18 +0200 Subject: [PATCH 6/9] bumped commit of evm-test-suite --- .github/workflows/tests-evm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-evm.yml b/.github/workflows/tests-evm.yml index 4cc49626bf1ff..80ef9ce2fa417 100644 --- a/.github/workflows/tests-evm.yml +++ b/.github/workflows/tests-evm.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: paritytech/evm-test-suite - ref: 79144d85626f97e481b84a16d2b8f0813d03548b + ref: c1d76bcadbdcd2953fa8a022198bc38c8f85b04d path: evm-test-suite - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 From d8dbdc5501ef56dd9c117a938a843a2af2ef7745 Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Sun, 19 Oct 2025 11:25:09 +0200 Subject: [PATCH 7/9] update tests-evm.yml workflow --- .github/workflows/tests-evm.yml | 38 ++++++++++----------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tests-evm.yml b/.github/workflows/tests-evm.yml index 80ef9ce2fa417..c4a458b2bf5b2 100644 --- a/.github/workflows/tests-evm.yml +++ b/.github/workflows/tests-evm.yml @@ -46,43 +46,27 @@ jobs: ref: c1d76bcadbdcd2953fa8a022198bc38c8f85b04d path: evm-test-suite - - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + - uses: denoland/setup-deno@v1 with: - node-version: 22 + deno-version: v2.x - name: script - env: - # EVM tests don't work with batchSize 300 on self-hosted runners in docker container - BATCH_SIZE: 100 run: | echo "Change to the evm-test-suite directory" cd evm-test-suite - echo "Download the resolc binary" - wget -O resolc https://github.com/paritytech/revive/releases/download/v0.3.0/resolc-x86_64-unknown-linux-musl -q - chmod +x resolc - mv resolc /usr/local/bin - resolc --version + + deno --version echo "Check that binaries are in place" - export NODE_BIN_PATH=$(readlink -f ../target/release/revive-dev-node) + export REVIVE_DEV_NODE_PATH=$(readlink -f ../target/release/revive-dev-node) export ETH_RPC_PATH=$(readlink -f ../target/release/eth-rpc) - export RESOLC_PATH=/usr/local/bin/resolc - echo $NODE_BIN_PATH $ETH_RPC_PATH $RESOLC_PATH + echo $REVIVE_DEV_NODE_PATH $ETH_RPC_PATH - echo "Install npm dependencies" - npm install - # cat matter-labs-tests/hardhat.config.ts | grep batchSize + echo "== Running pvm tests ==j" + START_REVIVE_DEV_NODE=true START_ETH_RPC=true deno task test:pvm - echo "Installing solc" - wget https://github.com/ethereum/solidity/releases/download/v0.8.30/solc-static-linux -q - chmod +x solc-static-linux - mv solc-static-linux /usr/local/bin/solc - # TODO restore once tests can be run against the revive-dev-node - # echo "Run the tests" - # echo "bash init.sh --kitchensink -- --matter-labs -- $NODE_BIN_PATH $ETH_RPC_PATH $RESOLC_PATH" - # bash init.sh --kitchensink -- --matter-labs -- $NODE_BIN_PATH $ETH_RPC_PATH $RESOLC_PATH - echo "Run eth-rpc tests" - bash init.sh --kitchensink http://localhost:9944 --eth-rpc -- $NODE_BIN_PATH $ETH_RPC_PATH $RESOLC_PATH + echo "== Running evm tests ==" + START_REVIVE_DEV_NODE=true START_ETH_RPC=true deno task test:evm - name: Collect tests results if: always() @@ -107,4 +91,4 @@ jobs: exit 1 else echo '### Good job! All the required jobs passed 🚀' >> $GITHUB_STEP_SUMMARY - fi + fi \ No newline at end of file From d20b4a0bbad2528abb11e356c125bf127b543582 Mon Sep 17 00:00:00 2001 From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Oct 2025 09:32:12 +0000 Subject: [PATCH 8/9] Update from github-actions[bot] running command 'prdoc --audience runtime_dev --bump patch' --- prdoc/pr_10041.prdoc | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 prdoc/pr_10041.prdoc diff --git a/prdoc/pr_10041.prdoc b/prdoc/pr_10041.prdoc new file mode 100644 index 0000000000000..a9929152e521b --- /dev/null +++ b/prdoc/pr_10041.prdoc @@ -0,0 +1,9 @@ +title: "added baltathar, charleth, dorothy, and ethan to eth-rpc and revive-d\u2026" +doc: +- audience: Runtime Dev + description: adds more funded accounts to eth-rpc and dev-node +crates: +- name: revive-dev-runtime + bump: patch +- name: pallet-revive-eth-rpc + bump: patch From e4b69752902c209f61e00e579fe991c40260a910 Mon Sep 17 00:00:00 2001 From: Robert van Eerdewijk Date: Sun, 19 Oct 2025 11:51:39 +0200 Subject: [PATCH 9/9] fix ci --- .github/workflows/tests-evm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-evm.yml b/.github/workflows/tests-evm.yml index c4a458b2bf5b2..54c7a821418af 100644 --- a/.github/workflows/tests-evm.yml +++ b/.github/workflows/tests-evm.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: paritytech/evm-test-suite - ref: c1d76bcadbdcd2953fa8a022198bc38c8f85b04d + ref: d20230d0a70ad1159ee75b4c56a47e85173f19e5 path: evm-test-suite - uses: denoland/setup-deno@v1