Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
Bitcoin–Monero Cross-chain Atomic Swap
2,276 Commits 72 Branches 27 Tags 73 MiB
Rust 99.8%
Shell 0.2%
6abe6a5f9b
Go to file
bors[bot] 6abe6a5f9b
Merge #1338 #1342 #1343 #1344 
1338: build(deps): bump async-trait from 0.1.66 to 0.1.68 r=delta1 a=dependabot[bot]

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.66 to 0.1.68.
<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.68</h2>
<ul>
<li>Improve error message if an async fn is written without a function body in an impl block</li>
</ul>
<h2>0.1.67</h2>
<ul>
<li>Update syn dependency to 2.x</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="dce60601d7"><code>dce6060</code></a> Release 0.1.68</li>
<li><a href="346f0509c6"><code>346f050</code></a> Merge pull request <a href="https://redirect.github.com/dtolnay/async-trait/issues/244">#244</a> from dtolnay/verbatimfn</li>
<li><a href="344a4f2a68"><code>344a4f2</code></a> Handle async impl fn without body</li>
<li><a href="f8a8650569"><code>f8a8650</code></a> Release 0.1.67</li>
<li><a href="d7a9cae8d2"><code>d7a9cae</code></a> Merge pull request <a href="https://redirect.github.com/dtolnay/async-trait/issues/241">#241</a> from dtolnay/syn</li>
<li><a href="15fd2820ac"><code>15fd282</code></a> Ignore match_like_matches_macro clippy lint</li>
<li><a href="032c1506e3"><code>032c150</code></a> Update to syn 2</li>
<li><a href="0d0a3465eb"><code>0d0a346</code></a> Update ui test suite to nightly-2023-03-17</li>
<li>See full diff in <a href="https://github.com/dtolnay/async-trait/compare/0.1.66...0.1.68">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.66&new-version=0.1.68)](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>

1342: build(deps): bump serde from 1.0.156 to 1.0.160 r=delta1 a=dependabot[bot]

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.156 to 1.0.160.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/serde-rs/serde/releases">serde's releases</a>.</em></p>
<blockquote>
<h2>v1.0.160</h2>
<ul>
<li>Make derived serializer/deserializer internals <code>doc(hidden)</code> (<a href="https://redirect.github.com/serde-rs/serde/issues/2426">#2426</a>, thanks <a href="https://github.com/compiler-errors"><code>`@​compiler-errors</code></a>)</li>`
</ul>
<h2>v1.0.159</h2>
<ul>
<li>Accept empty #[serde()] attribute (<a href="https://redirect.github.com/serde-rs/serde/issues/2422">#2422</a>)</li>
</ul>
<h2>v1.0.158</h2>
<ul>
<li>Fix <em>&quot;expected serde crate attribute to be a string&quot;</em> error when using macro_rules metavariable inside of serde attribute: <code>#[serde(crate = $serde_path)]</code> (<a href="https://redirect.github.com/serde-rs/serde/issues/2409">#2409</a>)</li>
</ul>
<h2>v1.0.157</h2>
<ul>
<li>Update syn dependency to 2.x</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="0c6a2bbf79"><code>0c6a2bb</code></a> Release 1.0.160</li>
<li><a href="a80d830f27"><code>a80d830</code></a> Merge pull request <a href="https://redirect.github.com/serde-rs/serde/issues/2426">#2426</a> from compiler-errors/dont-doc-private</li>
<li><a href="5f3fd9994e"><code>5f3fd99</code></a> Make serializer/deserializer internals doc(hidden)</li>
<li><a href="d6de911855"><code>d6de911</code></a> Release 1.0.159</li>
<li><a href="04af32230e"><code>04af322</code></a> Merge pull request <a href="https://redirect.github.com/serde-rs/serde/issues/2422">#2422</a> from dtolnay/emptyattr</li>
<li><a href="4cb8d079f8"><code>4cb8d07</code></a> Accept empty #[serde()] attribute</li>
<li><a href="6ab55a1e52"><code>6ab55a1</code></a> Add regression test for issue 2415</li>
<li><a href="acfd19cb46"><code>acfd19c</code></a> Release serde_derive_internals 0.27.0</li>
<li><a href="e3058105f0"><code>e305810</code></a> Release 1.0.158</li>
<li><a href="dc200a6450"><code>dc200a6</code></a> Reformat comments of non-public serde_derive internals</li>
<li>Additional commits viewable in <a href="https://github.com/serde-rs/serde/compare/v1.0.156...v1.0.160">compare view</a></li>
</ul>
</details>
<br />


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

1343: build(deps): bump uuid from 1.3.0 to 1.3.1 r=delta1 a=dependabot[bot]

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.3.0 to 1.3.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/uuid-rs/uuid/releases">uuid's releases</a>.</em></p>
<blockquote>
<h2>1.3.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Update syn requirement from 1.0.80 to 2.0.5 by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://redirect.github.com/uuid-rs/uuid/pull/663">uuid-rs/uuid#663</a></li>
<li>Update windows-sys requirement from 0.45.0 to 0.48.0 by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://redirect.github.com/uuid-rs/uuid/pull/665">uuid-rs/uuid#665</a></li>
<li>remove some extra chars in a comment by <a href="https://github.com/KodrAus"><code>`@​KodrAus</code></a>` in <a href="https://redirect.github.com/uuid-rs/uuid/pull/666">uuid-rs/uuid#666</a></li>
<li>Prepare for 1.3.1 release by <a href="https://github.com/KodrAus"><code>`@​KodrAus</code></a>` in <a href="https://redirect.github.com/uuid-rs/uuid/pull/667">uuid-rs/uuid#667</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/uuid-rs/uuid/compare/1.3.0...1.3.1">https://github.com/uuid-rs/uuid/compare/1.3.0...1.3.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="87082b9239"><code>87082b9</code></a> Merge pull request <a href="https://redirect.github.com/uuid-rs/uuid/issues/667">#667</a> from uuid-rs/cargo/1.3.1</li>
<li><a href="a367481dec"><code>a367481</code></a> prepare for 1.3.1 release</li>
<li><a href="ee19f3dfbb"><code>ee19f3d</code></a> Merge pull request <a href="https://redirect.github.com/uuid-rs/uuid/issues/666">#666</a> from uuid-rs/KodrAus-patch-2</li>
<li><a href="8ccdf67de1"><code>8ccdf67</code></a> remove some extra chars in a comment</li>
<li><a href="b111b12627"><code>b111b12</code></a> Merge pull request <a href="https://redirect.github.com/uuid-rs/uuid/issues/665">#665</a> from uuid-rs/dependabot/cargo/windows-sys-0.48.0</li>
<li><a href="faac14c1c0"><code>faac14c</code></a> Update windows-sys requirement from 0.45.0 to 0.48.0</li>
<li><a href="efa468692f"><code>efa4686</code></a> Merge pull request <a href="https://redirect.github.com/uuid-rs/uuid/issues/663">#663</a> from uuid-rs/dependabot/cargo/syn-2.0.5</li>
<li><a href="1795337b99"><code>1795337</code></a> Update syn requirement from 1.0.80 to 2.0.5</li>
<li>See full diff in <a href="https://github.com/uuid-rs/uuid/compare/1.3.0...1.3.1">compare view</a></li>
</ul>
</details>
<br />


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

1344: build(deps): bump dialoguer from 0.10.3 to 0.10.4 r=delta1 a=dependabot[bot]

Bumps [dialoguer](https://github.com/mitsuhiko/dialoguer) from 0.10.3 to 0.10.4.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/console-rs/dialoguer/blob/master/CHANGELOG.md">dialoguer's changelog</a>.</em></p>
<blockquote>
<h2>0.10.4</h2>
<h3>Enhancements</h3>
<ul>
<li>Added validator for password input</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="fa11422e90"><code>fa11422</code></a> Release 0.10.4</li>
<li><a href="d588da3df1"><code>d588da3</code></a> Merge pull request <a href="https://redirect.github.com/mitsuhiko/dialoguer/issues/219">#219</a> from qt2/password_validation</li>
<li><a href="4b92988853"><code>4b92988</code></a> Replace <code>&amp;str</code> in with <code>&amp;String</code></li>
<li><a href="c3774c0188"><code>c3774c0</code></a> Add <code>PasswordValidator</code> trait</li>
<li><a href="09e2ff16a4"><code>09e2ff1</code></a> Remove mut from <code>Password::interact</code></li>
<li><a href="0f5372377e"><code>0f53723</code></a> Resolve clippy warning on complex type</li>
<li><a href="df37b03c84"><code>df37b03</code></a> Fix doc-test failures on password validation</li>
<li><a href="61af341c2a"><code>61af341</code></a> Merge branch 'console-rs:master' into password_validation</li>
<li><a href="f6f6e26014"><code>f6f6e26</code></a> Merge pull request <a href="https://redirect.github.com/mitsuhiko/dialoguer/issues/240">#240</a> from dhoomakethu/patch-1</li>
<li><a href="8c41f786e9"><code>8c41f78</code></a> Fix README</li>
<li>See full diff in <a href="https://github.com/mitsuhiko/dialoguer/compare/0.10.3...v0.10.4">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=dialoguer&package-manager=cargo&previous-version=0.10.3&new-version=0.10.4)](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>
2023-04-13 08:46:03 +00:00
.cargo .cargo/config.toml for specifying linker 2021-03-15 14:36:05 +11:00
.github build(deps): bump actions/checkout from 3.3.0 to 3.5.0 2023-03-24 12:01:57 +00:00
docs Change example rendezvous node to /dns4/discover.unstoppableswap.net/tcp/8888/p2p/12D3Ko... 2022-04-22 14:51:37 +02:00
monero-harness feat: upgrade monero images to v0.18.1.2 2022-11-07 09:53:50 +02:00
monero-rpc chore: fix dprint config and run fmt 2023-03-15 14:19:57 +02:00
monero-wallet Update dependencies and rust-toolchain to 1.59 2022-03-12 13:05:36 +02:00
swap chore: fix dprint config and run fmt 2023-03-15 14:19:57 +02:00
utils/gpg_keys docs: add gpg key readme and delta1.asc 2022-08-11 13:05:21 +02:00
.gitignore docs: update sqlx script and add ci 2022-11-30 15:30:32 +02:00
bors.toml feat(swap): merge cancel/refund commands into one command 2023-01-08 12:53:56 +02:00
Cargo.lock Merge #1338 #1342 #1343 #1344 2023-04-13 08:46:03 +00:00
Cargo.toml Update secp256kfun and rand to latest version 2021-05-25 15:35:13 +10:00
CHANGELOG.md ci: update msrv and github actions toolchains 2023-01-10 14:57:09 +02:00
CONTRIBUTING.md Create CONTRIBUTING.md 2021-06-29 10:58:00 +10:00
dprint.json chore: fix dprint config and run fmt 2023-03-15 14:19:57 +02:00
LICENSE Change license to GPLv3 2020-10-12 17:13:25 +11:00
README.md readme: fix minor grammar error 2023-02-27 15:13:17 -05:00
rust-toolchain.toml ci: update msrv and github actions toolchains 2023-01-10 14:57:09 +02:00

README.md

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 encourage community contributions whether it be a bug fix or an improvement to the documentation. Please have a look at the contribution guidelines.

Rust Version Support

Please note that only the latest stable Rust toolchain is supported. All stable toolchains since 1.63 should work.

Contact

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