Commit Graph

1305 Commits

Author SHA1 Message Date
Daniel Karzel
04611ee9e1
Fix messages for awaiting containers ready
The message `JOINING all threads` is unfortunately not deterministic, it can happen that it just is not printed in the logs.
For Monerod container the message is set to `RPC server started ok`. This message appears in both a test run that was hanging with `JOINING all threads` and a successful run. Initially the message was set to `core RPC server started ok` with `core` being a variable value. We assume that `core` does not change, but did not to further code analysis what values it can be.

For Monero Wallet RPC container the message is set to `Run server thread name: RPC` which is what it was set to initially. After several container runs this message seems to be reasonable - there are no recorded issues of the Wallet RPC container hanging, but we had problems with Monerod in the past.
2021-04-28 11:44:55 +10:00
Philipp Hoenisch
c8e6db24f8
Derive Tor secret key from seed. 2021-04-27 16:39:32 +10:00
Philipp Hoenisch
3a5395d7a5
Optimize torut features.
OnionV2 addresses are being deprecated and will be fully phased out on 15.10.2021: https://blog.torproject.org/v2-deprecation-timeline
2021-04-27 16:39:32 +10:00
Philipp Hoenisch
632293cf91
Add support for swapping through Tor.
This PR does a few things.
* It adds a TorTransport which either dials through Tor's socks5 proxy or via clearnet.
* It enables ASB to register hidden services for each network it is listening on. We assume that we only care about different ports and re-use the same onion-address for all of them. The ASB requires to have access to Tor's control port.
* It adds support to dial through a local Tor socks5 proxy. We assume that Tor is always available on localhost.  Swap cli only requires Tor to be running so that it can send messages via Tor's socks5 proxy.
* It adds a new e2e test which swaps through Tor. For this we assume that Tor is currently running on localhost. All other tests are running via clear net.
2021-04-27 14:51:41 +10:00
bors[bot]
e262345b4f
Merge #442
442: Minor cleanups towards implementing a Monero wallet for local signing r=thomaseizinger a=thomaseizinger

Extracted out of #434.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-04-27 02:16:27 +00:00
bors[bot]
a84bf11991
Merge #450
450: Bump async-compression from 0.3.7 to 0.3.8 r=thomaseizinger a=dependabot[bot]

Bumps [async-compression](https://github.com/Nemo157/async-compression) from 0.3.7 to 0.3.8.
<details>
<summary>Commits</summary>
<ul>
<li><a href="acae25bdf9"><code>acae25b</code></a> Merge <a href="https://github-redirect.dependabot.com/Nemo157/async-compression/issues/119">#119</a></li>
<li><a href="19fd03f8bb"><code>19fd03f</code></a> Update all locked dependencies</li>
<li><a href="f145824fe7"><code>f145824</code></a> Upgrade ntest</li>
<li><a href="1808080c46"><code>1808080</code></a> Merge <a href="https://github-redirect.dependabot.com/Nemo157/async-compression/issues/118">#118</a></li>
<li><a href="2538217702"><code>2538217</code></a> Bump version to 0.3.8</li>
<li><a href="a23d7a6076"><code>a23d7a6</code></a> Merge <a href="https://github-redirect.dependabot.com/Nemo157/async-compression/issues/115">#115</a></li>
<li><a href="b064a5744d"><code>b064a57</code></a> Merge <a href="https://github-redirect.dependabot.com/Nemo157/async-compression/issues/117">#117</a></li>
<li><a href="c7fe7f9512"><code>c7fe7f9</code></a> update zstd dependency to 1.4.9</li>
<li><a href="429c5b4185"><code>429c5b4</code></a> Use ReaderStream to convert from IO to Stream&lt;Bytes&gt;</li>
<li><a href="f0d69901c6"><code>f0d6990</code></a> Test that replacements do result in the same thing</li>
<li>Additional commits viewable in <a href="https://github.com/Nemo157/async-compression/compare/0.3.7...0.3.8">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-27 01:47:20 +00:00
bors[bot]
80bd860f55
Merge #449
449: Bump rust_decimal from 1.11.1 to 1.12.2 r=thomaseizinger a=dependabot[bot]

Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.11.1 to 1.12.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="5f7f94fb3e"><code>5f7f94f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/357">#357</a> from paupino/version/1.12.2</li>
<li><a href="6779bec5b7"><code>6779bec</code></a> Added zero inverse property tests</li>
<li><a href="41c0bc30f7"><code>41c0bc3</code></a> Version 1.12.2</li>
<li><a href="ca01086b4c"><code>ca01086</code></a> Merge branch 'master' of github.com:paupino/rust-decimal into doc/readme</li>
<li><a href="55de2037cf"><code>55de203</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/356">#356</a> from KonishchevDmitry/master</li>
<li><a href="1b6a708f55"><code>1b6a708</code></a> Fix <code>0 - 0 = -0</code> -&gt; <code>0 - 0 = 0</code></li>
<li><a href="4c387bf589"><code>4c387bf</code></a> Fixes minor omission from docs</li>
<li><a href="000fab7856"><code>000fab7</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/352">#352</a> from paupino/version/1.12.1</li>
<li><a href="9209ad6c3b"><code>9209ad6</code></a> Version 1.12.1</li>
<li><a href="d51e8096f1"><code>d51e809</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/351">#351</a> from paupino/version/1.12</li>
<li>Additional commits viewable in <a href="https://github.com/paupino/rust-decimal/compare/1.11.1...1.12.2">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-27 01:23:48 +00:00
dependabot[bot]
b7abf2addb
Bump async-compression from 0.3.7 to 0.3.8
Bumps [async-compression](https://github.com/Nemo157/async-compression) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/Nemo157/async-compression/releases)
- [Commits](https://github.com/Nemo157/async-compression/compare/0.3.7...0.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 09:30:49 +00:00
dependabot[bot]
eb19036d3f
Bump rust_decimal from 1.11.1 to 1.12.2
Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.11.1 to 1.12.2.
- [Release notes](https://github.com/paupino/rust-decimal/releases)
- [Commits](https://github.com/paupino/rust-decimal/compare/1.11.1...1.12.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 09:30:40 +00:00
Thomas Eizinger
101483118a
Always display log output in CI 2021-04-26 18:12:58 +10:00
Thomas Eizinger
8d76607343
Refactor monero-harness containers
1. Split up image::Monero into Monerod and MoneroWalletRpc
2. Don't use `bash` to run the internal command. Instead we disable
the entrypoint script as per https://github.com/XMRto/monero#raw-commands
3. Remove the start up delay by listening for the correct log message.
To make this more resilient, we make the log level NOT configurable and
instead always log verbosely.
2021-04-26 18:12:57 +10:00
Thomas Eizinger
64729ffecc
Don't make tag configurable if we never use that 2021-04-26 18:12:56 +10:00
Thomas Eizinger
0970c2bc72
Initialize reqwest clients with verbose logging 2021-04-26 18:12:56 +10:00
bors[bot]
6230a63c02
Merge #441
441: Print peer ID on debog when starting CLI r=da-kami a=da-kami

In order to add more context to the debug logs we print Bob's peer ID.
This allows identifying peer related logs on the ASB.

Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-04-26 03:01:19 +00:00
Daniel Karzel
0f11ab051e
Print peer ID on debog when starting CLI
In order to add more context to the debug logs we print Bob's peer ID.
This allows identifying peer related logs on the ASB.
2021-04-26 13:00:37 +10:00
Thomas Eizinger
7e688eb7e8
Don't reinvent the wheel
`Alphanumeric` includes uppercase letters and digits as well but
for our usecase, that doesn't matter.
2021-04-26 12:45:41 +10:00
Thomas Eizinger
dc840e1562
Take wallet names by reference
We are always passing constants here. Make that more ergonomic.
2021-04-26 12:45:40 +10:00
Thomas Eizinger
22bdc08c83
Get rid of Bob's swap Builder
Doesn't serve any purpose. We are better of just having two
constructors.
2021-04-26 12:45:40 +10:00
Thomas Eizinger
e266fb07ef
Don't stutter 2021-04-26 12:45:39 +10:00
Thomas Eizinger
7adeaae12d
Be smart about how we import Config
By saying env::Config, we can save a line of code in the imports
and make it clearer, what kind of `Config` this is.
2021-04-26 12:45:39 +10:00
Thomas Eizinger
be5bf01ed4
Don't overqualify types that are already imported 2021-04-26 12:45:38 +10:00
Thomas Eizinger
325fcbdb8c
Introduce protocol::bob::behaviour to mimic structure from alice module 2021-04-26 12:45:37 +10:00
Thomas Eizinger
5b515d6fb2
Don't qualify with alice:: if we are within a module of Alice 2021-04-26 12:45:37 +10:00
Thomas Eizinger
a31d6febca
We don't need to import ourselves 2021-04-26 12:45:36 +10:00
Thomas Eizinger
881913ad9c
Re-order content of harness/mod.rs in a sane way
Most important things come first, remaining items are defined roughly
in the order they are used by the top level components.
2021-04-26 12:45:36 +10:00
Thomas Eizinger
6d06db3259
Use macro-based JSON-RPC client 2021-04-26 12:45:35 +10:00
bors[bot]
c614bcf0bd
Merge #435
435: Bump rust_decimal from 1.11.0 to 1.11.1 r=thomaseizinger a=dependabot[bot]

Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.11.0 to 1.11.1.
<details>
<summary>Commits</summary>
<ul>
<li><a href="044225ec03"><code>044225e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/346">#346</a> from paupino/version/1.11.1</li>
<li><a href="f8df779589"><code>f8df779</code></a> Version 1.11.1</li>
<li><a href="6605da6019"><code>6605da6</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/345">#345</a> from c410-f3r/patch-2</li>
<li><a href="e531d286fc"><code>e531d28</code></a> [docs.rs] Enable all-features</li>
<li>See full diff in <a href="https://github.com/paupino/rust-decimal/compare/1.11.0...1.11.1">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-26 02:13:42 +00:00
bors[bot]
f1608413be
Merge #440
440: Bump hyper from 0.14.5 to 0.14.7 r=thomaseizinger a=dependabot[bot]

Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.5 to 0.14.7.
<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.6</h2>
<h2>Features</h2>
<ul>
<li><strong>client:</strong> add option to allow misplaced spaces in HTTP/1 responses (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2506">#2506</a>) (<a href="11345394d9">11345394</a>)</li>
<li><strong>http1:</strong> add options to preserve header casing (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2480">#2480</a>) (<a href="dbea7716f1">dbea7716</a>, closes <a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2313">#2313</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.7 (2021-04-22)</h3>
<h4>Bug Fixes</h4>
<ul>
<li><strong>http1:</strong> http1_title_case_headers should move Builder (<a href="a303b3c329">a303b3c3</a>)</li>
</ul>
<h4>Features</h4>
<ul>
<li><strong>server:</strong> implement forgotten settings for case preserving (<a href="4fd6c4cb0b">4fd6c4cb</a>)</li>
</ul>
<h3>v0.14.6 (2021-04-21)</h3>
<h4>Features</h4>
<ul>
<li><strong>client:</strong> add option to allow misplaced spaces in HTTP/1 responses (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2506">#2506</a>) (<a href="11345394d9">11345394</a>)</li>
<li><strong>http1:</strong> add options to preserve header casing (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2480">#2480</a>) (<a href="dbea7716f1">dbea7716</a>, closes <a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2313">#2313</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="963dc23f0d"><code>963dc23</code></a> v0.14.7</li>
<li><a href="4fd6c4cb0b"><code>4fd6c4c</code></a> feat(server): implement forgotten settings for case preserving</li>
<li><a href="a303b3c329"><code>a303b3c</code></a> fix(http1): http1_title_case_headers should move Builder</li>
<li><a href="7f69d8f94c"><code>7f69d8f</code></a> v0.14.6</li>
<li><a href="dbea7716f1"><code>dbea771</code></a> feat(http1): add options to preserve header casing (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2480">#2480</a>)</li>
<li><a href="117cc492a6"><code>117cc49</code></a> chore(ci): quiet the warnings when verifying the generated header file (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2507">#2507</a>)</li>
<li><a href="11345394d9"><code>1134539</code></a> feat(client): add option to allow misplaced spaces in HTTP/1 responses (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2506">#2506</a>)</li>
<li><a href="ed2fdb7b6a"><code>ed2fdb7</code></a> chore(ffi): fix compile errors and warnings (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2492">#2492</a>)</li>
<li><a href="aa4a2eaa44"><code>aa4a2ea</code></a> chore(LICENSE): update license year (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2491">#2491</a>)</li>
<li><a href="a5464f761a"><code>a5464f7</code></a> chore(ffi): run gen_header.sh in CI environment (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2488">#2488</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/hyperium/hyper/compare/v0.14.5...v0.14.7">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.5&new-version=0.14.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-26 01:58:39 +00:00
bors[bot]
b46dbd738d
Merge #436
436: use '--seller-peer-id' r=da-kami a=SamouraiDev



Co-authored-by: TDevD <dev@samouraiwallet.com>
2021-04-26 00:19:18 +00:00
dependabot[bot]
0e3d30e711
Bump hyper from 0.14.5 to 0.14.7
Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.5 to 0.14.7.
- [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.5...v0.14.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-23 07:32:40 +00:00
TDevD
621332120e use '--seller-peer-id' 2021-04-21 10:23:18 +02:00
bors[bot]
9e82e7b116
Merge #433
433: `dnsaddr` instead of `dns4` r=da-kami a=da-kami



Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-04-21 04:36:38 +00:00
dependabot[bot]
aafbd26de9
Bump rust_decimal from 1.11.0 to 1.11.1
Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/paupino/rust-decimal/releases)
- [Commits](https://github.com/paupino/rust-decimal/compare/1.11.0...1.11.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-20 07:40:53 +00:00
bors[bot]
3f4ebf5f84
Merge #429
429: Bump dprint/check from v1.2 to v1.3 r=thomaseizinger a=dependabot[bot]

Bumps [dprint/check](https://github.com/dprint/check) from v1.2 to v1.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dprint/check/releases">dprint/check's releases</a>.</em></p>
<blockquote>
<h2>v1.3</h2>
<p>Support dprint 0.13.0</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="73e06d8656"><code>73e06d8</code></a> chore(release): v1.3</li>
<li>See full diff in <a href="https://github.com/dprint/check/compare/v1.2...73e06d86562a052a5fa32b01e1350a7b8de99966">compare view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-20 03:22:08 +00:00
bors[bot]
a5ee32ae23
Merge #420
420: Bump libp2p from 0.36.0 to 0.37.1 r=thomaseizinger a=dependabot[bot]

Bumps [libp2p](https://github.com/libp2p/rust-libp2p) from 0.36.0 to 0.37.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/libp2p/rust-libp2p/releases">libp2p's releases</a>.</em></p>
<blockquote>
<h2>v0.37.1</h2>
<p>See individual <a href="https://github.com/libp2p/rust-libp2p/blob/HEAD/CHANGELOG.md">changelogs</a> for details.</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/libp2p/rust-libp2p/blob/master/CHANGELOG.md">libp2p's changelog</a>.</em></p>
<blockquote>
<h2>Version 0.37.1 [2021-04-14]</h2>
<ul>
<li>Update individual crates.
<ul>
<li><code>libp2p-swarm-derive</code></li>
</ul>
</li>
</ul>
<h2>Version 0.37.0 [2021-04-13]</h2>
<ul>
<li>
<p>Update individual crates.</p>
<ul>
<li><code>libp2p-core</code></li>
<li><code>libp2p-dns</code></li>
<li><code>libp2p-floodsub</code></li>
<li><code>libp2p-gossipsub</code></li>
<li><code>libp2p-kad</code></li>
<li><code>libp2p-mdns</code></li>
<li><code>libp2p-ping</code></li>
<li><code>libp2p-relay</code></li>
<li><code>libp2p-request-response</code></li>
<li><code>libp2p-swarm</code></li>
<li><code>libp2p-wasm-ext</code></li>
<li><code>libp2p-yamux</code></li>
</ul>
</li>
<li>
<p>Drop support for <code>wasm32-unknown-unknown</code> in favor of
<code>wasm32-unknown-emscripten</code> and <code>wasm32-wasi</code> <a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/pull/2038">PR
2038</a>.</p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="40c4287bc9"><code>40c4287</code></a> *: Prepare libp2p-swarm-derive v0.23.0 and libp2p v0.37.1</li>
<li><a href="42441dbd86"><code>42441db</code></a> *: Prepare v0.37.0 release (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2049">#2049</a>)</li>
<li><a href="807ce10656"><code>807ce10</code></a> build(deps): bump actions/cache from v2.1.4 to v2.1.5 (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2050">#2050</a>)</li>
<li><a href="05aa794552"><code>05aa794</code></a> Derive debug for RelayConfig. (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2048">#2048</a>)</li>
<li><a href="426a20c66b"><code>426a20c</code></a> Update yamux requirement from 0.8.0 to 0.9.0 (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/1960">#1960</a>)</li>
<li><a href="8ccb96a9f3"><code>8ccb96a</code></a> *: Drop generic wasm32-unknown-unknown support (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2038">#2038</a>)</li>
<li><a href="687145d784"><code>687145d</code></a> protocols: Derive debug for MemoryStoreConfig and IdentifyConfig (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2029">#2029</a>)</li>
<li><a href="b1b6f2bafe"><code>b1b6f2b</code></a> build(deps): bump styfle/cancel-workflow-action from 0.8.0 to 0.9.0 (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2045">#2045</a>)</li>
<li><a href="de261d5280"><code>de261d5</code></a> .github: Only test benchmarks, don't run them (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2042">#2042</a>)</li>
<li><a href="2d995a62e7"><code>2d995a6</code></a> *: Fix redundant_semicolons warnings (<a href="https://github-redirect.dependabot.com/libp2p/rust-libp2p/issues/2039">#2039</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/libp2p/rust-libp2p/compare/v0.36.0...v0.37.1">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-20 02:58:48 +00:00
dependabot[bot]
19483c5ead
Bump libp2p from 0.36.0 to 0.37.1
Bumps [libp2p](https://github.com/libp2p/rust-libp2p) from 0.36.0 to 0.37.1.
- [Release notes](https://github.com/libp2p/rust-libp2p/releases)
- [Changelog](https://github.com/libp2p/rust-libp2p/blob/master/CHANGELOG.md)
- [Commits](https://github.com/libp2p/rust-libp2p/compare/v0.36.0...v0.37.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-20 11:51:40 +10:00
bors[bot]
9d7f244f7e
Merge #430
430: Bump zip from 0.5.11 to 0.5.12 r=thomaseizinger a=dependabot[bot]

Bumps [zip](https://github.com/zip-rs/zip) from 0.5.11 to 0.5.12.
<details>
<summary>Commits</summary>
<ul>
<li><a href="88e6f87884"><code>88e6f87</code></a> chore: release 0.5.12</li>
<li><a href="2d99f88870"><code>2d99f88</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zip-rs/zip/issues/222">#222</a> from mbrubeck/flate2</li>
<li><a href="c0ef84dd4e"><code>c0ef84d</code></a> Allow flate2 &gt;1.0.14</li>
<li>See full diff in <a href="https://github.com/zip-rs/zip/compare/v0.5.11...v0.5.12">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-20 01:31:32 +00:00
dependabot[bot]
df8bca54d9
Bump dprint/check from v1.2 to v1.3
Bumps [dprint/check](https://github.com/dprint/check) from v1.2 to v1.3.
- [Release notes](https://github.com/dprint/check/releases)
- [Commits](https://github.com/dprint/check/compare/v1.2...73e06d86562a052a5fa32b01e1350a7b8de99966)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-20 01:16:13 +00:00
bors[bot]
a8fb344fc8
Merge #431 #432
431: Bump async-trait from 0.1.49 to 0.1.50 r=thomaseizinger a=dependabot[bot]

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.49 to 0.1.50.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dtolnay/async-trait/releases">async-trait's releases</a>.</em></p>
<blockquote>
<h2>0.1.50</h2>
<ul>
<li>Make compatible with <code>tokio::select</code>, <code>futures::select</code> and similar macros (<a href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/161">#161</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="651ddc1131"><code>651ddc1</code></a> Release 0.1.50</li>
<li><a href="979ecce801"><code>979ecce</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/162">#162</a> from dtolnay/select</li>
<li><a href="4db8933f5f"><code>4db8933</code></a> Suppress clippy mut_mut pedantic lint in test suite</li>
<li><a href="54c5d9ca61"><code>54c5d9c</code></a> Treat select macro always as expression</li>
<li><a href="62f9924834"><code>62f9924</code></a> Add regression test for issue 161</li>
<li>See full diff in <a href="https://github.com/dtolnay/async-trait/compare/0.1.49...0.1.50">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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>

432: Bump rust_decimal from 1.10.3 to 1.11.0 r=thomaseizinger a=dependabot[bot]

Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.10.3 to 1.11.0.
<details>
<summary>Commits</summary>
<ul>
<li><a href="b5ffa94060"><code>b5ffa94</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/344">#344</a> from paupino/version/1.11</li>
<li><a href="467a08d532"><code>467a08d</code></a> Fix up readme.mdg</li>
<li><a href="9bf9e296ca"><code>9bf9e29</code></a> Exclude generated tests</li>
<li><a href="e4d2f94c60"><code>e4d2f94</code></a> Version 1.11</li>
<li><a href="4334b15bbe"><code>4334b15</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/343">#343</a> from paupino/issue/316</li>
<li><a href="711c0fb2af"><code>711c0fb</code></a> Add macro tests to github workflow</li>
<li><a href="e524da308c"><code>e524da3</code></a> Allow reexportable macros via feature flags</li>
<li><a href="e59749aa94"><code>e59749a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/342">#342</a> from paupino/feature/docs</li>
<li><a href="432aede688"><code>432aede</code></a> Merge branch 'master' into feature/docs</li>
<li><a href="a16e060982"><code>a16e060</code></a> Update documentation</li>
<li>Additional commits viewable in <a href="https://github.com/paupino/rust-decimal/compare/1.10.3...1.11.0">compare view</a></li>
</ul>
</details>
<br />


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

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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-04-20 01:15:27 +00:00
Daniel Karzel
80fb9b7393
dnsaddr instead of dns4 2021-04-19 22:48:08 +10:00
bors[bot]
2472d116a2
Merge #428
428: Change the public ASB to use the default port r=da-kami a=da-kami

I noticed that out public ASB is not using the configured default port for `tcp` connections. 
I don't know why that is, but I felt it would be better to update it to use the default port. I already opened port `9939` and closed `9876`.

This has the side-effect that releases prior to `0.4.0` will NOT just work upon startup anymore, because the ASB is not running on the auto-configured port anymore. I think that is a good thing, because the public ASB does not support these versions anymore. 

Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-04-19 11:21:28 +00:00
dependabot[bot]
b88deee663
Bump rust_decimal from 1.10.3 to 1.11.0
Bumps [rust_decimal](https://github.com/paupino/rust-decimal) from 1.10.3 to 1.11.0.
- [Release notes](https://github.com/paupino/rust-decimal/releases)
- [Commits](https://github.com/paupino/rust-decimal/compare/1.10.3...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 09:22:57 +00:00
dependabot[bot]
9b6a29deae
Bump async-trait from 0.1.49 to 0.1.50
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.49 to 0.1.50.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.49...0.1.50)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 09:22:47 +00:00
dependabot[bot]
d1da15338a
Bump zip from 0.5.11 to 0.5.12
Bumps [zip](https://github.com/zip-rs/zip) from 0.5.11 to 0.5.12.
- [Release notes](https://github.com/zip-rs/zip/releases)
- [Commits](https://github.com/zip-rs/zip/compare/v0.5.11...v0.5.12)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 09:22:10 +00:00
Daniel Karzel
33623c3a68
Change the public ASB to use the default port 2021-04-19 12:26:48 +10:00
bors[bot]
56a23fa98f
Merge #426
426: Upgrade to bdk 0.6 r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-04-19 01:24:01 +00:00
Thomas Eizinger
39eea61538
Upgrade to bdk 0.6 2021-04-19 10:14:14 +10:00
bors[bot]
822997c0c3
Merge #425
425: Release version 0.5.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/757973547.
I've updated the changelog and bumped the versions in the manifest files in this commit: 43dc74cd9d.

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-04-17 09:53:41 +00:00
COMIT Botty McBotface
43dc74cd9d Prepare release 0.5.0 2021-04-17 07:23:09 +00:00
bors[bot]
730315da08
Merge #419
419: Update changelog for recent PRs merged r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
Co-authored-by: Daniel Karzel <daniel@comit.network>
2021-04-17 06:53:03 +00:00