Skip to content

Fix batch header v #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2025
Merged

Fix batch header v #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5062774
fix(prover): generic batch header v7/v8 the same
roynalnaruto Jul 22, 2025
b7900a1
fix: reference header assignment
roynalnaruto Jul 22, 2025
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
7 changes: 3 additions & 4 deletions crates/integration/src/utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ impl From<&BatchHeaderV> for LastHeader {
fn from(value: &BatchHeaderV) -> Self {
match value {
BatchHeaderV::V6(h) => h.into(),
BatchHeaderV::V7(h) => h.into(),
BatchHeaderV::V8(h) => h.into(),
BatchHeaderV::V7_8(h) => h.into(),
}
}
}
Expand Down Expand Up @@ -293,7 +292,7 @@ pub fn build_batch_task(
ForkName::EuclidV2 => {
use scroll_zkvm_types::batch::BatchHeaderV7;
let _ = x + z;
BatchHeaderV::V7(BatchHeaderV7 {
BatchHeaderV::V7_8(BatchHeaderV7 {
version: last_header.version,
batch_index: last_header.batch_index + 1,
parent_batch_hash: last_header.batch_hash,
Expand All @@ -303,7 +302,7 @@ pub fn build_batch_task(
ForkName::Feynman => {
use scroll_zkvm_types::batch::BatchHeaderV8;
let _ = x + z;
BatchHeaderV::V8(BatchHeaderV8 {
BatchHeaderV::V7_8(BatchHeaderV8 {
version: last_header.version,
batch_index: last_header.batch_index + 1,
parent_batch_hash: last_header.batch_hash,
Expand Down
125 changes: 44 additions & 81 deletions crates/prover/src/task/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ use crate::{
#[serde(untagged)]
pub enum BatchHeaderV {
V6(BatchHeaderV6),
V7(BatchHeaderV7),
V8(BatchHeaderV8),
V7_8(BatchHeaderV7),
}

impl From<BatchHeaderV> for ReferenceHeader {
fn from(value: BatchHeaderV) -> Self {
match value {
BatchHeaderV::V6(h) => ReferenceHeader::V6(h),
BatchHeaderV::V7(h) => ReferenceHeader::V7(h),
BatchHeaderV::V8(h) => ReferenceHeader::V8(h),
BatchHeaderV::V7_8(h) => ReferenceHeader::V7(h),
}
}
}
Expand All @@ -43,8 +41,7 @@ impl BatchHeaderV {
pub fn batch_hash(&self) -> B256 {
match self {
BatchHeaderV::V6(h) => h.batch_hash(),
BatchHeaderV::V7(h) => h.batch_hash(),
BatchHeaderV::V8(h) => h.batch_hash(),
BatchHeaderV::V7_8(h) => h.batch_hash(),
}
}

Expand All @@ -57,15 +54,15 @@ impl BatchHeaderV {

pub fn must_v7_header(&self) -> &BatchHeaderV7 {
match self {
BatchHeaderV::V7(h) => h,
_ => panic!("try to pick v7 header"),
BatchHeaderV::V7_8(h) => h,
_ => panic!("try to pick other header"),
}
}

pub fn must_v8_header(&self) -> &BatchHeaderV8 {
match self {
BatchHeaderV::V8(h) => h,
_ => panic!("try to pick v8 header"),
BatchHeaderV::V7_8(h) => h,
_ => panic!("try to pick other header"),
}
}
}
Expand Down Expand Up @@ -120,35 +117,28 @@ impl ProvingTask for BatchProvingTask {
<EnvelopeV6 as Envelope>::from_slice(self.blob_bytes.as_slice())
.challenge_digest(versioned_hash)
}
BatchHeaderV::V7(_) => {
assert_eq!(
fork_name,
ForkName::EuclidV2,
"hardfork mismatch for da-codec@v7 header: found={fork_name:?}, expected={:?}",
ForkName::EuclidV2,
);
let padded_blob_bytes = {
let mut padded_blob_bytes = self.blob_bytes.to_vec();
padded_blob_bytes.resize(N_BLOB_BYTES, 0);
padded_blob_bytes
};
<EnvelopeV7 as Envelope>::from_slice(padded_blob_bytes.as_slice())
.challenge_digest(versioned_hash)
}
BatchHeaderV::V8(_) => {
assert_eq!(
fork_name,
ForkName::Feynman,
"hardfork mismatch for da-codec@v8 header: found={fork_name:?}, expected={:?}",
ForkName::Feynman,
);
BatchHeaderV::V7_8(_) => {
let padded_blob_bytes = {
let mut padded_blob_bytes = self.blob_bytes.to_vec();
padded_blob_bytes.resize(N_BLOB_BYTES, 0);
padded_blob_bytes
};
<EnvelopeV8 as Envelope>::from_slice(padded_blob_bytes.as_slice())
.challenge_digest(versioned_hash)

match fork_name {
ForkName::EuclidV2 => {
<EnvelopeV7 as Envelope>::from_slice(padded_blob_bytes.as_slice())
.challenge_digest(versioned_hash)
}
ForkName::Feynman => {
<EnvelopeV8 as Envelope>::from_slice(padded_blob_bytes.as_slice())
.challenge_digest(versioned_hash)
}
f => unreachable!(
"hardfork mismatch for da-codec@v7 header: found={}, expected={:?}",
f,
[ForkName::EuclidV2, ForkName::Feynman],
),
}
}
};

Expand All @@ -174,7 +164,11 @@ impl ProvingTask for BatchProvingTask {
kzg_proof: kzg_proof.into_inner(),
};

let reference_header = self.batch_header.clone().into();
let reference_header = match fork_name {
ForkName::EuclidV1 => ReferenceHeader::V6(*self.batch_header.must_v6_header()),
ForkName::EuclidV2 => ReferenceHeader::V7(*self.batch_header.must_v7_header()),
ForkName::Feynman => ReferenceHeader::V8(*self.batch_header.must_v8_header()),
};

let witness = BatchWitness {
fork_name,
Expand Down Expand Up @@ -246,52 +240,21 @@ impl From<&BatchProvingTask> for BatchInfo {
);
(h.parent_batch_hash, Default::default(), Default::default())
}
BatchHeaderV::V7(h) => {
assert_eq!(
fork_name,
ForkName::EuclidV2,
"hardfork mismatch for da-codec@v7 header: found={fork_name:?}, expected={:?}",
ForkName::EuclidV2,
);
(
h.parent_batch_hash,
task.chunk_proofs
.first()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.prev_msg_queue_hash,
task.chunk_proofs
.last()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.post_msg_queue_hash,
)
}
BatchHeaderV::V8(h) => {
assert_eq!(
fork_name,
ForkName::Feynman,
"hardfork mismatch for da-codec@v8 header: found={fork_name:?}, expected={:?}",
ForkName::Feynman,
);
(
h.parent_batch_hash,
task.chunk_proofs
.first()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.prev_msg_queue_hash,
task.chunk_proofs
.last()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.post_msg_queue_hash,
)
}
BatchHeaderV::V7_8(h) => (
h.parent_batch_hash,
task.chunk_proofs
.first()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.prev_msg_queue_hash,
task.chunk_proofs
.last()
.expect("at least one chunk in batch")
.metadata
.chunk_info
.post_msg_queue_hash,
),
};

let batch_hash = task.batch_header.batch_hash();
Expand Down