Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-12-17 09:34:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

chore: Upgrade bdk to 2.0.0 (#494)

Browse source 
* chore: Upgrade bdk to 2.0.0

* bump

* fix some clippy stuff
This commit is contained in:
Mohan 2025-08-03 01:55:40 +02:00 • committed by GitHub
parent 84aba174c3
commit d7031fdcfb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 251 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/ISSUE_TEMPLATE/submit_rendezvous_point.md vendored
View file

@ -7,9 +7,10 @@ assignees: ""
--- ---
**Rendezvous Server Address** **Rendezvous Server Address**
``` ```
/dns4/your.domain/tcp/8888/p2p/12D3KooWS5RaYJt4ANKMH4zczGVhNcw5W214e2DDYXnAb4dsj3 /dns4/your.domain/tcp/8888/p2p/12D3KooWS5RaYJt4ANKMH4zczGVhNcw5W214e2DDYXnAb4dsj3
``` ```
**Who is running the server?* *_Who is running the server?_
Username? How is this individual known within the community? Username? How is this individual known within the community?

291
Cargo.lock generated
View file

@ -283,7 +283,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]] [[package]]
name = "arti-client" name = "arti-client"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"cfg-if", "cfg-if",
@ -978,8 +978,9 @@ dependencies = [
[[package]] [[package]]
name = "bdk_chain" name = "bdk_chain"
version = "0.20.0" version = "0.23.0"
source = "git+https://github.com/Einliterflasche/bdk?branch=bump/rusqlite-0.32#2e57dc7495c14ed334fb525bf17f002d0a8ff6df" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e7e7c062f2229a767fe85062b8932352a7b8c1df586f91fae1017fd3dd281ef"
dependencies = [ dependencies = [
"bdk_core", "bdk_core",
"bitcoin 0.32.6", "bitcoin 0.32.6",
@ -990,8 +991,9 @@ dependencies = [
[[package]] [[package]]
name = "bdk_core" name = "bdk_core"
version = "0.3.0" version = "0.6.0"
source = "git+https://github.com/Einliterflasche/bdk?branch=bump/rusqlite-0.32#2e57dc7495c14ed334fb525bf17f002d0a8ff6df" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17698c25d2728afd6950d82069dce172147006f73960b9dc793a7e8dd7089016"
dependencies = [ dependencies = [
"bitcoin 0.32.6", "bitcoin 0.32.6",
"hashbrown 0.14.5", "hashbrown 0.14.5",
@ -1000,17 +1002,19 @@ dependencies = [
[[package]] [[package]]
name = "bdk_electrum" name = "bdk_electrum"
version = "0.19.0" version = "0.23.0"
source = "git+https://github.com/Einliterflasche/bdk?branch=bump/rusqlite-0.32#2e57dc7495c14ed334fb525bf17f002d0a8ff6df" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28f25503fbb646a219a23145ca1a753f7e239232225c661df8353f05faf00116"
dependencies = [ dependencies = [
"bdk_core", "bdk_core",
"electrum-client 0.22.0", "electrum-client 0.23.1",
] ]
[[package]] [[package]]
name = "bdk_wallet" name = "bdk_wallet"
version = "1.0.0-beta.5" version = "2.0.0"
source = "git+https://github.com/Einliterflasche/bdk?branch=bump/rusqlite-0.32#2e57dc7495c14ed334fb525bf17f002d0a8ff6df" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f278518ee6f2a17711fd4662dc34ce6153792a7a21575f05a9c8e2cb9ba36245"
dependencies = [ dependencies = [
"bdk_chain", "bdk_chain",
"bitcoin 0.32.6", "bitcoin 0.32.6",
@ -1534,7 +1538,7 @@ dependencies = [
[[package]] [[package]]
name = "caret" name = "caret"
version = "0.5.3" version = "0.5.3"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
[[package]] [[package]]
name = "cargo-platform" name = "cargo-platform"
@ -1566,7 +1570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
dependencies = [ dependencies = [
"serde", "serde",
"toml 0.9.3", "toml 0.9.4",
] ]
[[package]] [[package]]
@ -1586,9 +1590,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.30" version = "1.2.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
@ -1728,9 +1732,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.41" version = "4.5.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -1738,9 +1742,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.41" version = "4.5.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -2038,7 +2042,7 @@ dependencies = [
"anes", "anes",
"cast", "cast",
"ciborium", "ciborium",
"clap 4.5.41", "clap 4.5.42",
"criterion-plot", "criterion-plot",
"is-terminal", "is-terminal",
"itertools 0.10.5", "itertools 0.10.5",
@ -2306,7 +2310,7 @@ version = "1.0.161"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f426a20413ec2e742520ba6837c9324b55ffac24ead47491a6e29f933c5b135a" checksum = "f426a20413ec2e742520ba6837c9324b55ffac24ead47491a6e29f933c5b135a"
dependencies = [ dependencies = [
"clap 4.5.41", "clap 4.5.42",
"codespan-reporting", "codespan-reporting",
"indexmap 2.10.0", "indexmap 2.10.0",
"proc-macro2", "proc-macro2",
@ -2818,7 +2822,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [ dependencies = [
"libc", "libc",
"option-ext", "option-ext",
"redox_users 0.5.0", "redox_users 0.5.2",
"windows-sys 0.60.2", "windows-sys 0.60.2",
] ]
@ -3064,15 +3068,15 @@ dependencies = [
[[package]] [[package]]
name = "electrum-client" name = "electrum-client"
version = "0.22.0" version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d627e4feaf3009c10c8a0eb06d6ceb4ce1ff861849157fb35e8155d9706babb6" checksum = "5ed9a037f88aa61d3627a20af1c68fa0405ed5a16d9a0d9dc0e66adcda44afbe"
dependencies = [ dependencies = [
"bitcoin 0.32.6", "bitcoin 0.32.6",
"byteorder", "byteorder",
"libc", "libc",
"log", "log",
"rustls 0.23.29", "rustls 0.23.31",
"serde", "serde",
"serde_json", "serde_json",
"webpki-roots 0.25.4", "webpki-roots 0.25.4",
@ -3121,7 +3125,7 @@ dependencies = [
"cc", "cc",
"memchr", "memchr",
"rustc_version", "rustc_version",
"toml 0.9.3", "toml 0.9.4",
"vswhom", "vswhom",
"winreg 0.55.0", "winreg 0.55.0",
] ]
@ -3473,7 +3477,7 @@ dependencies = [
[[package]] [[package]]
name = "fs-mistrust" name = "fs-mistrust"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive_builder_fork_arti", "derive_builder_fork_arti",
"dirs", "dirs",
@ -3517,7 +3521,7 @@ dependencies = [
[[package]] [[package]]
name = "fslock-guard" name = "fslock-guard"
version = "0.2.4" version = "0.2.4"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"fslock-arti-fork", "fslock-arti-fork",
"thiserror 2.0.12", "thiserror 2.0.12",
@ -3651,7 +3655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
dependencies = [ dependencies = [
"futures-io", "futures-io",
"rustls 0.23.29", "rustls 0.23.31",
"rustls-pki-types", "rustls-pki-types",
] ]
@ -4166,6 +4170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [ dependencies = [
"ahash 0.8.12", "ahash 0.8.12",
"allocator-api2",
"serde", "serde",
] ]
@ -4189,15 +4194,6 @@ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.14.5",
] ]
[[package]]
name = "hashlink"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown 0.15.4",
]
[[package]] [[package]]
name = "hdrhistogram" name = "hdrhistogram"
version = "7.5.4" version = "7.5.4"
@ -4518,7 +4514,7 @@ dependencies = [
"http 1.3.1", "http 1.3.1",
"hyper 1.6.0", "hyper 1.6.0",
"hyper-util", "hyper-util",
"rustls 0.23.29", "rustls 0.23.31",
"rustls-native-certs 0.8.1", "rustls-native-certs 0.8.1",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
@ -5578,7 +5574,7 @@ dependencies = [
"quinn", "quinn",
"rand 0.8.5", "rand 0.8.5",
"ring 0.17.14", "ring 0.17.14",
"rustls 0.23.29", "rustls 0.23.31",
"socket2 0.5.10", "socket2 0.5.10",
"thiserror 1.0.69", "thiserror 1.0.69",
"tokio", "tokio",
@ -5716,7 +5712,7 @@ dependencies = [
"libp2p-identity", "libp2p-identity",
"rcgen", "rcgen",
"ring 0.17.14", "ring 0.17.14",
"rustls 0.23.29", "rustls 0.23.31",
"rustls-webpki 0.101.7", "rustls-webpki 0.101.7",
"thiserror 1.0.69", "thiserror 1.0.69",
"x509-parser 0.16.0", "x509-parser 0.16.0",
@ -5797,9 +5793,9 @@ dependencies = [
[[package]] [[package]]
name = "libredox" name = "libredox"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7" checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"libc", "libc",
@ -5808,9 +5804,9 @@ dependencies = [
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
version = "0.30.1" version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
dependencies = [ dependencies = [
"cc", "cc",
"pkg-config", "pkg-config",
@ -6246,7 +6242,7 @@ dependencies = [
"arti-client", "arti-client",
"axum", "axum",
"chrono", "chrono",
"clap 4.5.41", "clap 4.5.42",
"futures", "futures",
"http-body-util", "http-body-util",
"hyper 1.6.0", "hyper 1.6.0",
@ -6965,7 +6961,7 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
[[package]] [[package]]
name = "oneshot-fused-workaround" name = "oneshot-fused-workaround"
version = "0.2.3" version = "0.2.3"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"futures", "futures",
] ]
@ -7981,7 +7977,7 @@ dependencies = [
"quinn-proto", "quinn-proto",
"quinn-udp", "quinn-udp",
"rustc-hash", "rustc-hash",
"rustls 0.23.29", "rustls 0.23.31",
"socket2 0.5.10", "socket2 0.5.10",
"thiserror 2.0.12", "thiserror 2.0.12",
"tokio", "tokio",
@ -8001,7 +7997,7 @@ dependencies = [
"rand 0.9.2", "rand 0.9.2",
"ring 0.17.14", "ring 0.17.14",
"rustc-hash", "rustc-hash",
"rustls 0.23.29", "rustls 0.23.31",
"rustls-pki-types", "rustls-pki-types",
"slab", "slab",
"thiserror 2.0.12", "thiserror 2.0.12",
@ -8262,9 +8258,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_users" name = "redox_users"
version = "0.5.0" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
dependencies = [ dependencies = [
"getrandom 0.2.16", "getrandom 0.2.16",
"libredox", "libredox",
@ -8423,7 +8419,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"quinn", "quinn",
"rustls 0.23.29", "rustls 0.23.31",
"rustls-native-certs 0.8.1", "rustls-native-certs 0.8.1",
"rustls-pki-types", "rustls-pki-types",
"serde", "serde",
@ -8453,7 +8449,7 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
[[package]] [[package]]
name = "retry-error" name = "retry-error"
version = "0.6.5" version = "0.6.5"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
[[package]] [[package]]
name = "rfc6979" name = "rfc6979"
@ -8589,14 +8585,14 @@ dependencies = [
[[package]] [[package]]
name = "rusqlite" name = "rusqlite"
version = "0.32.1" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
"fallible-iterator", "fallible-iterator",
"fallible-streaming-iterator", "fallible-streaming-iterator",
"hashlink 0.9.1", "hashlink",
"libsqlite3-sys", "libsqlite3-sys",
"smallvec", "smallvec",
"time 0.3.41", "time 0.3.41",
@ -8729,9 +8725,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.29" version = "0.23.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
dependencies = [ dependencies = [
"log", "log",
"once_cell", "once_cell",
@ -8844,7 +8840,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]] [[package]]
name = "safelog" name = "safelog"
version = "0.4.7" version = "0.4.7"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive_more 2.0.1", "derive_more 2.0.1",
"educe", "educe",
@ -9264,9 +9260,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.141" version = "1.0.142"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
dependencies = [ dependencies = [
"itoa", "itoa",
"memchr", "memchr",
@ -9662,7 +9658,7 @@ dependencies = [
[[package]] [[package]]
name = "slotmap-careful" name = "slotmap-careful"
version = "0.2.5" version = "0.2.5"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"paste", "paste",
"serde", "serde",
@ -9806,10 +9802,20 @@ dependencies = [
] ]
[[package]] [[package]]
name = "sqlx" name = "sqlformat"
version = "0.8.6" version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
dependencies = [
"nom",
"unicode_categories",
]
[[package]]
name = "sqlx"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c"
dependencies = [ dependencies = [
"sqlx-core", "sqlx-core",
"sqlx-macros", "sqlx-macros",
@ -9820,46 +9826,52 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-core" name = "sqlx-core"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b"
dependencies = [ dependencies = [
"base64 0.22.1", "atoi",
"byteorder",
"bytes", "bytes",
"chrono", "chrono",
"crc", "crc",
"crossbeam-queue", "crossbeam-queue",
"either", "either",
"event-listener", "event-listener",
"futures-channel",
"futures-core", "futures-core",
"futures-intrusive", "futures-intrusive",
"futures-io", "futures-io",
"futures-util", "futures-util",
"hashbrown 0.15.4", "hashbrown 0.14.5",
"hashlink 0.10.0", "hashlink",
"hex",
"indexmap 2.10.0", "indexmap 2.10.0",
"log", "log",
"memchr", "memchr",
"once_cell", "once_cell",
"paste",
"percent-encoding", "percent-encoding",
"rustls 0.23.29", "rustls 0.21.12",
"rustls-pemfile",
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.10.9", "sha2 0.10.9",
"smallvec", "smallvec",
"thiserror 2.0.12", "sqlformat",
"thiserror 1.0.69",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
"url", "url",
"webpki-roots 0.26.11", "webpki-roots 0.25.4",
] ]
[[package]] [[package]]
name = "sqlx-macros" name = "sqlx-macros"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -9870,9 +9882,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-macros-core" name = "sqlx-macros-core"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776"
dependencies = [ dependencies = [
"dotenvy", "dotenvy",
"either", "either",
@ -9889,15 +9901,16 @@ dependencies = [
"sqlx-postgres", "sqlx-postgres",
"sqlx-sqlite", "sqlx-sqlite",
"syn 2.0.104", "syn 2.0.104",
"tempfile",
"tokio", "tokio",
"url", "url",
] ]
[[package]] [[package]]
name = "sqlx-mysql" name = "sqlx-mysql"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6"
dependencies = [ dependencies = [
"atoi", "atoi",
"base64 0.22.1", "base64 0.22.1",
@ -9931,16 +9944,16 @@ dependencies = [
"smallvec", "smallvec",
"sqlx-core", "sqlx-core",
"stringprep", "stringprep",
"thiserror 2.0.12", "thiserror 1.0.69",
"tracing", "tracing",
"whoami", "whoami",
] ]
[[package]] [[package]]
name = "sqlx-postgres" name = "sqlx-postgres"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21"
dependencies = [ dependencies = [
"atoi", "atoi",
"base64 0.22.1", "base64 0.22.1",
@ -9952,6 +9965,7 @@ dependencies = [
"etcetera", "etcetera",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-io",
"futures-util", "futures-util",
"hex", "hex",
"hkdf", "hkdf",
@ -9969,16 +9983,16 @@ dependencies = [
"smallvec", "smallvec",
"sqlx-core", "sqlx-core",
"stringprep", "stringprep",
"thiserror 2.0.12", "thiserror 1.0.69",
"tracing", "tracing",
"whoami", "whoami",
] ]
[[package]] [[package]]
name = "sqlx-sqlite" name = "sqlx-sqlite"
version = "0.8.6" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee"
dependencies = [ dependencies = [
"atoi", "atoi",
"chrono", "chrono",
@ -9994,7 +10008,6 @@ dependencies = [
"serde", "serde",
"serde_urlencoded", "serde_urlencoded",
"sqlx-core", "sqlx-core",
"thiserror 2.0.12",
"tracing", "tracing",
"url", "url",
] ]
@ -10208,6 +10221,7 @@ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bdk", "bdk",
"bdk_chain", "bdk_chain",
"bdk_core",
"bdk_electrum", "bdk_electrum",
"bdk_wallet", "bdk_wallet",
"big-bytes", "big-bytes",
@ -10248,7 +10262,7 @@ dependencies = [
"reqwest 0.12.22", "reqwest 0.12.22",
"rust_decimal", "rust_decimal",
"rust_decimal_macros", "rust_decimal_macros",
"rustls 0.23.29", "rustls 0.23.31",
"semver", "semver",
"serde", "serde",
"serde_cbor", "serde_cbor",
@ -10696,7 +10710,7 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53e76101cc9848adfb6a04aae48a389062be457a785bb4349ae1423ddab5a82d" checksum = "53e76101cc9848adfb6a04aae48a389062be457a785bb4349ae1423ddab5a82d"
dependencies = [ dependencies = [
"clap 4.5.41", "clap 4.5.42",
"log", "log",
"serde", "serde",
"serde_json", "serde_json",
@ -10966,13 +10980,13 @@ dependencies = [
[[package]] [[package]]
name = "tauri-winres" name = "tauri-winres"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4" checksum = "7c6d9028d41d4de835e3c482c677a8cb88137ac435d6ff9a71f392d4421576c9"
dependencies = [ dependencies = [
"embed-resource", "embed-resource",
"indexmap 2.10.0", "indexmap 2.10.0",
"toml 0.8.23", "toml 0.9.4",
] ]
[[package]] [[package]]
@ -11191,9 +11205,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.47.0" version = "1.47.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -11248,7 +11262,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
dependencies = [ dependencies = [
"rustls 0.23.29", "rustls 0.23.31",
"tokio", "tokio",
] ]
@ -11338,9 +11352,9 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.9.3" version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e06723639aaded957e5a80be250c1f82f274b9d23ebb4d94163668470623461c" checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1"
dependencies = [ dependencies = [
"indexmap 2.10.0", "indexmap 2.10.0",
"serde", "serde",
@ -11429,7 +11443,7 @@ checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
[[package]] [[package]]
name = "tor-async-utils" name = "tor-async-utils"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
"educe", "educe",
@ -11444,7 +11458,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-basic-utils" name = "tor-basic-utils"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive_more 2.0.1", "derive_more 2.0.1",
"hex", "hex",
@ -11462,7 +11476,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-bytes" name = "tor-bytes"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"bytes", "bytes",
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
@ -11479,7 +11493,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-cell" name = "tor-cell"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -11508,7 +11522,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-cert" name = "tor-cert"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"caret", "caret",
"derive_builder_fork_arti", "derive_builder_fork_arti",
@ -11523,7 +11537,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-chanmgr" name = "tor-chanmgr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"caret", "caret",
@ -11557,7 +11571,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-checkable" name = "tor-checkable"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"humantime", "humantime",
"signature 2.2.0", "signature 2.2.0",
@ -11568,7 +11582,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-circmgr" name = "tor-circmgr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"async-trait", "async-trait",
@ -11615,7 +11629,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-config" name = "tor-config"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"cfg-if", "cfg-if",
@ -11647,7 +11661,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-config-path" name = "tor-config-path"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"directories", "directories",
"serde", "serde",
@ -11660,7 +11674,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-consdiff" name = "tor-consdiff"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"digest 0.10.7", "digest 0.10.7",
"hex", "hex",
@ -11671,7 +11685,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-dirclient" name = "tor-dirclient"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-compression 0.4.27", "async-compression 0.4.27",
"base64ct", "base64ct",
@ -11698,7 +11712,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-dirmgr" name = "tor-dirmgr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"base64ct", "base64ct",
@ -11751,7 +11765,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-error" name = "tor-error"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive_more 2.0.1", "derive_more 2.0.1",
"futures", "futures",
@ -11767,7 +11781,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-general-addr" name = "tor-general-addr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive_more 2.0.1", "derive_more 2.0.1",
"thiserror 2.0.12", "thiserror 2.0.12",
@ -11777,7 +11791,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-guardmgr" name = "tor-guardmgr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"base64ct", "base64ct",
@ -11818,7 +11832,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-hsclient" name = "tor-hsclient"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
@ -11861,7 +11875,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-hscrypto" name = "tor-hscrypto"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"cipher", "cipher",
"data-encoding", "data-encoding",
@ -11892,7 +11906,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-hsservice" name = "tor-hsservice"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"async-trait", "async-trait",
@ -11949,7 +11963,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-key-forge" name = "tor-key-forge"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
"derive_more 2.0.1", "derive_more 2.0.1",
@ -11969,7 +11983,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-keymgr" name = "tor-keymgr"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"arrayvec", "arrayvec",
@ -12007,7 +12021,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-linkspec" name = "tor-linkspec"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"by_address", "by_address",
@ -12033,7 +12047,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-llcrypto" name = "tor-llcrypto"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"aes", "aes",
"base64ct", "base64ct",
@ -12071,7 +12085,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-log-ratelim" name = "tor-log-ratelim"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"futures", "futures",
"humantime", "humantime",
@ -12085,7 +12099,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-memquota" name = "tor-memquota"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
"derive_more 2.0.1", "derive_more 2.0.1",
@ -12112,7 +12126,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-netdir" name = "tor-netdir"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitflags 2.9.1", "bitflags 2.9.1",
@ -12144,7 +12158,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-netdoc" name = "tor-netdoc"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"base64ct", "base64ct",
@ -12187,7 +12201,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-persist" name = "tor-persist"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
@ -12215,7 +12229,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-proto" name = "tor-proto"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"asynchronous-codec 0.7.0", "asynchronous-codec 0.7.0",
@ -12277,7 +12291,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-protover" name = "tor-protover"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"caret", "caret",
"paste", "paste",
@ -12289,7 +12303,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-relay-selection" name = "tor-relay-selection"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"rand 0.9.2", "rand 0.9.2",
"serde", "serde",
@ -12302,7 +12316,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-rtcompat" name = "tor-rtcompat"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"async_executors", "async_executors",
@ -12331,7 +12345,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-rtmock" name = "tor-rtmock"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"assert_matches", "assert_matches",
@ -12359,7 +12373,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-socksproto" name = "tor-socksproto"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"amplify", "amplify",
"caret", "caret",
@ -12375,7 +12389,7 @@ dependencies = [
[[package]] [[package]]
name = "tor-units" name = "tor-units"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/eigenwallet/arti?rev=5db9ecbd2872d76243dd62be887efd67e4609c87#5db9ecbd2872d76243dd62be887efd67e4609c87" source = "git+https://github.com/eigenwallet/arti?rev=18111286b5830cda88af5df1950b5e24ee5a8841#18111286b5830cda88af5df1950b5e24ee5a8841"
dependencies = [ dependencies = [
"derive-deftly 1.1.0", "derive-deftly 1.1.0",
"derive_more 2.0.1", "derive_more 2.0.1",
@ -12856,6 +12870,12 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "unicode_categories"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
[[package]] [[package]]
name = "universal-hash" name = "universal-hash"
version = "0.5.1" version = "0.5.1"
@ -12894,7 +12914,7 @@ dependencies = [
"anyhow", "anyhow",
"dfx-swiss-sdk", "dfx-swiss-sdk",
"monero-rpc-pool", "monero-rpc-pool",
"rustls 0.23.29", "rustls 0.23.31",
"serde", "serde",
"serde_json", "serde_json",
"swap", "swap",
@ -13415,15 +13435,6 @@ version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "webpki-roots"
version = "0.26.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
dependencies = [
"webpki-roots 1.0.2",
]
[[package]] [[package]]
name = "webpki-roots" name = "webpki-roots"
version = "1.0.2" version = "1.0.2"

26
Cargo.toml
View file

@ -18,12 +18,21 @@ members = [
] ]
[workspace.dependencies] [workspace.dependencies]
anyhow = "1" # Bitcoin Dev Kit
bdk = "0.28"
bdk_chain = "0.23.0"
bdk_core = "0.6.0"
bdk_electrum = { version = "0.23.0", default-features = false }
bdk_wallet = "2.0.0"
bitcoin = { version = "0.32", features = ["rand", "serde"] } bitcoin = { version = "0.32", features = ["rand", "serde"] }
anyhow = "1"
backoff = { version = "0.4", features = ["futures", "tokio"] }
futures = { version = "0.3", default-features = false, features = ["std"] } futures = { version = "0.3", default-features = false, features = ["std"] }
hex = "0.4" hex = "0.4"
libp2p = { version = "0.53.2" } libp2p = { version = "0.53.2" }
monero = { version = "0.12", features = ["serde_support"] } monero = { version = "0.12", features = ["serde_support"] }
once_cell = "1.19"
rand = "0.8" rand = "0.8"
reqwest = { version = "0.12", default-features = false, features = ["json"] } reqwest = { version = "0.12", default-features = false, features = ["json"] }
rust_decimal = { version = "1", features = ["serde-float"] } rust_decimal = { version = "1", features = ["serde-float"] }
@ -39,21 +48,16 @@ url = { version = "2", features = ["serde"] }
uuid = { version = "1", features = ["v4"] } uuid = { version = "1", features = ["v4"] }
# Tor/Arti crates # Tor/Arti crates
arti-client = { git = "https://github.com/eigenwallet/arti", rev = "5db9ecbd2872d76243dd62be887efd67e4609c87", default-features = false } arti-client = { git = "https://github.com/eigenwallet/arti", rev = "18111286b5830cda88af5df1950b5e24ee5a8841", default-features = false }
tor-cell = { git = "https://github.com/eigenwallet/arti", rev = "5db9ecbd2872d76243dd62be887efd67e4609c87" } tor-cell = { git = "https://github.com/eigenwallet/arti", rev = "18111286b5830cda88af5df1950b5e24ee5a8841" }
tor-hsservice = { git = "https://github.com/eigenwallet/arti", rev = "5db9ecbd2872d76243dd62be887efd67e4609c87" } tor-hsservice = { git = "https://github.com/eigenwallet/arti", rev = "18111286b5830cda88af5df1950b5e24ee5a8841" }
tor-proto = { git = "https://github.com/eigenwallet/arti", rev = "5db9ecbd2872d76243dd62be887efd67e4609c87" } tor-proto = { git = "https://github.com/eigenwallet/arti", rev = "18111286b5830cda88af5df1950b5e24ee5a8841" }
tor-rtcompat = { git = "https://github.com/eigenwallet/arti", rev = "5db9ecbd2872d76243dd62be887efd67e4609c87" } tor-rtcompat = { git = "https://github.com/eigenwallet/arti", rev = "18111286b5830cda88af5df1950b5e24ee5a8841" }
[patch.crates-io] [patch.crates-io]
# patch until new release https://github.com/thomaseizinger/rust-jsonrpc-client/pull/51 # patch until new release https://github.com/thomaseizinger/rust-jsonrpc-client/pull/51
jsonrpc_client = { git = "https://github.com/delta1/rust-jsonrpc-client.git", rev = "3b6081697cd616c952acb9c2f02d546357d35506" } jsonrpc_client = { git = "https://github.com/delta1/rust-jsonrpc-client.git", rev = "3b6081697cd616c952acb9c2f02d546357d35506" }
monero = { git = "https://github.com/comit-network/monero-rs", rev = "818f38b" } monero = { git = "https://github.com/comit-network/monero-rs", rev = "818f38b" }
# patch until new release https://github.com/bitcoindevkit/bdk/pull/1766
bdk_wallet = { git = "https://github.com/Einliterflasche/bdk", branch = "bump/rusqlite-0.32", package = "bdk_wallet" }
bdk_electrum = { git = "https://github.com/Einliterflasche/bdk", branch = "bump/rusqlite-0.32", package = "bdk_electrum" }
bdk_chain = { git = "https://github.com/Einliterflasche/bdk", branch = "bump/rusqlite-0.32", package = "bdk_chain" }
[workspace.lints] [workspace.lints]
rust.unused_crate_dependencies = "warn" rust.unused_crate_dependencies = "warn"

2
dev-docs/asb/README.md
View file

@ -62,7 +62,7 @@ rendezvous_point = [
"/dns4/discover.unstoppableswap.net/tcp/8888/p2p/12D3KooWA6cnqJpVnreBVnoro8midDL9Lpzmg8oJPoAGi7YYaamE", "/dns4/discover.unstoppableswap.net/tcp/8888/p2p/12D3KooWA6cnqJpVnreBVnoro8midDL9Lpzmg8oJPoAGi7YYaamE",
"/dns4/discover2.unstoppableswap.net/tcp/8888/p2p/12D3KooWGRvf7qVQDrNR5nfYD6rKrbgeTi9x8RrbdxbmsPvxL4mw", "/dns4/discover2.unstoppableswap.net/tcp/8888/p2p/12D3KooWGRvf7qVQDrNR5nfYD6rKrbgeTi9x8RrbdxbmsPvxL4mw",
"/dns4/darkness.su/tcp/8888/p2p/12D3KooWFQAgVVS9t9UgL6v1sLprJVM7am5hFK7vy9iBCCoCBYmU", "/dns4/darkness.su/tcp/8888/p2p/12D3KooWFQAgVVS9t9UgL6v1sLprJVM7am5hFK7vy9iBCCoCBYmU",
"/dns4/eigen.center/tcp/8888/p2p/12D3KooWS5RaYJt4ANKMH4zczGVhNcw5W214e2DDYXnjs5Mx5zAT" "/dns4/eigen.center/tcp/8888/p2p/12D3KooWS5RaYJt4ANKMH4zczGVhNcw5W214e2DDYXnjs5Mx5zAT",
] ]
external_addresses = ["/dns4/example.com/tcp/9939"] external_addresses = ["/dns4/example.com/tcp/9939"]
``` ```

6
electrum-pool/Cargo.toml
View file

@ -5,11 +5,11 @@ authors = ["eigenwallet Team <help@unstoppableswap.net>"]
edition = "2021" edition = "2021"
[dependencies] [dependencies]
backoff = { version = "0.4", features = ["tokio"] } backoff = { workspace = true }
bdk_electrum = { version = "0.19", default-features = false, features = ["use-rustls-ring"] } bdk_electrum = { workspace = true, features = ["use-rustls-ring"] }
bitcoin = { workspace = true } bitcoin = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
once_cell = "1.19" once_cell = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }

29
electrum-pool/src/lib.rs
View file

@ -65,8 +65,7 @@ where
spawn_blocking(move || balancer.get_or_init_client_sync(idx)) spawn_blocking(move || balancer.get_or_init_client_sync(idx))
.await .await
.map_err(|e| { .map_err(|e| {
Error::IOError(std::io::Error::new( Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
)) ))
})? })?
@ -97,8 +96,7 @@ where
} }
// Return error if no client could be initialized // Return error if no client could be initialized
Err(Error::IOError(std::io::Error::new( Err(Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
"No client could be initialized", "No client could be initialized",
))) )))
} }
@ -156,8 +154,7 @@ where
match spawn_blocking(move || balancer.call_sync(&kind, f)).await { match spawn_blocking(move || balancer.call_sync(&kind, f)).await {
Ok(result) => result.map_err(|multi_error| multi_error.into()), Ok(result) => result.map_err(|multi_error| multi_error.into()),
Err(e) => Err(Error::IOError(std::io::Error::new( Err(e) => Err(Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
))), ))),
} }
@ -179,8 +176,7 @@ where
match spawn_blocking(move || balancer.call_sync(&kind, f)).await { match spawn_blocking(move || balancer.call_sync(&kind, f)).await {
Ok(result) => result.map_err(|multi_error| multi_error.into()), Ok(result) => result.map_err(|multi_error| multi_error.into()),
Err(e) => Err(Error::IOError(std::io::Error::new( Err(e) => Err(Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
))), ))),
} }
@ -209,8 +205,7 @@ where
"Failed to spawn blocking task for operation '{}'", "Failed to spawn blocking task for operation '{}'",
kind_for_error kind_for_error
); );
let error = Error::IOError(std::io::Error::new( let error = Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
)); ));
Err(MultiError::new(vec![error], context)) Err(MultiError::new(vec![error], context))
@ -372,8 +367,7 @@ where
Ok(client) => tokio::task::spawn_blocking(move || f(&client)) Ok(client) => tokio::task::spawn_blocking(move || f(&client))
.await .await
.map_err(|e| { .map_err(|e| {
Error::IOError(std::io::Error::new( Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
)) ))
})?, })?,
@ -394,8 +388,7 @@ where
Err(err) if err.is_cancelled() => { Err(err) if err.is_cancelled() => {
// We one task is cancelled, we do not continue // We one task is cancelled, we do not continue
// Most likely our function got cancelled // Most likely our function got cancelled
return Err(Error::IOError(std::io::Error::new( return Err(Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
"Task cancelled", "Task cancelled",
))); )));
} }
@ -664,8 +657,7 @@ impl Clone for MultiError {
.errors .errors
.iter() .iter()
.map(|e| { .map(|e| {
Error::IOError(std::io::Error::new( Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
e.to_string(), e.to_string(),
)) ))
}) })
@ -719,9 +711,8 @@ impl MultiError {
/// Convert to a single Error (uses the last error, or creates a generic one) /// Convert to a single Error (uses the last error, or creates a generic one)
pub fn into_single_error(self) -> Error { pub fn into_single_error(self) -> Error {
self.errors.into_iter().last().unwrap_or_else(|| { self.errors.into_iter().next_back().unwrap_or_else(|| {
Error::IOError(std::io::Error::new( Error::IOError(std::io::Error::other(
std::io::ErrorKind::Other,
format!("All operations failed: {}", self.context), format!("All operations failed: {}", self.context),
)) ))
}) })

2
libp2p-rendezvous-server/Cargo.toml
View file

@ -9,8 +9,8 @@ anyhow = "1"
futures = { workspace = true } futures = { workspace = true }
libp2p = { workspace = true, default-features = false, features = ["rendezvous", "tcp", "yamux", "dns", "noise", "ping", "websocket", "tokio", "macros"] } libp2p = { workspace = true, default-features = false, features = ["rendezvous", "tcp", "yamux", "dns", "noise", "ping", "websocket", "tokio", "macros"] }
libp2p-tor = { path = "../libp2p-tor", features = ["listen-onion-service"] } libp2p-tor = { path = "../libp2p-tor", features = ["listen-onion-service"] }
tor-hsservice = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "io-util"] } tokio = { workspace = true, features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "io-util"] }
tor-hsservice = { workspace = true }
tracing = { workspace = true, features = ["attributes"] } tracing = { workspace = true, features = ["attributes"] }
tracing-subscriber = { workspace = true, default-features = false, features = ["fmt", "ansi", "env-filter", "chrono", "tracing-log", "json"] } tracing-subscriber = { workspace = true, default-features = false, features = ["fmt", "ansi", "env-filter", "chrono", "tracing-log", "json"] }

1
libp2p-rendezvous-server/README.md
View file

@ -36,6 +36,7 @@ cargo run --release -- --onion
``` ```
This will: This will:
- Bootstrap a connection to the Tor network - Bootstrap a connection to the Tor network
- Create a new onion service - Create a new onion service
- Listen on both TCP (port 8888) and the onion address - Listen on both TCP (port 8888) and the onion address

26
libp2p-rendezvous-server/src/main.rs
View file

@ -11,7 +11,7 @@ use libp2p::tcp;
use libp2p::yamux; use libp2p::yamux;
use libp2p::{dns, SwarmBuilder}; use libp2p::{dns, SwarmBuilder};
use libp2p::{identity, rendezvous, Multiaddr, PeerId, Swarm, Transport}; use libp2p::{identity, rendezvous, Multiaddr, PeerId, Swarm, Transport};
use libp2p_tor::{TorTransport, AddressConversion}; use libp2p_tor::{AddressConversion, TorTransport};
use std::fmt; use std::fmt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::time::Duration; use std::time::Duration;
@ -19,9 +19,9 @@ use structopt::StructOpt;
use tokio::fs; use tokio::fs;
use tokio::fs::{DirBuilder, OpenOptions}; use tokio::fs::{DirBuilder, OpenOptions};
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
use tor_hsservice::config::OnionServiceConfigBuilder;
use tracing::level_filters::LevelFilter; use tracing::level_filters::LevelFilter;
use tracing_subscriber::FmtSubscriber; use tracing_subscriber::FmtSubscriber;
use tor_hsservice::config::OnionServiceConfigBuilder;
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
struct Cli { struct Cli {
@ -207,8 +207,13 @@ fn create_swarm(identity: identity::Keypair) -> Result<Swarm<Behaviour>> {
Ok(swarm) Ok(swarm)
} }
async fn create_swarm_with_onion(identity: identity::Keypair, onion_port: u16) -> Result<Swarm<Behaviour>> { async fn create_swarm_with_onion(
let (transport, onion_address) = create_transport_with_onion(&identity, onion_port).await.context("Failed to create transport with onion")?; identity: identity::Keypair,
onion_port: u16,
) -> Result<Swarm<Behaviour>> {
let (transport, onion_address) = create_transport_with_onion(&identity, onion_port)
.await
.context("Failed to create transport with onion")?;
let rendezvous = rendezvous::server::Behaviour::new(rendezvous::server::Config::default()); let rendezvous = rendezvous::server::Behaviour::new(rendezvous::server::Config::default());
let mut swarm = SwarmBuilder::with_existing_identity(identity) let mut swarm = SwarmBuilder::with_existing_identity(identity)
@ -236,13 +241,17 @@ fn create_transport(identity: &identity::Keypair) -> Result<Boxed<(PeerId, Strea
Ok(transport) Ok(transport)
} }
async fn create_transport_with_onion(identity: &identity::Keypair, onion_port: u16) -> Result<(Boxed<(PeerId, StreamMuxerBox)>, Multiaddr)> { async fn create_transport_with_onion(
identity: &identity::Keypair,
onion_port: u16,
) -> Result<(Boxed<(PeerId, StreamMuxerBox)>, Multiaddr)> {
// Create TCP transport // Create TCP transport
let tcp = tcp::tokio::Transport::new(tcp::Config::new().nodelay(true)); let tcp = tcp::tokio::Transport::new(tcp::Config::new().nodelay(true));
let tcp_with_dns = dns::tokio::Transport::system(tcp)?; let tcp_with_dns = dns::tokio::Transport::system(tcp)?;
// Create Tor transport // Create Tor transport
let mut tor_transport = TorTransport::unbootstrapped().await? let mut tor_transport = TorTransport::unbootstrapped()
.await?
.with_address_conversion(AddressConversion::IpAndDns); .with_address_conversion(AddressConversion::IpAndDns);
// Create onion service configuration // Create onion service configuration
@ -264,7 +273,10 @@ async fn create_transport_with_onion(identity: &identity::Keypair, onion_port: u
let onion_address = tor_transport.add_onion_service(onion_service_config, onion_port)?; let onion_address = tor_transport.add_onion_service(onion_service_config, onion_port)?;
// Combine transports // Combine transports
let combined_transport = tcp_with_dns.boxed().or_transport(tor_transport.boxed()).boxed(); let combined_transport = tcp_with_dns
.boxed()
.or_transport(tor_transport.boxed())
.boxed();
let transport = authenticate_and_multiplex(combined_transport, &identity).unwrap(); let transport = authenticate_and_multiplex(combined_transport, &identity).unwrap();

2
monero-sys/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
backoff = { version = "0.4.0", features = ["futures", "tokio"] } backoff = { workspace = true }
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
cxx = "1.0.137" cxx = "1.0.137"
monero = { workspace = true } monero = { workspace = true }

9
src-gui/src/renderer/components/pages/help/MoneroPoolHealthBox.tsx
View file

@ -76,8 +76,13 @@ export default function MoneroPoolHealthBox() {
size="small" size="small"
/> />
<Chip <Chip
label={`${poolStatus.bandwidth_kb_per_sec?.toFixed(1) ?? '0.0'} KB/s Bandwidth`} label={`${poolStatus.bandwidth_kb_per_sec?.toFixed(1) ?? "0.0"} KB/s Bandwidth`}
color={poolStatus.bandwidth_kb_per_sec != null && poolStatus.bandwidth_kb_per_sec > 10 ? "info" : "default"} color={
poolStatus.bandwidth_kb_per_sec != null &&
poolStatus.bandwidth_kb_per_sec > 10
? "info"
: "default"
}
variant="outlined" variant="outlined"
size="small" size="small"
/> />

31
src-gui/src/renderer/components/pages/monero/components/WalletOverview.tsx
View file

@ -32,7 +32,7 @@ export default function WalletOverview({
const isSyncing = syncProgress && syncProgress.progress_percentage < 100; const isSyncing = syncProgress && syncProgress.progress_percentage < 100;
const blocksLeft = syncProgress?.target_block - syncProgress?.current_block; const blocksLeft = syncProgress?.target_block - syncProgress?.current_block;
// Treat blocksLeft = 1 as if we have no direct knowledge // Treat blocksLeft = 1 as if we have no direct knowledge
const hasDirectKnowledge = blocksLeft != null && blocksLeft > 1; const hasDirectKnowledge = blocksLeft != null && blocksLeft > 1;
@ -50,18 +50,20 @@ export default function WalletOverview({
lowestCurrentBlock === null || !syncProgress lowestCurrentBlock === null || !syncProgress
? syncProgress?.progress_percentage || 0 ? syncProgress?.progress_percentage || 0
: syncProgress.target_block === lowestCurrentBlock : syncProgress.target_block === lowestCurrentBlock
? 100 // Fully synced when target equals lowest current block ? 100 // Fully synced when target equals lowest current block
: Math.max( : Math.max(
0, 0,
Math.min( Math.min(
100,
((syncProgress.current_block - lowestCurrentBlock) /
(syncProgress.target_block - lowestCurrentBlock)) *
100, 100,
), ((syncProgress.current_block - lowestCurrentBlock) /
); (syncProgress.target_block - lowestCurrentBlock)) *
100,
),
);
const isStuck = poolStatus?.bandwidth_kb_per_sec != null && poolStatus.bandwidth_kb_per_sec < 0.01; const isStuck =
poolStatus?.bandwidth_kb_per_sec != null &&
poolStatus.bandwidth_kb_per_sec < 0.01;
// Calculate estimated time remaining for sync // Calculate estimated time remaining for sync
const formatTimeRemaining = (seconds: number): string => { const formatTimeRemaining = (seconds: number): string => {
@ -72,7 +74,9 @@ export default function WalletOverview({
}; };
const estimatedTimeRemaining = const estimatedTimeRemaining =
hasDirectKnowledge && poolStatus?.bandwidth_kb_per_sec != null && poolStatus.bandwidth_kb_per_sec > 0 hasDirectKnowledge &&
poolStatus?.bandwidth_kb_per_sec != null &&
poolStatus.bandwidth_kb_per_sec > 0
? (blocksLeft * 130) / poolStatus.bandwidth_kb_per_sec // blocks * 130kb / kb_per_sec = seconds ? (blocksLeft * 130) / poolStatus.bandwidth_kb_per_sec // blocks * 130kb / kb_per_sec = seconds
: null; : null;
@ -192,7 +196,8 @@ export default function WalletOverview({
> >
{estimatedTimeRemaining && !isStuck && ( {estimatedTimeRemaining && !isStuck && (
<>{formatTimeRemaining(estimatedTimeRemaining)} left</> <>{formatTimeRemaining(estimatedTimeRemaining)} left</>
)} / {poolStatus.bandwidth_kb_per_sec?.toFixed(1) ?? '0.0'} KB/s )}{" "}
/ {poolStatus.bandwidth_kb_per_sec?.toFixed(1) ?? "0.0"} KB/s
</Typography> </Typography>
</> </>
)} )}

2
swap-feed/Cargo.toml
View file

@ -14,7 +14,7 @@ path = "src/bin/kraken_ticker.rs"
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
backoff = { version = "0.4", features = ["tokio"] } backoff = { workspace = true }
bitcoin = { workspace = true } bitcoin = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
monero = { workspace = true } monero = { workspace = true }

8
swap-feed/src/traits.rs
View file

@ -11,6 +11,10 @@ pub trait PriceFeed: Sized {
type Error: std::error::Error + Send + Sync + 'static; type Error: std::error::Error + Send + Sync + 'static;
type Update; type Update;
async fn connect(url: url::Url) -> Result<Self, Self::Error>; fn connect(
async fn next_update(&mut self) -> Result<Self::Update, Self::Error>; url: url::Url,
) -> impl std::future::Future<Output = Result<Self, Self::Error>> + Send;
fn next_update(
&mut self,
) -> impl std::future::Future<Output = Result<Self::Update, Self::Error>> + Send;
} }

15
swap/Cargo.toml
View file

@ -12,18 +12,21 @@ name = "swap"
tauri = ["dep:tauri", "dep:dfx-swiss-sdk"] tauri = ["dep:tauri", "dep:dfx-swiss-sdk"]
[dependencies] [dependencies]
# Bitcoin Dev Kit
bdk = { workspace = true }
bdk_chain = { workspace = true }
bdk_core = { workspace = true }
bdk_electrum = { workspace = true, features = ["use-rustls-ring"] }
bdk_wallet = { workspace = true, features = ["rusqlite", "test-utils"] }
anyhow = { workspace = true } anyhow = { workspace = true }
arti-client = { workspace = true, features = ["static-sqlite", "tokio", "rustls", "onion-service-service"] } arti-client = { workspace = true, features = ["static-sqlite", "tokio", "rustls", "onion-service-service"] }
async-compression = { version = "0.3", features = ["bzip2", "tokio"] } async-compression = { version = "0.3", features = ["bzip2", "tokio"] }
async-trait = "0.1" async-trait = "0.1"
asynchronous-codec = "0.7.0" asynchronous-codec = "0.7.0"
atty = "0.2" atty = "0.2"
backoff = { version = "0.4", features = ["tokio"] } backoff = { workspace = true }
base64 = "0.22" base64 = "0.22"
bdk = { version = "0.28" }
bdk_chain = { version = "0.20" }
bdk_electrum = { version = "0.19", default-features = false, features = ["use-rustls-ring"] }
bdk_wallet = { version = "1.0.0-beta.5", features = ["rusqlite", "test-utils"] }
big-bytes = "1" big-bytes = "1"
bitcoin = { workspace = true } bitcoin = { workspace = true }
bmrng = "0.5.2" bmrng = "0.5.2"
@ -49,7 +52,7 @@ monero-rpc = { path = "../monero-rpc" }
monero-rpc-pool = { path = "../monero-rpc-pool" } monero-rpc-pool = { path = "../monero-rpc-pool" }
monero-seed = { version = "0.1.0", path = "../monero-seed" } monero-seed = { version = "0.1.0", path = "../monero-seed" }
monero-sys = { path = "../monero-sys" } monero-sys = { path = "../monero-sys" }
once_cell = "1.19" once_cell = { workspace = true }
pem = "3.0" pem = "3.0"
proptest = "1" proptest = "1"
rand = { workspace = true } rand = { workspace = true }

19
swap/src/bitcoin/wallet.rs
View file

@ -414,7 +414,8 @@ impl Wallet {
let xprivkey = seed.derive_extended_private_key_legacy(legacy_network)?; let xprivkey = seed.derive_extended_private_key_legacy(legacy_network)?;
let old_wallet = let old_wallet =
pre_1_0_0_bdk::OldWallet::new(&pre_bdk_1_0_wallet_dir, xprivkey, network).await?; pre_1_0_0_bdk::OldWallet::new(&pre_bdk_1_0_wallet_dir, xprivkey, legacy_network)
.await?;
let export = old_wallet.export("old-wallet").await?; let export = old_wallet.export("old-wallet").await?;
@ -2728,8 +2729,9 @@ pub mod pre_1_0_0_bdk {
use std::path::Path; use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, Result};
use bdk::bitcoin::{util::bip32::ExtendedPrivKey, Network}; use bdk::bitcoin::util::bip32::ExtendedPrivKey;
use bdk::bitcoin::Network;
use bdk::sled::Tree; use bdk::sled::Tree;
use bdk::KeychainKind; use bdk::KeychainKind;
use tokio::sync::Mutex as TokioMutex; use tokio::sync::Mutex as TokioMutex;
@ -2762,21 +2764,12 @@ pub mod pre_1_0_0_bdk {
pub async fn new( pub async fn new(
data_dir: impl AsRef<Path>, data_dir: impl AsRef<Path>,
xprivkey: ExtendedPrivKey, xprivkey: ExtendedPrivKey,
network: bitcoin::Network, network: Network,
) -> Result<Self> { ) -> Result<Self> {
let data_dir = data_dir.as_ref(); let data_dir = data_dir.as_ref();
let wallet_dir = data_dir.join(WALLET); let wallet_dir = data_dir.join(WALLET);
let database = bdk::sled::open(wallet_dir)?.open_tree(SLED_TREE_NAME)?; let database = bdk::sled::open(wallet_dir)?.open_tree(SLED_TREE_NAME)?;
// Convert bitcoin network to the bdk network type...
let network = match network {
bitcoin::Network::Bitcoin => bdk::bitcoin::Network::Bitcoin,
bitcoin::Network::Testnet => bdk::bitcoin::Network::Testnet,
bitcoin::Network::Regtest => bdk::bitcoin::Network::Regtest,
bitcoin::Network::Signet => bdk::bitcoin::Network::Signet,
_ => bail!("Unsupported network"),
};
let wallet = bdk::Wallet::new( let wallet = bdk::Wallet::new(
bdk::template::Bip84(xprivkey, KeychainKind::External), bdk::template::Bip84(xprivkey, KeychainKind::External),
Some(bdk::template::Bip84(xprivkey, KeychainKind::Internal)), Some(bdk::template::Bip84(xprivkey, KeychainKind::Internal)),