Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ratankaliani committed Dec 3, 2024
1 parent 821ff93 commit bec5abe
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 23 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ sp1-zkvm = { version = "3.0.0", features = ["verify"] }
# Note: This rev is on Matt's mattstam/v3.0.0-w-network-v2 branch which includes the network-v2 changes from Dec 2.
# This branch DOES NOT include the SP1 mock groth16 bytes fix, skipping deferred verification and executor opts.
# This means deferred verification does not work, mock does not work and the cost estimator will be slow.
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "f668dc6568b082b9af75d8bd0c776205f6945185", features = [
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "0a455d69946a0eb9984cbabb38a5c3ed50ceebed", features = [
"network-v2",
] }
sp1-build = { version = "3.0.0" }
Expand Down
8 changes: 4 additions & 4 deletions contracts/opsuccinctl2ooconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
"rollupConfigHash": "0x71241d0f92749d7365aaaf6a015de550816632a4e4e84e273f865f582e8190aa",
"startingBlockNumber": 82060,
"startingOutputRoot": "0x714cca0f5f97496a9278b9e24bd6b716173ed6b87882a2b352483df343d8aaaa",
"startingTimestamp": 1732939204,
"startingBlockNumber": 113491,
"startingOutputRoot": "0x496564d61535e7559fa71091765ef674f26ef6f4076c11f764f4346a1e63c024",
"startingTimestamp": 1733253514,
"submissionInterval": 300,
"verifier": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
"aggregationVkey": "0x00ea4171dbd0027768055bee7f6d64e17e9cec99b29aad5d18e5d804b967775b",
"rangeVkeyCommitment": "0x28fd6a001de229d4520a62825ba78c0d57f083fc608851b94a71a29a52080056"
"rangeVkeyCommitment": "0x1a4ebe5c47d55436319c425951eb1a7e04f560945e29eb454215d30b30987bbb"
}
9 changes: 9 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ deploy-oracle env_file=".env":
# cd into contracts directory
cd contracts

# forge install
forge install

# Run the forge deployment script
forge script script/OPSuccinctDeployer.s.sol:OPSuccinctDeployer \
Expand All @@ -173,6 +176,9 @@ upgrade-oracle env_file=".env":
# cd into contracts directory
cd contracts

# forge install
forge install

# Run the forge upgrade script
if [ "${EXECUTE_UPGRADE_CALL:-true}" = "false" ]; then
Expand Down Expand Up @@ -203,6 +209,9 @@ update-parameters env_file=".env":
# cd into contracts directory
cd contracts

# forge install
forge install

# Run the forge upgrade script
if [ "${EXECUTE_UPGRADE_CALL:-true}" = "false" ]; then
Expand Down
12 changes: 7 additions & 5 deletions proposer/succinct/bin/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use op_succinct_host_utils::{
};
use op_succinct_proposer::{
AggProofRequest, ContractConfig, ProofResponse, ProofStatus, SpanProofRequest,
UnclaimDescription, ValidateConfigRequest, ValidateConfigResponse,
ValidateConfigRequest, ValidateConfigResponse,
};
use sp1_sdk::{
network_v2::{
Expand Down Expand Up @@ -150,7 +150,8 @@ async fn request_span_proof(
let sp1_stdin = get_proof_stdin(&host_cli)?;

// let prover = NetworkProverV1::new();
let prover = NetworkProverV2::new();
let mut prover = NetworkProverV2::new();
prover.with_strategy(FulfillmentStrategy::Reserved);

// Set simulation to false on range proofs as they're large.
env::set_var("SKIP_SIMULATION", "true");
Expand Down Expand Up @@ -209,7 +210,8 @@ async fn request_agg_proof(
.await?;

// Use the reserved strategy for the OP Succinct fulfiller/cluster.
let prover = NetworkProverV2::new().with_strategy(FulfillmentStrategy::Reserved);
let mut prover = NetworkProverV2::new();
prover.with_strategy(FulfillmentStrategy::Reserved);

let stdin =
get_agg_proof_stdin(proofs, boot_infos, headers, &state.range_vk, l1_head.into()).unwrap();
Expand All @@ -220,7 +222,7 @@ async fn request_agg_proof(

// Check if error, otherwise get proof ID.
let proof_id = match res {
Ok(proof_id) => String::from_utf8(proof_id).unwrap(),
Ok(proof_id) => proof_id,
Err(e) => {
log::error!("Failed to request proof: {}", e);
return Err(AppError(anyhow::anyhow!("Failed to request proof: {}", e)));
Expand Down Expand Up @@ -379,7 +381,7 @@ async fn get_proof_status(
));
}
};

// Note: Once network-v2 adds an execution error for reserved, we can use it.

let status = status.fulfillment_status();
Expand Down

0 comments on commit bec5abe

Please sign in to comment.