From c2438a60509dff2d80d4ff5fd49c95d2b454ce5d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 27 Nov 2024 01:26:59 +0000 Subject: [PATCH] fix: misc fixes --- configs/11155420/rollup.json | 1 + scripts/prove/bin/multi.rs | 8 +++----- utils/host/src/block_range.rs | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/11155420/rollup.json b/configs/11155420/rollup.json index 6eb39e0e..452e4c4f 100644 --- a/configs/11155420/rollup.json +++ b/configs/11155420/rollup.json @@ -41,6 +41,7 @@ "ecotone_time": 1708534800, "fjord_time": 1716998400, "granite_time": 1723478400, + "holocene_time": 1732633200, "batch_inbox_address": "0xff00000000000000000000000000000011155420", "deposit_contract_address": "0x16fc5058f25648194471939df75cf27a2fdc48bc", "l1_system_config_address": "0x034edd2a225f7f429a63e0f1d2084b9e0a93b538", diff --git a/scripts/prove/bin/multi.rs b/scripts/prove/bin/multi.rs index 37e2927d..eb2de2b0 100644 --- a/scripts/prove/bin/multi.rs +++ b/scripts/prove/bin/multi.rs @@ -9,7 +9,7 @@ use op_succinct_host_utils::{ }; use op_succinct_prove::{execute_multi, generate_witness, DEFAULT_RANGE, MULTI_BLOCK_ELF}; use sp1_sdk::{utils, ProverClient}; -use std::{fs, time::Duration}; +use std::{fs, path::PathBuf, time::Duration}; #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] @@ -36,7 +36,7 @@ struct Args { /// Env file. #[arg(long, default_value = ".env")] - env_file: Option, + env_file: PathBuf, } /// Execute the OP Succinct program for multiple blocks. @@ -44,9 +44,7 @@ struct Args { async fn main() -> Result<()> { let args = Args::parse(); - if let Some(env_file) = args.env_file { - dotenv::from_filename(env_file).ok(); - } + dotenv::from_path(&args.env_file)?; utils::setup_logger(); let data_fetcher = OPSuccinctDataFetcher::new_with_rollup_config().await?; diff --git a/utils/host/src/block_range.rs b/utils/host/src/block_range.rs index e7e98ba0..804f3241 100644 --- a/utils/host/src/block_range.rs +++ b/utils/host/src/block_range.rs @@ -31,7 +31,7 @@ pub async fn get_validated_block_range( // If start block not provided, use end block - default_range let l2_start_block = match start { Some(start) => start, - None => l2_end_block.saturating_sub(default_range), + None => l2_end_block - default_range }; if l2_start_block >= l2_end_block {