Skip to content

Commit 07413a5

Browse files
authored
ci(l1): use ethereum/hive for rpc-compat simulation. (#4885)
**Motivation** To not use our hive fork anymore **Description** With this ethereum/hive#1354 we can pin the https://github.com/ethereum/execution-apis.git version, and we will pin it to a commit that contains a post-merge commit
1 parent 58e0050 commit 07413a5

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

.github/workflows/pr-main_l1.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,48 +144,49 @@ jobs:
144144
include:
145145
- name: "Rpc Compat tests"
146146
simulation: ethereum/rpc-compat
147-
limit: "rpc-compat/(debug_[^/]+/.*|eth_blobBaseFee/.*|eth_blockNumber/.*|eth_call/.*|eth_chainId/.*|eth_createAccessList/.*|eth_estimateGas/.*|eth_feeHistory/.*|eth_getBalance/.*|eth_getBlockByHash/.*|eth_getBlockByNumber/.*|eth_getBlockReceipts/.*|eth_getBlockTransactionCountByHash/.*|eth_getBlockTransactionCountByNumber/.*|eth_getCode/.*|eth_getLogs/.*|eth_getProof/.*|eth_getStorageAt/.*|eth_getTransactionByBlockHashAndIndex/.*|eth_getTransactionByBlockNumberAndIndex/.*|eth_getTransactionByHash/.*|eth_getTransactionCount/.*|eth_getTransactionReceipt/.*|eth_sendRawTransaction/.*)"
148-
hive_repository: lambdaclass/hive
149-
hive_version: 115f4d6ef1bdd2bfcabe29ec60424f6327e92f43
147+
# https://github.com/ethereum/execution-apis/pull/627 changed the simulation to use a pre-merge genesis block, so we need to pin to a commit before that
148+
buildarg: "branch=d08382ae5c808680e976fce4b73f4ba91647199b"
149+
hive_repository: ethereum/hive
150+
hive_version: 7709e5892146c793307da072e1593f48039a7e4b
150151
artifact_prefix: rpc_compat
151152
- name: "Devp2p tests"
152153
simulation: devp2p
153154
limit: discv4|eth|snap/Ping|Findnode/WithoutEndpointProof|Findnode/PastExpiration|Amplification|Status|StorageRanges|ByteCodes|GetBlockHeaders|SimultaneousRequests|SameRequestID|ZeroRequestID|GetBlockBodies|MaliciousHandshake|MaliciousStatus|NewPooledTxs|GetBlockReceipts|BlockRangeUpdate|GetTrieNodes
154155
# Findnode/BasicFindnode fails due to packets being processed out of order
155156
# Findnode/UnsolicitedNeighbors flaky in CI very occasionally. When fixed replace all "Findnode/<test>" with "Findnode"
156157
hive_repository: ethereum/hive
157-
hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
158+
hive_version: 7709e5892146c793307da072e1593f48039a7e4b
158159
artifact_prefix: devp2p
159160
- name: "Engine Auth and EC tests"
160161
simulation: ethereum/engine
161162
limit: engine-(auth|exchange-capabilities)/
162163
hive_repository: ethereum/hive
163-
hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
164+
hive_version: 7709e5892146c793307da072e1593f48039a7e4b
164165
artifact_prefix: engine_auth_ec
165166
# - name: "Cancun Engine tests"
166167
# simulation: ethereum/engine
167168
# limit: "engine-cancun"
168169
# hive_repository: ethereum/hive
169-
# hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
170+
# hive_version: 7709e5892146c793307da072e1593f48039a7e4b
170171
# artifact_prefix: engine_cancun
171172
- name: "Paris Engine tests"
172173
simulation: ethereum/engine
173174
limit: "engine-api"
174175
hive_repository: ethereum/hive
175-
hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
176+
hive_version: 7709e5892146c793307da072e1593f48039a7e4b
176177
artifact_prefix: engine_paris
177178
- name: "Engine withdrawal tests"
178179
simulation: ethereum/engine
179180
limit: "engine-withdrawals/Corrupted Block Hash Payload|Empty Withdrawals|engine-withdrawals test loader|GetPayloadBodies|GetPayloadV2 Block Value|Max Initcode Size|Sync after 2 blocks - Withdrawals on Genesis|Withdraw many accounts|Withdraw to a single account|Withdraw to two accounts|Withdraw zero amount|Withdraw many accounts|Withdrawals Fork on Block 1 - 1 Block Re-Org|Withdrawals Fork on Block 1 - 8 Block Re-Org NewPayload|Withdrawals Fork on Block 2|Withdrawals Fork on Block 3|Withdrawals Fork on Block 8 - 10 Block Re-Org NewPayload|Withdrawals Fork on Canonical Block 8 / Side Block 7 - 10 Block Re-Org [^S]|Withdrawals Fork on Canonical Block 8 / Side Block 9 - 10 Block Re-Org [^S]"
180181
hive_repository: ethereum/hive
181-
hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
182+
hive_version: 7709e5892146c793307da072e1593f48039a7e4b
182183
artifact_prefix: engine_withdrawals
183184
# Investigate this test
184185
# - name: "Sync"
185186
# simulation: ethereum/sync
186187
# limit: ""
187188
# hive_repository: ethereum/hive
188-
# hive_version: c7deebe0c604248e90f27de51f6037d4b7b8c5b5
189+
# hive_version: 7709e5892146c793307da072e1593f48039a7e4b
189190
# artifact_prefix: sync
190191
steps:
191192
- name: Free Disk Space (Ubuntu)
@@ -222,12 +223,16 @@ jobs:
222223
shell: bash
223224
env:
224225
SIM_LIMIT: ${{ matrix.limit }}
226+
SIM_BUILDARG: ${{ matrix.buildarg }}
225227
run: |
226228
FLAGS='--sim.parallelism 16 --sim.loglevel 1'
227229
if [[ -n "$SIM_LIMIT" ]]; then
228230
escaped_limit=${SIM_LIMIT//\'/\'\\\'\'}
229231
FLAGS+=" --sim.limit '$escaped_limit'"
230232
fi
233+
if [[ -n "$SIM_BUILDARG" ]]; then
234+
FLAGS+=" --sim.buildarg $SIM_BUILDARG"
235+
fi
231236
echo "flags=$FLAGS" >> "$GITHUB_OUTPUT"
232237
233238
- name: Run Hive Simulation

0 commit comments

Comments
 (0)