Commit Graph

1604 Commits

Author SHA1 Message Date
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
binarybaron
bdfa6e1f9f
Replace xmr.to stagenet node with melo.tools node
XMR.to has abandoned their community services.
2021-07-06 19:49:50 +02:00
bors[bot]
3a99b753ed
Merge #593
593: Integrate rendezvous protocol r=thomaseizinger a=rishflab

Open things:

- [x] Default parameters for CLI
- [x] Print a human-readable table of sellers if `--json` is not passed
- [x] Unresolved comments of review

Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
Co-authored-by: rishflab <rishflab@hotmail.com>
2021-07-06 10:09:58 +00:00
Thomas Eizinger
acfd2dd6bb
Store Monero receive address in database and load it on resume 2021-07-06 20:08:24 +10:00
Thomas Eizinger
5463bde4f8
Add a mandatory --change-address parameter to buy-xmr
Fixes #513.
2021-07-06 20:07:53 +10:00
Thomas Eizinger
683d565679
Make variable naming consistent 2021-07-06 20:06:41 +10:00
Thomas Eizinger
8b59ac26ba
Replace sorting with slice pattern matching
Sorting `psbt.output` by `witness_script` is at times pointless
because it might be set to `None`. To be more robust, we pattern
match against the produced transaction.
2021-07-06 20:06:40 +10:00
Daniel Karzel
625ff4868a
Changelog entry for the rendezvous integration 2021-07-06 20:03:54 +10:00
Thomas Eizinger
348fca0827
Add isolated test for list_sellers function 2021-07-06 20:03:53 +10:00
Thomas Eizinger
e642f5c148
Extend SwarmExt with ability to listen on TCP localhost
The CLI's transport doesn't support memory addresses and it also shouldn't support those by default. To be able to use it in tests, we extend the `SwarmExt` trait with the ability to listen on local TCP addresses with a random port.
2021-07-06 20:03:19 +10:00
rishflab
93a0692998
Integrate rendezvous protocol into ASB
The rendezvous protocol allows us to register all of our external
addresses. Hence, the first step is to allow the user to configure
external addresses as part of the config. In the future, there might
be an automated way of determining these.

To register with a rendezvous node, the user needs to configure which
one. CoBloX is running a rendezvous node that acts as the default by
every spec-compliant node will do the job just fine. This behaviour
is optional which is why our custom behaviour is wrapped in a `Toggle`.

We also want our node to re-register after half the time of the
registration has passed. To make this simpler and allow for testing in
isolation, we create a custom behaviour that wraps the libp2p rendezvous
behaviour.
2021-07-06 20:03:19 +10:00
Daniel Karzel
ff10edd8a4
Add the list-sellers command to the CLI
This command uses a rendezvous node to find sellers (i.e. ASBs) and query them for quotes.
Sellers, that can be dialed and queried for a quote will be listed.
2021-07-06 20:03:18 +10:00
Daniel Karzel
f45cde84ab
comfy-table instead of prettytable-rs 2021-07-06 20:01:48 +10:00
Thomas Eizinger
b4fafeba6b
Allow large enum variant lint
The docs say one needs to measure the impact of this before taking
action. We didn't measure anything. Let's not take any action.
2021-07-06 19:58:41 +10:00
Thomas Eizinger
e163942850
Merge transport and behaviour module into network 2021-07-06 19:58:40 +10:00
Daniel Karzel
ff8cca2e27
Pass in CLI behaviour when creating swarm
This allows us to reuse the swarm setup with a different behaviour for discovering ASBs with a rendezvous node.
2021-07-06 19:58:36 +10:00
bors[bot]
4cd27e372c
Merge #604
604: Bump torut from 0.1.9 to 0.1.10 r=thomaseizinger a=dependabot[bot]

Bumps [torut](https://github.com/teawithsand/torut) from 0.1.9 to 0.1.10.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/teawithsand/torut/releases">torut's releases</a>.</em></p>
<blockquote>
<h2>Release 0.1.10</h2>
<p>Deprecated onion services V2 and all stuff associated with it.
Updated tokio version.
Implemented std::error::Error for error types in this crate, support for these errors is very basic and all that was done was implementing Error trait for existing error types. No error structure refactoring was done.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="8a26ddde79"><code>8a26ddd</code></a> Implemented std::error::Error for error types</li>
<li><a href="c5cee8a369"><code>c5cee8a</code></a> Implemented std::error::Error for error types</li>
<li><a href="caed51d697"><code>caed51d</code></a> Deprecated v2 onion service stuff</li>
<li><a href="87bcde20bb"><code>87bcde2</code></a> Updated tokio version</li>
<li>See full diff in <a href="https://github.com/teawithsand/torut/compare/v0.1.9...v0.1.10">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=torut&package-manager=cargo&previous-version=0.1.9&new-version=0.1.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>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-06 06:49:06 +00:00
bors[bot]
72673fa166
Merge #605
605: Merge `--seller-addr` and `--seller-peer-id` into `--seller` parameter r=thomaseizinger a=thomaseizinger

This simplifies the CLI's interface.

It wills also play nicely with https://github.com/comit-network/xmr-btc-swap/pull/593.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-06 05:55:25 +00:00
Thomas Eizinger
d49f4ea60d
Test saving and loading of addresses in isolation 2021-07-06 15:53:14 +10:00
Thomas Eizinger
ec4234fbb9
Merge --seller-addr and --seller-peer-id into --seller parameter
This simplifies the CLI's interface.
2021-07-06 14:51:08 +10:00
Thomas Eizinger
c2daf7a11e
Make use of torut's errors implementing std::error::Error
Anyhow all the things!
2021-07-06 14:46:00 +10:00
bors[bot]
962b648911
Merge #594
594: Refuse to dial addresses via Tor that are almost certainly not reachable r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-07-06 04:41:40 +00:00
bors[bot]
206c98d71b
Merge #600 #601
600: Bump tokio from 1.7.1 to 1.8.0 r=thomaseizinger a=dependabot[bot]

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.7.1 to 1.8.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/tokio-rs/tokio/releases">tokio's releases</a>.</em></p>
<blockquote>
<h2>tokio-1.8.0</h2>
<h1>1.8.0 (July 2, 2021)</h1>
<h3>Added</h3>
<ul>
<li>io: add <code>get_{ref,mut}</code> methods to <code>AsyncFdReadyGuard</code> and <code>AsyncFdReadyMutGuard</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3807">#3807</a>)</li>
<li>io: efficient implementation of vectored writes for <code>BufWriter</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3163">#3163</a>)</li>
<li>net: add ready/try methods to <code>NamedPipe{Client,Server}</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3866">#3866</a>, <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3899">#3899</a>)</li>
<li>sync: add <code>watch::Receiver::borrow_and_update</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3813">#3813</a>)</li>
<li>sync: implement <code>From&lt;T&gt;</code> for <code>OnceCell&lt;T&gt;</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3877">#3877</a>)</li>
<li>time: allow users to specify Interval behaviour when delayed (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3721">#3721</a>)</li>
</ul>
<h3>Added (unstable)</h3>
<ul>
<li>rt: add <code>tokio::task::Builder</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3881">#3881</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>net: handle HUP event with <code>UnixStream</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3898">#3898</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>doc: document cancellation safety (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3900">#3900</a>)</li>
<li>time: add wait alias to sleep (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3897">#3897</a>)</li>
<li>time: document auto-advancing behaviour of runtime (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3763">#3763</a>)</li>
</ul>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3163">#3163</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3163">tokio-rs/tokio#3163</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3721">#3721</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3721">tokio-rs/tokio#3721</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3763">#3763</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3763">tokio-rs/tokio#3763</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3807">#3807</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3807">tokio-rs/tokio#3807</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3813">#3813</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3813">tokio-rs/tokio#3813</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3866">#3866</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3866">tokio-rs/tokio#3866</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3877">#3877</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3877">tokio-rs/tokio#3877</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3881">#3881</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3881">tokio-rs/tokio#3881</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3897">#3897</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3897">tokio-rs/tokio#3897</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3898">#3898</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3898">tokio-rs/tokio#3898</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3899">#3899</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3899">tokio-rs/tokio#3899</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3900">#3900</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3900">tokio-rs/tokio#3900</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="677107d8d9"><code>677107d</code></a> chore: prepare Tokio v1.8.0 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3912">#3912</a>)</li>
<li><a href="c8ecfc894d"><code>c8ecfc8</code></a> sync: fix watch borrow_and_update (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3913">#3913</a>)</li>
<li><a href="08ed41f339"><code>08ed41f</code></a> chore: fix typos (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3907">#3907</a>)</li>
<li><a href="90e1935c48"><code>90e1935</code></a> test: test with tracing (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3906">#3906</a>)</li>
<li><a href="b877629cb1"><code>b877629</code></a> net: handle HUP event with UnixStream (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3898">#3898</a>)</li>
<li><a href="0531549b6e"><code>0531549</code></a> io: efficient implementation of vectored writes for BufWriter (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3163">#3163</a>)</li>
<li><a href="38204f5fba"><code>38204f5</code></a> time: fix Timeout size_hint (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3902">#3902</a>)</li>
<li><a href="8fa29cb00a"><code>8fa29cb</code></a> rt: add tokio::task::Builder (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3881">#3881</a>)</li>
<li><a href="b521cc2689"><code>b521cc2</code></a> doc: document cancellation safety (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3900">#3900</a>)</li>
<li><a href="57c90c9750"><code>57c90c9</code></a> net: add read/try_read etc methods to NamedPipeServer (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3899">#3899</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tokio/compare/tokio-1.7.1...tokio-1.8.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio&package-manager=cargo&previous-version=1.7.1&new-version=1.8.0)](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>

601: Bump hex-literal from 0.3.1 to 0.3.2 r=thomaseizinger a=dependabot[bot]

Bumps [hex-literal](https://github.com/RustCrypto/utils) from 0.3.1 to 0.3.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="80d7e3ac33"><code>80d7e3a</code></a> hex-literal: release v0.3.2 (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/513">#513</a>)</li>
<li><a href="4ea37fab44"><code>4ea37fa</code></a> build(deps): bump syn from 1.0.72 to 1.0.73 (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/495">#495</a>)</li>
<li><a href="aee72b8b92"><code>aee72b8</code></a> Allow line and block comments. (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/512">#512</a>)</li>
<li><a href="fb107e63cc"><code>fb107e6</code></a> crypto-bigint v0.2.2 (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/509">#509</a>)</li>
<li><a href="0e161320f6"><code>0e16132</code></a> build(deps): bump libc from 0.2.95 to 0.2.97 (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/496">#496</a>)</li>
<li><a href="b3d48c7fef"><code>b3d48c7</code></a> build(deps): bump rand_core from 0.6.2 to 0.6.3 (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/498">#498</a>)</li>
<li><a href="950e62c8a9"><code>950e62c</code></a> crypto-bigint: add <code>rand</code> feature (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/508">#508</a>)</li>
<li><a href="a93ddb637a"><code>a93ddb6</code></a> crypto-bigint: make <code>Limb</code>'s <code>Inner</code> value public (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/507">#507</a>)</li>
<li><a href="ccfb5526e9"><code>ccfb552</code></a> crypto-bigint: add <code>UInt::new</code> (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/506">#506</a>)</li>
<li><a href="e9556883b8"><code>e955688</code></a> crypto-bigint: add <code>Limb::is_odd</code> and <code>UInt::is_odd</code> (<a href="https://github-redirect.dependabot.com/RustCrypto/utils/issues/505">#505</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/RustCrypto/utils/compare/hex-literal-v0.3.1...hex-literal-v0.3.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=hex-literal&package-manager=cargo&previous-version=0.3.1&new-version=0.3.2)](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-05 22:43:59 +00:00
bors[bot]
f89bc701a5
Merge #602 #603
602: Bump thiserror from 1.0.25 to 1.0.26 r=thomaseizinger a=dependabot[bot]

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.25 to 1.0.26.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dtolnay/thiserror/releases">thiserror's releases</a>.</em></p>
<blockquote>
<h2>1.0.26</h2>
<ul>
<li>Work around bug in Clippy nonstandard_macro_braces lint (<a href="https://github-redirect.dependabot.com/rust-lang/rust-clippy/issues/7422">rust-lang/rust-clippy#7422</a>, 245e7cfd149140806ecef89d44b14e9557b297b1)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="031fea6f3b"><code>031fea6</code></a> Release 1.0.26</li>
<li><a href="245e7cfd14"><code>245e7cf</code></a> Suppress nonstandard_macro_braces in generated code</li>
<li><a href="4bbe3ece51"><code>4bbe3ec</code></a> Ignore buggy nonstandard_macro_braces clippy lint</li>
<li><a href="e0628be8ed"><code>e0628be</code></a> Ignore doc_markdown clippy false positive</li>
<li><a href="a37b5ab11f"><code>a37b5ab</code></a> Resolve needless_borrow clippy lints</li>
<li><a href="8862629bcc"><code>8862629</code></a> Delete broken #[deprecated] test</li>
<li>See full diff in <a href="https://github.com/dtolnay/thiserror/compare/1.0.25...1.0.26">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=thiserror&package-manager=cargo&previous-version=1.0.25&new-version=1.0.26)](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>

603: Bump structopt from 0.3.21 to 0.3.22 r=thomaseizinger a=dependabot[bot]

Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.21 to 0.3.22.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md">structopt's changelog</a>.</em></p>
<blockquote>
<h1>v0.3.22 (2021-07-04)</h1>
<ul>
<li>Add support for <a href="https://github-redirect.dependabot.com/TeXitoi/structopt/issues/128">generics in derive</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="004cfc218e"><code>004cfc2</code></a> v0.3.22</li>
<li><a href="4bdde69b60"><code>4bdde69</code></a> add basic support for generic structs and enums (<a href="https://github-redirect.dependabot.com/TeXitoi/structopt/issues/483">#483</a>)</li>
<li><a href="d16cfd264d"><code>d16cfd2</code></a> fix clippy</li>
<li><a href="8161b1522c"><code>8161b15</code></a> Add an example using strum</li>
<li><a href="3848d5b55b"><code>3848d5b</code></a> Fix explanation on optional string list argument</li>
<li>See full diff in <a href="https://github.com/TeXitoi/structopt/compare/v0.3.21...v0.3.22">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=structopt&package-manager=cargo&previous-version=0.3.21&new-version=0.3.22)](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-05 22:21:01 +00:00
dependabot[bot]
dcd854e697
Bump torut from 0.1.9 to 0.1.10
Bumps [torut](https://github.com/teawithsand/torut) from 0.1.9 to 0.1.10.
- [Release notes](https://github.com/teawithsand/torut/releases)
- [Commits](https://github.com/teawithsand/torut/compare/v0.1.9...v0.1.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 11:11:09 +00:00
dependabot[bot]
f33e50ab19
Bump structopt from 0.3.21 to 0.3.22
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.21 to 0.3.22.
- [Release notes](https://github.com/TeXitoi/structopt/releases)
- [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.21...v0.3.22)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 11:10:57 +00:00
dependabot[bot]
35f481f4ae
Bump thiserror from 1.0.25 to 1.0.26
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.25 to 1.0.26.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.25...1.0.26)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 11:10:40 +00:00
dependabot[bot]
15cf4ff638
Bump hex-literal from 0.3.1 to 0.3.2
Bumps [hex-literal](https://github.com/RustCrypto/utils) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/RustCrypto/utils/releases)
- [Commits](https://github.com/RustCrypto/utils/compare/hex-literal-v0.3.1...hex-literal-v0.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 11:10:24 +00:00
dependabot[bot]
31be076fd1
Bump tokio from 1.7.1 to 1.8.0
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.7.1 to 1.8.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.7.1...tokio-1.8.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 11:10:11 +00:00
Thomas Eizinger
8057b45e17
Test new reachability function in tests 2021-06-30 18:28:51 +10:00
Thomas Eizinger
92ed8d9c04
Refuse to dial addresses via Tor that are almost certainly not reachable
For now, this just concerns loopback addresses.
2021-06-30 18:28:47 +10:00
Thomas Eizinger
ec59184e85
Refactor fmt_as_address_string to return a structured value
Instead of formatting to a string right away, we parse the multiaddress
into a stricter data structure that only allows the kind of addresses
we can dial through Tor.

This will allow us to perform further checks on the parsed address.
2021-06-30 18:15:26 +10:00
bors[bot]
910ed9a333
Merge #592
592: Make CHANGELOG.md follow the semantic newline spec r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-06-29 01:27:32 +00:00
Thomas Eizinger
bb8e841b0d
Make CHANGELOG.md follow the semantic newline spec 2021-06-29 11:05:41 +10:00
bors[bot]
ee011b9c18
Merge #589
589: Create CONTRIBUTING.md r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-06-29 00:58:39 +00:00
Thomas Eizinger
bbd2951e39
Create CONTRIBUTING.md 2021-06-29 10:58:00 +10:00
bors[bot]
b708d5a4dd
Merge #585
585: Configurable kraken websocket url via the ASB config r=thomaseizinger a=cimble-code

- Allows the ASB operator to configure a custom kraken websocket url via the ASB config. 
- Addresses the issue of price control first brought up [here](https://github.com/comit-network/xmr-btc-swap/discussions/571)

>  Gotya. 
There is a relatively easy to implement (but temporary) solution for that. We could let the user configure the kraken websocket url via the ASB config. That way you can plug in your own service. The only requirement is that your service publishes prices updates in the same format as [kraken](https://docs.kraken.com/websockets/), e.g. : 

_Originally posted by @bonomat in https://github.com/comit-network/xmr-btc-swap/discussions/571#discussioncomment-885535_

Co-authored-by: Your Name <you@example.com>
2021-06-28 12:05:00 +00:00
bors[bot]
603e0610b3
Merge #590
590: Bump tracing-subscriber from 0.2.18 to 0.2.19 r=thomaseizinger a=dependabot[bot]

Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.2.18 to 0.2.19.
<details>
<summary>Commits</summary>
<ul>
<li><a href="807bc8fae7"><code>807bc8f</code></a> subscriber: prepare to release 0.2.19 (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1448">#1448</a>)</li>
<li><a href="204077fee5"><code>204077f</code></a> core: add a brief docs section on comparing levels (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1446">#1446</a>)</li>
<li><a href="4bf3d0000c"><code>4bf3d00</code></a> subscriber: add <code>MakeWriter</code> combinators (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1274">#1274</a>)</li>
<li><a href="29291af1fd"><code>29291af</code></a> opentelemetry: improve performance by pre-determining attribute length (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1327">#1327</a>)</li>
<li><a href="ab6207621d"><code>ab62076</code></a> subscriber: explain why we always call <code>inner.register_callsite()</code> before if ...</li>
<li><a href="de76e552cb"><code>de76e55</code></a> chore: fix new clippy warnings (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1444">#1444</a>)</li>
<li><a href="bc1c3a32ec"><code>bc1c3a3</code></a> opentelemetry: update opentelemetry to 0.15 (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1441">#1441</a>)</li>
<li><a href="1e361e4187"><code>1e361e4</code></a> opentelemetry: add opentelemetry source code attributes to spans (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1411">#1411</a>)</li>
<li><a href="379559645c"><code>3795596</code></a> tracing: Fix link to RAII pattern document (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1398">#1398</a>)</li>
<li><a href="805eb51bc9"><code>805eb51</code></a> subscriber: add <code>MakeWriter::make_writer_for</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1141">#1141</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.2.18...tracing-subscriber-0.2.19">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tracing-subscriber&package-manager=cargo&previous-version=0.2.18&new-version=0.2.19)](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-06-28 11:41:32 +00:00