Merge remote-tracking branch 'upstream/master' into rpc-server

.github/workflows/build-release-binaries.yml

@@ -54,7 +54,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.67
+          toolchain: "1.70"
           targets: armv7-unknown-linux-gnueabihf
 
       - name: Build ${{ matrix.target }} ${{ matrix.bin }} release binary
@@ -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"
 

.github/workflows/ci.yml

@@ -4,8 +4,6 @@ on:
   pull_request: # Need to run on pull-requests, otherwise PRs from forks don't run
   push:
     branches:
-      - "staging" # Bors uses this branch
-      - "trying" # Bors uses this branch
       - "master" # Always build head of master for the badge in the README
 
 jobs:
@@ -17,7 +15,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.67
+          toolchain: "1.70"
           components: clippy,rustfmt
 
       - uses: Swatinem/rust-cache@v2.7.1
@@ -84,7 +82,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.67
+          toolchain: "1.70"
           targets: armv7-unknown-linux-gnueabihf
 
       - name: Build binary

.github/workflows/draft-new-release.yml

@@ -43,7 +43,7 @@ jobs:
         id: make-commit
         env:
           DPRINT_VERSION: 0.39.1
-          RUST_TOOLCHAIN: 1.67
+          RUST_TOOLCHAIN: 1.70
         run: |
           rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu"
           curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Minimum Supported Rust Version (MSRV) bumped to 1.70
+
 ## [0.12.3] - 2023-09-20
 
 - Swap: If no Monero daemon is manually specified, we will automatically choose one from a list of public daemons by connecting to each and checking their availability.

README.md

@@ -50,7 +50,7 @@ Please have a look at the [contribution guidelines](./CONTRIBUTING.md).
 ## Rust Version Support
 
 Please note that only the latest stable Rust toolchain is supported.
-All stable toolchains since 1.67 _should_ work.
+All stable toolchains since 1.70 _should_ work.
 
 ## Contact
 

bors.toml

@@ -1,25 +0,0 @@
-status = [
-    "static_analysis",
-    "bdk_test",
-    "sqlx_test",
-    "build (x86_64-unknown-linux-gnu, ubuntu-latest)",
-    "build (armv7-unknown-linux-gnueabihf, ubuntu-latest)",
-    "build (x86_64-apple-darwin, macos-latest)",
-    "build (x86_64-pc-windows-msvc, windows-latest)",
-    "test (ubuntu-latest)",
-    "test (macos-latest)",
-    "docker_tests (happy_path)",
-    "docker_tests (happy_path_restart_bob_after_xmr_locked)",
-    "docker_tests (happy_path_restart_alice_after_xmr_locked)",
-    "docker_tests (happy_path_restart_bob_before_xmr_locked)",
-    "docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)",
-    "docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)",
-    "docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)",
-    "docker_tests (punish)",
-    "docker_tests (alice_punishes_after_restart_bob_dead)",
-    "docker_tests (alice_manually_punishes_after_bob_dead)",
-    "docker_tests (alice_refunds_after_restart_bob_refunded)",
-    "docker_tests (ensure_same_swap_id)",
-    "docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)",
-    "docker_tests (alice_manually_redeems_after_enc_sig_learned)"
-]

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.67" # also update this in the readme, changelog, and github actions
+channel = "1.70" # also update this in the readme, changelog, and github actions
 components = ["clippy"]
 targets = ["armv7-unknown-linux-gnueabihf"]

swap/Cargo.toml

@@ -19,11 +19,11 @@ bdk = "0.28"
 big-bytes = "1"
 bitcoin = { version = "0.29", features = [ "rand", "serde" ] }
 bmrng = "0.5"
-comfy-table = "6.1"
+comfy-table = "7.1"
 config = { version = "0.13", default-features = false, features = [ "toml" ] }
 conquer-once = "0.4"
 curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
-data-encoding = "2.4"
+data-encoding = "2.5"
 dialoguer = "0.10"
 directories-next = "2"
 ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde", "adaptor" ] }
@@ -52,21 +52,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.25", features = [ "derive" ] }
 thiserror = "1"
 time = "0.3"
 tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "parking_lot" ] }
 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.7"
 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.6", features = [ "serde", "v4" ] }
 void = "1"
 
 [target.'cfg(not(windows))'.dependencies]
@@ -78,9 +78,9 @@ zip = "0.5"
 [dev-dependencies]
 bitcoin-harness = "0.2.2"
 get-port = "3"
-hyper = "0.14"
+hyper = "1.0"
 jsonrpsee = { version = "0.16.2", features = [ "ws-client" ] }
-mockito = "1.1.0"
+mockito = "1.2.0"
 monero-harness = { path = "../monero-harness" }
 port_check = "0.1"
 proptest = "1"

swap/src/bin/swap.rs

@@ -14,7 +14,6 @@
 
 use anyhow::Result;
 use std::env;
-use std::sync::Arc;
 use swap::cli::command::{parse_args_and_apply_defaults, ParseResult};
 use swap::common::check_latest_version;
 
@@ -40,7 +39,7 @@ async fn main() -> Result<()> {
 mod tests {
     use super::*;
     use ::bitcoin::Amount;
-    use std::sync::Mutex;
+    use std::sync::{Arc, Mutex};
     use std::time::Duration;
     use swap::api::request::determine_btc_to_swap;
     use swap::network::quote::BidQuote;

swap/src/cli/tracing.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use std::option::Option::Some;
 use std::path::Path;
 use time::format_description::well_known::Rfc3339;
 use tracing::subscriber::set_global_default;