Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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.

19 changes: 9 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,21 @@ 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-20
# Pinned just after leanSpec PR #717 ("Aggregated block proof - devnet5")
# merged: the wire format collapses per-attestation Type-1s + proposer
# signature into a single block-level Type-2 merged proof, and fork-choice
# fixtures live under `lstar/` instead of `devnet/`. Fixtures must be
# generated with `--scheme=test`; the `prod` scheme's pre-generated keys
# upstream still use the pre-#725 JSON shape and break the filler.
LEAN_SPEC_COMMIT_HASH:=d9d2e6779a4dcbecbe1cf2bdda47cd64f3f4844a

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=test -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