Skip to content

Commit 98ad7be

Browse files
committed
Merge remote-tracking branch 'origin/move-stateroot-check' into wip-nimbus
2 parents 09e419a + ea1a0e4 commit 98ad7be

39 files changed

+678
-3323
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,17 @@ jobs:
6060
make dist-${{ matrix.os }}-${{ matrix.cpu }}
6161
cd dist
6262
ARCHIVE=$(echo *.tar.gz)
63+
ARCHIVE_DIR=$(basename -s .tar.gz -- *.tar.gz)
6364
tar -xzf ${ARCHIVE}
64-
NEW_ARCHIVE_DIR="nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}-${{ steps.extract_branch.outputs.tag_name }}-$(git rev-parse --short=8 HEAD)"
65-
mv ${ARCHIVE%.tar.gz} ${NEW_ARCHIVE_DIR}
66-
tar -czf ${NEW_ARCHIVE_DIR}.tar.gz ${NEW_ARCHIVE_DIR}
67-
cp ${NEW_ARCHIVE_DIR}.tar.gz nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}.tar.gz
68-
echo "archive=${NEW_ARCHIVE_DIR}.tar.gz" >> $GITHUB_OUTPUT
69-
echo "archive_dir=${NEW_ARCHIVE_DIR}" >> $GITHUB_OUTPUT
65+
echo "archive=${ARCHIVE}" >> $GITHUB_OUTPUT
66+
echo "archive_dir=${ARCHIVE_DIR}" >> $GITHUB_OUTPUT
7067
7168
- name: Upload archive artefact
7269
uses: actions/upload-artifact@v4
7370
with:
7471
name: ${{ matrix.os }}-${{ matrix.cpu }}-archive
7572
path: |
7673
./dist/${{ steps.make_dist.outputs.archive }}
77-
./dist/nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}.tar.gz
7874
retention-days: 2
7975

8076
- name: Upload checksum artefact
@@ -87,7 +83,7 @@ jobs:
8783
- name: Login to Docker Hub
8884
# This step runs only if the tag starts with 'v'
8985
if: matrix.os == 'linux' && startsWith(github.ref, 'refs/tags/v')
90-
uses: docker/login-action@v1
86+
uses: docker/login-action@v3
9187
with:
9288
username: ${{ secrets.DOCKERHUB_USERNAME }}
9389
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -168,7 +164,7 @@ jobs:
168164
macos-arm64-checksum
169165
170166
#- name: Login to Docker Hub
171-
# uses: docker/login-action@v1
167+
# uses: docker/login-action@v3
172168
# with:
173169
# username: ${{ secrets.DOCKERHUB_USERNAME }}
174170
# password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# at your option. This file may not be copied, modified, or distributed except
99
# according to those terms.
1010

11-
FROM debian:testing-slim AS build
11+
FROM debian:trixie-slim AS build
1212

1313
SHELL ["/bin/bash", "-c"]
1414

@@ -26,7 +26,7 @@ RUN cd /root/nimbus-eth1 \
2626
# --------------------------------- #
2727
# Starting new image to reduce size #
2828
# --------------------------------- #
29-
FROM debian:testing-slim AS deploy
29+
FROM debian:trixie-slim AS deploy
3030

3131
SHELL ["/bin/bash", "-c"]
3232
RUN apt-get clean && apt update \

GeneralStateTestsDevnet.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,11 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
165165
OK: 15/15 Fail: 0/15 Skip: 0/15
166166
## call
167167
```diff
168+
+ call_large_args_offset_size_zero.json OK
168169
+ call_large_offset_mstore.json OK
169170
+ call_memory_expands_on_early_revert.json OK
170171
```
171-
OK: 2/2 Fail: 0/2 Skip: 0/2
172+
OK: 3/3 Fail: 0/3 Skip: 0/3
172173
## calldatacopy
173174
```diff
174175
+ calldatacopy.json OK
@@ -318,13 +319,15 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
318319
## p256verify
319320
```diff
320321
+ call_types.json OK
322+
+ contract_creation_transaction.json OK
323+
+ contract_initcode.json OK
321324
+ gas.json OK
322325
+ invalid.json OK
323326
+ modular_comparison.json OK
324327
+ precompile_as_tx_entry_point.json OK
325328
+ valid.json OK
326329
```
327-
OK: 6/6 Fail: 0/6 Skip: 0/6
330+
OK: 8/8 Fail: 0/8 Skip: 0/8
328331
## p256verify_before_fork
329332
```diff
330333
+ precompile_before_fork.json OK
@@ -554,4 +557,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
554557
OK: 1/1 Fail: 0/1 Skip: 0/1
555558

556559
---TOTAL---
557-
OK: 264/264 Fail: 0/264 Skip: 0/264
560+
OK: 267/267 Fail: 0/267 Skip: 0/267

GeneralStateTestsStable.md

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

0 commit comments

Comments
 (0)