Commit Graph

1741 Commits

Author SHA1 Message Date
COMIT Botty McBotface
403e3d2b33 Prepare release 0.8.0 2021-07-09 02:02:13 +00:00
bors[bot]
9eb82cd0a9
Merge #624
624: Remove rendezvous point default r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-07-09 01:23:40 +00:00
Daniel Karzel
5e2e0f7dc0
No default for rendezvous-point in CLI README 2021-07-09 11:22:38 +10:00
Daniel Karzel
e72922923a
Update discover-and-take script with rendezvous-point param 2021-07-09 10:20:40 +10:00
Thomas Eizinger
d21bd556ec
Remove rendezvous point default
This also fixes a bug where an empty string wasn't actually allowed
as a rendezvous point in the ASB's initial setup wizard.
2021-07-09 09:44:56 +10:00
bors[bot]
3e3015a478
Merge #622
622: Bump hyper from 0.14.9 to 0.14.10 r=thomaseizinger a=dependabot[bot]

Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.9 to 0.14.10.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/hyperium/hyper/releases">hyper's releases</a>.</em></p>
<blockquote>
<h2>v0.14.10</h2>
<h2>Bug Fixes</h2>
<ul>
<li><strong>http1:</strong>
<ul>
<li>reject content-lengths that have a plus sign prefix (<a href="06335158ca">06335158</a>) (<strong>Security</strong> GHSA-f3pg-qwvg-p99c)</li>
<li>protect against overflow in chunked decoder (<a href="efd9a9821f">efd9a982</a>) (<strong>Security</strong> GHSA-5h46-h7hh-c6x9)</li>
</ul>
</li>
</ul>
<h2>Features</h2>
<ul>
<li><strong>ffi:</strong> add option to get raw headers from response (<a href="8c89a8c166">8c89a8c1</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/hyperium/hyper/blob/master/CHANGELOG.md">hyper's changelog</a>.</em></p>
<blockquote>
<h3>v0.14.10 (2021-07-07)</h3>
<h4>Bug Fixes</h4>
<ul>
<li><strong>http1:</strong>
<ul>
<li>reject content-lengths that have a plus sign prefix (<a href="06335158ca">06335158</a>)</li>
<li>protect against overflow in chunked decoder (<a href="efd9a9821f">efd9a982</a>)</li>
</ul>
</li>
</ul>
<h4>Features</h4>
<ul>
<li><strong>ffi:</strong> add option to get raw headers from response (<a href="8c89a8c166">8c89a8c1</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="9b69cbc254"><code>9b69cbc</code></a> v0.14.10</li>
<li><a href="1fb719e0b6"><code>1fb719e</code></a> fix(http1): reject content-lengths that have a plus sign prefix</li>
<li><a href="1068b994df"><code>1068b99</code></a> fix(http1): protect against overflow in chunked decoder</li>
<li><a href="11cb4725ad"><code>11cb472</code></a> refactor(http2): fix unstable name clash of Cursor::remaining</li>
<li><a href="13594c377d"><code>13594c3</code></a> chore(github): merge duplicate issue templates</li>
<li><a href="c60a9dd9c9"><code>c60a9dd</code></a> chore(github): add issue templates</li>
<li><a href="8c89a8c166"><code>8c89a8c</code></a> feat(ffi): add option to get raw headers from response</li>
<li><a href="08b2138e40"><code>08b2138</code></a> refactor(error): add header parse error details in <code>hyper::Error</code></li>
<li><a href="ea8b0cd86e"><code>ea8b0cd</code></a> refactor(error): remove PartialEq derives for error kind enums</li>
<li>See full diff in <a href="https://github.com/hyperium/hyper/compare/v0.14.9...v0.14.10">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=hyper&package-manager=cargo&previous-version=0.14.9&new-version=0.14.10)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-07-08 12:23:23 +00:00
dependabot[bot]
e43c9a8d6d
Bump hyper from 0.14.9 to 0.14.10
Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.9 to 0.14.10.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/hyper/compare/v0.14.9...v0.14.10)

---
updated-dependencies:
- dependency-name: hyper
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 11:08:20 +00:00
bors[bot]
9fc53d3f84
Merge #615
615: Update default Monero node URLs and info r=thomaseizinger a=da-kami

xmr.to nodes are not served at the xmr.to domain but moved to melo.tools

Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-07-08 06:43:12 +00:00
Daniel Karzel
0dc3943d9c
Update default Monero node URLs and info
xmr.to nodes are not served at the xmr.to domain but moved to melo.tools
2021-07-08 16:42:18 +10:00
bors[bot]
6208689237
Merge #620
620: Revert "Prepare release 0.8.0" r=thomaseizinger a=da-kami

This reverts commit 50da9580

Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-07-08 06:26:26 +00:00
bors[bot]
238e52228e
Merge #618
618: Don't spam on transaction status change r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-08 05:49:39 +00:00
bors[bot]
00f581dee1
Merge #619
619: Disallow Bitcoin legacy addresses r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-08 05:32:38 +00:00
Daniel Karzel
ab24f7bce5
Revert "Prepare release 0.8.0"
This reverts commit 50da9580
2021-07-08 15:03:37 +10:00
bors[bot]
b7a832eb7a
Merge #616
616: Don't spam the user while waiting for BTC to be deposited r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-08 04:48:55 +00:00
bors[bot]
41982e0ff9
Merge #617
617: Sort seller list inside of `list_sellers` r=thomaseizinger a=da-kami

By sorting the list inside we have a more deterministic output that makes processing in JSON easier.

Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-07-08 03:41:41 +00:00
Thomas Eizinger
2c8bbe4913
Remove left-over "half" of log message
With the move to using tracing's fields, this log message was not
properly updated.
2021-07-08 13:40:11 +10:00
Thomas Eizinger
94f089f4f2
Disallow Bitcoin legacy addresses
These cause problems during fee estimation.
2021-07-08 13:36:43 +10:00
Thomas Eizinger
367d75cab6
Reduce code duplication and make evaluation order determinisitic
The Rust compiler doesn't guarantee in which order field initialization
are executed. By extracting them, we can make sure they run in a certain
order. This will be important as we add more validations that can
fail.
2021-07-08 13:31:57 +10:00
Thomas Eizinger
46ffc34f40
Don't spam on transaction status change 2021-07-08 12:55:37 +10:00
Thomas Eizinger
991dbf496e
Extract print_status_change so it is easily testable 2021-07-08 12:55:36 +10:00
Thomas Eizinger
2eb7fab0c3
Make capture_logs available for the whole crate 2021-07-08 12:55:33 +10:00
Daniel Karzel
6abf83f4ad
Sort seller list inside of list_sellers
By sorting the list inside we have a more deterministic output that makes processing in JSON easier.
2021-07-08 12:42:26 +10:00
Thomas Eizinger
cacfc50fb2
Don't spam the user while waiting for BTC 2021-07-08 12:14:37 +10:00
Thomas Eizinger
56a48e71ef
Add failing test that shows spamming of output 2021-07-08 12:12:55 +10:00
Thomas Eizinger
56ea23c2a3
Assert log output for determine_btc_to_swap 2021-07-08 12:10:49 +10:00
Thomas Eizinger
a347dd8b97
Move helper structs below tests 2021-07-08 11:15:24 +10:00
bors[bot]
c275e33a6c
Merge #614
614: Fix quick start README.md list-sellers command r=thomaseizinger a=binarybaron

Change list-sellers from flag to command

Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com>
2021-07-08 00:50:43 +00:00
binarybaron
357f4a0711
Fix quick start README.md list-sellers command
Change list-sellers from flag to command
2021-07-08 06:10:13 +06:00
bors[bot]
7ff57ff0d4
Merge #613
613: Bump vergen from 5.1.11 to 5.1.12 r=thomaseizinger a=dependabot[bot]

Bumps [vergen](https://github.com/rustyhorde/vergen) from 5.1.11 to 5.1.12.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/rustyhorde/vergen/releases">vergen's releases</a>.</em></p>
<blockquote>
<h2>v5.1.12</h2>
<ul>
<li>Pinned <code>sysinfo</code> crate to 0.19.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="a113046c21"><code>a113046</code></a> version bump for next release</li>
<li><a href="a2ee46f16a"><code>a2ee46f</code></a> pin sysinfo to lowest supported version (<a href="https://github-redirect.dependabot.com/rustyhorde/vergen/issues/81">#81</a>)</li>
<li>See full diff in <a href="https://github.com/rustyhorde/vergen/compare/5.1.11...5.1.12">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=vergen&package-manager=cargo&previous-version=5.1.11&new-version=5.1.12)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-07-07 11:25:25 +00:00
dependabot[bot]
e90ceb392e
Bump vergen from 5.1.11 to 5.1.12
Bumps [vergen](https://github.com/rustyhorde/vergen) from 5.1.11 to 5.1.12.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/5.1.11...5.1.12)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 11:08:19 +00:00
bors[bot]
ab0f429eea
Merge #611
611: Release version 0.8.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/1007327199.
I've updated the changelog and bumped the versions in the manifest files in this commit: 50da958078.

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>
2021-07-07 08:34:08 +00:00
COMIT Botty McBotface
50da958078 Prepare release 0.8.0 2021-07-07 08:31:00 +00:00
bors[bot]
668a41e6e2
Merge #610
610: Provide a commit-specific version output r=da-kami a=thomaseizinger

For builds made directly on the tag, the output of `--version` will
not change. For builds not made on a tagged commit, the output will
look something like this:

```
> swap --version

swap 0.7.0-117-g93161f9
```

Fixes #409.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-07 08:03:52 +00:00
Thomas Eizinger
714514edbc
Provide a commit-specific version output
For builds made directly on the tag, the output of `--version` will
not change. For builds not made on a tagged commit, the output will
look something like this:

```
> swap --version

swap 0.7.0-117-g93161f9
```

Fixes #409.
2021-07-07 17:55:13 +10:00
bors[bot]
93a69563a9
Merge #606
606: Script to list sellers and auto trigger swap + docs r=da-kami a=da-kami

Uses best price to determine the seller to swap with.

TODO:
- [x] Codebase to be tested on test-/stagenet.
- [x] Update readme
- [x] Update docs

This includes a couple of changes that I found while toying with the output and writing docs. Can drop the individual commits if necessary (but would need to adapt the docs then).

Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-07 07:18:46 +00:00
Daniel Karzel
ffad47d515
Update docs with latest changes to CLI and ASB 2021-07-07 17:14:57 +10:00
Thomas Eizinger
5c37fe6733
Make struct-opt docs more consistent
- Remove dots from the of help messages
- Unify wording
2021-07-07 17:14:56 +10:00
Thomas Eizinger
bbc3a49f41
Make link rendering actually work 2021-07-07 17:14:56 +10:00
Thomas Eizinger
987f8abb9d
Include unreachable nodes in table output
We emit an `info!` log for every peer that we discover but only ever
emitted a `debug!` log if we fail to connect. This leads to a situation
where the user would run `swap list-sellers`, the logs would say
"Discovered XYZ at ABC" but then get a potentially empty table.

To not confuse the user, we include unreachable nodes in the table output.
For example:

```
Connected to rendezvous point, discovering nodes in 'xmr-btc-swap-testnet' namespace ...
Discovered peer 12D3KooWPZ69DRp4wbGB3wJsxxsg1XW1EVZ2evtVwcARCF3a1nrx at /dns4/ac4hgzmsmekwekjbdl77brufqqbylddugzze4tel6qsnlympgmr46iid.onion/tcp/8765
+-------+--------------+--------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------+
| PRICE | MIN_QUANTITY | MAX_QUANTITY | STATUS      | ADDRESS                                                                                                                                |
+============================================================================================================================================================================================+
| ???   | ???          | ???          | Unreachable | /dns4/ac4hgzmsmekwekjbdl77brufqqbylddugzze4tel6qsnlympgmr46iid.onion/tcp/8765/p2p/12D3KooWPZ69DRp4wbGB3wJsxxsg1XW1EVZ2evtVwcARCF3a1nrx |
+-------+--------------+--------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------+
```
2021-07-07 17:14:56 +10:00
Thomas Eizinger
09f395a26b
Don't print level and time for list-sellers
This is now consistent with the `buy-xmr` command.
2021-07-07 17:14:55 +10:00
Thomas Eizinger
40eccd089f
Change --data-dir for --data-base-dir 2021-07-07 17:14:55 +10:00
Thomas Eizinger
3b1789fe07
Make things private if possible 2021-07-07 17:14:55 +10:00
Daniel Karzel
91b0a0863b
Add script to list sellers and auto trigger swap
Uses best price to determine the seller to swap with.
2021-07-07 17:14:55 +10:00
bors[bot]
15751f8a0e
Merge #607
607: Tidy up tracing statements r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-07 06:03:49 +00:00
Thomas Eizinger
8f50eb2f34
Utilize tracing's fields more 2021-07-07 16:02:02 +10:00
Thomas Eizinger
9119ce5cc4
Tidy up log messages across the codebase
1. Clearly separate the log messages from any fields that are
captured. The log message itself should be meaningful because it
depends on the underlying formatter, how/if the fields are displayed.
2. Some log messages had very little context, expand that.
3. Wording of errors was inconsistent, hopefully all errors should
now start with `Failed to ...`.
4. Some log messages were duplicated across multiple layers (like opening
the database).
5. Some log messages were split into two where one part is now an `error!`
and the 2nd part is an `info!` on what is happening next.
6. Where appropriate, punctuation has been removed to not interrupt
the reader's flow.
2021-07-07 16:02:00 +10:00
Thomas Eizinger
78480547d5
Don't import tracing's macros
Log statements end up getting changed constantly and having to clean
up imports after that is annoying, for example, if the last `info!`
in a file disappears, you end up with an unused import warning.

Fully qualifying tracing's macros prevents that and also communicates
clearly that we are using tracing and not log.
2021-07-07 16:01:33 +10:00
bors[bot]
fa1a5e6efb
Merge #608
608: Smoothen the CLI's interface a bit r=da-kami a=thomaseizinger

- Add `--change-address` to the `buy-xmr` command.
- Remove `--receive-address` from the `resume` command.



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-07 05:07:09 +00:00
Thomas Eizinger
1d0d38cd48
Explain why we clear the bip32_derivation map 2021-07-07 14:37:56 +10:00
bors[bot]
c8b29aecd1
Merge #609
609: Replace xmr.to stagenet node with melo.tools node r=thomaseizinger a=binarybaron

XMR.to has abandoned their community services.

Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com>
2021-07-07 01:07:02 +00:00