Skip to content

Commit 47a770f

Browse files
committed
feat: fix Paris
1 parent a7df285 commit 47a770f

File tree

4 files changed

+4
-624
lines changed

4 files changed

+4
-624
lines changed

.github/workflows/gradle-tests.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,6 @@ jobs:
2424
# ==================================================================
2525
# Build
2626
# ==================================================================
27-
clear-cache:
28-
runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xl
29-
steps:
30-
- name: Clear cache
31-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
32-
with:
33-
script: |
34-
console.log("About to clear")
35-
const caches = await github.rest.actions.getActionsCacheList({
36-
owner: context.repo.owner,
37-
repo: context.repo.repo,
38-
})
39-
for (const cache of caches.data.actions_caches) {
40-
console.log(cache)
41-
github.rest.actions.deleteActionsCacheById({
42-
owner: context.repo.owner,
43-
repo: context.repo.repo,
44-
cache_id: cache.id,
45-
})
46-
}
47-
console.log("Clear completed")
48-
4927
build:
5028
if: github.event.pull_request.draft == false && github.base_ref != 'main'
5129
runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
@@ -79,7 +57,6 @@ jobs:
7957
# ==================================================================
8058
# Unit Tests
8159
# ==================================================================
82-
8360
unit-tests-london:
8461
if: github.event.pull_request.draft == false && github.base_ref != 'main'
8562
needs: [ build ]

Test Results - ExampleBesuTest_test_(1).html

Lines changed: 0 additions & 599 deletions
This file was deleted.

arithmetization/src/main/java/net/consensys/linea/zktracer/Fork.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public static Fork getForkFromBesuBlockchainService(
126126
HardforkId hardforkIdToBlock =
127127
BesuServiceProvider.getBesuService(context, BlockchainService.class)
128128
.getHardforkId(toBlock);
129-
if (hardforkIdFromBlock != hardforkIdToBlock) {
129+
if (!hardforkIdFromBlock.equals(hardforkIdToBlock)) {
130130
throw new IllegalArgumentException(
131131
"Fork change between blocks " + fromBlock + " and " + toBlock);
132132
}

testing/src/main/java/net/consensys/linea/testing/EngineAPIService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ public void buildNewBlock(Fork fork, long blockTimestampSeconds, long blockBuild
121121
try (final Response getPayloadResponse = getPayloadRequest.execute()) {
122122
assertThat(getPayloadResponse.code()).isEqualTo(200);
123123
JsonNode result = mapper.readTree(getPayloadResponse.body().string()).get("result");
124-
executionPayload = (ObjectNode) result.get("executionPayload");
124+
;
125+
executionPayload =
126+
(fork == Fork.PARIS) ? (ObjectNode) result : (ObjectNode) result.get("executionPayload");
125127
newBlockHash = executionPayload.get("blockHash").asText();
126128
if (isPostCancun(fork)) {
127129
blobsBundle = (ObjectNode) result.get("blobsBundle");

0 commit comments

Comments
 (0)