Merge branch 'monero-wallet-refresh-fix' of https://github.com/comit-network/xmr-btc-swap into monero-wallet-refresh-fix

3 months ago · 2bc8d0062e
parent bd3e6136ce 0dcf6d887c
commit 2bc8d0062e
7 changed files with 659 additions and 451 deletions
--- a/.github/workflows/build-release-binaries.yml
+++ b/.github/workflows/build-release-binaries.yml
@ -50,7 +50,7 @@ jobs:
          ref: ${{ github.event.release.target_commitish }}
          token: ${{ secrets.BOTTY_GITHUB_TOKEN }}

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - uses: dtolnay/rust-toolchain@master
        with:
@ -69,7 +69,7 @@ jobs:
        run: target/${{ matrix.target }}/release/${{ matrix.bin }} --help

      # Remove once python 3 is the default
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
        with:
          python-version: "3.x"

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -18,7 +18,7 @@ jobs:
          toolchain: "1.70"
          components: clippy,rustfmt

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - name: Check formatting
        uses: dprint/check@v2.2
@ -37,7 +37,7 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v4.1.1

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - name: Build swap
        run: cargo build --bin swap
@ -51,7 +51,7 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v4.1.1

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - name: Install sqlx-cli
        run: cargo install sqlx-cli --locked
@ -78,7 +78,7 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v4.1.1

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - uses: dtolnay/rust-toolchain@master
        with:
@ -98,13 +98,13 @@ jobs:
        run: cross build -p swap --target ${{ matrix.target }}

      - name: Upload swap binary
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: swap-${{ matrix.target }}
          path: target/${{ matrix.target }}/debug/swap

      - name: Upload asb binary
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: asb-${{ matrix.target }}
          path: target/${{ matrix.target }}/debug/asb
@ -118,7 +118,7 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v4.1.1

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - name: Build tests
        run: cargo build --tests --workspace --all-features
@ -155,7 +155,7 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v4.1.1

-      - uses: Swatinem/rust-cache@v2.7.1
+      - uses: Swatinem/rust-cache@v2.7.3

      - name: Run test ${{ matrix.test_name }}
        run: cargo test --package swap --all-features --test ${{ matrix.test_name }} -- --nocapture
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@ -19,24 +19,24 @@ bdk = "0.28"
 big-bytes = "1"
 bitcoin = { version = "0.29", features = [ "rand", "serde" ] }
 bmrng = "0.5"
-comfy-table = "6.1"
-config = { version = "0.13", default-features = false, features = [ "toml" ] }
+comfy-table = "7.1"
+config = { version = "0.14", default-features = false, features = [ "toml" ] }
 conquer-once = "0.4"
 curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
-data-encoding = "2.4"
-dialoguer = "0.10"
+data-encoding = "2.5"
+dialoguer = "0.11"
 directories-next = "2"
 ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde", "adaptor" ] }
 ed25519-dalek = "1"
 futures = { version = "0.3", default-features = false }
 hex = "0.4"
-itertools = "0.10"
+itertools = "0.12"
 libp2p = { version = "0.42.2", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket", "ping", "rendezvous", "identify" ] }
 monero = { version = "0.12", features = [ "serde_support" ] }
 monero-rpc = { path = "../monero-rpc" }
 pem = "3.0"
 proptest = "1"
-qrcode = "0.12"
+qrcode = "0.13"
 rand = "0.8"
 rand_chacha = "0.3"
 reqwest = { version = "0.11", features = [ "rustls-tls", "stream", "socks" ], default-features = false }
@ -50,21 +50,21 @@ sha2 = "0.10"
 sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "ed25519", "serde", "secp256k1", "alloc" ] }
 sqlx = { version = "0.6", features = [ "sqlite", "runtime-tokio-rustls", "offline" ] }
 structopt = "0.3"
-strum = { version = "0.24", features = [ "derive" ] }
+strum = { version = "0.26", features = [ "derive" ] }
 thiserror = "1"
 time = "0.3"
 tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }
 tokio-socks = "0.5"
 tokio-tungstenite = { version = "0.15", features = [ "rustls-tls" ] }
 tokio-util = { version = "0.7", features = [ "io", "codec" ] }
-toml = "0.5"
+toml = "0.8"
 torut = { version = "0.2", default-features = false, features = [ "v3", "control" ] }
 tracing = { version = "0.1", features = [ "attributes" ] }
 tracing-appender = "0.2"
 tracing-futures = { version = "0.2", features = [ "std-future", "futures-03" ] }
 tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", "ansi", "env-filter", "time", "tracing-log", "json" ] }
 url = { version = "2", features = [ "serde" ] }
-uuid = { version = "1.4", features = [ "serde", "v4" ] }
+uuid = { version = "1.7", features = [ "serde", "v4" ] }
 void = "1"

 [target.'cfg(not(windows))'.dependencies]
@ -76,17 +76,17 @@ zip = "0.5"
 [dev-dependencies]
 bitcoin-harness = "0.2.2"
 get-port = "3"
-hyper = "0.14"
-mockito = "1.1.0"
+hyper = "1.1"
+mockito = "1.2.0"
 monero-harness = { path = "../monero-harness" }
 port_check = "0.1"
 proptest = "1"
 serde_cbor = "0.11"
-serial_test = "2.0"
+serial_test = "3.0"
 spectral = "0.6"
 tempfile = "3"
 testcontainers = "0.12"

 [build-dependencies]
 anyhow = "1"
-vergen = { version = "7.5", default-features = false, features = [ "git", "build" ] }
+vergen = { version = "8.3", default-features = false, features = [ "build", "git", "git2" ] }
--- a/swap/build.rs
+++ b/swap/build.rs
@ -1,9 +1,9 @@
 use anyhow::Result;
-use vergen::{vergen, Config, SemverKind};
+use vergen::EmitBuilder;

 fn main() -> Result<()> {
-    let mut config = Config::default();
-    *config.git_mut().semver_kind_mut() = SemverKind::Lightweight;
-
-    vergen(config)
+    EmitBuilder::builder()
+        .git_describe(true, true, None)
+        .emit()?;
+    Ok(())
 }
--- a/swap/src/asb/command.rs
+++ b/swap/src/asb/command.rs
@ -226,7 +226,7 @@ pub enum Command {
    name = "asb",
    about = "Automated Swap Backend for swapping XMR for BTC",
    author,
-    version = env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")
+    version = env!("VERGEN_GIT_DESCRIBE")
 )]
 pub struct RawArguments {
    #[structopt(long, help = "Swap on testnet")]
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@ -298,7 +298,7 @@ pub enum Command {
    name = "swap",
    about = "CLI for swapping BTC for XMR",
    author,
-    version = env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")
+    version = env!("VERGEN_GIT_DESCRIBE")
 )]
 struct RawArguments {
    // global is necessary to ensure that clap can match against testnet in subcommands