Refactor: Convert project to Cargo workspace (BitVM#176)

chainwayxyz · Jan 7, 2025 · 834199a · 834199a
1 parent 8e9bd29
commit 834199a
Show file tree

Hide file tree

Showing 242 changed files with 373 additions and 272 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,20 +1,19 @@
-[package]
-name = "bitvm"
-version = "0.1.0"
-edition = "2021"
-exclude = ["tests"]
+[workspace]
+resolver = "2"
+members = [
+    "bitvm",
+    "bridge"
+]
 
-[dependencies]
-#bitcoin-script = { path = "../rust-bitcoin-script"}
-#bitcoin-scriptexec = { path = "../rust-bitcoin-scriptexec"}
+[workspace.dependencies]
 bitcoin-script = { git = "https://github.com/BitVM/rust-bitcoin-script", branch = "StructuredScript" }
 bitcoin = { version = "0.32.5", features = ["rand-std"] }
 strum = "0.26"
 strum_macros = "0.26"
 hex = "0.4.3"
 bitcoin-scriptexec = { git = "https://github.com/BitVM/rust-bitcoin-scriptexec" }
 serde = { version = "1.0.197", features = ["derive"] }
-num-bigint = "0.4.4"
+# num-bigint = "0.4.4"
 num-traits = "0.2.18"
 ark-bn254 = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop", features = ["curve"], default-features = false }
 ark-ff = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
@@ -45,16 +44,9 @@ toml = "0.5.11"
 colored = "2.0.0"
 itertools = "0.13.0"
 serde-big-array = "0.5.1"
-
-[dev-dependencies]
 num-bigint = { version = "0.4.4", features = ["rand"] }
-ark-std = { version = "0.4.0", default-features = false, features = [
-    "print-trace",
-] }
-ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", features = [
-    "snark",
-    "sponge",
-] }
+ark-std = { version = "0.4.0", default-features = false, features = ["print-trace"] }
+ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", features = ["snark", "sponge"] }
 ark-relations = { git = "https://github.com/arkworks-rs/snark/" }
 serial_test = "*"
 tqdm = "0.7"
@@ -71,17 +63,8 @@ ark-ec = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-lo
 ark-poly = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
 ark-serialize = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop" }
 ark-bn254 = { git = "https://github.com/chainwayxyz/algebra/", branch = "new-ate-loop", features = ["curve"], default-features = false }
-
 ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" }
 ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives/" }
-
 ark-relations = { git = "https://github.com/arkworks-rs/snark/" }
 ark-snark = { git = "https://github.com/arkworks-rs/snark/" }
-ark-groth16 = { git = "https://github.com/arkworks-rs/groth16" }
-
-[[bin]]
-name = "cli"
-
-[[bin]]
-name = "cli-query"
-path = "src/bin/cli_query/main.rs"
+ark-groth16 = { git = "https://github.com/arkworks-rs/groth16" }
diff --git a/bitvm/Cargo.toml b/bitvm/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "bitvm"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+
+[dependencies]
+bitcoin-script.workspace = true
+bitcoin.workspace = true
+hex.workspace = true
+bitcoin-scriptexec.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+ark-bn254.workspace = true
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-groth16.workspace = true
+ark-serialize.workspace = true
+sha2.workspace = true
+bitcoin-script-stack.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
+blake3.workspace = true
+paste.workspace = true
+colored.workspace = true
+itertools.workspace = true
+num-bigint.workspace = true
+ark-std.workspace = true
+ark-crypto-primitives.workspace = true
+ark-relations.workspace = true
+tqdm.workspace = true
+regex.workspace = true
+
+[profile.dev]
+opt-level = 3
+
+[profile.release]
+lto = true
diff --git a/src/bigint/add.rs → bitvm/src/bigint/add.rs b/src/bigint/add.rs → bitvm/src/bigint/add.rs
diff --git a/src/bigint/bits.rs → bitvm/src/bigint/bits.rs b/src/bigint/bits.rs → bitvm/src/bigint/bits.rs
diff --git a/src/bigint/cmp.rs → bitvm/src/bigint/cmp.rs b/src/bigint/cmp.rs → bitvm/src/bigint/cmp.rs
diff --git a/src/bigint/inv.rs → bitvm/src/bigint/inv.rs b/src/bigint/inv.rs → bitvm/src/bigint/inv.rs
diff --git a/src/bigint/mod.rs → bitvm/src/bigint/mod.rs b/src/bigint/mod.rs → bitvm/src/bigint/mod.rs
diff --git a/src/bigint/mul.rs → bitvm/src/bigint/mul.rs b/src/bigint/mul.rs → bitvm/src/bigint/mul.rs
diff --git a/src/bigint/std.rs → bitvm/src/bigint/std.rs b/src/bigint/std.rs → bitvm/src/bigint/std.rs
diff --git a/src/bigint/sub.rs → bitvm/src/bigint/sub.rs b/src/bigint/sub.rs → bitvm/src/bigint/sub.rs
diff --git a/src/bigint/u29x9.rs → bitvm/src/bigint/u29x9.rs b/src/bigint/u29x9.rs → bitvm/src/bigint/u29x9.rs
diff --git a/src/bigint/u32x8.rs → bitvm/src/bigint/u32x8.rs b/src/bigint/u32x8.rs → bitvm/src/bigint/u32x8.rs
diff --git a/src/bn254/curves.rs → bitvm/src/bn254/curves.rs b/src/bn254/curves.rs → bitvm/src/bn254/curves.rs
diff --git a/src/bn254/ell_coeffs.rs → bitvm/src/bn254/ell_coeffs.rs b/src/bn254/ell_coeffs.rs → bitvm/src/bn254/ell_coeffs.rs
diff --git a/src/bn254/fp254impl.rs → bitvm/src/bn254/fp254impl.rs b/src/bn254/fp254impl.rs → bitvm/src/bn254/fp254impl.rs
diff --git a/src/bn254/fq.rs → bitvm/src/bn254/fq.rs b/src/bn254/fq.rs → bitvm/src/bn254/fq.rs
diff --git a/src/bn254/fq12.rs → bitvm/src/bn254/fq12.rs b/src/bn254/fq12.rs → bitvm/src/bn254/fq12.rs
diff --git a/src/bn254/fq2.rs → bitvm/src/bn254/fq2.rs b/src/bn254/fq2.rs → bitvm/src/bn254/fq2.rs
diff --git a/src/bn254/fq6.rs → bitvm/src/bn254/fq6.rs b/src/bn254/fq6.rs → bitvm/src/bn254/fq6.rs
diff --git a/src/bn254/fr.rs → bitvm/src/bn254/fr.rs b/src/bn254/fr.rs → bitvm/src/bn254/fr.rs
diff --git a/src/bn254/g2_subgroup_check.rs → bitvm/src/bn254/g2_subgroup_check.rs b/src/bn254/g2_subgroup_check.rs → bitvm/src/bn254/g2_subgroup_check.rs
diff --git a/src/bn254/mod.rs → bitvm/src/bn254/mod.rs b/src/bn254/mod.rs → bitvm/src/bn254/mod.rs
diff --git a/src/bn254/msm.rs → bitvm/src/bn254/msm.rs b/src/bn254/msm.rs → bitvm/src/bn254/msm.rs
diff --git a/src/bn254/pairing.rs → bitvm/src/bn254/pairing.rs b/src/bn254/pairing.rs → bitvm/src/bn254/pairing.rs
diff --git a/src/bn254/utils.rs → bitvm/src/bn254/utils.rs b/src/bn254/utils.rs → bitvm/src/bn254/utils.rs
diff --git a/src/chunker/assigner.rs → bitvm/src/chunker/assigner.rs b/src/chunker/assigner.rs → bitvm/src/chunker/assigner.rs
@@ -9,13 +9,10 @@ use super::{
     elements::{ElementTrait, G2PointType},
 };
 use crate::{
-    bridge::{
-        graphs::peg_out::CommitmentMessageId,
-        transactions::signing_winternitz::{
-            generate_winternitz_checksig_leave_hash, generate_winternitz_checksig_leave_variable,
-            generate_winternitz_witness, WinternitzPublicKey, WinternitzSecret,
-            WinternitzSigningInputs,
-        },
+    signatures::signing_winternitz::{
+        generate_winternitz_checksig_leave_hash, generate_winternitz_checksig_leave_variable,
+        generate_winternitz_witness, WinternitzPublicKey, WinternitzSecret,
+        WinternitzSigningInputs,
     },
     execute_script_with_inputs,
     treepp::*,
@@ -302,7 +299,7 @@ mod tests {
     use crate::execute_script_with_inputs;
     use crate::treepp::{script, Script};
     use crate::{
-        bridge::transactions::signing_winternitz::{
+        signatures::signing_winternitz::{
             generate_winternitz_witness, winternitz_message_checksig, WinternitzPublicKey,
             WinternitzSecret, WinternitzSigningInputs, LOG_D,
         },

diff --git a/src/chunker/chunk_accumulator.rs → bitvm/src/chunker/chunk_accumulator.rs b/src/chunker/chunk_accumulator.rs → bitvm/src/chunker/chunk_accumulator.rs
diff --git a/src/chunker/chunk_evaluate_line.rs → bitvm/src/chunker/chunk_evaluate_line.rs b/src/chunker/chunk_evaluate_line.rs → bitvm/src/chunker/chunk_evaluate_line.rs
diff --git a/src/chunker/chunk_fq12_multiplication.rs → .../src/chunker/chunk_fq12_multiplication.rs b/src/chunker/chunk_fq12_multiplication.rs → .../src/chunker/chunk_fq12_multiplication.rs
diff --git a/src/chunker/chunk_g1_points.rs → bitvm/src/chunker/chunk_g1_points.rs b/src/chunker/chunk_g1_points.rs → bitvm/src/chunker/chunk_g1_points.rs
diff --git a/src/chunker/chunk_groth16_verifier.rs → bitvm/src/chunker/chunk_groth16_verifier.rs b/src/chunker/chunk_groth16_verifier.rs → bitvm/src/chunker/chunk_groth16_verifier.rs
diff --git a/src/chunker/chunk_hinted_accumulator.rs → ...m/src/chunker/chunk_hinted_accumulator.rs b/src/chunker/chunk_hinted_accumulator.rs → ...m/src/chunker/chunk_hinted_accumulator.rs
diff --git a/src/chunker/chunk_msm.rs → bitvm/src/chunker/chunk_msm.rs b/src/chunker/chunk_msm.rs → bitvm/src/chunker/chunk_msm.rs
diff --git a/src/chunker/chunk_non_fixed_point.rs → bitvm/src/chunker/chunk_non_fixed_point.rs b/src/chunker/chunk_non_fixed_point.rs → bitvm/src/chunker/chunk_non_fixed_point.rs
diff --git a/src/chunker/chunk_scalar_mul.rs → bitvm/src/chunker/chunk_scalar_mul.rs b/src/chunker/chunk_scalar_mul.rs → bitvm/src/chunker/chunk_scalar_mul.rs
diff --git a/src/chunker/common.rs → bitvm/src/chunker/common.rs b/src/chunker/common.rs → bitvm/src/chunker/common.rs
@@ -23,7 +23,7 @@ pub use crate::hash::blake3_u32::blake3_var_length;
 use super::disprove_execution::RawProof;
 
 /// The depth of a blake3 hash, depending on the defination of `N_DIGEST_U32_LIMBS`
-pub(crate) const BLAKE3_HASH_LENGTH: usize =
+pub const BLAKE3_HASH_LENGTH: usize =
     crate::hash::blake3_u32::N_DIGEST_U32_LIMBS as usize * 4;
 pub type BLAKE3HASH = [u8; BLAKE3_HASH_LENGTH];
 

diff --git a/src/chunker/disprove_execution.rs → bitvm/src/chunker/disprove_execution.rs b/src/chunker/disprove_execution.rs → bitvm/src/chunker/disprove_execution.rs
diff --git a/src/chunker/elements.rs → bitvm/src/chunker/elements.rs b/src/chunker/elements.rs → bitvm/src/chunker/elements.rs
diff --git a/src/chunker/mod.rs → bitvm/src/chunker/mod.rs b/src/chunker/mod.rs → bitvm/src/chunker/mod.rs
diff --git a/src/chunker/segment.rs → bitvm/src/chunker/segment.rs b/src/chunker/segment.rs → bitvm/src/chunker/segment.rs
diff --git a/src/groth16/constants.rs → bitvm/src/groth16/constants.rs b/src/groth16/constants.rs → bitvm/src/groth16/constants.rs
diff --git a/src/groth16/mod.rs → bitvm/src/groth16/mod.rs b/src/groth16/mod.rs → bitvm/src/groth16/mod.rs
diff --git a/src/groth16/offchain_checker.rs → bitvm/src/groth16/offchain_checker.rs b/src/groth16/offchain_checker.rs → bitvm/src/groth16/offchain_checker.rs
diff --git a/src/groth16/test.rs → bitvm/src/groth16/test.rs b/src/groth16/test.rs → bitvm/src/groth16/test.rs
diff --git a/src/groth16/verifier.rs → bitvm/src/groth16/verifier.rs b/src/groth16/verifier.rs → bitvm/src/groth16/verifier.rs
diff --git a/src/hash/blake3.rs → bitvm/src/hash/blake3.rs b/src/hash/blake3.rs → bitvm/src/hash/blake3.rs
diff --git a/src/hash/blake3_u32.rs → bitvm/src/hash/blake3_u32.rs b/src/hash/blake3_u32.rs → bitvm/src/hash/blake3_u32.rs
diff --git a/src/hash/blake3_u4.rs → bitvm/src/hash/blake3_u4.rs b/src/hash/blake3_u4.rs → bitvm/src/hash/blake3_u4.rs
diff --git a/src/hash/mod.rs → bitvm/src/hash/mod.rs b/src/hash/mod.rs → bitvm/src/hash/mod.rs
diff --git a/src/hash/sha256.rs → bitvm/src/hash/sha256.rs b/src/hash/sha256.rs → bitvm/src/hash/sha256.rs
diff --git a/src/hash/sha256_u4.rs → bitvm/src/hash/sha256_u4.rs b/src/hash/sha256_u4.rs → bitvm/src/hash/sha256_u4.rs
diff --git a/src/hash/sha256_u4_stack.rs → bitvm/src/hash/sha256_u4_stack.rs b/src/hash/sha256_u4_stack.rs → bitvm/src/hash/sha256_u4_stack.rs
diff --git a/src/lib.rs → bitvm/src/lib.rs b/src/lib.rs → bitvm/src/lib.rs
@@ -18,7 +18,6 @@ use bitcoin_scriptexec::{Exec, ExecCtx, ExecError, ExecStats, Options, Stack, Tx
 
 pub mod bigint;
 pub mod bn254;
-pub mod bridge;
 pub mod chunker;
 pub mod groth16;
 pub mod hash;

diff --git a/src/pseudo.rs → bitvm/src/pseudo.rs b/src/pseudo.rs → bitvm/src/pseudo.rs
diff --git a/src/signatures/mod.rs → bitvm/src/signatures/mod.rs b/src/signatures/mod.rs → bitvm/src/signatures/mod.rs
@@ -1,3 +1,4 @@
 pub mod winternitz;
 pub mod winternitz_hash;
 pub mod utils;
+pub mod signing_winternitz;
diff --git a/...bridge/transactions/signing_winternitz.rs → bitvm/src/signatures/signing_winternitz.rs b/...bridge/transactions/signing_winternitz.rs → bitvm/src/signatures/signing_winternitz.rs
diff --git a/src/signatures/utils.rs → bitvm/src/signatures/utils.rs b/src/signatures/utils.rs → bitvm/src/signatures/utils.rs
diff --git a/src/signatures/winternitz.rs → bitvm/src/signatures/winternitz.rs b/src/signatures/winternitz.rs → bitvm/src/signatures/winternitz.rs
diff --git a/src/signatures/winternitz_hash.rs → bitvm/src/signatures/winternitz_hash.rs b/src/signatures/winternitz_hash.rs → bitvm/src/signatures/winternitz_hash.rs
diff --git a/src/u32/mod.rs → bitvm/src/u32/mod.rs b/src/u32/mod.rs → bitvm/src/u32/mod.rs
diff --git a/src/u32/u32_add.rs → bitvm/src/u32/u32_add.rs b/src/u32/u32_add.rs → bitvm/src/u32/u32_add.rs
diff --git a/src/u32/u32_and.rs → bitvm/src/u32/u32_and.rs b/src/u32/u32_and.rs → bitvm/src/u32/u32_and.rs
diff --git a/src/u32/u32_or.rs → bitvm/src/u32/u32_or.rs b/src/u32/u32_or.rs → bitvm/src/u32/u32_or.rs
diff --git a/src/u32/u32_rrot.rs → bitvm/src/u32/u32_rrot.rs b/src/u32/u32_rrot.rs → bitvm/src/u32/u32_rrot.rs
diff --git a/src/u32/u32_rshift.rs → bitvm/src/u32/u32_rshift.rs b/src/u32/u32_rshift.rs → bitvm/src/u32/u32_rshift.rs
diff --git a/src/u32/u32_std.rs → bitvm/src/u32/u32_std.rs b/src/u32/u32_std.rs → bitvm/src/u32/u32_std.rs
diff --git a/src/u32/u32_xor.rs → bitvm/src/u32/u32_xor.rs b/src/u32/u32_xor.rs → bitvm/src/u32/u32_xor.rs
diff --git a/src/u32/u32_zip.rs → bitvm/src/u32/u32_zip.rs b/src/u32/u32_zip.rs → bitvm/src/u32/u32_zip.rs
diff --git a/src/u4/mod.rs → bitvm/src/u4/mod.rs b/src/u4/mod.rs → bitvm/src/u4/mod.rs
diff --git a/src/u4/u4_add.rs → bitvm/src/u4/u4_add.rs b/src/u4/u4_add.rs → bitvm/src/u4/u4_add.rs
diff --git a/src/u4/u4_add_stack.rs → bitvm/src/u4/u4_add_stack.rs b/src/u4/u4_add_stack.rs → bitvm/src/u4/u4_add_stack.rs
diff --git a/src/u4/u4_logic.rs → bitvm/src/u4/u4_logic.rs b/src/u4/u4_logic.rs → bitvm/src/u4/u4_logic.rs
diff --git a/src/u4/u4_logic_stack.rs → bitvm/src/u4/u4_logic_stack.rs b/src/u4/u4_logic_stack.rs → bitvm/src/u4/u4_logic_stack.rs
diff --git a/src/u4/u4_rot.rs → bitvm/src/u4/u4_rot.rs b/src/u4/u4_rot.rs → bitvm/src/u4/u4_rot.rs
diff --git a/src/u4/u4_rot_stack.rs → bitvm/src/u4/u4_rot_stack.rs b/src/u4/u4_rot_stack.rs → bitvm/src/u4/u4_rot_stack.rs
diff --git a/src/u4/u4_shift.rs → bitvm/src/u4/u4_shift.rs b/src/u4/u4_shift.rs → bitvm/src/u4/u4_shift.rs
diff --git a/src/u4/u4_shift_stack.rs → bitvm/src/u4/u4_shift_stack.rs b/src/u4/u4_shift_stack.rs → bitvm/src/u4/u4_shift_stack.rs
diff --git a/src/u4/u4_std.rs → bitvm/src/u4/u4_std.rs b/src/u4/u4_std.rs → bitvm/src/u4/u4_std.rs
diff --git a/bridge/Cargo.toml b/bridge/Cargo.toml
@@ -0,0 +1,58 @@
+[package]
+name = "bridge"
+version = "0.1.0"
+edition = "2021"
+exclude = ["tests"]
+
+[dependencies]
+bitvm = { path = "../bitvm" }
+bitcoin-script.workspace = true
+bitcoin.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+hex.workspace = true
+bitcoin-scriptexec.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+sha2.workspace = true
+tokio.workspace = true
+esplora-client.workspace = true
+serde_json.workspace = true
+rand.workspace = true
+dotenv.workspace = true
+aws-sdk-s3.workspace = true
+regex.workspace = true
+musig2.workspace = true
+futures.workspace = true
+async-trait.workspace = true
+suppaftp.workspace = true
+openssh-sftp-client.workspace = true
+openssh.workspace = true
+alloy.workspace = true
+clap.workspace = true
+toml.workspace = true
+colored.workspace = true
+itertools.workspace = true
+serial_test.workspace = true
+ark-bn254.workspace = true
+ark-groth16.workspace = true
+ark-ff.workspace = true
+ark-std.workspace = true
+
+
+[profile.dev]
+opt-level = 3
+
+[profile.release]
+lto = true
+
+[profile.profiling]
+inherits = "release"
+debug = true
+
+[[bin]]
+name = "cli"
+
+[[bin]]
+name = "cli-query"
+path = "src/bin/cli_query/main.rs"
diff --git a/src/bin/cli/main.rs → bridge/src/bin/cli/main.rs b/src/bin/cli/main.rs → bridge/src/bin/cli/main.rs
@@ -1,6 +1,6 @@
 use bitcoin::PublicKey;
-use bitvm::bridge::client::cli::client_command::{ClientCommand, CommonArgs};
-use bitvm::bridge::client::cli::key_command::KeysCommand;
+use bridge::client::cli::client_command::{ClientCommand, CommonArgs};
+use bridge::client::cli::key_command::KeysCommand;
 use clap::{arg, command};
 use std::error::Error;
 

diff --git a/src/bin/cli_query/main.rs → bridge/src/bin/cli_query/main.rs b/src/bin/cli_query/main.rs → bridge/src/bin/cli_query/main.rs
@@ -1,5 +1,5 @@
 use bitcoin::Network;
-use bitvm::bridge::{client::cli::query_command::QueryCommand, constants::DestinationNetwork};
+use bridge::{client::cli::query_command::QueryCommand, constants::DestinationNetwork};
 use clap::{arg, command};
 use std::error::Error;
 

diff --git a/src/bridge/client/chain/base.rs → bridge/src/client/chain/base.rs b/src/bridge/client/chain/base.rs → bridge/src/client/chain/base.rs
diff --git a/src/bridge/client/chain/chain.rs → bridge/src/client/chain/chain.rs b/src/bridge/client/chain/chain.rs → bridge/src/client/chain/chain.rs
diff --git a/src/bridge/client/chain/ethereum.rs → bridge/src/client/chain/ethereum.rs b/src/bridge/client/chain/ethereum.rs → bridge/src/client/chain/ethereum.rs
diff --git a/src/bridge/client/chain/mod.rs → bridge/src/client/chain/mod.rs b/src/bridge/client/chain/mod.rs → bridge/src/client/chain/mod.rs
diff --git a/src/bridge/client/cli/client_command.rs → bridge/src/client/cli/client_command.rs b/src/bridge/client/cli/client_command.rs → bridge/src/client/cli/client_command.rs
@@ -1,9 +1,9 @@
 use super::key_command::KeysCommand;
-use crate::bridge::client::client::BitVMClient;
-use crate::bridge::constants::DestinationNetwork;
-use crate::bridge::contexts::base::generate_keys_from_secret;
-use crate::bridge::graphs::base::{VERIFIER_0_SECRET, VERIFIER_1_SECRET};
-use crate::bridge::transactions::base::Input;
+use crate::client::client::BitVMClient;
+use crate::constants::DestinationNetwork;
+use crate::contexts::base::generate_keys_from_secret;
+use crate::graphs::base::{VERIFIER_0_SECRET, VERIFIER_1_SECRET};
+use crate::transactions::base::Input;
 use bitcoin::PublicKey;
 use bitcoin::{Network, OutPoint};
 use clap::{arg, ArgMatches, Command};

diff --git a/src/bridge/client/cli/key_command.rs → bridge/src/client/cli/key_command.rs b/src/bridge/client/cli/key_command.rs → bridge/src/client/cli/key_command.rs
@@ -7,7 +7,7 @@ use std::io::{self, Read, Write};
 use std::path::PathBuf;
 use toml;
 
-use crate::bridge::contexts::base::generate_keys_from_secret;
+use crate::contexts::base::generate_keys_from_secret;
 
 #[derive(Serialize, Deserialize, Default)]
 pub struct Config {

diff --git a/src/bridge/client/cli/mod.rs → bridge/src/client/cli/mod.rs b/src/bridge/client/cli/mod.rs → bridge/src/client/cli/mod.rs
diff --git a/src/bridge/client/cli/query_command.rs → bridge/src/client/cli/query_command.rs b/src/bridge/client/cli/query_command.rs → bridge/src/client/cli/query_command.rs
@@ -7,7 +7,7 @@ use super::{
     query_response::{Response, ResponseStatus},
     validation::{validate, ArgType},
 };
-use crate::bridge::{
+use crate::{
     client::{
         client::BitVMClient,
         sdk::{query::ClientCliQuery, query_contexts::depositor_signatures::DepositorSignatures},

diff --git a/src/bridge/client/cli/query_response.rs → bridge/src/client/cli/query_response.rs b/src/bridge/client/cli/query_response.rs → bridge/src/client/cli/query_response.rs