Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge #527

Browse Source 
527: Release version 0.6.0 r=da-kami a=comit-botty-mc-botface

Hi @da-kami!

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/870083908.
I've updated the changelog and bumped the versions in the manifest files in this commit: 30b2cb467a8dde873da16cedf69f5b4ccbdb7508.

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

Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: COMIT Botty McBotface <botty@coblox.tech>
This commit is contained in:
bors[bot] 2021-05-24 06:02:15 +00:00 committed by GitHub
commit ca6cb0a76a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [0.6.0] - 2021-05-24
### Added ### Added
- Cancel command for the ASB that allows cancelling a specific swap by id. - Cancel command for the ASB that allows cancelling a specific swap by id.
@ -117,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 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. - 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. 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.5.0...HEAD [Unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.6.0...HEAD
[0.6.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.5.0...0.6.0
[0.5.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.4.0...0.5.0 [0.5.0]: https://github.com/comit-network/xmr-btc-swap/compare/0.4.0...0.5.0
[0.4.0]: https://github.com/comit-network/xmr-btc-swap/compare/v0.3...0.4.0 [0.4.0]: https://github.com/comit-network/xmr-btc-swap/compare/v0.3...0.4.0

2
Cargo.lock generated
View File

@ -3843,7 +3843,7 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]] [[package]]
name = "swap" name = "swap"
version = "0.5.0" version = "0.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",

9
docs/asb/README.md
View File

@ -21,11 +21,12 @@ Run `./asb --help` for more information.
### Running on mainnet ### Running on mainnet
Public Monero mainnet nodes can be found [here](https://moneroworld.com/#nodes).
The default mainnet node is set to `node.moneroworld.com:18089`.
For running the ASB on mainnet you will have to change you `monero-wallet-rpc` setup to mainnet. For running the ASB on mainnet you will have to change you `monero-wallet-rpc` setup to mainnet.
The default port for expecting the `monero-wallet-rpc` when running the ASB on mainnet is `18083`.
It is recommended that you run your own Monero and Bitcoin node when running on mainnet.
It is possible to plug into public blockchain nodes but be aware that you might lose some privacy doing so.
Public Monero mainnet nodes can be found [here](https://moneroworld.com/#nodes).
Public Electrum mainnet nodes can be found [here](https://1209k.com/bitcoin-eye/ele.php?chain=btc).
## ASB Details ## ASB Details

2
swap/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "swap" name = "swap"
version = "0.5.0" version = "0.6.0"
authors = [ "The COMIT guys <hello@comit.network>" ] authors = [ "The COMIT guys <hello@comit.network>" ]
edition = "2018" edition = "2018"
description = "XMR/BTC trustless atomic swaps." description = "XMR/BTC trustless atomic swaps."

2
swap/src/cli/command.rs
View File

@ -12,7 +12,7 @@ use url::Url;
use uuid::Uuid; use uuid::Uuid;
// See: https://moneroworld.com/ // See: https://moneroworld.com/
pub const DEFAULT_MONERO_DAEMON_ADDRESS: &str = "node.moneroworld.com:18089"; pub const DEFAULT_MONERO_DAEMON_ADDRESS: &str = "node.xmr.to:18081";
pub const DEFAULT_MONERO_DAEMON_ADDRESS_STAGENET: &str = "monero-stagenet.exan.tech:38081"; pub const DEFAULT_MONERO_DAEMON_ADDRESS_STAGENET: &str = "monero-stagenet.exan.tech:38081";
// See: https://1209k.com/bitcoin-eye/ele.php?chain=btc // See: https://1209k.com/bitcoin-eye/ele.php?chain=btc