Merge branch 'master' into asb/enhance-history-cmd

Author: binarybaron

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

@@ -24,7 +24,7 @@ jobs:
             archive_ext: tar
           - bin: swap
             target: x86_64-apple-darwin
-            os: macos-12
+            os: macos-13
             archive_ext: tar
           - bin: swap
             target: aarch64-apple-darwin
@@ -44,7 +44,7 @@ jobs:
             archive_ext: tar
           - bin: asb
             target: x86_64-apple-darwin
-            os: macos-12
+            os: macos-13
             archive_ext: tar
           - bin: asb
             target: aarch64-apple-darwin

.github/workflows/ci.yml

@@ -109,7 +109,7 @@ jobs:
           - target: armv7-unknown-linux-gnueabihf
             os: ubuntu-latest
           - target: x86_64-apple-darwin
-            os: macos-12
+            os: macos-13
           - target: aarch64-apple-darwin
             os: macos-latest
           - target: x86_64-pc-windows-msvc

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - ASB: The `history` command will now display additional information about each swap such as the amounts involved, the current state and the txid of the Bitcoin lock transaction.
 
-## [1.0.0-rc.8] - 2024-12-04
+## [1.0.0-rc.10] - 2024-12-05
 
 - GUI: Release .deb installer for Debian-based systems
 - ASB: The maker will now retry indefinitely to redeem the Bitcoin until the cancel timelock expires. This fixes an issue where the swap would be refunded if the maker failed to publish the redeem transaction on the first try (e.g due to a network error).
@@ -425,7 +425,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/UnstoppableSwap/core/compare/1.0.0-rc.8...HEAD
+[unreleased]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.10...HEAD
+[1.0.0-rc.10]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.8...1.0.0-rc.10
 [1.0.0-rc.8]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.7...1.0.0-rc.8
 [1.0.0-rc.7]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.6...1.0.0-rc.7
 [1.0.0-rc.6]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.5...1.0.0-rc.6

Cargo.lock

@@ -67,11 +67,11 @@ In particular, you may be interested in setting up your ASB to be reachable via
 
 In order to understand the different components of the ASB and CLI better here is a component diagram showcasing the ASB and CLI setup using public Bitcoin and Monero infrastructure:
 
-![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/dev-docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml)
+![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/UnstoppableSwap/core/refs/heads/master/dev-docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml)
 
 Contrary, here is a diagram that showcases a service provider running it's own blockchain infrastructure for the ASB:
 
-![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/comit-network/xmr-btc-swap/363ce1cdf6fe6478736ff91e1458d650c2319248/dev-docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml)
+![Service Provider scenarios](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/UnstoppableSwap/core/refs/heads/master/dev-docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml)
 
 The diagram shows that the `asb` group (representing the `asb` binary) consists of three components:
 

dev-docs/asb/README.md

@@ -26,7 +26,7 @@
     "@tauri-apps/plugin-process": "^2.0.0",
     "@tauri-apps/plugin-shell": "^2.0.0",
     "@tauri-apps/plugin-store": "^2.0.0",
-    "@tauri-apps/plugin-updater": "^2.1.0",
+    "@tauri-apps/plugin-updater": "^2.0.0",
     "@types/react-redux": "^7.1.34",
     "humanize-duration": "^3.32.1",
     "jdenticon": "^3.3.0",
@@ -68,4 +68,4 @@
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^2.1.1"
   }
-}
+}