Skip to content

Commit 47b9f38

Browse files
committed
update batch task for galileov2
1 parent f59bc76 commit 47b9f38

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

crates/libzkp/src/tasks/batch.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ pub enum BatchHeaderV {
4444
///
4545
/// Since the codec essentially is unchanged for the above STF versions, we do not define new
4646
/// variants, instead re-using the [`BatchHeaderV7`] variant.
47-
V7_V8_V9(BatchHeaderV7),
47+
V7_V8_V9_V10(BatchHeaderV7),
4848
}
4949

5050
impl core::fmt::Display for BatchHeaderV {
5151
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
5252
match self {
5353
BatchHeaderV::V6(_) => write!(f, "V6"),
54-
BatchHeaderV::V7_V8_V9(_) => write!(f, "V7_V8_V9"),
54+
BatchHeaderV::V7_V8_V9_V10(_) => write!(f, "V7_V8_V9_V10"),
5555
BatchHeaderV::Validium(_) => write!(f, "Validium"),
5656
}
5757
}
@@ -61,7 +61,7 @@ impl BatchHeaderV {
6161
pub fn batch_hash(&self) -> B256 {
6262
match self {
6363
BatchHeaderV::V6(h) => h.batch_hash(),
64-
BatchHeaderV::V7_V8_V9(h) => h.batch_hash(),
64+
BatchHeaderV::V7_V8_V9_V10(h) => h.batch_hash(),
6565
BatchHeaderV::Validium(h) => h.header.batch_hash(),
6666
}
6767
}
@@ -73,9 +73,9 @@ impl BatchHeaderV {
7373
}
7474
}
7575

76-
pub fn must_v7_v8_v9_header(&self) -> &BatchHeaderV7 {
76+
pub fn must_v7_v8_v9_v10header(&self) -> &BatchHeaderV7 {
7777
match self {
78-
BatchHeaderV::V7_V8_V9(h) => h,
78+
BatchHeaderV::V7_V8_V9_V10(h) => h,
7979
_ => unreachable!("A header of {} is considered to be in [v7, v8, v9]", self),
8080
}
8181
}
@@ -154,8 +154,8 @@ impl BatchProvingTask {
154154
version.fork,
155155
ForkName::EuclidV1,
156156
),
157-
BatchHeaderV::V7_V8_V9(_) => assert!(
158-
matches!(version.fork, ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo),
157+
BatchHeaderV::V7_V8_V9_V10(_) => assert!(
158+
matches!(version.fork, ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo | ForkName::GalileoV2),
159159
"hardfork mismatch for da-codec@v7/8/9 header: found={}, expected={:?}",
160160
version.fork,
161161
[ForkName::EuclidV2, ForkName::Feynman, ForkName::Galileo],
@@ -240,9 +240,10 @@ impl BatchProvingTask {
240240
// hard-fork (feynman or galileo) and the codec from the version byte.
241241
//
242242
// Refer [`scroll_zkvm_types::public_inputs::Version`].
243-
(Domain::Scroll, STFVersion::V7 | STFVersion::V8 | STFVersion::V9) => {
244-
ReferenceHeader::V7_V8_V9(*self.batch_header.must_v7_v8_v9_header())
245-
}
243+
(
244+
Domain::Scroll,
245+
STFVersion::V7 | STFVersion::V8 | STFVersion::V9 | STFVersion::V10,
246+
) => ReferenceHeader::V7_V8_V9(*self.batch_header.must_v7_v8_v9_v10header()),
246247
(Domain::Validium, STFVersion::V1) => {
247248
ReferenceHeader::Validium(*self.batch_header.must_validium_header())
248249
}

0 commit comments

Comments
 (0)