Bitcoin–Monero Cross-chain Atomic Swap
Go to file
bors[bot] d52f4f7727
Merge #831 #833 #853 #861 #866 #874
831: Bump structopt from 0.3.23 to 0.3.25 r=rishflab a=dependabot[bot]

Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.23 to 0.3.25.
<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.25 (2021-10-18)</h1>
<ul>
<li>Fix duplication of aliases in subcommands <a href="https://github-redirect.dependabot.com/TeXitoi/structopt/pull/504">#504</a></li>
</ul>
<h1>v0.3.25 (2021-10-18)</h1>
<ul>
<li>No changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="da1fff81ad"><code>da1fff8</code></a> v0.3.25</li>
<li><a href="e83b0fcf8a"><code>e83b0fc</code></a> Merge branch 'master' of github.com:TeXitoi/structopt</li>
<li><a href="6dc2963fe6"><code>6dc2963</code></a> v0.4.17</li>
<li><a href="ddb51cb33f"><code>ddb51cb</code></a> Fix duplication of aliases in subcommands</li>
<li><a href="701d6ddbc1"><code>701d6dd</code></a> Remove most <code>ignore</code>s and the <code>should_panic</code> from code blocks in documentation</li>
<li><a href="d30aff1e46"><code>d30aff1</code></a> Improve doc code block formatting</li>
<li><a href="32d6e6dee9"><code>32d6e6d</code></a> Bless Rust <code>1.55</code> test output</li>
<li>See full diff in <a href="https://github.com/TeXitoi/structopt/compare/v0.3.23...v0.3.25">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.23&new-version=0.3.25)](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>

833: Bump serde_with from 1.10.0 to 1.11.0 r=rishflab a=dependabot[bot]

Bumps [serde_with](https://github.com/jonasbb/serde_with) from 1.10.0 to 1.11.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/jonasbb/serde_with/releases">serde_with's releases</a>.</em></p>
<blockquote>
<h2>serde_with v1.11.0</h2>
<h3>Added</h3>
<ul>
<li>
<p>Serialize bytes as base64 encoded strings.<br />
The character set and padding behavior can be configured.</p>
<pre lang="rust"><code>// Rust
#[serde_as(as = &quot;serde_with::base64::Base64&quot;)]
value: Vec&lt;u8&gt;,
#[serde_as(as = &quot;Base64&lt;Bcrypt, Unpadded&gt;&quot;)]
bcrypt_unpadded: Vec&lt;u8&gt;,
<p>// JSON
&quot;value&quot;: &quot;SGVsbG8gV29ybGQ=&quot;,
&quot;bcrypt_unpadded&quot;: &quot;QETqZE6eT07wZEO&quot;,
</code></pre></p>
</li>
<li>
<p>The minimal supported Rust version (MSRV) is now specified in the <code>Cargo.toml</code> via the <code>rust-version</code> field. The field is supported in Rust 1.56 and has no effect on versions before.</p>
<p>More details: <a href="https://doc.rust-lang.org/nightly/cargo/reference/manifest.html#the-rust-version-field">https://doc.rust-lang.org/nightly/cargo/reference/manifest.html#the-rust-version-field</a></p>
</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Fixed RUSTSEC-2020-0071 in the <code>time</code> v0.1 dependency, but changing the feature flags of the <code>chrono</code> dependency. This should not change anything. Crates requiring the <code>oldtime</code> feature of <code>chrono</code> can enable it separately.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="0243453497"><code>0243453</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/380">#380</a></li>
<li><a href="30ec108368"><code>30ec108</code></a> Bump versions to 1.11.0 and 1.5.1</li>
<li><a href="1733ae56f3"><code>1733ae5</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/379">#379</a></li>
<li><a href="7a9dffe26d"><code>7a9dffe</code></a> chrono insecurly uses <code>localtime_r</code></li>
<li><a href="d91731b5f5"><code>d91731b</code></a> Remove default features from chrono to get rid of the oldtime feature</li>
<li><a href="a561ac5c0c"><code>a561ac5</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/377">#377</a></li>
<li><a href="69c9303a49"><code>69c9303</code></a> Only pin major version in actions</li>
<li><a href="75bfa5920b"><code>75bfa59</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/374">#374</a></li>
<li><a href="40df0508cb"><code>40df050</code></a> Specify the MSRV in the Cargo.toml</li>
<li><a href="bb1c03a9e2"><code>bb1c03a</code></a> Merge <a href="https://github-redirect.dependabot.com/jonasbb/serde_with/issues/373">#373</a></li>
<li>Additional commits viewable in <a href="https://github.com/jonasbb/serde_with/compare/v1.10.0...v1.11.0">compare view</a></li>
</ul>
</details>
<br />


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

853: Bump rust_decimal_macros from 1.16.0 to 1.18.0 r=rishflab a=dependabot[bot]

Bumps [rust_decimal_macros](https://github.com/paupino/rust-decimal) from 1.16.0 to 1.18.0.
<details>
<summary>Commits</summary>
<ul>
<li><a href="6766bafb3a"><code>6766baf</code></a> Version 1.18.0 (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/447">#447</a>)</li>
<li><a href="b4e72bccc0"><code>b4e72bc</code></a> Add MySQL support for Diesel (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/446">#446</a>)</li>
<li><a href="2f2d0fbe46"><code>2f2d0fb</code></a> Fixes integer handling in Decimal::to_f64 by expanding range (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/443">#443</a>)</li>
<li><a href="9b6a1cefe0"><code>9b6a1ce</code></a> Add support for Rocket forms (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/445">#445</a>)</li>
<li><a href="f01dd0c773"><code>f01dd0c</code></a> Version 1.17.0 (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/442">#442</a>)</li>
<li><a href="d762427801"><code>d762427</code></a> Feature: Retain excess precision during float conversions (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/441">#441</a>)</li>
<li><a href="5ff1538b5a"><code>5ff1538</code></a> Fixes significant figure calcs for small numbers (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/440">#440</a>)</li>
<li><a href="980c98704a"><code>980c987</code></a> Auto rounding of scales 29, 30 and 31 for deserialization (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/436">#436</a>)</li>
<li><a href="67c29ef307"><code>67c29ef</code></a> Fixes issue with mantissa sf calculation (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/434">#434</a>)</li>
<li><a href="c74bd40701"><code>c74bd40</code></a> Fixes Display Overflow issue when using precision greater than 30 (<a href="https://github-redirect.dependabot.com/paupino/rust-decimal/issues/433">#433</a>)</li>
<li>See full diff in <a href="https://github.com/paupino/rust-decimal/compare/1.16.0...1.18.0">compare view</a></li>
</ul>
</details>
<br />


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

861: Bump thomaseizinger/create-pull-request from 1.2.1 to 1.2.2 r=rishflab a=dependabot[bot]

Bumps [thomaseizinger/create-pull-request](https://github.com/thomaseizinger/create-pull-request) from 1.2.1 to 1.2.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="ed928d9a28"><code>ed928d9</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/174">#174</a> from uluzox/master</li>
<li><a href="c12554b15f"><code>c12554b</code></a> add input 'repository'</li>
<li><a href="843eecc34a"><code>843eecc</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/164">#164</a> from thomaseizinger/dependabot/npm_and_yarn/tar-4.4.19</li>
<li><a href="96bcc576df"><code>96bcc57</code></a> Bump tar from 4.4.15 to 4.4.19</li>
<li><a href="330dc75f44"><code>330dc75</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/157">#157</a> from thomaseizinger/dependabot/npm_and_yarn/path-pars...</li>
<li><a href="6e35354371"><code>6e35354</code></a> Bump path-parse from 1.0.6 to 1.0.7</li>
<li><a href="133e95ec62"><code>133e95e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/151">#151</a> from thomaseizinger/dependabot/npm_and_yarn/node-fetc...</li>
<li><a href="900803c415"><code>900803c</code></a> Bump node-fetch from 2.6.0 to 2.6.1</li>
<li><a href="56ebc6093e"><code>56ebc60</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/thomaseizinger/create-pull-request/issues/145">#145</a> from thomaseizinger/remove-eslint</li>
<li><a href="4a98166d2b"><code>4a98166</code></a> Run build script</li>
<li>Additional commits viewable in <a href="https://github.com/thomaseizinger/create-pull-request/compare/1.2.1...1.2.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=thomaseizinger/create-pull-request&package-manager=github_actions&previous-version=1.2.1&new-version=1.2.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>

866: Fix electrum query failing (CloseNotify bug) r=rishflab a=devbordecraft

Retry query the electrum server if it fail. This address #797 

874: Bump async-trait from 0.1.51 to 0.1.52 r=rishflab a=dependabot[bot]

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.51 to 0.1.52.
<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.52</h2>
<ul>
<li>Eliminate <code>clippy::shadow_some</code> restriction lint from generated code (<a href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/184">#184</a>, thanks <a href="https://github.com/c410-f3r"><code>`@​c410-f3r</code></a>)</li>`
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="20bd296e0d"><code>20bd296</code></a> Release 0.1.52</li>
<li><a href="076b7303ab"><code>076b730</code></a> Touch up PR 184</li>
<li><a href="9c42e3d90d"><code>9c42e3d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/184">#184</a> from c410-f3r/clippy</li>
<li><a href="7f0d4b6488"><code>7f0d4b6</code></a> Format PR 184 with rustfmt</li>
<li><a href="572f7e95f4"><code>572f7e9</code></a> Sort lint_suppress_with_body</li>
<li><a href="5629db9678"><code>5629db9</code></a> Fix <code>clippy::shadow_same</code> warning</li>
<li><a href="c5de48ef87"><code>c5de48e</code></a> Update ui test suite to nightly-2021-11-26</li>
<li><a href="7080dc8c99"><code>7080dc8</code></a> Raise minimum tested version to rustc 1.45</li>
<li><a href="278abc7ab4"><code>278abc7</code></a> Install newest build of cargo-outdated</li>
<li><a href="1ab566d3e7"><code>1ab566d</code></a> Remove noisy warnings from unreachable ui test</li>
<li>Additional commits viewable in <a href="https://github.com/dtolnay/async-trait/compare/0.1.51...0.1.52">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.51&new-version=0.1.52)](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: devbordecraft <devbordecraft>
2021-12-21 06:22:14 +00:00
.cargo .cargo/config.toml for specifying linker 2021-03-15 14:36:05 +11:00
.github Bump thomaseizinger/create-pull-request from 1.2.1 to 1.2.2 2021-12-08 11:08:03 +00:00
docs Add note to readme that --testnet swaps on monero stagenet 2021-09-02 13:47:29 +10:00
monero-harness Drop monero-wallet-rpc test container if errors 2021-06-23 15:07:36 +10:00
monero-rpc Load wallet in monero-wallet-rpc on demand if necessary 2021-08-27 09:39:29 +10:00
monero-wallet Introduce monero-wallet crate 2021-04-30 10:28:46 +10:00
swap Merge #831 #833 #853 #861 #866 #874 2021-12-21 06:22:14 +00:00
.gitignore Push cargo lock to git as we are building a binary 2020-12-01 09:31:41 +11:00
bors.toml Remove flaky test 2021-10-07 10:00:17 +11:00
Cargo.lock Merge #831 #833 #853 #861 #866 #874 2021-12-21 06:22:14 +00:00
Cargo.toml Update secp256kfun and rand to latest version 2021-05-25 15:35:13 +10:00
CHANGELOG.md Fix electrum query failing (CloseNotify bug) and use a more stable mainnet electrum server. 2021-12-11 20:07:34 +01:00
CONTRIBUTING.md Create CONTRIBUTING.md 2021-06-29 10:58:00 +10:00
dprint.json Replace cargo-fmt with dprint 2021-05-25 16:11:48 +10:00
LICENSE Change license to GPLv3 2020-10-12 17:13:25 +11:00
README.md Add section that discourages bumping fees 2021-11-05 22:33:34 +11:00
rust-toolchain.toml Upgrade to Rust 1.53 2021-06-21 11:56:04 +10:00

XMR to BTC Atomic Swap

This repository hosts an MVP for atomically swapping BTC to XMR. It implements the protocol described in section 3 of this paper.

More information about the protocol in this presentation and this blog post.

Currently, swaps are only offered in one direction with the swap CLI on the buying side (send BTC, receive XMR). We are working on implementing a protocol where XMR moves first, but are currently blocked by advances on Monero itself. You can read this blogpost for more information.

Quick Start

  1. Download the latest swap binary release for your operating system.
  2. Find a seller to swap with:
./swap --testnet list-sellers
  1. Swap with a seller:
./swap --testnet buy-xmr --receive-address <YOUR MONERO ADDRESS> --change-address <YOUR BITCOIN CHANGE ADDRESS> --seller <SELLER MULTIADDRESS>

For more detailed documentation on the CLI, see this README.

Becoming a Market Maker

Swapping of course needs two parties - and the CLI is only one of them: The taker that occasionally starts a swap with a market maker.

If you are interested in becoming a market maker you will want to run the second binary provided in this repository: asb - the Automated Swap Backend. Detailed documentation for the asb can be found in this README.

Safety

This software is using cryptography that has not been formally audited. While we do our best to make it safe, it is up to the user to evaluate whether or not it is safe to use for their purposes. Please also see section 15 and 16 of the license.

Keep in mind that swaps are complex protocols, it is recommended to not do anything fancy when moving coins in and out. It is not recommended to bump fees when swapping because it can have unpredictable side effects.

Contributing

We are encourage community contributions whether it be a bug fix or an improvement to the documentation. Please have a look at the contribution guidelines.

Contact

Feel free to reach out to us in the COMIT-Monero Matrix channel.