Merge #1189

1189: Release version 0.11.1 r=delta1 a=comit-botty-mc-botface

Hi `@delta1!`

This PR was created in response to a manual trigger of the release workflow here: https://github.com/comit-network/xmr-btc-swap/actions/runs/3346535880.
I've updated the changelog and bumped the versions in the manifest files in this commit: e1e26e92ba.

Merging this PR will create a GitHub release and upload any assets that are created as part of the release build.

Co-authored-by: COMIT Botty McBotface <botty@coblox.tech>
Co-authored-by: Byron Hambly <bhambly@blockstream.com>

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

@@ -45,12 +45,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout tagged commit
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.1.0
         with:
           ref: ${{ github.event.release.target_commitish }}
           token: ${{ secrets.BOTTY_GITHUB_TOKEN }}
 
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2.0.1
 
       - name: Install compiler for armhf arch
         if: matrix.target == 'armv7-unknown-linux-gnueabihf'

.github/workflows/ci.yml

@@ -7,20 +7,19 @@ on:
       - "staging" # Bors uses this branch
       - "trying" # Bors uses this branch
       - "master" # Always build head of master for the badge in the README
+      - "0.11.x"
 
 jobs:
   static_analysis:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.1.0
 
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2.0.1
 
       - name: Check formatting
         uses: dprint/check@v2.1
-        with:
-          dprint-version: 0.30.3
 
       - name: Run clippy with default features
         run: cargo clippy --workspace --all-targets -- -D warnings
@@ -43,9 +42,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.1.0
 
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2.0.1
 
       - name: Install compiler for armhf arch
         if: matrix.target == 'armv7-unknown-linux-gnueabihf'
@@ -58,13 +57,13 @@ jobs:
           cargo build -p swap --target ${{ matrix.target }}
 
       - name: Upload swap binary
-        uses: actions/upload-artifact@v2-preview
+        uses: actions/upload-artifact@v3
         with:
           name: swap-${{ matrix.target }}
           path: target/${{ matrix.target }}/debug/swap
 
       - name: Upload asb binary
-        uses: actions/upload-artifact@v2-preview
+        uses: actions/upload-artifact@v3
         with:
           name: asb-${{ matrix.target }}
           path: target/${{ matrix.target }}/debug/asb
@@ -76,9 +75,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.1.0
 
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2.0.1
 
       - name: Build tests
         run: cargo build --tests --workspace --all-features
@@ -112,9 +111,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.1.0
 
-      - uses: Swatinem/rust-cache@v2.0.0
+      - uses: Swatinem/rust-cache@v2.0.1
 
       - name: Run test ${{ matrix.test_name }}
         run: cargo test --package swap --all-features --test ${{ matrix.test_name }} -- --nocapture

.github/workflows/create-release.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
 
       - name: Extract version from branch name
         id: extract-version

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

@@ -6,13 +6,17 @@ on:
       version:
         description: "The new version in X.Y.Z format."
         required: true
+      base:
+        description: "The base branch for the pull request."
+        default: "master"
+        required: true
 
 jobs:
   draft-new-release:
     name: "Draft a new release"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
         with:
           token: ${{ secrets.BOTTY_GITHUB_TOKEN }}
 
@@ -58,7 +62,7 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }}
           head: release/${{ github.event.inputs.version }}
-          base: master
+          base: ${{ github.event.inputs.base }}
           title: Release version ${{ github.event.inputs.version }}
           reviewers: ${{ github.actor }}
           body: |

.github/workflows/preview-release.yml

@@ -10,7 +10,7 @@ jobs:
     name: Create preview release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
 
       - name: Delete 'preview' release
         uses: larryjoelane/delete-release-action@v1.0.24

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1] - 2022-10-28
+
+### Changed
+
+- Immediately fetch transaction status upon subscription
+- Dependency updates
+
 ## [0.11.0] - 2022-08-11
 
 ### Changed
@@ -320,7 +327,8 @@ It is possible to migrate critical data from the old db to the sqlite but there
 - Fixed an issue where Alice would not verify if Bob's Bitcoin lock transaction is semantically correct, i.e. pays the agreed upon amount to an output owned by both of them.
   Fixing this required a **breaking change** on the network layer and hence old versions are not compatible with this version.
 
-[Unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.11.0...HEAD
+[Unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.11.1...HEAD
+[0.11.1]: https://github.com/comit-network/xmr-btc-swap/compare/0.11.0...0.11.1
 [0.11.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.10.2...0.11.0
 [0.10.2]: https://github.com/comit-network/xmr-btc-swap/compare/0.10.1...0.10.2
 [0.10.1]: https://github.com/comit-network/xmr-btc-swap/compare/0.10.0...0.10.1

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.58 _should_ work.
+All stable toolchains since 1.62 _should_ work.
 
 ## Contact
 

monero-harness/src/lib.rs

@@ -296,7 +296,7 @@ impl<'c> MoneroWalletRpc {
 
     /// Sends amount to address
     pub async fn transfer(&self, address: &str, amount: u64) -> Result<Transfer> {
-        Ok(self.client().transfer_single(0, amount, address).await?)
+        self.client().transfer_single(0, amount, address).await
     }
 
     pub async fn address(&self) -> Result<GetAddress> {

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.59"
+channel = "1.62"
 components = ["clippy"]
 targets = ["armv7-unknown-linux-gnueabihf"]

swap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swap"
-version = "0.11.0"
+version = "0.11.1"
 authors = [ "The COMIT guys <hello@comit.network>" ]
 edition = "2021"
 description = "XMR/BTC trustless atomic swaps."
@@ -19,14 +19,14 @@ bdk = "0.16"
 big-bytes = "1"
 bitcoin = { version = "0.27", features = [ "rand", "use-serde" ] }
 bmrng = "0.5"
-comfy-table = "5.0"
+comfy-table = "6.1"
 config = { version = "0.11", default-features = false, features = [ "toml" ] }
 conquer-once = "0.3"
 curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
 data-encoding = "2.3"
 dialoguer = "0.10"
 directories-next = "2"
-ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde" ] }
+ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "84134daf34845434d7f38cdae7ffc31730a3b1e9", default-features = false, features = [ "libsecp_compat", "serde" ] }
 ed25519-dalek = "1"
 futures = { version = "0.3", default-features = false }
 hex = "0.4"
@@ -47,7 +47,7 @@ serde_cbor = "0.11"
 serde_json = "1"
 serde_with = { version = "1", features = [ "macros" ] }
 sha2 = "0.9"
-sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "ed25519", "serde" ] }
+sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "84134daf34845434d7f38cdae7ffc31730a3b1e9", default-features = false, features = [ "ed25519", "serde" ] }
 sqlx = { version = "0.5", features = [ "sqlite", "runtime-tokio-rustls", "offline" ] }
 structopt = "0.3"
 strum = { version = "0.24", features = [ "derive" ] }
@@ -64,7 +64,7 @@ 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.1", features = [ "serde", "v4" ] }
+uuid = { version = "1.2", features = [ "serde", "v4" ] }
 void = "1"
 
 [target.'cfg(not(windows))'.dependencies]
@@ -74,7 +74,7 @@ tokio-tar = "0.3"
 zip = "0.5"
 
 [dev-dependencies]
-bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs" }
+bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs", rev = "53bdc62a98b9a1e0debb06ab3a4239df1bfe4e04" }
 get-port = "3"
 hyper = "0.14"
 monero-harness = { path = "../monero-harness" }

swap/src/asb/event_loop.rs

@@ -176,7 +176,7 @@ where
                             let _ = responder.respond(wallet_snapshot);
                         }
                         SwarmEvent::Behaviour(OutEvent::SwapSetupCompleted{peer_id, swap_id, state3}) => {
-                            let _ = self.handle_execution_setup_done(peer_id, swap_id, state3).await;
+                            self.handle_execution_setup_done(peer_id, swap_id, state3).await;
                         }
                         SwarmEvent::Behaviour(OutEvent::SwapDeclined { peer, error }) => {
                             tracing::warn!(%peer, "Ignoring spot price request: {}", error);

swap/src/bitcoin/wallet.rs

@@ -143,8 +143,6 @@ impl Wallet {
                     let mut last_status = None;
 
                     loop {
-                        tokio::time::sleep(Duration::from_secs(5)).await;
-
                         let new_status = match client.lock().await.status_of_script(&tx) {
                             Ok(new_status) => new_status,
                             Err(error) => {
@@ -165,6 +163,8 @@ impl Wallet {
                                 return;
                             }
                         }
+
+                        tokio::time::sleep(Duration::from_secs(5)).await;
                     }
                 });
 
@@ -696,7 +696,7 @@ impl Client {
         Ok(Self {
             electrum,
             latest_block_height: BlockHeight::try_from(latest_block)?,
-            last_sync: Instant::now(),
+            last_sync: Instant::now() - interval,
             sync_interval: interval,
             script_history: Default::default(),
             subscriptions: Default::default(),
@@ -1076,7 +1076,7 @@ mod tests {
     proptest! {
         #[test]
         fn given_fee_above_max_should_always_errors(
-            sat_per_vb in 100_000_000.0f32..,
+            sat_per_vb in 100_000_000.0f32..f32::MAX,
         ) {
             let weight = 400;
             let amount = bitcoin::Amount::from_sat(547u64);

swap/src/cli/event_loop.rs

@@ -248,9 +248,8 @@ impl EventLoopHandle {
         &mut self,
         tx_redeem_encsig: EncryptedSignature,
     ) -> Result<(), bmrng::error::RequestError<EncryptedSignature>> {
-        Ok(self
-            .encrypted_signature
+        self.encrypted_signature
             .send_receive(tx_redeem_encsig)
-            .await?)
+            .await
     }
 }

swap/src/monero/wallet_rpc.rs

@@ -142,7 +142,7 @@ impl WalletRpc {
                     tracing::debug!("{}%", percent);
                     notified = percent;
                 }
-                file.write(&bytes).await?;
+                file.write_all(&bytes).await?;
             }
 
             file.flush().await?;

swap/src/protocol/alice/swap.rs

@@ -176,7 +176,7 @@ where
                    }
                 },
                 result = tx_lock_status.wait_until_confirmed_with(state3.cancel_timelock) => {
-                    let _ = result?;
+                    result?;
                     AliceState::CancelTimelockExpired {
                         monero_wallet_restore_blockheight,
                         transfer_proof,
@@ -196,7 +196,7 @@ where
                 biased; // make sure the cancel timelock expiry future is polled first
 
                 result = tx_lock_status.wait_until_confirmed_with(state3.cancel_timelock) => {
-                    let _ = result?;
+                    result?;
                     AliceState::CancelTimelockExpired {
                         monero_wallet_restore_blockheight,
                         transfer_proof,
@@ -326,7 +326,7 @@ where
                     }
                 }
                 result = tx_cancel_status.wait_until_confirmed_with(state3.punish_timelock) => {
-                    let _ = result?;
+                    result?;
 
                     AliceState::BtcPunishable {
                         monero_wallet_restore_blockheight,

swap/src/protocol/bob/swap.rs

@@ -137,7 +137,7 @@ async fn next_state(
                         }
                     },
                     result = cancel_timelock_expires => {
-                        let _ = result?;
+                        result?;
                         tracing::info!("Alice took too long to lock Monero, cancelling the swap");
 
                         let state4 = state3.cancel();
@@ -174,7 +174,7 @@ async fn next_state(
                         }
                     }
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }
@@ -198,7 +198,7 @@ async fn next_state(
                         }
                     },
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }
@@ -215,7 +215,7 @@ async fn next_state(
                         BobState::BtcRedeemed(state5?)
                     },
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }