Skip to content

Commit 5d0bae6

Browse files
authored
feat: add devnet-2 support (#42)
* fix: reorder BlockSignatures fields * fix: use aggregated signatures instead of naive ones * chore: add devnet1 fixes * refactor: add ByteListMiB type alias * refactor: don't use zero hash in justification roots leanEthereum/leanSpec#305
1 parent e33d70b commit 5d0bae6

19 files changed

Lines changed: 1170 additions & 329 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Lint
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v4
2525

2626
- name: Setup Rust
2727
uses: dtolnay/rust-toolchain@master
@@ -45,30 +45,14 @@ jobs:
4545
name: Test
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v6
48+
- uses: actions/checkout@v4
4949

50-
# - name: Download test fixtures
51-
# env:
52-
# GH_TOKEN: ${{ github.token }}
53-
# run: |
54-
# mkdir -p leanSpec/fixtures
55-
# gh run download --repo leanEthereum/leanSpec --name fixtures-prod-scheme --dir leanSpec/fixtures
56-
57-
- name: Checkout leanSpec
58-
uses: actions/checkout@v6
59-
with:
60-
repository: leanEthereum/leanSpec
61-
ref: 050fa4a18881d54d7dc07601fe59e34eb20b9630
62-
path: leanSpec
63-
64-
- name: Install uv
65-
uses: astral-sh/setup-uv@v7
66-
67-
- name: Generate test fixtures
68-
working-directory: leanSpec
50+
- name: Download test fixtures
51+
env:
52+
GH_TOKEN: ${{ github.token }}
6953
run: |
70-
uv sync
71-
uv run fill --fork=devnet --clean -n auto
54+
mkdir -p leanSpec/fixtures
55+
gh run download --repo leanEthereum/leanSpec --name fixtures-prod-scheme --dir leanSpec/fixtures
7256
7357
- name: Setup Rust
7458
uses: dtolnay/rust-toolchain@master

Cargo.lock

Lines changed: 74 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ clap = { version = "4.3", features = ["derive", "env"] }
5252
ethereum-types = { version = "0.15.1", features = ["serialize"] }
5353

5454
# XMSS signatures
55-
leansig = { git = "https://github.com/leanEthereum/leansig.git", rev = "f10dcbe" }
55+
leansig = { git = "https://github.com/leanEthereum/leansig.git", rev = "ae12a5feb25d917c42b6466444ebd56ec115a629" }
5656

5757
# SSZ deps
5858
# TODO: roll up our own implementation

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ test: ## 🧪 Run all tests, then forkchoice tests with skip-signature-verificat
1313
docker-build: ## 🐳 Build the Docker image
1414
docker build -t ghcr.io/lambdaclass/ethlambda:local .
1515

16-
LEAN_SPEC_COMMIT_HASH:=050fa4a18881d54d7dc07601fe59e34eb20b9630
16+
LEAN_SPEC_COMMIT_HASH:=fbbacbea4545be870e25e3c00a90fc69e019c5bb
1717

1818
leanSpec:
1919
git clone https://github.com/leanEthereum/leanSpec.git --single-branch
2020
cd leanSpec && git checkout $(LEAN_SPEC_COMMIT_HASH)
2121

2222
leanSpec/fixtures: leanSpec
23-
cd leanSpec && uv run fill --fork devnet -o fixtures #--scheme=prod
23+
cd leanSpec && uv run fill --fork devnet --scheme=prod -o fixtures
2424

2525
# lean-quickstart:
2626
# git clone https://github.com/blockblaz/lean-quickstart.git --depth 1 --single-branch

crates/blockchain/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,8 @@ name = "forkchoice_spectests"
4545
path = "tests/forkchoice_spectests.rs"
4646
harness = false
4747
required-features = ["skip-signature-verification"]
48+
49+
[[test]]
50+
name = "signature_spectests"
51+
path = "tests/signature_spectests.rs"
52+
harness = false

0 commit comments

Comments
 (0)