Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1cd80dd
feat(crypto): integrate leanMultisig devnet5 (merge, verify, split)
MegaRedHand May 14, 2026
2c9dec0
refactor(types): align Type-1/Type-2 envelope with leanSpec PR #717
MegaRedHand May 14, 2026
5361136
fix(blockchain): strip per-component Type-1 bytes from Type-2 envelope
MegaRedHand May 14, 2026
3199e7d
feat(blockchain): gate Type-2 SNARK behind --crypto-merge-t1-into-t2
MegaRedHand May 14, 2026
2f34f9e
review: address PR #370 greptile comments
MegaRedHand May 14, 2026
70c7cdb
Revert "feat(blockchain): gate Type-2 SNARK behind --crypto-merge-t1-…
MegaRedHand May 15, 2026
20c6326
Merge branch 'devnet5' into feat/integrate-leanmultisig-devnet5
MegaRedHand May 15, 2026
2076625
Merge branch 'devnet5' into feat/integrate-leanmultisig-devnet5
MegaRedHand May 20, 2026
604ea4c
refactor(types): align block proof envelope with leanSpec PR #717
MegaRedHand May 20, 2026
cc3df59
feat(blockchain): reaggregate per-attestation Type-1s from imported b…
MegaRedHand May 20, 2026
4238a94
test(fixtures): bump leanSpec to post-#717, switch to test-scheme gen…
MegaRedHand May 20, 2026
961aba4
fix(types): restore SSZ proof envelope, drop MAX_ATTESTATIONS_DATA to 8
MegaRedHand May 20, 2026
a0b9677
chore: bump leanSpec commit
MegaRedHand May 21, 2026
06c3e59
Merge branch 'devnet5' into feat/integrate-leanmultisig-devnet5
MegaRedHand May 21, 2026
f00646e
ci: update fork name in fixture generation
MegaRedHand May 21, 2026
df54c78
chore: remove comment
MegaRedHand May 21, 2026
9542216
Merge branch 'devnet5' into feat/integrate-leanmultisig-devnet5
MegaRedHand May 26, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 77 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 3 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,15 @@ docker-build: ## 🐳 Build the Docker image
-t ghcr.io/lambdaclass/ethlambda:$(DOCKER_TAG) .
@echo

# 2026-04-29
# NOTE(type1-type2): an attempted bump to anshalshukla/leanSpec@0ab09dd ("dummy
# type 1 and type 2 aggregation with block proofs") was reverted because the
# testing harness in that branch still imports `AttestationSignatures`, which
# the same commit removed — the fixture generator fails to load. We stay on
# the canonical commit and skip the affected SSZ-spec and signature-spec test
# cases until the upstream refactor lands together with matching testing-side
# updates.
LEAN_SPEC_COMMIT_HASH:=18fe71fee49f8865a5c8a4cb8b1787b0cbc9e25b
# 2026-05-21
LEAN_SPEC_COMMIT_HASH:=825bec6bf278920cfc56730d64a7c90522a0bb6c

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

leanSpec/fixtures: leanSpec
cd leanSpec && uv run fill --fork devnet -n auto --scheme=prod -o fixtures
cd leanSpec && uv run fill --fork Lstar -n auto --scheme=prod -o fixtures

lean-quickstart:
git clone https://github.com/blockblaz/lean-quickstart.git --depth 1 --single-branch
Expand Down
16 changes: 4 additions & 12 deletions crates/blockchain/src/aggregation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use ethlambda_crypto::aggregate_mixed;
use ethlambda_storage::Store;
use ethlambda_types::{
attestation::{AggregationBits, HashedAttestationData},
block::{ByteListMiB, BytecodeClaim, TypeOneInfo, TypeOneMultiSignature},
block::{ByteList512KiB, TypeOneMultiSignature},
primitives::H256,
signature::{ValidatorPublicKey, ValidatorSignature},
state::Validator,
Expand Down Expand Up @@ -46,7 +46,7 @@ pub struct AggregationJob {
pub(crate) slot: u64,
/// Pre-resolved `(participant_pubkeys, proof_data)` pairs for children
/// selected via greedy coverage.
pub(crate) children: Vec<(Vec<ValidatorPublicKey>, ByteListMiB)>,
pub(crate) children: Vec<(Vec<ValidatorPublicKey>, ByteList512KiB)>,
pub(crate) accepted_child_ids: Vec<u64>,
pub(crate) raw_pubkeys: Vec<ValidatorPublicKey>,
pub(crate) raw_sigs: Vec<ValidatorSignature>,
Expand Down Expand Up @@ -234,7 +234,7 @@ fn build_job(
fn resolve_child_pubkeys(
child_proofs: &[TypeOneMultiSignature],
validators: &[Validator],
) -> (Vec<(Vec<ValidatorPublicKey>, ByteListMiB)>, Vec<u64>) {
) -> (Vec<(Vec<ValidatorPublicKey>, ByteList512KiB)>, Vec<u64>) {
let mut children = Vec::with_capacity(child_proofs.len());
let mut accepted_child_ids: Vec<u64> = Vec::new();

Expand Down Expand Up @@ -290,15 +290,7 @@ pub fn aggregate_job(job: AggregationJob) -> Option<AggregatedGroupOutput> {
participants.dedup();

let aggregation_bits = aggregation_bits_from_validator_indices(&participants);
let proof = TypeOneMultiSignature {
info: TypeOneInfo {
message: data_root,
slot: job.slot,
participants: aggregation_bits,
bytecode_claim: BytecodeClaim::ZERO,
},
proof: proof_data,
};
let proof = TypeOneMultiSignature::new(aggregation_bits, proof_data);
metrics::observe_aggregated_proof_size(proof.proof.len());

Some(AggregatedGroupOutput {
Expand Down
Loading
Loading