chore: create utils folder (#88)

* chore: create utils folder * fix clippy * fix * clean * clean" gp --------- Co-authored-by: ratankaliani <[email protected]>
succinctlabs · Aug 30, 2024 · b41180c · b41180c
1 parent 62751dd
commit b41180c
Show file tree

Hide file tree

Showing 35 changed files with 101 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
+    "utils/*",
     "programs/*",
-    "crates/*",
     "native-host",
     "zkvm-host",
     "proposer/succinct",
@@ -58,8 +58,8 @@ rkyv = "0.7.44"
 hex = "0.4.3"
 
 # local
-client-utils = { path = "crates/client-utils" }
-host-utils = { path = "crates/host-utils" }
+op-succinct-client-utils = { path = "utils/client" }
+op-succinct-host-utils = { path = "utils/host" }
 zkvm-host = { path = "zkvm-host" }
 op-succinct-proposer = { path = "proposer/succinct" }
 

diff --git a/programs/aggregation/Cargo.toml b/programs/aggregation/Cargo.toml
@@ -11,7 +11,7 @@ repository.workspace = true
 sha2 = { workspace = true }
 sp1-zkvm = { workspace = true }
 sp1-lib = { workspace = true }
-client-utils = { workspace = true }
+op-succinct-client-utils = { workspace = true }
 alloy-consensus = { workspace = true }
 alloy-primitives = { workspace = true }
 serde_cbor.workspace = true
diff --git a/programs/aggregation/src/main.rs b/programs/aggregation/src/main.rs
@@ -6,7 +6,7 @@ sp1_zkvm::entrypoint!(main);
 
 use alloy_consensus::Header;
 use alloy_primitives::B256;
-use client_utils::{types::AggregationInputs, RawBootInfo};
+use op_succinct_client_utils::{types::AggregationInputs, RawBootInfo};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 

diff --git a/programs/fault-proof/Cargo.toml b/programs/fault-proof/Cargo.toml
@@ -21,7 +21,7 @@ kona-executor.workspace = true
 kona-client.workspace = true
 
 # workspace (local)
-client-utils.workspace = true
+op-succinct-client-utils.workspace = true
 
 # sp1
 sp1-zkvm = { workspace = true }

diff --git a/programs/fault-proof/src/main.rs b/programs/fault-proof/src/main.rs
@@ -21,16 +21,16 @@ cfg_if! {
     // from SP1 and compile to a program that can be run in zkVM.
     if #[cfg(target_os = "zkvm")] {
         sp1_zkvm::entrypoint!(main);
-        use client_utils::{RawBootInfo, InMemoryOracle};
+        use op_succinct_client_utils::{RawBootInfo, InMemoryOracle};
         use alloc::vec::Vec;
     } else {
         use kona_client::CachingOracle;
-        use client_utils::pipes::{ORACLE_READER, HINT_WRITER};
+        use op_succinct_client_utils::pipes::{ORACLE_READER, HINT_WRITER};
     }
 }
 
 fn main() {
-    client_utils::block_on(async move {
+    op_succinct_client_utils::block_on(async move {
         ////////////////////////////////////////////////////////////////
         //                          PROLOGUE                          //
         ////////////////////////////////////////////////////////////////

diff --git a/programs/range/Cargo.toml b/programs/range/Cargo.toml
@@ -10,7 +10,7 @@ repository.workspace = true
 [dependencies]
 # workspace (general)
 cfg-if.workspace = true
-client-utils.workspace = true
+op-succinct-client-utils.workspace = true
 
 # workspace (ethereum)
 op-alloy-consensus.workspace = true

diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs
@@ -1,12 +1,12 @@
 //! A program to verify a Optimism L2 block STF in the zkVM.
 #![cfg_attr(target_os = "zkvm", no_main)]
 
-use client_utils::precompiles::ZKVMPrecompileOverride;
 use kona_client::{
     l1::{OracleBlobProvider, OracleL1ChainProvider},
     BootInfo,
 };
 use kona_executor::StatelessL2BlockExecutor;
+use op_succinct_client_utils::precompiles::ZKVMPrecompileOverride;
 
 use alloy_eips::eip2718::Decodable2718;
 use kona_primitives::{L2ExecutionPayloadEnvelope, OpBlock};
@@ -16,7 +16,7 @@ use alloc::sync::Arc;
 use alloy_consensus::Sealed;
 use cfg_if::cfg_if;
 
-use client_utils::{
+use op_succinct_client_utils::{
     driver::MultiBlockDerivationDriver, l2_chain_provider::MultiblockOracleL2ChainProvider,
 };
 
@@ -30,19 +30,19 @@ cfg_if! {
     if #[cfg(target_os = "zkvm")] {
         sp1_zkvm::entrypoint!(main);
 
-        use client_utils::{
+        use op_succinct_client_utils::{
             RawBootInfo,
             InMemoryOracle
         };
         use alloc::vec::Vec;
     } else {
         use kona_client::CachingOracle;
-        use client_utils::pipes::{ORACLE_READER, HINT_WRITER};
+        use op_succinct_client_utils::pipes::{ORACLE_READER, HINT_WRITER};
     }
 }
 
 fn main() {
-    client_utils::block_on(async move {
+    op_succinct_client_utils::block_on(async move {
         ////////////////////////////////////////////////////////////////
         //                          PROLOGUE                          //
         ////////////////////////////////////////////////////////////////

diff --git a/proposer/succinct/Cargo.toml b/proposer/succinct/Cargo.toml
@@ -43,14 +43,14 @@ kona-host = { workspace = true }
 kona-primitives.workspace = true
 
 # local
-host-utils.workspace = true
+op-succinct-host-utils.workspace = true
 
 # sp1
 sp1-sdk = { workspace = true }
 
 anyhow.workspace = true
 dotenv.workspace = true
-client-utils.workspace = true
+op-succinct-client-utils.workspace = true
 serde = { workspace = true }
 
 # server

diff --git a/proposer/succinct/Dockerfile.server b/proposer/succinct/Dockerfile.server
@@ -31,7 +31,7 @@ COPY zkvm-host ./zkvm-host
 COPY proposer/succinct ./proposer/succinct
 COPY native-host ./native-host
 COPY elf ./elf
-COPY crates ./crates
+COPY utils ./utils
 COPY programs ./programs
 
 # Build the server

diff --git a/proposer/succinct/bin/cost_estimator.rs b/proposer/succinct/bin/cost_estimator.rs
@@ -1,14 +1,14 @@
 use anyhow::Result;
 use clap::Parser;
-use host_utils::{
+use kona_host::HostCli;
+use kona_primitives::RollupConfig;
+use log::{error, info};
+use op_succinct_host_utils::{
     fetcher::{ChainMode, OPSuccinctDataFetcher},
     get_proof_stdin,
     stats::{get_execution_stats, ExecutionStats},
     ProgramType,
 };
-use kona_host::HostCli;
-use kona_primitives::RollupConfig;
-use log::{error, info};
 use op_succinct_proposer::run_native_host;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use reqwest::Client;

diff --git a/proposer/succinct/bin/fetch_and_save_proof.rs b/proposer/succinct/bin/fetch_and_save_proof.rs
@@ -1,8 +1,8 @@
 use alloy::hex;
 use anyhow::Result;
 use clap::Parser;
-use client_utils::{RawBootInfo, BOOT_INFO_SIZE};
 use dotenv::dotenv;
+use op_succinct_client_utils::{RawBootInfo, BOOT_INFO_SIZE};
 use sp1_sdk::{NetworkProver, SP1ProofWithPublicValues};
 use std::{fs, path::Path};
 

diff --git a/proposer/succinct/bin/load_stdin.rs b/proposer/succinct/bin/load_stdin.rs
@@ -1,4 +1,4 @@
-use client_utils::RawBootInfo;
+use op_succinct_client_utils::RawBootInfo;
 use sp1_sdk::{utils, SP1Stdin};
 use std::fs;
 

diff --git a/proposer/succinct/bin/server.rs b/proposer/succinct/bin/server.rs
@@ -7,11 +7,11 @@ use axum::{
     Json, Router,
 };
 use base64::{engine::general_purpose, Engine as _};
-use client_utils::{RawBootInfo, BOOT_INFO_SIZE};
-use host_utils::{
+use log::info;
+use op_succinct_client_utils::{RawBootInfo, BOOT_INFO_SIZE};
+use op_succinct_host_utils::{
     fetcher::OPSuccinctDataFetcher, get_agg_proof_stdin, get_proof_stdin, ProgramType,
 };
-use log::info;
 use op_succinct_proposer::run_native_host;
 use serde::{Deserialize, Deserializer, Serialize};
 use sp1_sdk::{