Skip to content

Commit d89d16e

Browse files
pawanjay176michaelsproul
authored andcommitted
Replace ganache-cli with anvil (sigp#3555)
N/A Replace ganache-cli with anvil https://github.com/foundry-rs/foundry/blob/master/anvil/README.md We can lose all js dependencies in CI as a consequence. Also changes the ethers-rs version used in the execution layer (for the transaction reconstruction) to a newer one. This was necessary to get use the ethers utils for anvil. The fixed execution engine integration tests should catch any potential issues with the payload reconstruction after sigp#3592 Co-authored-by: Michael Sproul <[email protected]>
1 parent b7b8460 commit d89d16e

File tree

21 files changed

+320
-410
lines changed

21 files changed

+320
-410
lines changed

.github/workflows/local-testnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
2626
with:
2727
repo-token: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Install ganache
29-
run: npm install ganache@latest --global
28+
- name: Install anvil
29+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
3030

3131
- name: Install GNU sed & GNU grep
3232
run: |

.github/workflows/test-suite.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
5959
with:
6060
repo-token: ${{ secrets.GITHUB_TOKEN }}
61-
- name: Install ganache
62-
run: sudo npm install -g ganache
61+
- name: Install anvil
62+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
6363
- name: Run tests in release
6464
run: make test-release
6565
release-tests-windows:
@@ -78,8 +78,8 @@ jobs:
7878
run: |
7979
choco install python protoc visualstudio2019-workload-vctools -y
8080
npm config set msvs_version 2019
81-
- name: Install ganache
82-
run: npm install -g ganache --loglevel verbose
81+
- name: Install anvil
82+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
8383
- name: Install make
8484
run: choco install -y make
8585
- uses: KyleMayes/install-llvm-action@v1
@@ -140,8 +140,8 @@ jobs:
140140
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
141141
with:
142142
repo-token: ${{ secrets.GITHUB_TOKEN }}
143-
- name: Install ganache
144-
run: sudo npm install -g ganache
143+
- name: Install anvil
144+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
145145
- name: Run tests in debug
146146
run: make test-debug
147147
state-transition-vectors-ubuntu:
@@ -196,8 +196,8 @@ jobs:
196196
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
197197
with:
198198
repo-token: ${{ secrets.GITHUB_TOKEN }}
199-
- name: Install ganache
200-
run: sudo npm install -g ganache
199+
- name: Install anvil
200+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
201201
- name: Run the beacon chain sim that starts from an eth1 contract
202202
run: cargo run --release --bin simulator eth1-sim
203203
merge-transition-ubuntu:
@@ -212,8 +212,8 @@ jobs:
212212
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
213213
with:
214214
repo-token: ${{ secrets.GITHUB_TOKEN }}
215-
- name: Install ganache
216-
run: sudo npm install -g ganache
215+
- name: Install anvil
216+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
217217
- name: Run the beacon chain sim and go through the merge transition
218218
run: cargo run --release --bin simulator eth1-sim --post-merge
219219
no-eth1-simulator-ubuntu:
@@ -228,8 +228,8 @@ jobs:
228228
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
229229
with:
230230
repo-token: ${{ secrets.GITHUB_TOKEN }}
231-
- name: Install ganache
232-
run: sudo npm install -g ganache
231+
- name: Install anvil
232+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
233233
- name: Run the beacon chain sim without an eth1 connection
234234
run: cargo run --release --bin simulator no-eth1-sim
235235
syncing-simulator-ubuntu:
@@ -244,8 +244,8 @@ jobs:
244244
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
245245
with:
246246
repo-token: ${{ secrets.GITHUB_TOKEN }}
247-
- name: Install ganache
248-
run: sudo npm install -g ganache
247+
- name: Install anvil
248+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
249249
- name: Run the syncing simulator
250250
run: cargo run --release --bin simulator syncing-sim
251251
doppelganger-protection-test:
@@ -260,8 +260,8 @@ jobs:
260260
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
261261
with:
262262
repo-token: ${{ secrets.GITHUB_TOKEN }}
263-
- name: Install ganache
264-
run: sudo npm install -g ganache
263+
- name: Install anvil
264+
run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
265265
- name: Install lighthouse and lcli
266266
run: |
267267
make

beacon_node/eth1/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77
[dev-dependencies]
88
eth1_test_rig = { path = "../../testing/eth1_test_rig" }
99
serde_yaml = "0.8.13"
10-
web3 = { version = "0.18.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] }
1110
sloggers = { version = "2.1.1", features = ["json"] }
1211
environment = { path = "../../lighthouse/environment" }
1312

0 commit comments

Comments
 (0)