0xPolygonMiden · mFragaBA · Jul 2, 2024 · Jun 28, 2024 · Jun 28, 2024 · Jun 28, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+* Split cli and client into workspace (#407).
 * Note importing in client now uses the `NoteFile` type (#375).
 * Added build script to import Miden node protobuf files to generate types for `tonic_client` and removed `miden-node-proto` dependency (#395).
 * Implemented retrieval of executed transaction info (id, commit height, account_id) from sync state RPC endpoint (#387).

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,80 +1,20 @@
-[package]
-name = "miden-client"
-version = "0.3.1"
-description = "Client library that facilitates interaction with the Miden rollup"
-authors = ["miden contributors"]
-readme = "README.md"
-license = "MIT"
-repository = "https://github.com/0xPolygonMiden/miden-client"
-documentation = "https://docs.rs/miden-client/0.3.1"
-keywords = ["miden", "client"]
-edition = "2021"
-rust-version = "1.78"
-default-run = "miden"
-
-[lib]
-crate-type = ["lib"]
+[workspace]
+resolver = "2"
 
-[[bin]]
-name = "miden"
-path = "src/main.rs"
-required-features = ["executable"]
+members = [
+  "bin/miden-cli",
+  "crates/miden-client",
+  "tests"
+]
 
-[[test]]
-name = "integration"
-path = "tests/integration/main.rs"
-required-features = ["integration"]
-
-[features]
-async = ["miden-tx/async"]
-concurrent = ["miden-lib/concurrent", "miden-objects/concurrent", "miden-tx/concurrent", "std"]
-default = ["std"]
-executable = ["std", "sqlite", "tonic", "dep:clap", "dep:comfy-table", "dep:figment", "dep:tokio", "dep:toml"]
-integration = ["concurrent", "executable", "testing"]
-sqlite = ["dep:rusqlite", "dep:rusqlite_migration", "dep:lazy_static"]
-std = ["miden-objects/std"]
-testing = ["miden-objects/testing", "miden-lib/testing"]
-tonic = ["dep:hex", "dep:prost","dep:tonic"]
+[workspace.package]
+edition = "2021"
+rust-version = "1.78"
+license = "MIT"
+authors = ["miden contributors"]
+repository = "https://github.com/0xPolygonMiden/miden-client"
 
-[dependencies]
-chrono = { version = "0.4", optional = false }
-clap = { version = "4.3", features = ["derive"], optional = true }
-comfy-table = { version = "7.1.0", optional = true } 
-figment = { version = "0.10", features = ["toml", "env"], optional = true }
-hex = { version = "0.4" , optional = true}
-lazy_static = { version = "1.4.0", optional = true }
-miden-lib = { package = "miden-lib", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
-miden-tx = { package = "miden-tx", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
-miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde"] }
-prost = { version = "0.12", optional = true }
+[workspace.dependencies]
 rand = { version = "0.8.5" }
-rusqlite = { version = "0.30.0", features = ["vtab", "array", "bundled"], optional = true }
-rusqlite_migration = { version = "1.0", optional = true }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0", features = ["raw_value"] }
-tokio = { version = "1.29", features = ["rt-multi-thread", "net", "macros"], optional = true }
-tonic = { version = "0.11", optional = true }
-toml = { version = "0.8", optional = true }
-thiserror = { version = "1.0", optional = true }
+tokio = { version = "1.29", features = ["rt-multi-thread", "net", "macros"] }
 tracing = { version = "0.1" }
-tracing-subscriber = { version = "0.3" }
-winter-maybe-async = "0.10.0"
-
-[target.'wasm32-unknown-unknown'.dependencies]
-getrandom = { version = "0.2", features = ["js"] }
-
-[dev-dependencies]
-# To enable testing feature during tests
-assert_cmd = { version = "2.0" }
-miden-lib = { package = "miden-lib", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["testing"] }
-miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde", "testing"] }
-proptest = { version = "1.2" }
-uuid = { version = "1.6.1", features = ["serde", "v4"] }
-
-[build-dependencies]
-miden-rpc-proto = { package = "miden-rpc-proto", git = "https://github.com/0xPolygonMiden/miden-node.git", branch = "next" }
-miette = { version = "7.0", features = ["fancy"] }
-prost = { version = "0.12" }
-prost-build = { version = "0.12" }
-protox = { version = "0.6" }
-tonic-build = { version = "0.11" }
diff --git a/Makefile b/Makefile
@@ -92,7 +92,7 @@ start-node: ## Run node. This requires the node repo to be present at `miden-nod
 # --- Installing ----------------------------------------------------------------------------------
 
 install: ## Installs the CLI binary using the current dir
-	cargo install --features $(FEATURES_CLI) --path .
+	cargo install --path miden-cli
 
 # --- Building ------------------------------------------------------------------------------------
 

diff --git a/bin/miden-cli/Cargo.toml b/bin/miden-cli/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "miden-client-cli"
+version = "0.3.1"
+description = "CLI binary application that facilitates interaction with the Miden rollup"
+readme = "README.md"
+documentation = "https://docs.rs/miden-client/0.3.1"
+keywords = ["miden", "client"]
+license.workspace = true
+authors.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+
+[[bin]]
+name = "miden"
+path = "src/main.rs"
+
+[features]
+default = ["dep:clap", "dep:comfy-table", "dep:figment", "dep:tokio", "dep:toml"]
+
+[dependencies]
+clap = { version = "4.3", features = ["derive"], optional = true }
+comfy-table = { version = "7.1.0", optional = true } 
+figment = { version = "0.10", features = ["toml", "env"], optional = true }
+miden-client = { path = "../../crates/miden-client", features = ["sqlite", "tonic", "testing", "concurrent"] }
+miden-tx = { package = "miden-tx", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
+miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde"] }
+rand = { version = "0.8.5" }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["raw_value"] }
+tokio = { version = "1.29", features = ["rt-multi-thread", "net", "macros"], optional = true }
+tonic = { version = "0.11", optional = true }
+toml = { version = "0.8", optional = true }
+tracing = { version = "0.1" }
+tracing-subscriber = { version = "0.3" }
diff --git a/src/cli/account.rs → bin/miden-cli/src/cli/account.rs b/src/cli/account.rs → bin/miden-cli/src/cli/account.rs
diff --git a/src/cli/config.rs → bin/miden-cli/src/cli/config.rs b/src/cli/config.rs → bin/miden-cli/src/cli/config.rs
diff --git a/src/cli/export.rs → bin/miden-cli/src/cli/export.rs b/src/cli/export.rs → bin/miden-cli/src/cli/export.rs
diff --git a/src/cli/import.rs → bin/miden-cli/src/cli/import.rs b/src/cli/import.rs → bin/miden-cli/src/cli/import.rs
diff --git a/src/cli/info.rs → bin/miden-cli/src/cli/info.rs b/src/cli/info.rs → bin/miden-cli/src/cli/info.rs
diff --git a/src/cli/init.rs → bin/miden-cli/src/cli/init.rs b/src/cli/init.rs → bin/miden-cli/src/cli/init.rs
diff --git a/src/cli/mod.rs → bin/miden-cli/src/cli/mod.rs b/src/cli/mod.rs → bin/miden-cli/src/cli/mod.rs
diff --git a/src/cli/new_account.rs → bin/miden-cli/src/cli/new_account.rs b/src/cli/new_account.rs → bin/miden-cli/src/cli/new_account.rs
diff --git a/src/cli/new_transactions.rs → bin/miden-cli/src/cli/new_transactions.rs b/src/cli/new_transactions.rs → bin/miden-cli/src/cli/new_transactions.rs
diff --git a/src/cli/notes.rs → bin/miden-cli/src/cli/notes.rs b/src/cli/notes.rs → bin/miden-cli/src/cli/notes.rs
diff --git a/src/cli/sync.rs → bin/miden-cli/src/cli/sync.rs b/src/cli/sync.rs → bin/miden-cli/src/cli/sync.rs
diff --git a/src/cli/tags.rs → bin/miden-cli/src/cli/tags.rs b/src/cli/tags.rs → bin/miden-cli/src/cli/tags.rs
diff --git a/src/cli/transactions.rs → bin/miden-cli/src/cli/transactions.rs b/src/cli/transactions.rs → bin/miden-cli/src/cli/transactions.rs
diff --git a/src/cli/utils.rs → bin/miden-cli/src/cli/utils.rs b/src/cli/utils.rs → bin/miden-cli/src/cli/utils.rs
diff --git a/bin/miden-cli/src/main.rs b/bin/miden-cli/src/main.rs
@@ -0,0 +1,15 @@
+extern crate alloc;
+
+mod cli;
+
+#[tokio::main]
+async fn main() -> Result<(), String> {
+    use clap::Parser;
+
+    tracing_subscriber::fmt::init();
+    // read command-line args
+    let cli = cli::Cli::parse();
+
+    // execute cli action
+    cli.execute().await
+}
diff --git a/crates/miden-client/Cargo.toml b/crates/miden-client/Cargo.toml
@@ -0,0 +1,62 @@
+[package]
+name = "miden-client"
+version = "0.3.1"
+description = "Client library that facilitates interaction with the Miden rollup"
+readme = "README.md"
+documentation = "https://docs.rs/miden-client/0.3.1"
+keywords = ["miden", "client"]
+license.workspace = true
+authors.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+
+[lib]
+crate-type = ["lib"]
+
+[features]
+async = ["miden-tx/async"]
+concurrent = ["miden-lib/concurrent", "miden-objects/concurrent", "miden-tx/concurrent", "std"]
+default = ["std"]
+executable = ["std", "sqlite", "tonic", "dep:tokio"]
+integration = ["concurrent", "executable", "testing"]
+sqlite = ["dep:rusqlite", "dep:rusqlite_migration", "dep:lazy_static"]
+std = ["miden-objects/std"]
+testing = ["miden-objects/testing", "miden-lib/testing"]
+tonic = ["dep:hex", "dep:prost","dep:tonic"]
+
+[dependencies]
+chrono = { version = "0.4", optional = false }
+hex = { version = "0.4" , optional = true}
+lazy_static = { version = "1.4.0", optional = true }
+miden-lib = { package = "miden-lib", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
+miden-tx = { package = "miden-tx", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
+miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde"] }
+prost = { version = "0.12", optional = true }
+rand = { workspace = true }
+rusqlite = { version = "0.30.0", features = ["vtab", "array", "bundled"], optional = true }
+rusqlite_migration = { version = "1.0", optional = true }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["raw_value"] }
+tokio = { workspace = true , optional = true }
+tonic = { version = "0.11", optional = true }
+thiserror = { version = "1.0", optional = true }
+tracing = { workspace = true }
+winter-maybe-async = "0.10.0"
+
+[target.'wasm32-unknown-unknown'.dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
+[dev-dependencies]
+miden-lib = { package = "miden-lib", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["testing"] }
+miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde", "testing"] }
+proptest = { version = "1.2" }
+uuid = { version = "1.6.1", features = ["serde", "v4"] }
+
+[build-dependencies]
+miden-rpc-proto = { package = "miden-rpc-proto", git = "https://github.com/0xPolygonMiden/miden-node.git", branch = "next" }
+miette = { version = "7.0", features = ["fancy"] }
+prost = { version = "0.12" }
+prost-build = { version = "0.12" }
+protox = { version = "0.6" }
+tonic-build = { version = "0.11" }
diff --git a/src/client/accounts.rs → crates/miden-client/src/client/accounts.rs b/src/client/accounts.rs → crates/miden-client/src/client/accounts.rs
diff --git a/src/client/mod.rs → crates/miden-client/src/client/mod.rs b/src/client/mod.rs → crates/miden-client/src/client/mod.rs
diff --git a/src/client/note_screener.rs → .../miden-client/src/client/note_screener.rs b/src/client/note_screener.rs → .../miden-client/src/client/note_screener.rs
diff --git a/src/client/notes.rs → crates/miden-client/src/client/notes.rs b/src/client/notes.rs → crates/miden-client/src/client/notes.rs
diff --git a/src/client/rpc/mod.rs → crates/miden-client/src/client/rpc/mod.rs b/src/client/rpc/mod.rs → crates/miden-client/src/client/rpc/mod.rs
diff --git a/...lient/rpc/tonic_client/domain/accounts.rs → ...lient/rpc/tonic_client/domain/accounts.rs b/...lient/rpc/tonic_client/domain/accounts.rs → ...lient/rpc/tonic_client/domain/accounts.rs
diff --git a/src/client/rpc/tonic_client/domain/blocks.rs → .../client/rpc/tonic_client/domain/blocks.rs b/src/client/rpc/tonic_client/domain/blocks.rs → .../client/rpc/tonic_client/domain/blocks.rs
diff --git a/src/client/rpc/tonic_client/domain/digest.rs → .../client/rpc/tonic_client/domain/digest.rs b/src/client/rpc/tonic_client/domain/digest.rs → .../client/rpc/tonic_client/domain/digest.rs
diff --git a/src/client/rpc/tonic_client/domain/merkle.rs → .../client/rpc/tonic_client/domain/merkle.rs b/src/client/rpc/tonic_client/domain/merkle.rs → .../client/rpc/tonic_client/domain/merkle.rs
diff --git a/src/client/rpc/tonic_client/domain/mod.rs → ...src/client/rpc/tonic_client/domain/mod.rs b/src/client/rpc/tonic_client/domain/mod.rs → ...src/client/rpc/tonic_client/domain/mod.rs
diff --git a/src/client/rpc/tonic_client/domain/notes.rs → ...c/client/rpc/tonic_client/domain/notes.rs b/src/client/rpc/tonic_client/domain/notes.rs → ...c/client/rpc/tonic_client/domain/notes.rs
diff --git a/...ent/rpc/tonic_client/domain/nullifiers.rs → ...ent/rpc/tonic_client/domain/nullifiers.rs b/...ent/rpc/tonic_client/domain/nullifiers.rs → ...ent/rpc/tonic_client/domain/nullifiers.rs
diff --git a/...t/rpc/tonic_client/domain/transactions.rs → ...t/rpc/tonic_client/domain/transactions.rs b/...t/rpc/tonic_client/domain/transactions.rs → ...t/rpc/tonic_client/domain/transactions.rs
diff --git a/...ent/rpc/tonic_client/generated/account.rs → ...ent/rpc/tonic_client/generated/account.rs b/...ent/rpc/tonic_client/generated/account.rs → ...ent/rpc/tonic_client/generated/account.rs
diff --git a/...pc/tonic_client/generated/block_header.rs → ...pc/tonic_client/generated/block_header.rs b/...pc/tonic_client/generated/block_header.rs → ...pc/tonic_client/generated/block_header.rs
diff --git a/...ient/rpc/tonic_client/generated/digest.rs → ...ient/rpc/tonic_client/generated/digest.rs b/...ient/rpc/tonic_client/generated/digest.rs → ...ient/rpc/tonic_client/generated/digest.rs
diff --git a/...ient/rpc/tonic_client/generated/merkle.rs → ...ient/rpc/tonic_client/generated/merkle.rs b/...ient/rpc/tonic_client/generated/merkle.rs → ...ient/rpc/tonic_client/generated/merkle.rs
diff --git a/src/client/rpc/tonic_client/generated/mmr.rs → .../client/rpc/tonic_client/generated/mmr.rs b/src/client/rpc/tonic_client/generated/mmr.rs → .../client/rpc/tonic_client/generated/mmr.rs
diff --git a/src/client/rpc/tonic_client/generated/mod.rs → .../client/rpc/tonic_client/generated/mod.rs b/src/client/rpc/tonic_client/generated/mod.rs → .../client/rpc/tonic_client/generated/mod.rs
diff --git a/...client/rpc/tonic_client/generated/note.rs → ...client/rpc/tonic_client/generated/note.rs b/...client/rpc/tonic_client/generated/note.rs → ...client/rpc/tonic_client/generated/note.rs
diff --git a/...nt/rpc/tonic_client/generated/requests.rs → ...nt/rpc/tonic_client/generated/requests.rs b/...nt/rpc/tonic_client/generated/requests.rs → ...nt/rpc/tonic_client/generated/requests.rs
diff --git a/...t/rpc/tonic_client/generated/responses.rs → ...t/rpc/tonic_client/generated/responses.rs b/...t/rpc/tonic_client/generated/responses.rs → ...t/rpc/tonic_client/generated/responses.rs
diff --git a/src/client/rpc/tonic_client/generated/rpc.rs → .../client/rpc/tonic_client/generated/rpc.rs b/src/client/rpc/tonic_client/generated/rpc.rs → .../client/rpc/tonic_client/generated/rpc.rs
diff --git a/src/client/rpc/tonic_client/generated/smt.rs → .../client/rpc/tonic_client/generated/smt.rs b/src/client/rpc/tonic_client/generated/smt.rs → .../client/rpc/tonic_client/generated/smt.rs
diff --git a/...rpc/tonic_client/generated/transaction.rs → ...rpc/tonic_client/generated/transaction.rs b/...rpc/tonic_client/generated/transaction.rs → ...rpc/tonic_client/generated/transaction.rs
diff --git a/src/client/rpc/tonic_client/mod.rs → ...client/src/client/rpc/tonic_client/mod.rs b/src/client/rpc/tonic_client/mod.rs → ...client/src/client/rpc/tonic_client/mod.rs
diff --git a/src/client/store_authenticator.rs → ...-client/src/client/store_authenticator.rs b/src/client/store_authenticator.rs → ...-client/src/client/store_authenticator.rs
diff --git a/src/client/sync.rs → crates/miden-client/src/client/sync.rs b/src/client/sync.rs → crates/miden-client/src/client/sync.rs
diff --git a/...ansaction_scripts/auth_consume_notes.masm → ...ansaction_scripts/auth_consume_notes.masm b/...ansaction_scripts/auth_consume_notes.masm → ...ansaction_scripts/auth_consume_notes.masm
diff --git a/.../transaction_scripts/auth_send_asset.masm → .../transaction_scripts/auth_send_asset.masm b/.../transaction_scripts/auth_send_asset.masm → .../transaction_scripts/auth_send_asset.masm
diff --git a/...on_scripts/distribute_fungible_asset.masm → ...on_scripts/distribute_fungible_asset.masm b/...on_scripts/distribute_fungible_asset.masm → ...on_scripts/distribute_fungible_asset.masm
diff --git a/src/client/transactions/mod.rs → ...den-client/src/client/transactions/mod.rs b/src/client/transactions/mod.rs → ...den-client/src/client/transactions/mod.rs
diff --git a/...lient/transactions/transaction_request.rs → ...lient/transactions/transaction_request.rs b/...lient/transactions/transaction_request.rs → ...lient/transactions/transaction_request.rs
diff --git a/src/config.rs → crates/miden-client/src/config.rs b/src/config.rs → crates/miden-client/src/config.rs
diff --git a/src/errors.rs → crates/miden-client/src/errors.rs b/src/errors.rs → crates/miden-client/src/errors.rs
diff --git a/src/lib.rs → crates/miden-client/src/lib.rs b/src/lib.rs → crates/miden-client/src/lib.rs
diff --git a/src/mock.rs → crates/miden-client/src/mock.rs b/src/mock.rs → crates/miden-client/src/mock.rs
diff --git a/src/store/data_store.rs → crates/miden-client/src/store/data_store.rs b/src/store/data_store.rs → crates/miden-client/src/store/data_store.rs
diff --git a/src/store/mod.rs → crates/miden-client/src/store/mod.rs b/src/store/mod.rs → crates/miden-client/src/store/mod.rs
diff --git a/src/store/note_record/input_note_record.rs → ...rc/store/note_record/input_note_record.rs b/src/store/note_record/input_note_record.rs → ...rc/store/note_record/input_note_record.rs
diff --git a/src/store/note_record/mod.rs → ...miden-client/src/store/note_record/mod.rs b/src/store/note_record/mod.rs → ...miden-client/src/store/note_record/mod.rs
diff --git a/src/store/note_record/output_note_record.rs → ...c/store/note_record/output_note_record.rs b/src/store/note_record/output_note_record.rs → ...c/store/note_record/output_note_record.rs
diff --git a/src/store/sqlite_store/accounts.rs → ...client/src/store/sqlite_store/accounts.rs b/src/store/sqlite_store/accounts.rs → ...client/src/store/sqlite_store/accounts.rs
@@ -1,4 +1,3 @@
-use clap::error::Result;
 use miden_lib::transaction::TransactionKernel;
 use miden_objects::{
     accounts::{Account, AccountCode, AccountId, AccountStorage, AccountStub, AuthSecretKey},

diff --git a/src/store/sqlite_store/chain_data.rs → ...ient/src/store/sqlite_store/chain_data.rs b/src/store/sqlite_store/chain_data.rs → ...ient/src/store/sqlite_store/chain_data.rs
@@ -1,7 +1,6 @@
 use alloc::{collections::BTreeMap, rc::Rc};
 use std::num::NonZeroUsize;
 
-use clap::error::Result;
 use miden_objects::{
     crypto::merkle::{InOrderIndex, MmrPeaks},
     BlockHeader, Digest,

diff --git a/src/store/sqlite_store/config.rs → ...n-client/src/store/sqlite_store/config.rs b/src/store/sqlite_store/config.rs → ...n-client/src/store/sqlite_store/config.rs
diff --git a/src/store/sqlite_store/migrations.rs → ...ient/src/store/sqlite_store/migrations.rs b/src/store/sqlite_store/migrations.rs → ...ient/src/store/sqlite_store/migrations.rs
diff --git a/src/store/sqlite_store/mod.rs → ...iden-client/src/store/sqlite_store/mod.rs b/src/store/sqlite_store/mod.rs → ...iden-client/src/store/sqlite_store/mod.rs
@@ -265,6 +265,7 @@ impl Store for SqliteStore {
     fn get_unspent_input_note_nullifiers(&self) -> Result<Vec<Nullifier>, StoreError> {
         self.get_unspent_input_note_nullifiers()
     }
+
     fn update_note_inclusion_proof(
         &self,
         note_id: miden_objects::notes::NoteId,
@@ -277,7 +278,7 @@ impl Store for SqliteStore {
         &self,
         note_id: miden_objects::notes::NoteId,
         metadata: miden_objects::notes::NoteMetadata,
-    ) -> clap::error::Result<(), StoreError> {
+    ) -> Result<(), StoreError> {
         self.update_note_metadata(note_id, metadata)
     }
 }

diff --git a/src/store/sqlite_store/notes.rs → ...en-client/src/store/sqlite_store/notes.rs b/src/store/sqlite_store/notes.rs → ...en-client/src/store/sqlite_store/notes.rs
@@ -2,7 +2,6 @@ use alloc::rc::Rc;
 use std::fmt;
 
 use chrono::Utc;
-use clap::error::Result;
 use miden_objects::{
     accounts::AccountId,
     crypto::utils::{Deserializable, Serializable},

diff --git a/src/store/sqlite_store/store.sql → ...n-client/src/store/sqlite_store/store.sql b/src/store/sqlite_store/store.sql → ...n-client/src/store/sqlite_store/store.sql
diff --git a/src/store/sqlite_store/sync.rs → ...den-client/src/store/sqlite_store/sync.rs b/src/store/sqlite_store/sync.rs → ...den-client/src/store/sqlite_store/sync.rs
diff --git a/src/store/sqlite_store/transactions.rs → ...nt/src/store/sqlite_store/transactions.rs b/src/store/sqlite_store/transactions.rs → ...nt/src/store/sqlite_store/transactions.rs
diff --git a/src/tests.rs → crates/miden-client/src/tests.rs b/src/tests.rs → crates/miden-client/src/tests.rs
diff --git a/src/main.rs b/src/main.rs
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "miden-client-tests"
+version = "0.3.1"
+description = "Integration Tests for the miden client library and CLI"
+readme = "README.md"
+publish = false
+license.workspace = true
+authors.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+
+[dev-dependencies]
+figment = { version = "0.10", features = ["toml", "env"] }
+miden-client = { path = "../crates/miden-client", features = ["executable", "testing"] }
+miden-tx = { package = "miden-tx", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false }
+miden-objects = { package = "miden-objects", git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next", default-features = false, features = ["serde"] }
+assert_cmd = { version = "2.0" }
+uuid = { version = "1.6.1", features = ["serde", "v4"] }
+rand = { workspace = true }
+tokio = { workspace = true }
+
+[[test]]
+name = "integration"
+path = "integration/main.rs"