Skip to content

Commit

Permalink
Merge branch 'master' into asb/listen-onion-service-arti
Browse files Browse the repository at this point in the history
  • Loading branch information
binarybaron authored Dec 3, 2024
2 parents 45fd6fb + 45a4cf4 commit a53c85c
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- GUI: Release .deb installer for Debian-based systems

## [1.0.0-rc.7] - 2024-11-26

- GUI: Changed terminology from "swap providers" to "makers"
Expand Down
4 changes: 4 additions & 0 deletions dev-docs/asb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ It is possible to plug into public blockchain nodes but be aware that you might
Public Monero mainnet nodes can be found [here](https://monero.fail/?chain=monero).
Public Electrum mainnet nodes can be found [here](https://1209k.com/bitcoin-eye/ele.php?chain=btc).

### Connect with others

Consider joining the designated [Matrix chat](https://matrix.to/#/%23unstoppableswap-market-makers:matrix.org) to connect with other individuals running asbs. The core developers are active in this chat and always looking for feedback.

## ASB Details

The ASB is a long running daemon that acts as the trading partner to the swap CLI.
Expand Down
2 changes: 1 addition & 1 deletion src-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0",
"@tauri-apps/plugin-updater": "^2.1.0",
"@types/react-redux": "^7.1.34",
"humanize-duration": "^3.32.1",
"jdenticon": "^3.3.0",
Expand Down
15 changes: 10 additions & 5 deletions src-gui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,11 @@
dependencies:
"@swc/counter" "^0.1.3"

"@tauri-apps/[email protected]":
version "2.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-alpha.4.tgz#63979fbd4e9f962a688cda4d685a107241dec3fc"
integrity sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==

"@tauri-apps/api@^2.0.0":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.1.tgz#dc49d899fb873b96ee1d46a171384625ba5ad404"
Expand Down Expand Up @@ -921,12 +926,12 @@
dependencies:
"@tauri-apps/api" "^2.0.0"

"@tauri-apps/plugin-updater@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-updater/-/plugin-updater-2.0.0.tgz#38cb3e735da28cd1726a3c0e13f032117e4db111"
integrity sha512-N0cl71g7RPr7zK2Fe5aoIwzw14NcdLcz7XMGFWZVjprsqgDRWoxbnUkknyCQMZthjhGkppCd/wN2MIsUz+eAhQ==
"@tauri-apps/plugin-updater@^2.1.0":
version "2.0.0-alpha.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-updater/-/plugin-updater-2.0.0-alpha.0.tgz#5e6d56b3a600316e48a2b71c6704e0c89e02f024"
integrity sha512-xV2hIdyOWg6e530JaO6+1krhNUc2mcj/+wAvhWT3IA9re7PN0Nq3Jeq+wAJk5m9YytB65FwS+XxZUTEvqU1XIQ==
dependencies:
"@tauri-apps/api" "^2.0.0"
"@tauri-apps/api" "2.0.0-alpha.4"

"@testing-library/react@^16.0.1":
version "16.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tauri-plugin-clipboard-manager = "^2.0.0"
tauri-plugin-process = "^2.0.0"
tauri-plugin-shell = "^2.0.0"
tauri-plugin-store = "^2.0.0"
tauri-plugin-updater = "^2.0.0"
tauri-plugin-updater = "^2.1.0"
tracing = "0.1"

[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
Expand Down
3 changes: 2 additions & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"appimage",
"dmg",
"nsis",
"app"
"app",
"deb"
],
"icon": [
"icons/32x32.png",
Expand Down
2 changes: 1 addition & 1 deletion swap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ For more detailed documentation on the CLI, see [this README](./dev-docs/cli/REA
Swapping of course needs two parties - and the CLI is only one of them: The taker that occasionally starts a swap with a market maker.

If you are interested in becoming a market maker you will want to run the second binary provided in this repository: `asb` - the Automated Swap Backend.
Detailed documentation for the `asb` can be found [in this README](./dev-docs/asb/README.md).
Detailed documentation for the `asb` can be found [in this README](/dev-docs/asb/README.md).

## Safety

Expand Down

0 comments on commit a53c85c

Please sign in to comment.