refactor: improve workspace layout

summa-tx · Jun 9, 2024 · d85a9e2 · d85a9e2
1 parent 0c3f993
commit d85a9e2
Show file tree

Hide file tree

Showing 63 changed files with 120 additions and 74 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,50 @@
 [workspace]
 members = [
-    "core",
-    "bip32",
-    "bip39",
-    "ledger",
+    "crates/*"
 ]
+resolver = "2"
+
+[workspace.package]
+version = "0.11.0"
+authors = [
+    "Summa <[email protected]>",
+    "James Prestwich <[email protected]>",
+]
+edition = "2021"
+repository = "https://github.com/summa-tx/coins"
+license = "MIT OR Apache-2.0"
+rust-version = "1.65"
+
+[workspace.dependencies]
+coins-bip32 = { path = "crates/bip32" }
+coins-bip39 = { path = "crates/bip39" }
+coins-core = { path = "crates/core" }
+coins-ledger = { path = "crates/ledger" }
+
+# core
+base64 = "0.21"
+bech32 = "0.9"
+bs58 = "0.5.1"
+digest = "0.10.7"
+generic-array = "0.14.7"
+hex = { package = "const-hex", version = "1.12.0" }
+ripemd = "0.1.3"
+serde = "1.0.203"
+sha3 = "0.10.8"
+
+# bip32
+hmac = "0.12.1"
+k256 = { version = "0.13.3", features = ["std", "arithmetic"] }
+sha2 = "0.10.8"
+thiserror = "1.0.61"
+
+# bip39
+bitvec = "1.0.1"
+pbkdf2 = "0.12.2"
+rand = "0.8.5"
+once_cell = "1.19.0"
+
+# ledger
+async-trait = "0.1.80"
+cfg-if = "1.0.0"
+
diff --git a/bip32/Cargo.toml b/bip32/Cargo.toml
diff --git a/core/Cargo.toml b/core/Cargo.toml
diff --git a/crates/bip32/Cargo.toml b/crates/bip32/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "coins-bip32"
+version.workspace =  true
+authors.workspace =  true
+edition.workspace =  true
+repository.workspace = true
+license.workspace = true
+
+categories = ["cryptography"]
+keywords = ["bip32", "bitcoin", "cryptocurrency", "blockchain"]
+description = "Bip32 in Rust"
+
+[dependencies]
+coins-core.workspace = true
+
+bs58.workspace = true
+digest.workspace = true
+hmac.workspace = true
+k256.workspace = true
+serde.workspace = true
+sha2.workspace = true
+thiserror.workspace = true
+
+[dev-dependencies]
+hex = "0.4"
+
+[features]
+default = ["mainnet"]
+mainnet = []
+testnet = []
diff --git a/bip32/README.md → crates/bip32/README.md b/bip32/README.md → crates/bip32/README.md
diff --git a/bip32/src/defaults.rs → crates/bip32/src/defaults.rs b/bip32/src/defaults.rs → crates/bip32/src/defaults.rs
diff --git a/bip32/src/derived.rs → crates/bip32/src/derived.rs b/bip32/src/derived.rs → crates/bip32/src/derived.rs
diff --git a/bip32/src/enc.rs → crates/bip32/src/enc.rs b/bip32/src/enc.rs → crates/bip32/src/enc.rs
diff --git a/bip32/src/lib.rs → crates/bip32/src/lib.rs b/bip32/src/lib.rs → crates/bip32/src/lib.rs
diff --git a/bip32/src/macros.rs → crates/bip32/src/macros.rs b/bip32/src/macros.rs → crates/bip32/src/macros.rs
diff --git a/bip32/src/path.rs → crates/bip32/src/path.rs b/bip32/src/path.rs → crates/bip32/src/path.rs
diff --git a/bip32/src/prelude.rs → crates/bip32/src/prelude.rs b/bip32/src/prelude.rs → crates/bip32/src/prelude.rs
diff --git a/bip32/src/primitives.rs → crates/bip32/src/primitives.rs b/bip32/src/primitives.rs → crates/bip32/src/primitives.rs
diff --git a/bip32/src/xkeys.rs → crates/bip32/src/xkeys.rs b/bip32/src/xkeys.rs → crates/bip32/src/xkeys.rs
diff --git a/bip39/Cargo.toml → crates/bip39/Cargo.toml b/bip39/Cargo.toml → crates/bip39/Cargo.toml
@@ -12,22 +12,23 @@ repository = "https://github.com/summa-tx/coins"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-coins-bip32 = { version = "0.8.3", path = "../bip32" }
+coins-bip32.workspace = true
 
-bitvec = "1.0"
-hmac = "0.12"
-pbkdf2 = "0.12"
-rand = "0.8"
-sha2 = "0.10"
-thiserror = "1.0"
+hmac.workspace = true
+bitvec.workspace = true
+pbkdf2.workspace = true
+rand.workspace = true
+sha2.workspace = true
+thiserror.workspace = true
 
 # used by all wordlists
-once_cell = { version = "1.18", optional = true }
+once_cell = { workspace = true, optional = true }
 
 [dev-dependencies]
-hex = "0.4"
+hex.workspace = true
 
 [features]
+once_cell = ["dep:once_cell"]
 default = ["all-langs"]
 all-langs = [
     "chinese-simplified",

diff --git a/bip39/README.md → crates/bip39/README.md b/bip39/README.md → crates/bip39/README.md
diff --git a/bip39/src/lib.rs → crates/bip39/src/lib.rs b/bip39/src/lib.rs → crates/bip39/src/lib.rs
diff --git a/bip39/src/mnemonic.rs → crates/bip39/src/mnemonic.rs b/bip39/src/mnemonic.rs → crates/bip39/src/mnemonic.rs
diff --git a/bip39/src/wordlist/chinese_simplified.rs → .../bip39/src/wordlist/chinese_simplified.rs b/bip39/src/wordlist/chinese_simplified.rs → .../bip39/src/wordlist/chinese_simplified.rs
diff --git a/bip39/src/wordlist/chinese_traditional.rs → ...bip39/src/wordlist/chinese_traditional.rs b/bip39/src/wordlist/chinese_traditional.rs → ...bip39/src/wordlist/chinese_traditional.rs
diff --git a/bip39/src/wordlist/czech.rs → crates/bip39/src/wordlist/czech.rs b/bip39/src/wordlist/czech.rs → crates/bip39/src/wordlist/czech.rs
diff --git a/bip39/src/wordlist/english.rs → crates/bip39/src/wordlist/english.rs b/bip39/src/wordlist/english.rs → crates/bip39/src/wordlist/english.rs
diff --git a/bip39/src/wordlist/french.rs → crates/bip39/src/wordlist/french.rs b/bip39/src/wordlist/french.rs → crates/bip39/src/wordlist/french.rs
diff --git a/bip39/src/wordlist/italian.rs → crates/bip39/src/wordlist/italian.rs b/bip39/src/wordlist/italian.rs → crates/bip39/src/wordlist/italian.rs
diff --git a/bip39/src/wordlist/japanese.rs → crates/bip39/src/wordlist/japanese.rs b/bip39/src/wordlist/japanese.rs → crates/bip39/src/wordlist/japanese.rs
diff --git a/bip39/src/wordlist/korean.rs → crates/bip39/src/wordlist/korean.rs b/bip39/src/wordlist/korean.rs → crates/bip39/src/wordlist/korean.rs
diff --git a/bip39/src/wordlist/mod.rs → crates/bip39/src/wordlist/mod.rs b/bip39/src/wordlist/mod.rs → crates/bip39/src/wordlist/mod.rs
diff --git a/bip39/src/wordlist/portuguese.rs → crates/bip39/src/wordlist/portuguese.rs b/bip39/src/wordlist/portuguese.rs → crates/bip39/src/wordlist/portuguese.rs
diff --git a/bip39/src/wordlist/spanish.rs → crates/bip39/src/wordlist/spanish.rs b/bip39/src/wordlist/spanish.rs → crates/bip39/src/wordlist/spanish.rs
diff --git a/...src/wordlist/words/chinese_simplified.txt → ...src/wordlist/words/chinese_simplified.txt b/...src/wordlist/words/chinese_simplified.txt → ...src/wordlist/words/chinese_simplified.txt
diff --git a/...rc/wordlist/words/chinese_traditional.txt → ...rc/wordlist/words/chinese_traditional.txt b/...rc/wordlist/words/chinese_traditional.txt → ...rc/wordlist/words/chinese_traditional.txt
diff --git a/bip39/src/wordlist/words/czech.txt → crates/bip39/src/wordlist/words/czech.txt b/bip39/src/wordlist/words/czech.txt → crates/bip39/src/wordlist/words/czech.txt
diff --git a/bip39/src/wordlist/words/english.txt → crates/bip39/src/wordlist/words/english.txt b/bip39/src/wordlist/words/english.txt → crates/bip39/src/wordlist/words/english.txt
diff --git a/bip39/src/wordlist/words/french.txt → crates/bip39/src/wordlist/words/french.txt b/bip39/src/wordlist/words/french.txt → crates/bip39/src/wordlist/words/french.txt
diff --git a/bip39/src/wordlist/words/italian.txt → crates/bip39/src/wordlist/words/italian.txt b/bip39/src/wordlist/words/italian.txt → crates/bip39/src/wordlist/words/italian.txt
diff --git a/bip39/src/wordlist/words/japanese.txt → crates/bip39/src/wordlist/words/japanese.txt b/bip39/src/wordlist/words/japanese.txt → crates/bip39/src/wordlist/words/japanese.txt
diff --git a/bip39/src/wordlist/words/korean.txt → crates/bip39/src/wordlist/words/korean.txt b/bip39/src/wordlist/words/korean.txt → crates/bip39/src/wordlist/words/korean.txt
diff --git a/bip39/src/wordlist/words/portuguese.txt → ...s/bip39/src/wordlist/words/portuguese.txt b/bip39/src/wordlist/words/portuguese.txt → ...s/bip39/src/wordlist/words/portuguese.txt
diff --git a/bip39/src/wordlist/words/spanish.txt → crates/bip39/src/wordlist/words/spanish.txt b/bip39/src/wordlist/words/spanish.txt → crates/bip39/src/wordlist/words/spanish.txt
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "coins-core"
+version = "0.8.7"
+authors = ["James Prestwich <[email protected]>"]
+edition = "2018"
+description = "Core library for coins-bip32 and coins-bip39"
+repository = "https://github.com/summa-tx/coins"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+base64.workspace = true
+bech32.workspace = true
+bs58 = { workspace = true, features = ["check"] }
+digest.workspace = true
+generic-array.workspace = true
+hex.workspace = true
+ripemd.workspace = true
+serde = { workspace = true, features = ["derive"] }
+sha2.workspace = true
+sha3.workspace = true
+thiserror.workspace = true
diff --git a/core/README.md → crates/core/README.md b/core/README.md → crates/core/README.md
diff --git a/core/src/enc.rs → crates/core/src/enc.rs b/core/src/enc.rs → crates/core/src/enc.rs
diff --git a/core/src/hashes.rs → crates/core/src/hashes.rs b/core/src/hashes.rs → crates/core/src/hashes.rs
diff --git a/core/src/lib.rs → crates/core/src/lib.rs b/core/src/lib.rs → crates/core/src/lib.rs
diff --git a/core/src/macros.rs → crates/core/src/macros.rs b/core/src/macros.rs → crates/core/src/macros.rs
diff --git a/core/src/prelude.rs → crates/core/src/prelude.rs b/core/src/prelude.rs → crates/core/src/prelude.rs
diff --git a/core/src/ser.rs → crates/core/src/ser.rs b/core/src/ser.rs → crates/core/src/ser.rs
diff --git a/ledger/Cargo.toml → crates/ledger/Cargo.toml b/ledger/Cargo.toml → crates/ledger/Cargo.toml
@@ -1,30 +1,32 @@
 [package]
 name = "coins-ledger"
-version = "0.10.1"
+
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+
 authors = [
     "Summa <[email protected]>",
-    "James Prestwich <james@summa.one>",
+    "James Prestwich <james@prestwi.ch>",
     "Zondax GmbH <[email protected]>",
 ]
-edition = "2018"
 categories = ["authentication", "cryptography"]
 keywords = ["ledger", "apdu", "cryptocurrency"]
-repository = "https://github.com/summa-tx/coins"
-license = "MIT OR Apache-2.0"
 description = "Ledger Nano X/S connection and communication management library"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-async-trait = "0.1"
-cfg-if = "1.0"
-hex = "0.4"
-thiserror = "1.0"
+async-trait.workspace = true
+cfg-if.workspace = true
+hex.workspace = true
+thiserror.workspace = true
 
 # native
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-once_cell = "1.18.0"
+once_cell.workspace = true
 byteorder = "1.5"
 tracing = "0.1"
 hidapi-rusb = "1.3"

diff --git a/ledger/README.md → crates/ledger/README.md b/ledger/README.md → crates/ledger/README.md
diff --git a/ledger/node_tests/package-lock.json → crates/ledger/node_tests/package-lock.json b/ledger/node_tests/package-lock.json → crates/ledger/node_tests/package-lock.json
diff --git a/ledger/node_tests/package.json → crates/ledger/node_tests/package.json b/ledger/node_tests/package.json → crates/ledger/node_tests/package.json
diff --git a/ledger/node_tests/test.js → crates/ledger/node_tests/test.js b/ledger/node_tests/test.js → crates/ledger/node_tests/test.js
diff --git a/ledger/src/common.rs → crates/ledger/src/common.rs b/ledger/src/common.rs → crates/ledger/src/common.rs
diff --git a/ledger/src/errors.rs → crates/ledger/src/errors.rs b/ledger/src/errors.rs → crates/ledger/src/errors.rs
diff --git a/ledger/src/lib.rs → crates/ledger/src/lib.rs b/ledger/src/lib.rs → crates/ledger/src/lib.rs
diff --git a/ledger/src/protocol.rs → crates/ledger/src/protocol.rs b/ledger/src/protocol.rs → crates/ledger/src/protocol.rs
diff --git a/ledger/src/transports/mod.rs → crates/ledger/src/transports/mod.rs b/ledger/src/transports/mod.rs → crates/ledger/src/transports/mod.rs
diff --git a/ledger/src/transports/native/error.rs → crates/ledger/src/transports/native/error.rs b/ledger/src/transports/native/error.rs → crates/ledger/src/transports/native/error.rs
diff --git a/ledger/src/transports/native/hid.rs → crates/ledger/src/transports/native/hid.rs b/ledger/src/transports/native/hid.rs → crates/ledger/src/transports/native/hid.rs
diff --git a/ledger/src/transports/native/mod.rs → crates/ledger/src/transports/native/mod.rs b/ledger/src/transports/native/mod.rs → crates/ledger/src/transports/native/mod.rs
diff --git a/ledger/src/transports/wasm.rs → crates/ledger/src/transports/wasm.rs b/ledger/src/transports/wasm.rs → crates/ledger/src/transports/wasm.rs
diff --git a/ledger/test.sh → crates/ledger/test.sh b/ledger/test.sh → crates/ledger/test.sh
diff --git a/ledger/tests/integration.rs → crates/ledger/tests/integration.rs b/ledger/tests/integration.rs → crates/ledger/tests/integration.rs