diff --git a/cli/Cargo.lock b/cli/Cargo.lock index f2c3a60..d29eaf1 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -315,9 +315,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97" dependencies = [ "proc-macro2", "quote", @@ -686,17 +686,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829a082bd3761fde7476dc2ed85ca56c11628948460ece621e4f56fef5046567" -[[package]] -name = "bollard-stubs" -version = "1.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" -dependencies = [ - "chrono", - "serde", - "serde_with", -] - [[package]] name = "boltz-client" version = "0.2.0" @@ -756,9 +745,8 @@ dependencies = [ "lwk_common", "lwk_signer", "lwk_wollet", - "openssl", "prost 0.13.4", - "reqwest 0.11.20", + "reqwest 0.12.9", "rusqlite", "rusqlite_migration", "sdk-common", @@ -876,7 +864,6 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", - "serde", "wasm-bindgen", "windows-targets 0.52.6", ] @@ -911,7 +898,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -1064,41 +1051,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - [[package]] name = "dart-sys" version = "4.1.5" @@ -1129,7 +1081,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -1225,7 +1177,7 @@ dependencies = [ "hkdf", "libsecp256k1", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand_core", "sha2", "typenum", @@ -1707,6 +1659,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "h2" version = "0.3.26" @@ -1745,12 +1710,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1872,7 +1831,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand", "resolv-conf", "smallvec", @@ -2103,6 +2062,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.5.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.10" @@ -2149,7 +2124,7 @@ dependencies = [ "i18n-embed-impl", "intl-memoizer", "log", - "parking_lot 0.12.3", + "parking_lot", "rust-embed", "thiserror 1.0.69", "unic-langid", @@ -2171,7 +2146,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.90", "unic-langid", ] @@ -2330,12 +2305,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "1.0.3" @@ -2387,15 +2356,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "intl-memoizer" version = "0.5.2" @@ -2471,9 +2431,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -2674,41 +2634,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "lwk_containers" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f88c9817902800ee931cc42ef91df10df1e98fdb14848c07996463b4c711f80" -dependencies = [ - "bitcoin 0.32.5", - "rand", - "tempfile", - "testcontainers", -] - -[[package]] -name = "lwk_jade" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237fb37f329df999a3f503536da0de035332256c821bc341cf4644590a8057c8" -dependencies = [ - "elements", - "elements-miniscript", - "hex", - "log", - "lwk_common", - "lwk_containers", - "rand", - "reqwest 0.12.9", - "serde", - "serde_bytes", - "serde_cbor", - "serde_json", - "tempfile", - "thiserror 1.0.69", - "wasm-timer", -] - [[package]] name = "lwk_signer" version = "0.8.0" @@ -2719,7 +2644,6 @@ dependencies = [ "bip39", "elements-miniscript", "lwk_common", - "lwk_jade", "thiserror 1.0.69", ] @@ -3037,17 +2961,6 @@ dependencies = [ "log", ] -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -3055,21 +2968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3080,7 +2979,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.8", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -3484,15 +3383,6 @@ dependencies = [ "getrandom 0.2.14", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.8" @@ -3552,7 +3442,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -3592,11 +3482,13 @@ dependencies = [ "http-body-util", "hyper 1.5.1", "hyper-rustls", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -3610,6 +3502,7 @@ dependencies = [ "sync_wrapper 1.0.2", "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.1", "tower-service", "url", @@ -3947,15 +3840,17 @@ dependencies = [ [[package]] name = "sdk-common" version = "0.6.2" -source = "git+https://github.com/breez/breez-sdk?rev=84578d9abe1dd0d59867f93a22a92220ab16a52e#84578d9abe1dd0d59867f93a22a92220ab16a52e" +source = "git+https://github.com/breez/breez-sdk?rev=19ed955c6fa854ad6cd2beb2eca9127d8099c506#19ed955c6fa854ad6cd2beb2eca9127d8099c506" dependencies = [ "aes", "anyhow", + "async-trait", "base64 0.13.1", "bip21", "bitcoin 0.29.2", "cbc", "elements", + "getrandom 0.2.14", "hex", "hickory-resolver", "lazy_static", @@ -3965,6 +3860,7 @@ dependencies = [ "log", "percent-encoding", "prost 0.11.9", + "prost 0.13.4", "querystring", "regex", "reqwest 0.11.20", @@ -3973,10 +3869,15 @@ dependencies = [ "strum_macros", "thiserror 1.0.69", "tokio", + "tonic 0.12.3", "tonic 0.8.3", + "tonic-build 0.12.3", "tonic-build 0.8.4", + "tonic-web-wasm-client", + "tsify-next", "url", "urlencoding", + "wasm-bindgen", ] [[package]] @@ -4102,25 +4003,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.216" @@ -4132,6 +4014,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "serde_json" version = "1.0.133" @@ -4156,28 +4049,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "sha1" version = "0.10.6" @@ -4206,15 +4077,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - [[package]] name = "slab" version = "0.4.9" @@ -4258,12 +4120,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -4386,23 +4242,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "testcontainers" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87" -dependencies = [ - "bollard-stubs", - "futures", - "hex", - "hmac", - "log", - "rand", - "serde", - "serde_json", - "sha2", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -4518,9 +4357,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", "pin-project-lite", - "signal-hook-registry", "socket2", "tokio-macros", "windows-sys 0.52.0", @@ -4722,6 +4559,31 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "tonic-web-wasm-client" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c191f6613df48874158b6af303313eadf25d1b7a534216b62a1f049d77cd2711" +dependencies = [ + "base64 0.22.1", + "byteorder", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "httparse", + "js-sys", + "pin-project", + "thiserror 1.0.69", + "tonic 0.12.3", + "tower-service", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + [[package]] name = "tower" version = "0.4.13" @@ -4815,6 +4677,31 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tsify-next" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8bf7232b89b86f63b5f0ef22c64960f9cf4fb52c6698f1e7f60de93bc3292f" +dependencies = [ + "gloo-utils", + "serde", + "serde_json", + "tsify-next-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-next-macros" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2d85ebe93eedca20d3fe6d65814c856467a649674aa7763ebd42e3bb815fec" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.90", +] + [[package]] name = "tungstenite" version = "0.21.0" @@ -5035,20 +4922,21 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -5060,9 +4948,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -5073,9 +4961,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5083,9 +4971,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -5096,20 +4984,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] -name = "wasm-timer" -version = "0.2.5" +name = "wasm-streams" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ - "futures", + "futures-util", "js-sys", - "parking_lot 0.11.2", - "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5117,9 +5006,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 7b2a8c2..20fcd26 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -781,17 +781,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829a082bd3761fde7476dc2ed85ca56c11628948460ece621e4f56fef5046567" -[[package]] -name = "bollard-stubs" -version = "1.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" -dependencies = [ - "chrono", - "serde", - "serde_with", -] - [[package]] name = "boltz-client" version = "0.2.0" @@ -835,10 +824,9 @@ dependencies = [ "lwk_common", "lwk_signer", "lwk_wollet", - "openssl", "paste", "prost 0.13.4", - "reqwest 0.11.20", + "reqwest 0.12.7", "rusqlite", "rusqlite_migration", "sdk-common", @@ -880,6 +868,15 @@ dependencies = [ "uniffi_bindgen_kotlin_multiplatform", ] +[[package]] +name = "breez-sdk-liquid-wasm" +version = "0.7.1" +dependencies = [ + "breez-sdk-liquid", + "wasm-bindgen", + "wasm-bindgen-futures", +] + [[package]] name = "build-target" version = "0.4.0" @@ -1000,7 +997,6 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", - "serde", "wasm-bindgen", "windows-targets 0.52.6", ] @@ -1218,41 +1214,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - [[package]] name = "dart-sys" version = "4.1.5" @@ -1283,7 +1244,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -1379,7 +1340,7 @@ dependencies = [ "hkdf", "libsecp256k1", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand_core 0.6.4", "sha2", "typenum", @@ -1841,6 +1802,19 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "goblin" version = "0.6.1" @@ -1890,12 +1864,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" - [[package]] name = "hashbrown" version = "0.12.3" @@ -2005,7 +1973,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "rand 0.8.5", "resolv-conf", "smallvec", @@ -2236,6 +2204,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.10" @@ -2282,7 +2266,7 @@ dependencies = [ "i18n-embed-impl", "intl-memoizer", "log", - "parking_lot 0.12.3", + "parking_lot", "rust-embed", "thiserror", "unic-langid", @@ -2463,12 +2447,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -2549,15 +2527,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "intl-memoizer" version = "0.5.2" @@ -2624,10 +2593,11 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2826,41 +2796,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "lwk_containers" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f88c9817902800ee931cc42ef91df10df1e98fdb14848c07996463b4c711f80" -dependencies = [ - "bitcoin 0.32.4", - "rand 0.8.5", - "tempfile", - "testcontainers", -] - -[[package]] -name = "lwk_jade" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237fb37f329df999a3f503536da0de035332256c821bc341cf4644590a8057c8" -dependencies = [ - "elements", - "elements-miniscript", - "hex", - "log", - "lwk_common", - "lwk_containers", - "rand 0.8.5", - "reqwest 0.12.7", - "serde", - "serde_bytes", - "serde_cbor", - "serde_json", - "tempfile", - "thiserror", - "wasm-timer", -] - [[package]] name = "lwk_signer" version = "0.8.0" @@ -2871,7 +2806,6 @@ dependencies = [ "bip39", "elements-miniscript", "lwk_common", - "lwk_jade", "thiserror", ] @@ -3186,17 +3120,6 @@ dependencies = [ "log", ] -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -3204,21 +3127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3229,7 +3138,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -3686,15 +3595,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -3763,7 +3663,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -3803,11 +3703,13 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -3821,6 +3723,7 @@ dependencies = [ "sync_wrapper 1.0.1", "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.0", "tower-service", "url", @@ -4164,15 +4067,17 @@ dependencies = [ [[package]] name = "sdk-common" version = "0.6.2" -source = "git+https://github.com/breez/breez-sdk?rev=84578d9abe1dd0d59867f93a22a92220ab16a52e#84578d9abe1dd0d59867f93a22a92220ab16a52e" +source = "git+https://github.com/breez/breez-sdk?rev=19ed955c6fa854ad6cd2beb2eca9127d8099c506#19ed955c6fa854ad6cd2beb2eca9127d8099c506" dependencies = [ "aes", "anyhow", + "async-trait", "base64 0.13.1", "bip21", "bitcoin 0.29.2", "cbc", "elements", + "getrandom", "hex", "hickory-resolver", "lazy_static", @@ -4182,6 +4087,7 @@ dependencies = [ "log", "percent-encoding", "prost 0.11.9", + "prost 0.13.4", "querystring", "regex", "reqwest 0.11.20", @@ -4190,10 +4096,15 @@ dependencies = [ "strum_macros", "thiserror", "tokio", + "tonic 0.12.3", "tonic 0.8.3", + "tonic-build 0.12.3", "tonic-build 0.8.4", + "tonic-web-wasm-client", + "tsify-next", "url", "urlencoding", + "wasm-bindgen", ] [[package]] @@ -4322,25 +4233,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.210" @@ -4352,6 +4244,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "serde_json" version = "1.0.128" @@ -4376,28 +4279,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "sha1" version = "0.10.6" @@ -4628,23 +4509,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "testcontainers" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87" -dependencies = [ - "bollard-stubs", - "futures", - "hex", - "hmac", - "log", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", -] - [[package]] name = "textwrap" version = "0.16.1" @@ -4746,7 +4610,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -4951,6 +4815,31 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "tonic-web-wasm-client" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c191f6613df48874158b6af303313eadf25d1b7a534216b62a1f049d77cd2711" +dependencies = [ + "base64 0.22.1", + "byteorder", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "httparse", + "js-sys", + "pin-project", + "thiserror", + "tonic 0.12.3", + "tower-service", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + [[package]] name = "tower" version = "0.4.13" @@ -5044,6 +4933,31 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tsify-next" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8bf7232b89b86f63b5f0ef22c64960f9cf4fb52c6698f1e7f60de93bc3292f" +dependencies = [ + "gloo-utils", + "serde", + "serde_json", + "tsify-next-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-next-macros" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2d85ebe93eedca20d3fe6d65814c856467a649674aa7763ebd42e3bb815fec" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.87", +] + [[package]] name = "tungstenite" version = "0.21.0" @@ -5527,24 +5441,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.87", @@ -5553,21 +5467,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5575,9 +5490,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -5588,20 +5503,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] -name = "wasm-timer" -version = "0.2.5" +name = "wasm-streams" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ - "futures", + "futures-util", "js-sys", - "parking_lot 0.11.2", - "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5609,9 +5525,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index b779339..d1ccb6a 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,13 +1,13 @@ [profile.release] lto = true -opt-level = "z" # Optimize for size. +opt-level = "z" # Optimize for size. codegen-units = 1 # Reduce Parallel Code Generation Units to Increase Optimization -panic = "abort" # Abort on panic, as unwinding code does require extra binary size +panic = "abort" # Abort on panic, as unwinding code does require extra binary size rpath = true [profile.frb] inherits = "release" -strip = true # Automatically strip symbols from the binary. +strip = true # Automatically strip symbols from the binary. opt-level = 3 lto = "thin" debug = 0 @@ -16,15 +16,11 @@ incremental = false [profile.frb-min] inherits = "frb" -opt-level = "z" # Optimize for size. +opt-level = "z" # Optimize for size. lto = true [workspace] -members = [ - "bindings", - "bindings/langs/react-native", - "core", -] +members = ["bindings", "bindings/langs/react-native", "core", "wasm"] resolver = "2" [workspace.package] diff --git a/lib/core/Cargo.toml b/lib/core/Cargo.toml index d15026c..52d710d 100644 --- a/lib/core/Cargo.toml +++ b/lib/core/Cargo.toml @@ -17,7 +17,6 @@ workspace = true [dependencies] anyhow = { workspace = true } bip39 = "2.0.0" -boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", rev = "12c9e546f15706b563ba7e49f2be7e8a5e7ada90" } chrono = "0.4" derivative = "2.2.0" env_logger = "0.11" @@ -26,33 +25,25 @@ flutter_rust_bridge = { version = "=2.8.0", features = [ ], optional = true } log = { workspace = true } lwk_common = "0.8.0" -lwk_signer = "0.8.0" -lwk_wollet = { git = "https://github.com/breez/lwk", branch = "breez-sdk-liquid-0.6.3" } -#lwk_wollet = "0.8.0" +lwk_signer = { version = "0.8.0", default-features = false } rusqlite = { version = "0.31", features = ["backup", "bundled"] } +tokio = { version = "1", default-features = false, features = ["rt", "macros"] } +# TODO: Change on top of main once PR is merged +sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "19ed955c6fa854ad6cd2beb2eca9127d8099c506", features = ["liquid"] } rusqlite_migration = "1.0" -sdk-common = { git = "https://github.com/breez/breez-sdk", rev = "84578d9abe1dd0d59867f93a22a92220ab16a52e", features = ["liquid"] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.116" strum = "0.25" strum_macros = "0.25" thiserror = { workspace = true } -tokio-tungstenite = { version = "0.21.0", features = ["native-tls-vendored"] } -openssl = { version = "0.10", features = ["vendored"] } -tokio = { version = "1", features = ["rt", "macros"] } -tokio-stream = { version = "0.1.14", features = ["sync"] } url = "2.5.0" futures-util = { version = "0.3.28", default-features = false, features = [ "sink", "std", ] } -async-trait = "0.1.80" +async-trait = "0.1.86" hex = "0.4" -reqwest = { version = "=0.11.20", features = ["json"] } -electrum-client = { version = "0.21.0", default-features = false, features = [ - "use-rustls-ring", - "proxy", -] } +reqwest = { version = "0.12", features = [ "json" ] } zbase32 = "0.1.2" x509-parser = { version = "0.16.0" } tempfile = "3" @@ -60,8 +51,21 @@ prost = "0.13.3" ecies = { version = "0.2.7", default-features = false, features = ["pure"] } semver = "1.0.23" lazy_static = "1.5.0" + +[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies] +electrum-client = { version = "0.21.0", default-features = false, features = [ + "use-rustls-ring", + "proxy", +] } +boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", rev = "12c9e546f15706b563ba7e49f2be7e8a5e7ada90" } +tokio-stream = { version = "0.1.14", features = ["sync"] } +tokio-tungstenite = { version = "0.21.0", features = ["native-tls-vendored"] } tonic = { version = "0.12.3", features = ["tls", "tls-webpki-roots"] } uuid = { version = "1.8.0", features = ["v4"] } +lwk_wollet = { git = "https://github.com/breez/lwk", branch = "breez-sdk-liquid-0.6.3" } + +[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies] +lwk_wollet = { git = "https://github.com/breez/lwk", branch = "breez-sdk-liquid-0.6.3", default-features = false, features = [ "esplora" ] } [dev-dependencies] paste = "1.0.15" diff --git a/lib/core/src/sync/model/client.rs b/lib/core/src/sync/model/client.rs index 55e6f71..f0b4d13 100644 --- a/lib/core/src/sync/model/client.rs +++ b/lib/core/src/sync/model/client.rs @@ -5,7 +5,7 @@ use crate::{ use anyhow::Result; use log::trace; use lwk_wollet::hashes::hex::DisplayHex as _; -use openssl::sha::sha256; +use sdk_common::bitcoin::hashes::{sha256, Hash}; use std::sync::Arc; use super::{ @@ -16,10 +16,10 @@ use super::{ fn sign_message(msg: &[u8], signer: Arc>) -> Result { let msg = [MESSAGE_PREFIX, msg].concat(); trace!("About to compute sha256 hash of msg: {msg:?}"); - let digest = sha256(&sha256(&msg)); + let digest = sha256::Hash::hash(&sha256::Hash::hash(&msg)); trace!("About to sign digest: {digest:?}"); signer - .sign_ecdsa_recoverable(digest.into()) + .sign_ecdsa_recoverable(digest.to_vec()) .map(|bytes| zbase32::encode_full_bytes(&bytes)) } diff --git a/lib/core/src/sync/model/mod.rs b/lib/core/src/sync/model/mod.rs index fd5a313..2e64b1e 100644 --- a/lib/core/src/sync/model/mod.rs +++ b/lib/core/src/sync/model/mod.rs @@ -8,11 +8,11 @@ use anyhow::Result; use lazy_static::lazy_static; use log::trace; use lwk_wollet::hashes::hex::DisplayHex; -use openssl::sha::sha256; use rusqlite::{ types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef}, ToSql, }; +use sdk_common::bitcoin::hashes::{sha256, Hash}; use semver::Version; pub(crate) mod client; @@ -151,7 +151,7 @@ impl Record { } fn id(prefix: String, data_id: &str) -> String { - sha256((prefix + ":" + data_id).as_bytes()).to_lower_hex_string() + sha256::Hash::hash((prefix + ":" + data_id).as_bytes()).to_lower_hex_string() } pub(crate) fn get_id_from_sync_data(data: &SyncData) -> String { diff --git a/lib/wasm/Cargo.toml b/lib/wasm/Cargo.toml new file mode 100644 index 0000000..29a0012 --- /dev/null +++ b/lib/wasm/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "breez-sdk-liquid-wasm" +edition = "2021" +version.workspace = true + +[lib] +name = "breez_sdk_liquid_wasm" +crate-type = ["cdylib"] + +[lints] +workspace = true + +[dependencies] +breez-sdk-liquid = { path = "../core" } +wasm-bindgen = "0.2.100" +wasm-bindgen-futures = "0.4.50" diff --git a/lib/wasm/src/lib.rs b/lib/wasm/src/lib.rs new file mode 100644 index 0000000..d0cbe1a --- /dev/null +++ b/lib/wasm/src/lib.rs @@ -0,0 +1,6 @@ +use wasm_bindgen::prelude::*; + +#[wasm_bindgen] +pub struct LiquidSdk { + _inner: breez_sdk_liquid::sdk::LiquidSdk, +}