@@ -29,7 +29,7 @@ pub struct BatchHeaderValidiumWithHash {
2929/// Parse header types passed from golang side and adapt to the
3030/// definition in zkvm-prover's types
3131/// We distinguish the header type in golang side according to the STF
32- /// version, i.e. v6 - v10 (current), and validium
32+ /// version, i.e. v6, v7- v10 (current), and validium
3333/// And adapt it to the corresponding batch header type used in zkvm-prover's witness
3434/// definition, i.e. v6, v7 (current), and validium
3535#[ derive( Clone , serde:: Deserialize , serde:: Serialize ) ]
@@ -40,7 +40,7 @@ pub enum BatchHeaderV {
4040 Validium ( BatchHeaderValidiumWithHash ) ,
4141 /// Header for scroll's STF version v6.
4242 V6 ( BatchHeaderV6 ) ,
43- /// Header for scroll's STF versions v7 - V10 .
43+ /// Header for scroll's STF versions v7 - v10 .
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.
@@ -73,7 +73,7 @@ impl BatchHeaderV {
7373 }
7474 }
7575
76- pub fn to_zkvm_batch_header_v7_to_v9 ( & self ) -> & BatchHeaderV7 {
76+ pub fn to_zkvm_batch_header_v7_to_v10 ( & self ) -> & BatchHeaderV7 {
7777 match self {
7878 BatchHeaderV :: V7_to_V10 ( h) => h,
7979 _ => unreachable ! (
@@ -159,7 +159,7 @@ impl BatchProvingTask {
159159 ) ,
160160 BatchHeaderV :: V7_to_V10 ( _) => assert ! (
161161 matches!( version. fork, ForkName :: EuclidV2 | ForkName :: Feynman | ForkName :: Galileo | ForkName :: GalileoV2 ) ,
162- "hardfork mismatch for da-codec@v7/8/9 header: found={}, expected={:?}" ,
162+ "hardfork mismatch for da-codec@v7/8/9/10 header: found={}, expected={:?}" ,
163163 version. fork,
164164 [ ForkName :: EuclidV2 , ForkName :: Feynman , ForkName :: Galileo , ForkName :: GalileoV2 ] ,
165165 ) ,
@@ -233,20 +233,20 @@ impl BatchProvingTask {
233233 ( Domain :: Scroll , STFVersion :: V6 ) => {
234234 ReferenceHeader :: V6 ( * self . batch_header . to_zkvm_batch_header_v6 ( ) )
235235 }
236- // The da-codec for STF versions v7, v8, v9 is identical. In zkvm-prover we do not
236+ // The da-codec for STF versions v7, v8, v9, v10 is identical. In zkvm-prover we do not
237237 // create additional variants to indicate the identical behaviour of codec. Instead we
238238 // add a separate variant for the STF version.
239239 //
240240 // We handle the different STF versions here however build the same batch header since
241241 // that type does not change. The batch header's version byte constructed in the
242- // coordinator actually defines the STF version (v7, v8 or v9) and we can derive the
243- // hard-fork (feynman or galileo) and the codec from the version byte.
242+ // coordinator actually defines the STF version (v7, v8 or v9, v10 ) and we can derive the
243+ // hard-fork (e.g. feynman or galileo) and the codec from the version byte.
244244 //
245245 // Refer [`scroll_zkvm_types::public_inputs::Version`].
246246 (
247247 Domain :: Scroll ,
248248 STFVersion :: V7 | STFVersion :: V8 | STFVersion :: V9 | STFVersion :: V10 ,
249- ) => ReferenceHeader :: V7_V8_V9 ( * self . batch_header . to_zkvm_batch_header_v7_to_v9 ( ) ) ,
249+ ) => ReferenceHeader :: V7_V8_V9 ( * self . batch_header . to_zkvm_batch_header_v7_to_v10 ( ) ) ,
250250 ( Domain :: Validium , STFVersion :: V1 ) => {
251251 ReferenceHeader :: Validium ( * self . batch_header . to_zkvm_batch_header_validium ( ) )
252252 }
0 commit comments