From bec5abed5c5d0636e9583c349ed3e28b01fd65f2 Mon Sep 17 00:00:00 2001 From: ratankaliani Date: Tue, 3 Dec 2024 20:48:07 +0000 Subject: [PATCH] fix --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 2 +- contracts/opsuccinctl2ooconfig.json | 8 ++++---- justfile | 9 +++++++++ proposer/succinct/bin/server.rs | 12 +++++++----- 5 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6438a75..edc4484b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6910,7 +6910,7 @@ dependencies = [ [[package]] name = "sp1-core-executor" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "bincode", "bytemuck", @@ -6943,7 +6943,7 @@ dependencies = [ [[package]] name = "sp1-core-machine" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "bincode", "cfg-if", @@ -6990,7 +6990,7 @@ dependencies = [ [[package]] name = "sp1-curves" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "cfg-if", "curve25519-dalek", @@ -7011,7 +7011,7 @@ dependencies = [ [[package]] name = "sp1-derive" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "quote", "syn 1.0.109", @@ -7044,7 +7044,7 @@ dependencies = [ [[package]] name = "sp1-primitives" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "bincode", "hex", @@ -7079,7 +7079,7 @@ dependencies = [ [[package]] name = "sp1-prover" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "anyhow", "bincode", @@ -7120,7 +7120,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -7153,7 +7153,7 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "backtrace", "itertools 0.13.0", @@ -7174,7 +7174,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "backtrace", "ff 0.13.0", @@ -7209,7 +7209,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "quote", "syn 1.0.109", @@ -7218,7 +7218,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "anyhow", "bincode", @@ -7243,7 +7243,7 @@ dependencies = [ [[package]] name = "sp1-sdk" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "alloy-primitives 0.8.14", "alloy-signer 0.3.6", @@ -7288,7 +7288,7 @@ dependencies = [ [[package]] name = "sp1-stark" version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=f668dc6568b082b9af75d8bd0c776205f6945185#f668dc6568b082b9af75d8bd0c776205f6945185" +source = "git+https://github.com/succinctlabs/sp1.git?rev=0a455d69946a0eb9984cbabb38a5c3ed50ceebed#0a455d69946a0eb9984cbabb38a5c3ed50ceebed" dependencies = [ "arrayref", "getrandom", diff --git a/Cargo.toml b/Cargo.toml index 3f747181..a0c08bd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/contracts/opsuccinctl2ooconfig.json b/contracts/opsuccinctl2ooconfig.json index d03df5e1..42e8e336 100644 --- a/contracts/opsuccinctl2ooconfig.json +++ b/contracts/opsuccinctl2ooconfig.json @@ -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" } \ No newline at end of file diff --git a/justfile b/justfile index 9c1a24f1..1ec26eda 100644 --- a/justfile +++ b/justfile @@ -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 \ @@ -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 @@ -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 diff --git a/proposer/succinct/bin/server.rs b/proposer/succinct/bin/server.rs index 0d55e044..652ea55d 100644 --- a/proposer/succinct/bin/server.rs +++ b/proposer/succinct/bin/server.rs @@ -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::{ @@ -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"); @@ -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(); @@ -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))); @@ -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();