Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
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
14 changes: 1 addition & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ members = [
"integration-tests",
"tools/generate-deposit",
"lib/observability",
"lib/object_store",
"lib/state_full_diffs",
"lib/status",
"lib/multivm",
Expand Down Expand Up @@ -155,7 +154,7 @@ futures = "0.3"
vise = "0.3.0"
vise-exporter = "0.3.0"
bincode = { version = "2.0.1", features = ["serde"] }
smart-config = { version = "0.4.0-pre.2"}
smart-config = { version = "0.4.0-pre.2" }
smart-config-commands = { version = "0.4.0-pre.2" }
thiserror = "2.0.12"
clap = "4.2.2"
Expand All @@ -182,20 +181,10 @@ tower-http = "0.6.6"
hyper = "1.6.0"
hyper-util = "0.1.19"
semver = { version = "1", features = ["serde"] }
async-stream = "0.3.6"
num_cpus = "1.17.0"
rocksdb = "0.24.0"
thread_local = "1.1.9"
pin-project = "1.1.10"
aws-config = { version = "1.8.6", default-features = false, features = [
"behavior-version-latest",
] }
aws-runtime = { version = "1.5.10" }
aws-sdk-s3 = { version = "1.106.0", default-features = false, features = [
"behavior-version-latest",
"rt-tokio",
"default-https-client",
] }
assert_matches = "1.5"
serde_yaml = "0.9"
secrecy = "0.10.3"
Expand Down Expand Up @@ -263,7 +252,6 @@ zksync_os_storage = { version = "=0.16.0", path = "lib/storage" }
zksync_os_storage_api = { version = "=0.16.0", path = "lib/storage_api" }
zksync_os_types = { version = "=0.16.0", path = "lib/types" }
zksync_os_genesis = { version = "=0.16.0", path = "lib/genesis" }
zksync_os_object_store = { version = "=0.16.0", path = "lib/object_store" }
zksync_os_status_server = { version = "=0.16.0", path = "lib/status" }
zksync_os_multivm = { version = "=0.16.0", path = "lib/multivm" }
zksync_os_pipeline = { version = "=0.16.0", path = "lib/pipeline" }
Expand Down
1 change: 0 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ feature-depth = 1
ignore = [
"RUSTSEC-2025-0137",
# Unsoundness in lru <0.16.3. Waiting for:
# * aws-sdk-s3 to upgrade (https://github.com/smithy-lang/smithy-rs/pull/4470)
# * alloy-provider to upgrade (https://github.com/alloy-rs/alloy/pull/3460)
"RUSTSEC-2026-0002",
]
Expand Down
1 change: 0 additions & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ build = "build.rs"
zksync_os_server.workspace = true
zksync_os_contract_interface.workspace = true
zksync_os_types.workspace = true
zksync_os_object_store.workspace = true
zksync_os_rpc_api.workspace = true
zksync_os_state_full_diffs.workspace = true
zksync_os_multivm.workspace = true
Expand Down
27 changes: 7 additions & 20 deletions integration-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ use tempfile::TempDir;
use tokio::sync::watch;
use tokio::task::JoinHandle;
use zksync_os_network::NodeRecord;
use zksync_os_object_store::{ObjectStoreConfig, ObjectStoreMode};
use zksync_os_server::config::{
BatchVerificationConfig, Config, FakeFriProversConfig, FakeSnarkProversConfig, FeeConfig,
GeneralConfig, NetworkConfig, ProverApiConfig, ProverInputGeneratorConfig, RpcConfig,
SequencerConfig, StatusServerConfig,
GeneralConfig, NetworkConfig, ProofStorageConfig, ProverApiConfig, ProverInputGeneratorConfig,
RpcConfig, SequencerConfig, StatusServerConfig,
};
use zksync_os_server::default_protocol_version::{NEXT_PROTOCOL_VERSION, PROTOCOL_VERSION};
use zksync_os_state_full_diffs::FullDiffsState;
Expand Down Expand Up @@ -76,7 +75,6 @@ pub struct Tester {

#[allow(dead_code)]
tempdir: Arc<tempfile::TempDir>,
main_node_tempdir: Arc<tempfile::TempDir>,

// Needed to be able to connect external nodes
node_record: NodeRecord,
Expand Down Expand Up @@ -139,7 +137,6 @@ impl Tester {
self.l1.clone(),
false,
Some(overrides_fun),
Some(self.main_node_tempdir.clone()),
PROTOCOL_VERSION,
)
.await
Expand All @@ -149,7 +146,6 @@ impl Tester {
l1: AnvilL1,
enable_prover: bool,
config_overrides: Option<impl FnOnce(&mut Config)>,
main_node_tempdir: Option<Arc<tempfile::TempDir>>,
protocol_version: &str,
) -> anyhow::Result<Self> {
// Initialize and **hold** locked ports for the duration of node initialization.
Expand All @@ -168,11 +164,8 @@ impl Tester {

let tempdir = tempfile::tempdir()?;
let rocks_db_path = tempdir.path().join("rocksdb");
let object_store_path = main_node_tempdir
.as_ref()
.map(|t| t.path())
.unwrap_or(tempdir.path())
.join("object_store");
// ENs will not use this dir
let proof_storage_path = tempdir.path().join("proof_storage_path");
let (stop_sender, stop_receiver) = watch::channel(false);

// Create a handle to run the sequencer in the background
Expand Down Expand Up @@ -201,12 +194,9 @@ impl Tester {
..Default::default()
},
address: prover_api_address,
object_store: ObjectStoreConfig {
mode: ObjectStoreMode::FileBacked {
file_backed_base_path: object_store_path.clone(),
},
max_retries: 1,
local_mirror_path: None,
proof_storage: ProofStorageConfig {
path: proof_storage_path.clone(),
..Default::default()
},
..Default::default()
};
Expand Down Expand Up @@ -377,7 +367,6 @@ impl Tester {
batch_verification_url,
node_record,
tempdir: tempdir.clone(),
main_node_tempdir: main_node_tempdir.unwrap_or(tempdir),
})
}
}
Expand Down Expand Up @@ -444,7 +433,6 @@ impl TesterBuilder {
l1,
self.enable_prover,
Some(overrides_fun),
None,
PROTOCOL_VERSION,
)
.await
Expand Down Expand Up @@ -544,7 +532,6 @@ impl MultiChainTesterBuilder {
l1.clone(),
false, // disable prover for faster tests
Some(chain_override),
None,
NEXT_PROTOCOL_VERSION,
)
.await?;
Expand Down
29 changes: 0 additions & 29 deletions lib/object_store/Cargo.toml

This file was deleted.

39 changes: 0 additions & 39 deletions lib/object_store/README.md

This file was deleted.

174 changes: 0 additions & 174 deletions lib/object_store/src/config.rs

This file was deleted.

Loading
Loading