From 61a2a01aa2dc9243b588e324f134df714736ec47 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Tue, 20 Feb 2024 15:32:01 +0000 Subject: [PATCH] Update deps to match mutiny --- Cargo.lock | 365 ++++++++++++++++++++++++++++++++---------- waila-wasm/Cargo.toml | 2 +- waila/Cargo.toml | 6 +- waila/src/lib.rs | 18 +-- waila/src/nwa.rs | 14 +- 5 files changed, 296 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b3b013..3ce56be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,16 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + [[package]] name = "aes" version = "0.8.3" @@ -107,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayref" @@ -161,9 +171,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "base85" @@ -212,10 +228,16 @@ dependencies = [ "bitcoin_hashes 0.12.0", "core2", "hex_lit", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + [[package]] name = "bitcoin-private" version = "0.1.0" @@ -229,12 +251,12 @@ dependencies = [ "bech32", "bip21", "bitcoin", - "itertools 0.12.0", + "itertools", "lightning", "lightning-invoice", "lnurl-rs", "moksha-core", - "nostr 0.27.0", + "nostr", "rgb-std", "rgb-wallet", "url", @@ -257,6 +279,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bitcoin_hashes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -303,7 +335,7 @@ dependencies = [ "amplify", "chrono", "commit_verify", - "secp256k1", + "secp256k1 0.27.0", "strict_encoding", "strict_types", ] @@ -334,7 +366,7 @@ dependencies = [ "base85", "bp-consensus", "commit_verify", - "secp256k1", + "secp256k1 0.27.0", "strict_encoding", ] @@ -401,6 +433,19 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + [[package]] name = "chrono" version = "0.4.31" @@ -424,6 +469,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] @@ -497,6 +543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] @@ -521,7 +568,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.50", ] [[package]] @@ -532,7 +579,7 @@ checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.50", ] [[package]] @@ -553,6 +600,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -678,6 +726,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -730,9 +787,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -763,18 +820,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -836,7 +884,7 @@ dependencies = [ "hashbrown 0.8.2", "lightning", "num-traits", - "secp256k1", + "secp256k1 0.27.0", ] [[package]] @@ -887,23 +935,24 @@ dependencies = [ [[package]] name = "moksha-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1f9af10be82ae519e9a056cf47ee6d45388edd04ebb9ebaf15f7c025d6757e" +version = "0.2.0-beta" +source = "git+https://github.com/ngutech21/moksha?rev=0b9a32d216ba0782a4aa2cdb19a87589e16d9089#0b9a32d216ba0782a4aa2cdb19a87589e16d9089" dependencies = [ "anyhow", - "base64 0.21.5", - "bitcoin_hashes 0.12.0", + "base64 0.21.7", + "bitcoin_hashes 0.13.0", "getrandom", "hex", - "itertools 0.11.0", + "itertools", "rand", - "secp256k1", + "secp256k1 0.28.2", "serde", "serde_json", "serde_with", "thiserror", "url", + "utoipa", + "uuid", ] [[package]] @@ -914,44 +963,27 @@ checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe" [[package]] name = "nostr" -version = "0.26.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72adfa99eb5f1e5afa3f1fe6503c89989b7b0b61c4e5ec23c5b839967cd54da1" -dependencies = [ - "base64 0.21.5", - "bip39", - "bitcoin", - "cbc", - "chacha20", - "getrandom", - "instant", - "negentropy", - "once_cell", - "serde", - "serde_json", - "tracing", - "url-fork", -] - -[[package]] -name = "nostr" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e47228d958fd65ef3e04650a3b1dd80f16f10f0243c80ed969556dead0f48c8" +checksum = "62abb4201e9d6b8b25660bebcad7bc0eb0cf25ecf9fd139c8d8c36ac455d37da" dependencies = [ "aes", - "base64 0.21.5", + "base64 0.21.7", "bip39", "bitcoin", "cbc", "chacha20", + "chacha20poly1305", "getrandom", "instant", "negentropy", "once_cell", + "scrypt", "serde", "serde_json", "tracing", + "unicode-normalization", + "url", "url-fork", "wasm-bindgen", ] @@ -977,12 +1009,39 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + [[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -1001,6 +1060,17 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1013,20 +1083,44 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1115,7 +1209,7 @@ dependencies = [ "commit_verify", "fluent-uri", "getrandom", - "indexmap 2.1.0", + "indexmap 2.2.3", "percent-encoding", "rgb-core", "rgb-std", @@ -1138,6 +1232,27 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash", + "pbkdf2", + "salsa20", + "sha2", +] + [[package]] name = "secp256k1" version = "0.27.0" @@ -1146,7 +1261,18 @@ checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ "bitcoin_hashes 0.12.0", "rand", - "secp256k1-sys", + "secp256k1-sys 0.8.1", + "serde", +] + +[[package]] +name = "secp256k1" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" +dependencies = [ + "rand", + "secp256k1-sys 0.9.2", "serde", ] @@ -1159,6 +1285,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +dependencies = [ + "cc", +] + [[package]] name = "secp256k1-zkp" version = "0.9.2" @@ -1167,7 +1302,7 @@ checksum = "026efcdacb95ee6aae5cc19144dc1549973eac36a4972700c28493de1ee5d69f" dependencies = [ "bitcoin-private", "rand", - "secp256k1", + "secp256k1 0.27.0", "secp256k1-zkp-sys", ] @@ -1178,36 +1313,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d03ab1ca75a18e1899e8d9b8d28b5998ae1ddcb42fec5956769718543293c723" dependencies = [ "cc", - "secp256k1-sys", + "secp256k1-sys 0.8.1", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.50", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -1219,11 +1354,11 @@ version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", "serde_derive", "serde_json", @@ -1240,7 +1375,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.50", ] [[package]] @@ -1295,9 +1430,9 @@ checksum = "d10cc45e67d452cfe0d87d4714c3250190d97479af3502bbd823651bfe0f505f" dependencies = [ "amplify", "baid58", - "base64 0.21.5", + "base64 0.21.7", "half", - "indexmap 2.1.0", + "indexmap 2.2.3", "sha2", "strict_encoding", ] @@ -1308,6 +1443,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[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" @@ -1321,9 +1462,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" dependencies = [ "proc-macro2", "quote", @@ -1332,22 +1473,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.50", ] [[package]] @@ -1442,6 +1583,16 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "url" version = "2.5.0" @@ -1467,6 +1618,40 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "utoipa" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" +dependencies = [ + "indexmap 2.2.3", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom", + "serde", +] + [[package]] name = "version_check" version = "0.9.4" @@ -1479,7 +1664,7 @@ version = "0.3.0" dependencies = [ "bitcoin", "bitcoin-waila", - "nostr 0.26.0", + "nostr", "wasm-bindgen", ] @@ -1510,7 +1695,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.50", "wasm-bindgen-shared", ] @@ -1532,7 +1717,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.50", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1618,3 +1803,9 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/waila-wasm/Cargo.toml b/waila-wasm/Cargo.toml index c4a19ce..7542529 100644 --- a/waila-wasm/Cargo.toml +++ b/waila-wasm/Cargo.toml @@ -17,5 +17,5 @@ crate-type = ["cdylib", "rlib"] [dependencies] bitcoin-waila = { path = "../waila", version = "0.3.0" } bitcoin = "0.30.2" -nostr = { version = "0.26.0", default-features = false, features = ["std"] } +nostr = { version = "0.28.1", default-features = false, features = ["std"] } wasm-bindgen = "0.2.84" diff --git a/waila/Cargo.toml b/waila/Cargo.toml index f747b08..c2c206c 100644 --- a/waila/Cargo.toml +++ b/waila/Cargo.toml @@ -18,15 +18,15 @@ crate-type = ["cdylib", "rlib"] bech32 = "0.9.1" bitcoin = { version = "0.30.2", default-features = false, features = ["serde"] } bip21 = "0.3.1" -itertools = "0.12.0" -nostr = { version = "0.27.0", default-features = false, features = ["nip47"] } +itertools = "0.12.1" +nostr = { version = "0.28.1", default-features = false, features = ["nip47"] } lnurl-rs = { version = "0.4.0", default-features = false } lightning-invoice = { version = "0.29.0", default-features = false } lightning = { version = "0.0.121", default-features = false } rgb-std = { version = "0.10.9", optional = true } rgb-wallet = { version = "0.10.9", optional = true } url = "2.4.1" -moksha-core = "0.1.2" +moksha-core = { git = "https://github.com/ngutech21/moksha", rev = "0b9a32d216ba0782a4aa2cdb19a87589e16d9089" } [features] default = ["std"] diff --git a/waila/src/lib.rs b/waila/src/lib.rs index f8ac654..3a68cce 100644 --- a/waila/src/lib.rs +++ b/waila/src/lib.rs @@ -3,7 +3,6 @@ use std::convert::{TryFrom, TryInto}; use std::str::FromStr; use bitcoin::blockdata::constants::ChainHash; -use bitcoin::key::XOnlyPublicKey; use bitcoin::secp256k1::PublicKey; use bitcoin::{Address, Amount, Network}; use lightning::offers::offer; @@ -12,8 +11,7 @@ use lightning::offers::refund::Refund; use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription}; use lnurl::lightning_address::LightningAddress; use lnurl::lnurl::LnUrl; -use moksha_core::model::TokenV3; -use nostr::FromBech32; +use moksha_core::token::TokenV3; #[cfg(feature = "rgb")] use rgbstd::Chain; @@ -37,7 +35,7 @@ pub enum PaymentParams<'a> { NodePubkey(PublicKey), LnUrl(LnUrl), LightningAddress(LightningAddress), - Nostr(XOnlyPublicKey), + Nostr(nostr::PublicKey), FedimintInvite(String), NostrWalletAuth(NIP49URI), CashuToken(TokenV3), @@ -294,7 +292,7 @@ impl PaymentParams<'_> { } } - pub fn nostr_pubkey(&self) -> Option { + pub fn nostr_pubkey(&self) -> Option { match self { PaymentParams::OnChain(_) => None, PaymentParams::Bip21(_) => None, @@ -432,9 +430,8 @@ impl FromStr for PaymentParams<'_> { .map_err(|_| ()); } else if lower.starts_with("nostr:") { let str = lower.strip_prefix("nostr:").unwrap(); - return XOnlyPublicKey::from_str(str) + return nostr::PublicKey::from_str(str) .map(PaymentParams::Nostr) - .or_else(|_| XOnlyPublicKey::from_bech32(str).map(PaymentParams::Nostr)) .map_err(|_| ()); } else if lower.starts_with("fedimint:") { let str = lower.strip_prefix("fedimint:").unwrap(); @@ -457,8 +454,7 @@ impl FromStr for PaymentParams<'_> { .or_else(|_| PublicKey::from_str(str).map(PaymentParams::NodePubkey)) .or_else(|_| Offer::from_str(str).map(PaymentParams::Bolt12)) .or_else(|_| Refund::from_str(str).map(PaymentParams::Bolt12Refund)) - .or_else(|_| XOnlyPublicKey::from_str(str).map(PaymentParams::Nostr)) - .or_else(|_| XOnlyPublicKey::from_bech32(str).map(PaymentParams::Nostr)) + .or_else(|_| nostr::PublicKey::from_str(str).map(PaymentParams::Nostr)) .or_else(|_| NIP49URI::from_str(str).map(PaymentParams::NostrWalletAuth)) .or_else(|_| parse_fedi_invite_code(str).map(PaymentParams::FedimintInvite)) .or_else(|_| TokenV3::try_from(str.to_string()).map(PaymentParams::CashuToken)) @@ -766,7 +762,7 @@ mod tests { assert_eq!( parsed.nostr_pubkey(), Some( - XOnlyPublicKey::from_str( + nostr::PublicKey::from_str( "e1ff3bfdd4e40315959b08b4fcc8245eaa514637e1d4ec2ae166b743341be1af" ) .unwrap() @@ -790,7 +786,7 @@ mod tests { assert_eq!( parsed.nostr_pubkey(), Some( - XOnlyPublicKey::from_str( + nostr::PublicKey::from_str( "e1ff3bfdd4e40315959b08b4fcc8245eaa514637e1d4ec2ae166b743341be1af" ) .unwrap() diff --git a/waila/src/nwa.rs b/waila/src/nwa.rs index ee5c641..9f963bd 100644 --- a/waila/src/nwa.rs +++ b/waila/src/nwa.rs @@ -1,8 +1,8 @@ use core::fmt; use itertools::Itertools; -use nostr::key::XOnlyPublicKey; +use nostr::key::PublicKey; use nostr::nips::nip47::{Error, Method}; -use nostr::prelude::form_urlencoded::byte_serialize; +use nostr::prelude::url::form_urlencoded::byte_serialize; use nostr::Url; use std::borrow::Cow; use std::str::FromStr; @@ -97,7 +97,7 @@ impl FromStr for NIP49Budget { #[derive(Debug, Clone, Eq, PartialEq)] pub struct NIP49URI { /// App Pubkey - pub public_key: XOnlyPublicKey, + pub public_key: PublicKey, /// URL of the relay of choice where the `App` is connected and the `Signer` must send and listen for messages. pub relay_url: Url, /// A random identifier that the wallet will use to identify the connection. @@ -109,7 +109,7 @@ pub struct NIP49URI { /// Budget pub budget: Option, /// App's pubkey for identity verification - pub identity: Option, + pub identity: Option, } impl FromStr for NIP49URI { @@ -122,14 +122,14 @@ impl FromStr for NIP49URI { } if let Some(pubkey) = url.domain() { - let public_key = XOnlyPublicKey::from_str(pubkey)?; + let public_key = PublicKey::from_str(pubkey)?; let mut relay_url: Option = None; let mut required_commands: Vec = vec![]; let mut optional_commands: Vec = vec![]; let mut budget: Option = None; let mut secret: Option = None; - let mut identity: Option = None; + let mut identity: Option = None; for (key, value) in url.query_pairs() { match key { @@ -155,7 +155,7 @@ impl FromStr for NIP49URI { budget = Some(NIP49Budget::from_str(value.as_ref())?); } Cow::Borrowed("identity") => { - identity = Some(XOnlyPublicKey::from_str(value.as_ref())?); + identity = Some(PublicKey::from_str(value.as_ref())?); } _ => (), }