Move "core" back to be the root of the crate

virto-network · Apr 9, 2023 · 8a1ec24 · 8a1ec24
1 parent 98c5463
commit 8a1ec24
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 47 deletions.
diff --git a/.github/workflows/javascript.yml b/.github/workflows/javascript.yml
@@ -21,11 +21,11 @@ jobs:
         rustup target add wasm32-unknown-unknown
         curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
     - name: Build
-      working-directory: libwallet-js
+      working-directory: js
       run: |
         wasm-pack build --dev --target nodejs --all-features
     - name: Run tests
-      working-directory: libwallet-js/test
+      working-directory: js/test
       run: |
         npm ci
         npm test
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -17,8 +17,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build
-      working-directory: libwallet-core
       run: cargo build --verbose
     - name: Run tests
-      working-directory: libwallet-core
       run: cargo test --verbose --all-features
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,53 @@
+[package]
+authors = ["Daniel Olano <[email protected]>"]
+autoexamples = true
+edition = "2018"
+name = "libwallet"
+version = "0.3.0"
+
+[dependencies]
+# base dependencies
+arrayvec = {version = "0.7.2", default-features = false}
+
+serde = {version = "1.0", default-features = false, features = ["derive"], optional = true}
+
+# feature util_pin
+hmac = {version = "0.12.1", default-features = false, optional = true}
+pbkdf2 = {version = "0.11.0", default-features = false, optional = true}
+sha2 = {version = "0.10.2", default-features = false, optional = true}
+
+mnemonic = {package = "bip0039", version = "0.10.1", default-features = false, optional = true}
+
+rand_core = {version = "0.6.3", optional = true}
+# substrate related
+schnorrkel = {version = "0.10.2", default-features = false, optional = true}# soft derivation in no_std
+rand_chacha = {version = "0.3.1", default-features = false, optional = true}
+
+# vault os
+keyring = {version = "1.1.2", optional = true}
+# vault pass
+prs-lib = {version = "0.2.1", optional = true}
+
+[dev-dependencies]
+async-std = {version = "1.10.0", features = ["attributes"]}
+serde_json = {version = "1.0", default-features = false, features = ["alloc"]}
+# pass vault example
+dirs = "4.0"
+
+[features]
+default = ["std", "substrate", "vault_simple", "mnemonic", "rand"]
+rand = ["rand_core"]
+sr25519 = ["schnorrkel/u64_backend", "schnorrkel/getrandom"]
+std = [
+  "rand_core/getrandom",
+]
+substrate = ["sr25519"]
+util_pin = ["pbkdf2", "hmac", "sha2"]
+vault_os = ["keyring"]
+vault_pass = ["prs-lib"]
+vault_simple = []
+
 [workspace]
 members = [
-  "libwallet-core",
-  "libwallet-js"
+  "js",
 ]
diff --git a/...allet-core/examples/account_generation.rs → examples/account_generation.rs b/...allet-core/examples/account_generation.rs → examples/account_generation.rs
diff --git a/...let-core/examples/persisted_in_keyring.rs → examples/persisted_in_keyring.rs b/...let-core/examples/persisted_in_keyring.rs → examples/persisted_in_keyring.rs
diff --git a/libwallet-core/examples/persisted_in_pass.rs → examples/persisted_in_pass.rs b/libwallet-core/examples/persisted_in_pass.rs → examples/persisted_in_pass.rs
diff --git a/libwallet-js/.gitignore → js/.gitignore b/libwallet-js/.gitignore → js/.gitignore
diff --git a/libwallet-js/.npmignore → js/.npmignore b/libwallet-js/.npmignore → js/.npmignore
diff --git a/libwallet-js/Cargo.toml → js/Cargo.toml b/libwallet-js/Cargo.toml → js/Cargo.toml
@@ -9,11 +9,11 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-hex = {version = "0.4.3", optional = true}
+libwallet = { path = "..", default-features = false }
+hex = { version = "0.4.3", optional = true }
 js-sys = "0.3.61"
-libwallet = {path = "../libwallet-core", default-features = false}
-rand_core = {version = "0.6.3", features = ["getrandom"]}
-serde = {version = "1.0.152", features = ["derive"]}
+rand_core = { version = "0.6.3", features = ["getrandom"] }
+serde = { version = "1.0.152", features = ["derive"] }
 serde-wasm-bindgen = "0.4.5"
 wasm-bindgen = "0.2.84"
 wasm-bindgen-futures = "0.4.34"

diff --git a/libwallet-js/README.md → js/README.md b/libwallet-js/README.md → js/README.md
diff --git a/libwallet-js/package-lock.json → js/package-lock.json b/libwallet-js/package-lock.json → js/package-lock.json
diff --git a/libwallet-js/package.json → js/package.json b/libwallet-js/package.json → js/package.json
diff --git a/libwallet-js/src/lib.cjs → js/src/lib.cjs b/libwallet-js/src/lib.cjs → js/src/lib.cjs
diff --git a/libwallet-js/src/lib.d.ts → js/src/lib.d.ts b/libwallet-js/src/lib.d.ts → js/src/lib.d.ts
diff --git a/libwallet-js/src/lib.js → js/src/lib.js b/libwallet-js/src/lib.js → js/src/lib.js
diff --git a/libwallet-js/src/lib.rs → js/src/lib.rs b/libwallet-js/src/lib.rs → js/src/lib.rs
diff --git a/libwallet-js/src/util.rs → js/src/util.rs b/libwallet-js/src/util.rs → js/src/util.rs
diff --git a/libwallet-js/src/wallet.cjs → js/src/wallet.cjs b/libwallet-js/src/wallet.cjs → js/src/wallet.cjs
diff --git a/libwallet-js/src/wallet.d.ts → js/src/wallet.d.ts b/libwallet-js/src/wallet.d.ts → js/src/wallet.d.ts
diff --git a/libwallet-js/src/wallet.rs → js/src/wallet.rs b/libwallet-js/src/wallet.rs → js/src/wallet.rs
diff --git a/libwallet-js/test/index.js → js/test/index.js b/libwallet-js/test/index.js → js/test/index.js
diff --git a/libwallet-js/test/wallet.test.js → js/test/wallet.test.js b/libwallet-js/test/wallet.test.js → js/test/wallet.test.js
diff --git a/libwallet-core/Cargo.toml b/libwallet-core/Cargo.toml
diff --git a/libwallet-core/src/account.rs → src/account.rs b/libwallet-core/src/account.rs → src/account.rs
diff --git a/libwallet-core/src/key_pair.rs → src/key_pair.rs b/libwallet-core/src/key_pair.rs → src/key_pair.rs
diff --git a/libwallet-core/src/lib.rs → src/lib.rs b/libwallet-core/src/lib.rs → src/lib.rs
@@ -311,6 +311,8 @@ mod util {
             let protected_seed = $pin.protect::<64>($seed);
             #[cfg(feature = "util_pin")]
             let $seed = &protected_seed;
+            #[cfg(not(feature = "util_pin"))]
+            let _ = &$pin; // use the variable to avoid warning
         };
     }
 

diff --git a/libwallet-core/src/substrate_ext.rs → src/substrate_ext.rs b/libwallet-core/src/substrate_ext.rs → src/substrate_ext.rs
diff --git a/libwallet-core/src/vault.rs → src/vault.rs b/libwallet-core/src/vault.rs → src/vault.rs
diff --git a/libwallet-core/src/vault/README.md → src/vault/README.md b/libwallet-core/src/vault/README.md → src/vault/README.md
diff --git a/libwallet-core/src/vault/os.rs → src/vault/os.rs b/libwallet-core/src/vault/os.rs → src/vault/os.rs
diff --git a/libwallet-core/src/vault/pass.rs → src/vault/pass.rs b/libwallet-core/src/vault/pass.rs → src/vault/pass.rs
diff --git a/libwallet-core/src/vault/simple.rs → src/vault/simple.rs b/libwallet-core/src/vault/simple.rs → src/vault/simple.rs