dependabot[bot]
4a2bfbf9cf
Bump comfy-table from 4.0.1 to 4.1.1
...
Bumps [comfy-table](https://github.com/nukesor/comfy-table ) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/nukesor/comfy-table/releases )
- [Changelog](https://github.com/Nukesor/comfy-table/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nukesor/comfy-table/compare/v4.0.1...v4.1.1 )
---
updated-dependencies:
- dependency-name: comfy-table
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-20 01:32:09 +00:00
COMIT Botty McBotface
7126d77dc1
Prepare release 0.8.1
2021-08-16 01:37:09 +00:00
Thomas Eizinger
0296509110
Upgrade to bdk 0.10
...
This fixes #546 . I don't know why, but I can't reproduce the problem
with the updated dependency.
2021-08-12 18:47:05 +10:00
Thomas Eizinger
148fdb8d0a
Ensure the size of our locking script never changes
2021-08-12 18:39:31 +10:00
dependabot[bot]
8ea0877dc1
Bump comfy-table from 4.0.0 to 4.0.1
...
Bumps [comfy-table](https://github.com/nukesor/comfy-table ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/nukesor/comfy-table/releases )
- [Changelog](https://github.com/Nukesor/comfy-table/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nukesor/comfy-table/compare/v4.0.0...v4.0.1 )
---
updated-dependencies:
- dependency-name: comfy-table
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-09 11:08:51 +00:00
COMIT Botty McBotface
403e3d2b33
Prepare release 0.8.0
2021-07-09 02:02:13 +00:00
Daniel Karzel
ab24f7bce5
Revert "Prepare release 0.8.0"
...
This reverts commit 50da9580
2021-07-08 15:03:37 +10:00
COMIT Botty McBotface
50da958078
Prepare release 0.8.0
2021-07-07 08:31:00 +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
Thomas Eizinger
5463bde4f8
Add a mandatory --change-address parameter to buy-xmr
...
Fixes #513 .
2021-07-06 20:07:53 +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
Daniel Karzel
818147a629
swap_setup instead of spot_price and execution_setup
...
Having `spot_price` and `execution_setup` as separate protocols did not bring any advantages, but was problematic because we had to ensure that `execution_setup` would be triggered after `spot_price`. Because of this dependency it is better to combine the protocols into one.
Combining the protocols also allows a refactoring to get rid of the `libp2p-async-await` dependency.
Alice always listens for the `swap_setup` protocol. When Bob opens a substream on that protocol the spot price is communicated, and then all execution setup messages (swap-id and signature exchange).
2021-06-28 10:04:07 +10:00
dependabot[bot]
9577875834
Bump bdk from 0.7.0 to 0.8.0
...
Bumps [bdk](https://github.com/bitcoindevkit/bdk ) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/bitcoindevkit/bdk/releases )
- [Changelog](https://github.com/bitcoindevkit/bdk/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bitcoindevkit/bdk/compare/v0.7.0...v0.8.0 )
---
updated-dependencies:
- dependency-name: bdk
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-21 11:16:45 +10:00
bors[bot]
7f2aa59880
Merge #504 #547 #556 #563 #564
...
504: Bump bdk from 0.6.0 to 0.7.0 r=thomaseizinger a=dependabot[bot]
Bumps [bdk](https://github.com/bitcoindevkit/bdk ) from 0.6.0 to 0.7.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/bitcoindevkit/bdk/blob/v0.7.0/CHANGELOG.md ">bdk's changelog</a>.</em></p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="766570abfd934ec366d9d0733e94963c7a1f591885aadaccd2fad0fe9f3047f26447da3608ff9f14898dfe6cf17961ae7f8ehttps://github.com/bitcoindevkit/bdk/compare/v0.6.0...v0.7.0 ">compare view</a></li>
</ul>
</details>
<br />
[](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>
547: Print the Bitcoin address to the terminal as a QR code r=thomaseizinger a=xscd
It helps to fund the Bitcoin address with your mobile device without a need to copy-paste the receive address.
Here is how it looks like under different terminals:
1) Gnome Terminal:
2) Alacritty:
3) Kitty:
4) Konsole:
556: Bump rust_decimal from 1.14.1 to 1.14.2 r=thomaseizinger a=dependabot[bot]
Bumps [rust_decimal](https://github.com/paupino/rust-decimal ) from 1.14.1 to 1.14.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="16b41cc58chttps://github-redirect.dependabot.com/paupino/rust-decimal/issues/394 ">#394</a> from paupino/version/1.14.2</li>
<li><a href="c7bd3bf987c0117ddc36https://github-redirect.dependabot.com/paupino/rust-decimal/issues/393 ">#393</a> from paupino/issue/392</li>
<li><a href="a231fbf12chttps://github.com/paupino/rust-decimal/compare/1.14.1...1.14.2 ">compare view</a></li>
</ul>
</details>
<br />
[](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>
563: Bump tokio from 1.6.0 to 1.7.0 r=thomaseizinger a=dependabot[bot]
Bumps [tokio](https://github.com/tokio-rs/tokio ) from 1.6.0 to 1.7.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 v1.7.0</h2>
<h1>1.7.0 (June 15, 2021)</h1>
<h3>Added</h3>
<ul>
<li>net: add named pipes on windows (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3760 ">#3760</a>)</li>
<li>net: add <code>TcpSocket</code> from <code>std::net::TcpStream</code> conversion (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3838 ">#3838</a>)</li>
<li>sync: add <code>receiver_count</code> to <code>watch::Sender</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3729 ">#3729</a>)</li>
<li>sync: export <code>sync::notify::Notified</code> future publicly (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3840 ">#3840</a>)</li>
<li>tracing: instrument task wakers (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3836 ">#3836</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>macros: suppress <code>clippy::default_numeric_fallback</code> lint in generated code (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3831 ">#3831</a>)</li>
<li>runtime: immediately drop new tasks when runtime is shut down (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3752 ">#3752</a>)</li>
<li>sync: deprecate unused <code>mpsc::RecvError</code> type (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3833 ">#3833</a>)</li>
</ul>
<h3>Documented</h3>
<ul>
<li>io: clarify EOF condition for <code>AsyncReadExt::read_buf</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3850 ">#3850</a>)</li>
<li>io: clarify limits on return values of <code>AsyncWrite::poll_write</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3820 ">#3820</a>)</li>
<li>sync: add examples to Semaphore (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3808 ">#3808</a>)</li>
</ul>
<h2>Tokio v1.6.2</h2>
<h3>Fixes</h3>
<ul>
<li>test: sub-ms <code>time:advance</code> regression introduced in 1.6 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3852 ">#3852</a>)</li>
</ul>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3852 ">#3852</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/pull/3852 ">tokio-rs/tokio#3852</a></p>
<h2>Tokio v1.6.1</h2>
<p>This release reverts <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3518 ">#3518</a> because it doesn't work on some kernels due to
a kernel bug. (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3803 ">#3803</a>)</p>
<p><a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3518 ">#3518</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3518 ">tokio-rs/tokio#3518</a>
<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3803 ">#3803</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3803 ">tokio-rs/tokio#3803</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="34c6a26c01https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3863 ">#3863</a>)</li>
<li><a href="97e7830364https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3760 ">#3760</a>)</li>
<li><a href="606206ecaddfe4013ff2https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3859 ">#3859</a>)</li>
<li><a href="18779aa2e2https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3852 ">#3852</a>)</li>
<li><a href="2c24a028f6https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3844 ">#3844</a>)</li>
<li><a href="f55b77aaddhttps://github-redirect.dependabot.com/tokio-rs/tokio/issues/3853 ">#3853</a>)</li>
<li><a href="21de476ae7https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3840 ">#3840</a>)</li>
<li><a href="cb147a2b3fhttps://github-redirect.dependabot.com/tokio-rs/tokio/issues/3833 ">#3833</a>)</li>
<li><a href="f759240254https://github-redirect.dependabot.com/tokio-rs/tokio/issues/3851 ">#3851</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tokio/compare/tokio-1.6.0...tokio-1.7.0 ">compare view</a></li>
</ul>
</details>
<br />
[](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>
564: Bump thomaseizinger/create-pull-request from 1.0.0 to 1.1.0 r=thomaseizinger a=dependabot[bot]
Bumps [thomaseizinger/create-pull-request](https://github.com/thomaseizinger/create-pull-request ) from 1.0.0 to 1.1.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/thomaseizinger/create-pull-request/blob/master/CHANGELOG.md ">thomaseizinger/create-pull-request's changelog</a>.</em></p>
<blockquote>
<h2>[1.1.0] - 2021-06-16</h2>
<h3>Added</h3>
<ul>
<li>Git hook to make sure we always run <code>yarn build</code> before committing any Typescript changes. This should prevent dist/index.js from getting out of date.</li>
<li>Support for setting a proxy using the <code>HTTPS_PROXY</code> environment variable</li>
<li>Support for GitHub Enterprise by reading <code>process.env.GITHUB_REPOSITORY</code></li>
</ul>
<h3>Fixed</h3>
<ul>
<li>action.yml suggested to use <code>github-token</code> as the input where as in reality, we are looking for an input <code>github_token</code> (note the underscore!)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="285345fb83https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/41 ">#41</a>)</li>
<li><a href="13c98abb44https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/37 ">#37</a> from orestesgaolin/patch-1</li>
<li><a href="5c8c2b6c091dde00b9ad655db51f4acedbbbb2ba2cd3e70bc6faf5ed2aa53fb1c8b1bee46f94e6aehttps://github.com/thomaseizinger/create-pull-request/compare/1.0.0...1.1.0 ">compare view</a></li>
</ul>
</details>
<br />
[](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: xscd <xscd@pm.me>
2021-06-17 01:06:54 +00:00
xscd
03857ca835
Print the Bitcoin address to the terminal as a QR code
2021-06-16 15:18:16 +03:00
dependabot[bot]
e9595487f6
Bump strum from 0.20.0 to 0.21.0
...
Bumps [strum](https://github.com/Peternator7/strum ) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/Peternator7/strum/releases )
- [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Peternator7/strum/commits )
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 06:45:25 +00:00
dependabot[bot]
6badf09394
Bump bdk from 0.6.0 to 0.7.0
...
Bumps [bdk](https://github.com/bitcoindevkit/bdk ) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/bitcoindevkit/bdk/releases )
- [Changelog](https://github.com/bitcoindevkit/bdk/blob/v0.7.0/CHANGELOG.md )
- [Commits](https://github.com/bitcoindevkit/bdk/compare/v0.6.0...v0.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 18:42:25 +10:00
COMIT Botty McBotface
7e6ff81efb
Prepare release 0.7.0
2021-05-28 07:17:26 +00:00
bors[bot]
baf5a0896e
Merge #536
...
536: Switch to using stable Rust instead of nightly r=thomaseizinger a=thomaseizinger
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-05-28 04:47:26 +00:00
Daniel Karzel
c9064d5a37
Add ping protocol to ensure connection is alive
...
Adds the ping behaviour to both ASB and CLI behaviour that periodically pings a connected party to ensure that the underlying network connection is still alive.
This fixes problems with long-running connections that become dead without a connection closure being reported back to the swarm.
2021-05-27 11:19:27 +10:00
Thomas Eizinger
b8cb9e1b8b
Update secp256kfun and rand to latest version
...
This will allow us to compile on stable Rust.
The latest version of `secp256kfun` uses `curve25519-dalek-ng` instead
of the original curve25519-dalek crate. Instead of converting back and
forth, we simply switch to this crate as well. Judging from the README
it is just a fork because there was trouble between the maintainers of
the original crate.
2021-05-25 15:35:13 +10:00
COMIT Botty McBotface
3f2d094f65
Prepare release 0.6.0
2021-05-24 16:00:43 +10:00
dependabot[bot]
6c206c7067
Bump libp2p from 0.37.1 to 0.38.0
...
Bumps [libp2p](https://github.com/libp2p/rust-libp2p ) from 0.37.1 to 0.38.0.
- [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.37.1...v0.38.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-18 06:33:38 +00:00
Thomas Eizinger
a3f436104f
Use tokio-tar from crates.io
2021-05-18 12:52:17 +10:00
Thomas Eizinger
75c5db53b2
Remove tokio-tar from workspace in favor of git dependency
...
Fixes #315 .
Fixes #227 .
2021-05-17 11:04:20 +10:00
Philipp Hoenisch
fc0cceb180
Toggle json logs using commandline flag.
2021-05-11 15:28:25 +10:00
Daniel Karzel
1d62f4916c
Move max_buy and ask_spread into config
...
Max-buy and spread is not something that one would configure on every run.
More convenient to keep this in the config.
The max-buy Bitcoin value was adapted to `0.02` which is more reasonable for mainnet.
Activated feature `serde-float` to serialize the spread (Decimal) as float instead of string.
```
...
[maker]
max_buy_btc = 0.02
ask_spread = 0.02
```
2021-05-11 12:02:57 +10:00
Philipp Hoenisch
b5073e3052
Use rust_decimal in estimate_fee function.
2021-05-10 10:53:43 +10:00
Philipp Hoenisch
e93eeb81a2
Added some proptests.
2021-05-07 10:24:41 +10:00
Thomas Eizinger
dd6bfd3bf4
Extend RPC client for monerod with binary requests
2021-04-30 10:28:45 +10:00
Thomas Eizinger
1820139786
Use dprint for formatting Cargo.toml files
...
Invoking cargo tomlfmt on all files is a PITA and as we can see from
the CI scripts, it is often forgotten to as new crates are added to
the workspace.
Using dprint for toml files fixes this.
Unfortunately, we can't use dprint for Rust code yet because there
hasn't been a release of rustfmt in quite a while but we are already
using features from a newer rustfmt via rustup.
2021-04-29 17:35:02 +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
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
Thomas Eizinger
39eea61538
Upgrade to bdk 0.6
2021-04-19 10:14:14 +10:00
COMIT Botty McBotface
43dc74cd9d
Prepare release 0.5.0
2021-04-17 07:23:09 +00:00
Daniel Karzel
f70e2aa8d6
Listen on tcp and websocket transports
...
- Listen on both tcp and websockets as default
- Listening addresses in config as array
- Configure fallback transport using `or_transport` - if listening on a given address fails on WS, we fall back to TCP.
2021-04-16 16:00:38 +10:00
rishflab
9745d150e7
Log at debug level to file
...
EnvFilter is applied globally. This means you cannot log at INFO level
to the terminal and at DEBUG level to log files. To get a around this
limitation I had to implement the layer trait on a new type and filter
in the on_event() trait method. Each swap has its own log file denoted
by its swap_id. The logger appends to the existing file when resuming a
swap.
Closes #278
2021-04-08 16:10:35 +10:00
COMIT Botty McBotface
1687f84aa1
Prepare release 0.4.0
2021-04-06 08:20:31 +00:00
bors[bot]
e0b859bb1e
Merge #387
...
387: Improve the resilience of the network layer r=thomaseizinger a=thomaseizinger
We improve the resilience in two ways:
1. Use a timeout on Bob's side for the execution-setup.
2. Use the `bmrng` library to model the communication between Alice and Bob.
See commit messages for details.
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
2021-04-06 06:20:30 +00:00
Daniel Karzel
0341e7c9fc
Point BDK to commit that fixes overflow error
...
Edge cases of UTXOs where value < fee cause the BDK's `coin_select` calculation to panic.
This issue was fixed upstream thus we point the BDK dependency against the commit of the merged fix.
2021-04-06 14:50:27 +10:00
Thomas Eizinger
1c47b32681
Use bmrng to model communicaton of Bob's EventLoop with the handle
...
bmrng is a library providing a request-response channel that allows
the receiving end of the channel to send a response back to the sender.
This allows us to more accurately implement the functions on the
`EventLoopHandle`. In particular, we now _wait_ for the ACK of specific
messages from the other party before resolving the future.
For example, when sending the encrypted signature, the async function
on the `EventLoopHandle` does not resolve until we received the ACK
from the other party.
We also delete the `Channels` abstraction in favor of directly creating
bmrng channels. This allows us to directly control the channel buffer
which we set to 1 because we don't need more than that on Bob's side.
2021-04-01 17:09:17 +11:00
Daniel Karzel
1c129d58c4
Distinguish loading all swaps for alice or bob on db level
2021-04-01 16:03:28 +11:00
bors[bot]
6df26109aa
Merge #389
...
389: Bump bdk-testutils from 0.3.0 to 0.4.0 r=thomaseizinger a=dependabot[bot]
Bumps [bdk-testutils](https://github.com/bitcoindevkit/bdk ) from 0.3.0 to 0.4.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/bitcoindevkit/bdk/releases ">bdk-testutils's releases</a>.</em></p>
<blockquote>
<h2>v0.4.0</h2>
<p>The v0.4.0 release brings updated dependencies, more sanity checks and an overhauled API to build transactions.</p>
<p>You can find the full v0.4.0 changelog on GitHub.</p>
<p>As always, thanks to everybody who contributed to this release!</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/bitcoindevkit/bdk/blob/master/CHANGELOG.md ">bdk-testutils's changelog</a>.</em></p>
<blockquote>
<h2>[v0.5.0] - [v0.4.0]</h2>
<h3>Misc</h3>
<h4>Changed</h4>
<ul>
<li>Updated <code>electrum-client</code> to version <code>0.7</code></li>
</ul>
<h3>Wallet</h3>
<h4>Changed</h4>
<ul>
<li><code>FeeRate</code> constructors <code>from_sat_per_vb</code> and <code>default_min_relay_fee</code> are now <code>const</code> functions</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="e3f893dbd13f5513a2d6fcf5e971a6cdf7b331047bbff79d4b3a2b8bdb857843732e176092c6e789b61427c07bfa2610538fhttps://github.com/bitcoindevkit/bdk/compare/v0.3.0...v0.4.0 ">compare view</a></li>
</ul>
</details>
<br />
[](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-03-31 01:13:05 +00:00
dependabot[bot]
8440cb9d9a
Bump monero from 0.10.0 to 0.11.1
...
Bumps [monero](https://github.com/monero-rs/monero-rs ) from 0.10.0 to 0.11.1.
- [Release notes](https://github.com/monero-rs/monero-rs/releases )
- [Commits](https://github.com/monero-rs/monero-rs/compare/v0.10.0...v0.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 07:26:53 +00:00
dependabot[bot]
04fc870756
Bump bdk-testutils from 0.3.0 to 0.4.0
...
Bumps [bdk-testutils](https://github.com/bitcoindevkit/bdk ) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/bitcoindevkit/bdk/releases )
- [Changelog](https://github.com/bitcoindevkit/bdk/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bitcoindevkit/bdk/compare/v0.3.0...v0.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 07:26:39 +00:00
Thomas Eizinger
52b9a78de2
Alice to validate Bob's PSBT for correctness
...
In order for the re-construction of TxLock to be meaningful, we limit
`Message2` to the PSBT instead of the full struct. This is a breaking
change in the network layer.
The PSBT is valid if:
- It has at most two outputs (we allow a change output)
- One of the outputs pays the agreed upon amount to a shared output script
Resolves #260 .
2021-03-30 13:02:56 +11:00
bors[bot]
6fb495b6ab
Merge #383 #385 #386
...
383: Improve resilience of balance assertions r=thomaseizinger a=thomaseizinger
The final commit is the relevant patch!
It sits on top of several refactoring commits that happened while I was debugging why things didn't work as expected. Turned out to be reasonably useful so I just left them in :)
385: Bump anyhow from 1.0.39 to 1.0.40 r=thomaseizinger a=dependabot[bot]
Bumps [anyhow](https://github.com/dtolnay/anyhow ) from 1.0.39 to 1.0.40.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/dtolnay/anyhow/releases ">anyhow's releases</a>.</em></p>
<blockquote>
<h2>1.0.40</h2>
<ul>
<li>Reduce memory footprint of errors on Rust versions 1.51+ (<a href="https://github-redirect.dependabot.com/dtolnay/anyhow/issues/145 ">#145</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="704622f25d64ac0c00a9https://github-redirect.dependabot.com/dtolnay/anyhow/issues/145 ">#145</a> from dtolnay/addrof</li>
<li><a href="ef082670ea1295b1fef9be89adf403ac64560c422987c9b59e827bb9d4c6ce0041866dhttps://github-redirect.dependabot.com/dtolnay/anyhow/issues/144 ">#144</a> from dtolnay/ptr</li>
<li><a href="3c32aa7dcdhttps://github.com/dtolnay/anyhow/compare/1.0.39...1.0.40 ">compare view</a></li>
</ul>
</details>
<br />
[](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>
386: Bump hyper from 0.14.4 to 0.14.5 r=thomaseizinger a=dependabot[bot]
Bumps [hyper](https://github.com/hyperium/hyper ) from 0.14.4 to 0.14.5.
<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.5</h2>
<h2>Bug Fixes</h2>
<ul>
<li><strong>client:</strong> omit default port from automatic Host headers (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2441 ">#2441</a>) (<a href="0b11eee9bdhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2471 ">#2471</a>) (<a href="48fdaf1606https://github-redirect.dependabot.com/hyperium/hyper/issues/2470 ">#2470</a>)</li>
<li><strong>server:</strong> skip automatic Content-Length headers when not allowed (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2216 ">#2216</a>) (<a href="8cbf9527dfhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2215 ">#2215</a>)</li>
</ul>
<h2>Features</h2>
<ul>
<li><strong>client:</strong> allow HTTP/0.9 responses behind a flag (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2473 ">#2473</a>) (<a href="68d4e4a3dbhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2468 ">#2468</a>)</li>
<li><strong>server:</strong> add <code>AddrIncoming::from_listener</code> constructor (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2439 ">#2439</a>) (<a href="4c946af49chttps://github.com/hyperium/hyper/blob/master/CHANGELOG.md ">hyper's changelog</a>.</em></p>
<blockquote>
<h3>v0.14.5 (2021-03-26)</h3>
<h4>Bug Fixes</h4>
<ul>
<li><strong>client:</strong> omit default port from automatic Host headers (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2441 ">#2441</a>) (<a href="0b11eee9bdhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2471 ">#2471</a>) (<a href="48fdaf1606https://github-redirect.dependabot.com/hyperium/hyper/issues/2470 ">#2470</a>)</li>
<li><strong>server:</strong> skip automatic Content-Length headers when not allowed (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2216 ">#2216</a>) (<a href="8cbf9527dfhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2215 ">#2215</a>)</li>
</ul>
<h4>Features</h4>
<ul>
<li><strong>client:</strong> allow HTTP/0.9 responses behind a flag (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2473 ">#2473</a>) (<a href="68d4e4a3dbhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2468 ">#2468</a>)</li>
<li><strong>server:</strong> add <code>AddrIncoming::from_listener</code> constructor (<a href="https://github-redirect.dependabot.com/hyperium/hyper/issues/2439 ">#2439</a>) (<a href="4c946af49c98e7e0bd15895e4cf3fbhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2478 ">#2478</a>)</li>
<li><a href="68d4e4a3dbhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2473 ">#2473</a>)</li>
<li><a href="51ed71b0a6https://hyper.rs/guide ">https://hyper.rs/guide </a>...</li>
<li><a href="41f99578a5https://github-redirect.dependabot.com/hyperium/hyper/issues/2472 ">#2472</a>)</li>
<li><a href="48fdaf1606https://github-redirect.dependabot.com/hyperium/hyper/issues/2471 ">#2471</a>)</li>
<li><a href="eb0e718696https://github-redirect.dependabot.com/hyperium/hyper/issues/2464 ">#2464</a>)</li>
<li><a href="297a068454https://github-redirect.dependabot.com/hyperium/hyper/issues/2456 ">#2456</a>)</li>
<li><a href="34085afef6https://github-redirect.dependabot.com/hyperium/hyper/issues/2451 ">#2451</a>)</li>
<li><a href="8cbf9527dfhttps://github-redirect.dependabot.com/hyperium/hyper/issues/2216 ">#2216</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/hyperium/hyper/compare/v0.14.4...v0.14.5 ">compare view</a></li>
</ul>
</details>
<br />
[](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: Thomas Eizinger <thomas@eizinger.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-29 22:31:43 +00:00
