mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-03-19 04:46:17 -04:00
61aaeb1579
575: Bump bitcoin from 0.26.0 to 0.26.2 r=thomaseizinger a=dependabot[bot] Bumps [bitcoin](https://github.com/rust-bitcoin/rust-bitcoin) from 0.26.0 to 0.26.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/rust-bitcoin/rust-bitcoin/blob/master/CHANGELOG.md">bitcoin's changelog</a>.</em></p> <blockquote> <h1>0.26.2 - 2021-06-08</h1> <ul> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/611">Fix <code>Display</code> impl of <code>ChildNumber</code></a></li> </ul> <p>The previous release changed the behavior of <code>Display</code> for <code>ChildNumber</code>, assuming that any correct usage would not be affected. <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/608">Issue 608</a> goes into the details of why this isn't the case and how we broke both <code>rust-miniscript</code> and BDK.</p> <h1>0.26.1 - 2021-06-06 (yanked, see explanation above)</h1> <ul> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/414">Change Amount Debug impl to BTC with 8 decimals</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/511">Make uint types (un)serializable</a></li> <li>Add <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/551">more derives for key::Error</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/552">Fix optional amount serialization</a></li> <li>Add <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/557">PSBT base64 (de)serialization with Display & FromStr</a></li> <li>Add <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/558">non-API breaking derives for error & transaction types</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/559">Fix error derives</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/565">Add function to check RBF-ness of transactions</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/566">Add Script:dust_value() to get minimum output value for a spk</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/567">Improving bip32 ChildNumber display implementation</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/569">Make Script::fmt_asm a static method and add Script::str_asm </a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/572">Return BlockHash from BlockHeader::validate_pow</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/573">Add a method to error on non-standard hashtypes</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/577">Include proprietary key in deserialized PSBT</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/579">Fix Script::dust_value()'s calculation for non-P2*PKH script_pubkeys</a></li> <li>Add <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/581">Address to optimized QR string</a> conversion</li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/582">Correct Transaction struct encode_signing_data_to doc comment</a></li> <li>Fixing <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/583">CI if base image's apt db is outdated</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/584">Introduce some policy constants from Bitcoin Core</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/586">Fix warnings for sighashtype</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/589">Introduction of Schnorr keys</a></li> <li>Adding <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/592">constructors for compressed and uncompressed ECDSA keys</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/594">Count bytes read in encoding</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/598">Add verify_with_flags to Script and Transaction</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/600">Fixes documentation intra-links and enforce it</a></li> <li><a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/pull/602">Fixing hashes core dependency and fuzz feature</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="9b2098517e"><code>9b20985</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/611">#611</a> from sgeisler/2021-06-fix-release</li> <li><a href="c82e75854a"><code>c82e758</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/610">#610</a> from afilini/fix/irc-link</li> <li><a href="055d0fb087"><code>055d0fb</code></a> Prepare release 0.26.2</li> <li><a href="091ac89440"><code>091ac89</code></a> Fix semver breaking Display change of ChildNumber</li> <li><a href="f11f09d55b"><code>f11f09d</code></a> Fix release date in the changelog for <code>0.26.1</code></li> <li><a href="dc3d9eebaa"><code>dc3d9ee</code></a> Update IRC info to libera.chat</li> <li><a href="a685ce60bf"><code>a685ce6</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/607">#607</a> from LNP-BP/ver/0.26.1</li> <li><a href="73f1ed7d4c"><code>73f1ed7</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/606">#606</a> from romanz/fix-bip158-format</li> <li><a href="d2ee8e81f3"><code>d2ee8e8</code></a> Bump version to 0.26.1</li> <li><a href="d7eb15c6f1"><code>d7eb15c</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-bitcoin/rust-bitcoin/issues/584">#584</a> from darosior/max_tx_weight_const</li> <li>Additional commits viewable in <a href="https://github.com/rust-bitcoin/rust-bitcoin/compare/0.26.0...0.26.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> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.
Quick start - CLI
From version 0.6.0 onwards the software default to running on mainnet.
It is recommended to try the software on testnet first, which can be achieved by providing the --testnet flag.
This quickstart guide assumes that you are running the software on testnet (i.e. Bitcoin testnet3 and Monero stagenet):
- Download the latest
swapbinary release for your operating system - Run the binary specifying the monero address where you wish to receive monero and the connection details of the seller:
./swap --testnet buy-xmr --receive-address <YOUR MONERO ADDRESS> --seller-peer-id <SELLERS PEER ID> --seller-addr <SELLERS MULTIADDRESS>You can generate a receive address using your monero wallet. The seller will provide you their peer id and multiaddress. We are running anasbinstance on testnet. You can swap with to get familiar with theswapCLI. Our peer id is12D3KooWCdMKjesXMJz1SiZ7HgotrxuqhQJbP5sgBm2BwP1cqThiand our multiaddress is/dnsaddr/xmr-btc-asb.coblox.tech - Follow the instructions printed to the terminal
For running the software on mainnet you just omit the --testnet flag.
Running on mainnet will automatically apply sane defaults.
Be aware that this software is still early-stage.
Make sure to check --help and understand how the cancel and refund commands work before running on mainnet.
You are running this software at your own risk.
As always we recommend: Verify, don't trust.
All code is available in this repository.
How it works
This repository primarily hosts two components:
- the
swapCLI - the
asbservice
swap CLI
The swap CLI acts in the role of Bob and swaps BTC for XMR.
See ./swap --help for a description of all commands.
The main command is buy-xmr which automatically connects to an instance of asb.
asb service
asb is short for automated swap backend (we are open to suggestions for better names!).
The service acts as the counter-party for the swap CLI in the role of Alice.
It provides the CLI with a quote and the liquidity necessary for swapping BTC into XMR.
For details on how to run the ASB please refer to the ASB docs.
Contact
Feel free to reach out to us in the COMIT-Monero Matrix channel.