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

Jump to bottom

test: upgrade geth version in the sim tests #6540

Merged
merged 6 commits into from
Mar 13, 2024
Merged

test: upgrade geth version in the sim tests #6540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
192d978
Upgrade geth in the sim tests
nazarhussain Mar 13, 2024
4b3183f
Update env file
nazarhussain Mar 13, 2024
4081f91
Apply suggestions from code review
nazarhussain Mar 13, 2024
1899f86
Remove nethermind image from download
nazarhussain Mar 13, 2024
f950bf4
Merge branch 'nh/sim-geth-upgrade' of github.com:ChainSafe/lodestar i…
nazarhussain Mar 13, 2024
7cf7003
Set a version for nethermind to avoid changes in CI
nazarhussain Mar 13, 2024
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
9 changes: 6 additions & 3 deletions .env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# We use these images during sim and e2e tests
# TODO: Upgrade Geth once the Nethermind issue is resolved else it's causing following error
# Rejected peer id=134e2c1a76745626 addr=192.168.0.3:9052 conn=staticdial err="useless peer"
GETH_DOCKER_IMAGE=ethereum/client-go:v1.11.6
# This is the last version which supports pre/post merge chains in the same network
# All newer versions only work with post merge chains
GETH_DOCKER_IMAGE=ethereum/client-go:v1.13.14
# Use either image or local binary for the testing
GETH_BINARY_DIR=
LIGHTHOUSE_DOCKER_IMAGE=sigp/lighthouse:v4.6.0-amd64-modern-dev

# We can't upgrade nethermind further due to genesis hash mismatch with the geth
# https://github.com/NethermindEth/nethermind/issues/6683
# Disabling Nethermind from sim tests until the above issue is resolved
NETHERMIND_DOCKER_IMAGE=nethermind/nethermind:1.18.2

# We mostly use mainnet for unit testing
# Changing this value may impact the tests which are written with mainnet in mind
LODESTAR_PRESET=mainnet
2 changes: 1 addition & 1 deletion .github/workflows/test-sim.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
run: |
docker pull ${{env.GETH_DOCKER_IMAGE}}
docker pull ${{env.LIGHTHOUSE_DOCKER_IMAGE}}
docker pull ${{env.NETHERMIND_DOCKER_IMAGE}}
# docker pull ${{env.NETHERMIND_DOCKER_IMAGE}}
- name: Sim tests mixed client
run: DEBUG='${{github.event.inputs.debug}}' yarn test:sim:mixedclient
working-directory: packages/cli
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/test/scripts/e2e_test_env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const env = await SimulationEnvironment.initWithDefaults(
},
[
{id: "node-1", beacon: BeaconClient.Lodestar, execution: ExecutionClient.Geth, keysCount: 32, mining: true},
{id: "node-2", beacon: BeaconClient.Lodestar, execution: ExecutionClient.Nethermind, keysCount: 32},
{id: "node-2", beacon: BeaconClient.Lodestar, execution: ExecutionClient.Geth, keysCount: 32},
]
);

Expand Down
6 changes: 3 additions & 3 deletions packages/cli/test/sim/multi_fork.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const env = await SimulationEnvironment.initWithDefaults(
},
},
},
execution: ExecutionClient.Nethermind,
execution: ExecutionClient.Geth,
keysCount: 32,
remote: true,
},
Expand All @@ -93,7 +93,7 @@ const env = await SimulationEnvironment.initWithDefaults(
},
},
},
execution: ExecutionClient.Nethermind,
execution: ExecutionClient.Geth,
keysCount: 32,
},
{
Expand All @@ -110,7 +110,7 @@ const env = await SimulationEnvironment.initWithDefaults(
},
},
},
execution: ExecutionClient.Nethermind,
execution: ExecutionClient.Geth,
keysCount: 32,
},
{id: "node-5", beacon: BeaconClient.Lighthouse, execution: ExecutionClient.Geth, keysCount: 32},
Expand Down
1 change: 1 addition & 0 deletions packages/cli/test/utils/simulation/execution_clients/geth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export const generateGethNode: ExecutionNodeGenerator<ExecutionClient.Geth> = (o
`extip:${address}`,
"--authrpc.jwtsecret",
jwtsecretFilePathMounted,
"--nodiscover",
jeluard marked this conversation as resolved.
Show resolved Hide resolved
"--datadir",
rootDirMounted,
"--allow-insecure-unlock",
Expand Down
Loading