Skip to content

(merge after protocol upgrade) cleaup rkyv and openvm-v13 stuffs #232

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

(merge after protocol upgrade) cleaup rkyv and openvm-v13 stuffs #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
152 changes: 0 additions & 152 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ openvm-rv32im-transpiler = { git = "https://github.com/openvm-org/openvm.git", t
openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", tag = "v1.4.1", default-features = false, features = [
"parallel",
"evm-prove",
"legacy-v1-3",
"tco",
"unprotected"
] }
Expand All @@ -84,7 +83,6 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [
"std",
"map-hashbrown",
"map-fxhash",
"rkyv",
] }
alloy-serde = { version = "1.0.13", default-features = false }
alloy-sol-types = { version = "1.3", default-features = false }
Expand All @@ -111,7 +109,6 @@ metrics = "0.23.0"
metrics-util = "0.17"
metrics-tracing-context = "0.16.0"
rayon = "1.10"
rkyv = "0.8"
revm = "29"
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = { version = "1.0" }
Expand Down Expand Up @@ -161,23 +158,6 @@ revm-precompile = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v
revm-primitives = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }
revm-state = { git = "https://github.com/scroll-tech/revm", tag = "scroll-v91" }

## FIXME: when openvm fixes https://github.com/openvm-org/openvm/pull/1937
#[patch.'https://github.com/openvm-org/openvm.git']
#openvm = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-algebra-complex-macros = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-custom-insn = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-sha2 = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-sha256-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-p256 = { git = "https://github.com/lightsing/openvm.git", package = "p256", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-k256 = { git = "https://github.com/lightsing/openvm.git", package = "k256", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-pairing = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-keccak256-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-algebra-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-ecc-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-bigint-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-pairing-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }
#openvm-rv32im-guest = { git = "https://github.com/lightsing/openvm.git", rev = "f834efa186784cfdb0401c8596e1264cc9030f97" }

[profile.maxperf]
inherits = "release"
lto = "fat"
Expand Down
1 change: 0 additions & 1 deletion crates/integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ scroll-zkvm-types.workspace = true
scroll-zkvm-prover.workspace = true
scroll-zkvm-verifier.workspace = true

rkyv.workspace = true
sbv-primitives = { workspace = true }
sbv-utils = { workspace = true }
sbv-core = { workspace = true, features = ["scroll"] }
Expand Down
12 changes: 3 additions & 9 deletions crates/integration/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,13 @@ pub trait PartialProvingTask: serde::Serialize {
fn identifier(&self) -> String;
fn fork_name(&self) -> ForkName;

fn legacy_rkyv_archive(&self) -> eyre::Result<Vec<u8>>;

fn archive(&self) -> eyre::Result<Vec<u8>>
where
Self: Sized,
{
let bytes: Vec<u8> = match GUEST_VERSION.as_ref() {
"0.5.2" => self.legacy_rkyv_archive()?,
_ => {
let config = bincode::config::standard();
bincode::serde::encode_to_vec(self, config)?
}
let bytes: Vec<u8> = {
let config = bincode::config::standard();
bincode::serde::encode_to_vec(self, config)?
};
Ok(bytes)
}
Expand Down Expand Up @@ -210,7 +205,6 @@ pub trait ProverTester {
let config = scroll_zkvm_prover::ProverConfig {
path_app_exe,
path_app_config,
is_openvm_v13: *GUEST_VERSION == "0.5.2",
..Default::default()
};
let prover = Prover::setup(config, Some(Self::NAME))?;
Expand Down
8 changes: 1 addition & 7 deletions crates/integration/src/testers/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use scroll_zkvm_types::{
batch::{BatchHeader, BatchInfo, BatchWitness, LegacyBatchWitness, ReferenceHeader},
batch::{BatchHeader, BatchInfo, BatchWitness, ReferenceHeader},
chunk::ChunkInfo,
proof::ProofEnum,
public_inputs::{ForkName, Version},
Expand All @@ -23,12 +23,6 @@ impl PartialProvingTask for BatchWitness {
header_hash.to_string()
}

fn legacy_rkyv_archive(&self) -> eyre::Result<Vec<u8>> {
let witness_legacy = LegacyBatchWitness::from(self.clone());
let bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&witness_legacy)?;
Ok(bytes.to_vec())
}

fn fork_name(&self) -> ForkName {
ForkName::from(self.fork_name.as_str())
}
Expand Down
Loading