From 71dca06a7c788f329ba4ed04fbd6865f008bec3e Mon Sep 17 00:00:00 2001 From: fi3 Date: Thu, 15 Feb 2024 17:11:20 +0100 Subject: [PATCH] Fix cargo toml for bip-32-key-derivation --- utils/Cargo.lock | 141 ++++++++++++++++++++++++-- utils/Cargo.toml | 3 +- utils/bip32-key-derivation/Cargo.toml | 2 +- 3 files changed, 133 insertions(+), 13 deletions(-) diff --git a/utils/Cargo.lock b/utils/Cargo.lock index 4e93124ec1..7f7f5887b6 100644 --- a/utils/Cargo.lock +++ b/utils/Cargo.lock @@ -67,6 +67,46 @@ dependencies = [ "memchr", ] +[[package]] +name = "amplify" +version = "3.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba2ec14f4fb838e9ddace42fa5944bb1ee4dff8477494ba48c5f874e16caf27a" +dependencies = [ + "amplify_derive", + "amplify_num", + "wasm-bindgen", +] + +[[package]] +name = "amplify_derive" +version = "2.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c3de270e75f27a4468a7c344070109046656e85cb522141f7d40ab4b83803ac" +dependencies = [ + "amplify_syn", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "amplify_num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27d3d00d3d115395a7a8a4dc045feb7aa82b641e485f7e15f4e67ac16f4f56d" + +[[package]] +name = "amplify_syn" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da24db1445cc7bc3842fa072c2d51fe5b25b812b6a572d65842a4c72e87221ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -249,6 +289,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "binary_codec_sv2" version = "0.1.5" @@ -267,12 +313,38 @@ dependencies = [ "tracing", ] +[[package]] +name = "bip32_derivation" +version = "1.0.0" +dependencies = [ + "slip132", + "stratum-common", + "toml", +] + +[[package]] +name = "bitcoin" +version = "0.29.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" +dependencies = [ + "bech32", + "bitcoin_hashes 0.11.0", + "secp256k1 0.24.3", +] + [[package]] name = "bitcoin-internals" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitcoin_hashes" version = "0.13.0" @@ -445,7 +517,7 @@ dependencies = [ name = "const_sv2" version = "0.1.3" dependencies = [ - "secp256k1", + "secp256k1 0.28.2", ] [[package]] @@ -752,7 +824,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] @@ -935,7 +1007,7 @@ name = "key-utils" version = "1.0.0" dependencies = [ "bs58", - "secp256k1", + "secp256k1 0.28.2", "serde", "toml", ] @@ -1042,7 +1114,7 @@ dependencies = [ "const_sv2", "rand", "rand_chacha", - "secp256k1", + "secp256k1 0.28.2", ] [[package]] @@ -1390,15 +1462,34 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "secp256k1" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +dependencies = [ + "bitcoin_hashes 0.11.0", + "secp256k1-sys 0.6.1", +] + [[package]] name = "secp256k1" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.13.0", "rand", - "secp256k1-sys", + "secp256k1-sys 0.9.2", +] + +[[package]] +name = "secp256k1-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +dependencies = [ + "cc", ] [[package]] @@ -1437,7 +1528,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] @@ -1490,6 +1581,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slip132" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890b12cf298c4548739d6b1e53286576e43014ff1d3421751f2c26c80cc7a639" +dependencies = [ + "amplify", + "bitcoin", +] + [[package]] name = "smallvec" version = "1.13.1" @@ -1516,12 +1617,30 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "stratum-common" +version = "0.1.0" +dependencies = [ + "bitcoin", +] + [[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.48" @@ -1579,7 +1698,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] @@ -1610,7 +1729,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] @@ -1705,7 +1824,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -1739,7 +1858,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 385d52a0c0..93c57a5472 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -19,7 +19,8 @@ members = [ "network-helpers", "buffer", "error-handling", - "key-utils" + "key-utils", + "bip32-key-derivation" ] exclude = [ diff --git a/utils/bip32-key-derivation/Cargo.toml b/utils/bip32-key-derivation/Cargo.toml index e67ea36216..5f549ba3b9 100644 --- a/utils/bip32-key-derivation/Cargo.toml +++ b/utils/bip32-key-derivation/Cargo.toml @@ -14,7 +14,7 @@ name = "bip32_derivation-bin" path = "src/main.rs" [dependencies] -stratum-common = { path = "../../common" } +stratum-common = { version="0.1.0", path = "../../common", features=["bitcoin"]} slip132 = "0.10" [dev-dependencies]