github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

update dep

Browse Source
This commit is contained in:
Ho
2025-11-28 09:18:51 +09:00
parent 47b9f387ff
commit 7fdc5a6cac
2 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Cargo.lock generated
View File

@@ -1347,7 +1347,7 @@ dependencies = [
"bitflags 2.10.0",
"cexpr",
"clang-sys",
"itertools 0.12.1",
"itertools 0.11.0",
"lazy_static",
"lazycell",
"proc-macro2",
@@ -1367,7 +1367,7 @@ dependencies = [
"bitflags 2.10.0",
"cexpr",
"clang-sys",
"itertools 0.13.0",
"itertools 0.11.0",
"proc-macro2",
"quote",
"regex",
@@ -3851,15 +3851,6 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.13.0"
@@ -8231,7 +8222,7 @@ dependencies = [
[[package]]
name = "risc0-ethereum-trie"
version = "0.1.0"
source = "git+https://github.com/risc0/risc0-ethereum#c1ddb41a44dc0730da883bbfa9fbe75ad335df1b"
source = "git+https://github.com/risc0/risc0-ethereum#e475fe6c8dcff92fb5e67d6556cb11ba3ab4e494"
dependencies = [
"alloy-primitives",
"alloy-rlp",
@@ -8775,8 +8766,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-prover"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"base64 0.22.1",
"bincode 1.3.3",
@@ -8802,8 +8793,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-types"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"alloy-primitives",
"base64 0.22.1",
@@ -8826,8 +8817,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-types-base"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"alloy-primitives",
"alloy-serde 1.0.41",
@@ -8839,8 +8830,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-types-batch"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"alloy-primitives",
"c-kzg",
@@ -8861,8 +8852,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-types-bundle"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"rkyv",
"scroll-zkvm-types-base",
@@ -8871,8 +8862,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-types-chunk"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"alloy-consensus",
"alloy-primitives",
@@ -8896,8 +8887,8 @@ dependencies = [
[[package]]
name = "scroll-zkvm-verifier"
version = "0.7.0"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#facf96257331a9de67b895906c0904718053a90d"
version = "0.7.1"
source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo-v2#ba9ff25b55feb9d2ec1eeae49650b43699126a04"
dependencies = [
"bincode 1.3.3",
"eyre",

39
crates/libzkp/src/tasks/batch.rs
View File

@@ -28,10 +28,10 @@ pub struct BatchHeaderValidiumWithHash {
/// Parse header types passed from golang side and adapt to the
/// definition in zkvm-prover's types
/// We distinguish the header type in golang side according to the codec
/// version, i.e. v7 - v9 (current), and validium
/// And adapt it to the corresponding header version used in zkvm-prover's witness
/// definition, i.e. v7- v8 (current), and validium
/// We distinguish the header type in golang side according to the STF
/// version, i.e. v6 - v10 (current), and validium
/// And adapt it to the corresponding batch header type used in zkvm-prover's witness
/// definition, i.e. v6, v7 (current), and validium
#[derive(Clone, serde::Deserialize, serde::Serialize)]
#[serde(untagged)]
#[allow(non_camel_case_types)]
@@ -40,18 +40,18 @@ pub enum BatchHeaderV {
Validium(BatchHeaderValidiumWithHash),
/// Header for scroll's STF version v6.
V6(BatchHeaderV6),
/// Header for scroll's STF versions v7, v8, v9.
/// Header for scroll's STF versions v7 - V10.
///
/// Since the codec essentially is unchanged for the above STF versions, we do not define new
/// variants, instead re-using the [`BatchHeaderV7`] variant.
V7_V8_V9_V10(BatchHeaderV7),
V7_to_V10(BatchHeaderV7),
}
impl core::fmt::Display for BatchHeaderV {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match self {
BatchHeaderV::V6(_) => write!(f, "V6"),
BatchHeaderV::V7_V8_V9_V10(_) => write!(f, "V7_V8_V9_V10"),
BatchHeaderV::V7_to_V10(_) => write!(f, "V7 - V10"),
BatchHeaderV::Validium(_) => write!(f, "Validium"),
}
}
@@ -61,26 +61,29 @@ impl BatchHeaderV {
pub fn batch_hash(&self) -> B256 {
match self {
BatchHeaderV::V6(h) => h.batch_hash(),
BatchHeaderV::V7_V8_V9_V10(h) => h.batch_hash(),
BatchHeaderV::V7_to_V10(h) => h.batch_hash(),
BatchHeaderV::Validium(h) => h.header.batch_hash(),
}
}
pub fn must_v6_header(&self) -> &BatchHeaderV6 {
pub fn to_zkvm_batch_header_v6(&self) -> &BatchHeaderV6 {
match self {
BatchHeaderV::V6(h) => h,
_ => unreachable!("A header of {} is considered to be v6", self),
}
}
pub fn must_v7_v8_v9_v10header(&self) -> &BatchHeaderV7 {
pub fn to_zkvm_batch_header_v7_to_v9(&self) -> &BatchHeaderV7 {
match self {
BatchHeaderV::V7_V8_V9_V10(h) => h,
_ => unreachable!("A header of {} is considered to be in [v7, v8, v9]", self),
BatchHeaderV::V7_to_V10(h) => h,
_ => unreachable!(
"A header of {} is considered to be in [v7, v8, v9, v10]",
self
),
}
}
pub fn must_validium_header(&self) -> &BatchHeaderValidium {
pub fn to_zkvm_batch_header_validium(&self) -> &BatchHeaderValidium {
match self {
BatchHeaderV::Validium(h) => &h.header,
_ => unreachable!("A header of {} is considered to be validium", self),
@@ -154,11 +157,11 @@ impl BatchProvingTask {
version.fork,
ForkName::EuclidV1,
),
BatchHeaderV::V7_V8_V9_V10(_) => assert!(
BatchHeaderV::V7_to_V10(_) => assert!(
matches!(version.fork, ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo | ForkName::GalileoV2),
"hardfork mismatch for da-codec@v7/8/9 header: found={}, expected={:?}",
version.fork,
[ForkName::EuclidV2, ForkName::Feynman, ForkName::Galileo],
[ForkName::EuclidV2, ForkName::Feynman, ForkName::Galileo, ForkName::GalileoV2],
),
}
@@ -228,7 +231,7 @@ impl BatchProvingTask {
let reference_header = match (version.domain, version.stf_version) {
(Domain::Scroll, STFVersion::V6) => {
ReferenceHeader::V6(*self.batch_header.must_v6_header())
ReferenceHeader::V6(*self.batch_header.to_zkvm_batch_header_v6())
}
// The da-codec for STF versions v7, v8, v9 is identical. In zkvm-prover we do not
// create additional variants to indicate the identical behaviour of codec. Instead we
@@ -243,9 +246,9 @@ impl BatchProvingTask {
(
Domain::Scroll,
STFVersion::V7 | STFVersion::V8 | STFVersion::V9 | STFVersion::V10,
) => ReferenceHeader::V7_V8_V9(*self.batch_header.must_v7_v8_v9_v10header()),
) => ReferenceHeader::V7_V8_V9(*self.batch_header.to_zkvm_batch_header_v7_to_v9()),
(Domain::Validium, STFVersion::V1) => {
ReferenceHeader::Validium(*self.batch_header.must_validium_header())
ReferenceHeader::Validium(*self.batch_header.to_zkvm_batch_header_validium())
}
(domain, stf_version) => {
unreachable!("unsupported domain={domain:?},stf-version={stf_version:?}")