Skip to content

Commit d1ef845

Browse files
authored
feat: make customize easy (#239)
* make submodules allow adding other pi inputs to customize scroll toolchain * expose encoded pi api * apply review * group types * move sol types out * re-export * fmt * fix feature gate * update commit
1 parent 2e8e29f commit d1ef845

File tree

36 files changed

+449
-458
lines changed

36 files changed

+449
-458
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#![cfg_attr(rustfmt, rustfmt_skip)]
22
//! Generated by crates/build-guest. DO NOT EDIT!
33
4-
pub const COMMIT: [u32; 8] = [890757180, 1649007893, 1418561989, 1736314948, 223360016, 1081880906, 1677391942, 1226516817];
4+
pub const COMMIT: [u32; 8] = [1323428575, 739444403, 975817221, 1884376082, 1869082474, 301119364, 847692461, 1689905020];

crates/circuits/batch-circuit/src/circuit.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ use scroll_zkvm_types_circuit::{
55
io::read_witnesses,
66
public_inputs::{
77
Version,
8-
batch::{BatchInfo, VersionedBatchInfo},
9-
chunk::VersionedChunkInfo,
8+
scroll::{
9+
batch::{BatchInfo, VersionedBatchInfo},
10+
chunk::VersionedChunkInfo,
11+
},
1012
},
1113
};
1214

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#![cfg_attr(rustfmt, rustfmt_skip)]
22
//! Generated by crates/build-guest. DO NOT EDIT!
33
4-
pub const COMMIT: [u32; 8] = [1247172214, 1931214656, 1068729231, 398739518, 1658920406, 920892194, 1958141633, 1294205275];
4+
pub const COMMIT: [u32; 8] = [395255096, 1538461738, 1900404427, 924047718, 794880083, 331615215, 287045005, 551525680];

crates/circuits/bundle-circuit/src/circuit.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ use scroll_zkvm_types_circuit::{
55
io::read_witnesses,
66
public_inputs::{
77
Version,
8-
batch::VersionedBatchInfo,
9-
bundle::{BundleInfo, VersionedBundleInfo},
8+
scroll::{
9+
batch::VersionedBatchInfo,
10+
bundle::{BundleInfo, VersionedBundleInfo},
11+
},
1012
},
1113
};
1214

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#![cfg_attr(rustfmt, rustfmt_skip)]
22
//! Generated by crates/build-guest. DO NOT EDIT!
33
4-
pub const COMMIT: [u32; 8] = [521613781, 1622539563, 151651136, 1386962758, 237337157, 1727643820, 1779614850, 552755794];
4+
pub const COMMIT: [u32; 8] = [153372445, 1720016086, 1822473630, 946375535, 421518027, 1979460861, 209770256, 812698810];

crates/circuits/chunk-circuit/src/circuit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use openvm::init;
2-
use scroll_zkvm_types_chunk::ChunkWitness;
2+
use scroll_zkvm_types_chunk::scroll::ChunkWitness;
33
use scroll_zkvm_types_circuit::{
44
Circuit,
55
io::read_witnesses,
66
public_inputs::{
77
Version,
8-
chunk::{ChunkInfo, VersionedChunkInfo},
8+
scroll::chunk::{ChunkInfo, VersionedChunkInfo},
99
},
1010
};
1111

crates/integration/src/bin/chunk-scanner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use scroll_zkvm_integration::{
1010
ProverTester,
1111
testers::chunk::{ChunkProverTester, exec_chunk},
1212
};
13-
use scroll_zkvm_types::{chunk::ChunkWitness, version};
13+
use scroll_zkvm_types::{scroll::chunk::ChunkWitness, version};
1414
use std::collections::HashMap;
1515
use std::{fs::File, path::PathBuf, slice};
1616
use url::Url;

crates/integration/src/testers/batch.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use scroll_zkvm_types::{
2-
batch::{BatchHeader, BatchInfo, BatchWitness, ReferenceHeader},
3-
chunk::ChunkInfo,
42
proof::ProofEnum,
53
public_inputs::{ForkName, Version},
4+
scroll::{
5+
batch::{BatchHeader, BatchInfo, BatchWitness, ReferenceHeader},
6+
chunk::ChunkInfo,
7+
},
68
utils::serialize_vk,
79
};
810

crates/integration/src/testers/bundle.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use scroll_zkvm_types::{
2-
batch::BatchInfo,
3-
bundle::{BundleInfo, BundleWitness},
42
proof::ProofEnum,
53
public_inputs::ForkName,
4+
scroll::{
5+
batch::BatchInfo,
6+
bundle::{BundleInfo, BundleWitness},
7+
},
68
};
79

810
// Only related to hardcoded commitments. Can be refactored later.

crates/integration/src/testers/chunk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use sbv_primitives::{B256, types::consensus::TxL1Message};
99
use scroll_zkvm_prover::utils::read_json;
1010
use scroll_zkvm_prover::utils::vm::ExecutionResult;
1111
use scroll_zkvm_types::{
12-
chunk::{ChunkInfo, ChunkWitness, SecretKey},
1312
proof::ProofEnum,
1413
public_inputs::{ForkName, Version},
14+
scroll::chunk::{ChunkInfo, ChunkWitness, SecretKey},
1515
};
1616
use std::{
1717
fs::File,

0 commit comments

Comments
 (0)