Commit Graph

1776 Commits (490c1d2ec133a899d0f0f11987c8abb9caa3f56c)
 

Author SHA1 Message Date
Thomas Eizinger 2c8bbe4913
Remove left-over "half" of log message
With the move to using tracing's fields, this log message was not
properly updated.
3 years ago
Thomas Eizinger 94f089f4f2
Disallow Bitcoin legacy addresses
These cause problems during fee estimation.
3 years ago
Thomas Eizinger 367d75cab6
Reduce code duplication and make evaluation order determinisitic
The Rust compiler doesn't guarantee in which order field initialization
are executed. By extracting them, we can make sure they run in a certain
order. This will be important as we add more validations that can
fail.
3 years ago
Thomas Eizinger 46ffc34f40
Don't spam on transaction status change 3 years ago
Thomas Eizinger 991dbf496e
Extract `print_status_change` so it is easily testable 3 years ago
Thomas Eizinger 2eb7fab0c3
Make `capture_logs` available for the whole crate 3 years ago
Daniel Karzel 6abf83f4ad
Sort seller list inside of `list_sellers`
By sorting the list inside we have a more deterministic output that makes processing in JSON easier.
3 years ago
Thomas Eizinger cacfc50fb2
Don't spam the user while waiting for BTC 3 years ago
Thomas Eizinger 56a48e71ef
Add failing test that shows spamming of output 3 years ago
Thomas Eizinger 56ea23c2a3
Assert log output for `determine_btc_to_swap` 3 years ago
Thomas Eizinger a347dd8b97
Move helper structs below tests 3 years ago
bors[bot] c275e33a6c
Merge #614
614: Fix quick start README.md list-sellers command r=thomaseizinger a=binarybaron

Change list-sellers from flag to command

Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com>
3 years ago
binarybaron 357f4a0711
Fix quick start README.md list-sellers command
Change list-sellers from flag to command
3 years ago
bors[bot] 7ff57ff0d4
Merge #613
613: Bump vergen from 5.1.11 to 5.1.12 r=thomaseizinger a=dependabot[bot]

Bumps [vergen](https://github.com/rustyhorde/vergen) from 5.1.11 to 5.1.12.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/rustyhorde/vergen/releases">vergen's releases</a>.</em></p>
<blockquote>
<h2>v5.1.12</h2>
<ul>
<li>Pinned <code>sysinfo</code> crate to 0.19.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="a113046c21"><code>a113046</code></a> version bump for next release</li>
<li><a href="a2ee46f16a"><code>a2ee46f</code></a> pin sysinfo to lowest supported version (<a href="https://github-redirect.dependabot.com/rustyhorde/vergen/issues/81">#81</a>)</li>
<li>See full diff in <a href="https://github.com/rustyhorde/vergen/compare/5.1.11...5.1.12">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=vergen&package-manager=cargo&previous-version=5.1.11&new-version=5.1.12)](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>
3 years ago
dependabot[bot] e90ceb392e
Bump vergen from 5.1.11 to 5.1.12
Bumps [vergen](https://github.com/rustyhorde/vergen) from 5.1.11 to 5.1.12.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/5.1.11...5.1.12)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
bors[bot] ab0f429eea
Merge #611
611: Release version 0.8.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/1007327199.
I've updated the changelog and bumped the versions in the manifest files in this commit: 50da958078.

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>
3 years ago
COMIT Botty McBotface 50da958078 Prepare release 0.8.0 3 years ago
bors[bot] 668a41e6e2
Merge #610
610: Provide a commit-specific version output r=da-kami a=thomaseizinger

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.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
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.
3 years ago
bors[bot] 93a69563a9
Merge #606
606: Script to list sellers and auto trigger swap + docs r=da-kami a=da-kami

Uses best price to determine the seller to swap with.

TODO:
- [x] Codebase to be tested on test-/stagenet.
- [x] Update readme
- [x] Update docs

This includes a couple of changes that I found while toying with the output and writing docs. Can drop the individual commits if necessary (but would need to adapt the docs then).

Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
Daniel Karzel ffad47d515
Update docs with latest changes to CLI and ASB 3 years ago
Thomas Eizinger 5c37fe6733
Make struct-opt docs more consistent
- Remove dots from the of help messages
- Unify wording
3 years ago
Thomas Eizinger bbc3a49f41
Make link rendering actually work 3 years ago
Thomas Eizinger 987f8abb9d
Include unreachable nodes in table output
We emit an `info!` log for every peer that we discover but only ever
emitted a `debug!` log if we fail to connect. This leads to a situation
where the user would run `swap list-sellers`, the logs would say
"Discovered XYZ at ABC" but then get a potentially empty table.

To not confuse the user, we include unreachable nodes in the table output.
For example:

```
Connected to rendezvous point, discovering nodes in 'xmr-btc-swap-testnet' namespace ...
Discovered peer 12D3KooWPZ69DRp4wbGB3wJsxxsg1XW1EVZ2evtVwcARCF3a1nrx at /dns4/ac4hgzmsmekwekjbdl77brufqqbylddugzze4tel6qsnlympgmr46iid.onion/tcp/8765
+-------+--------------+--------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------+
| PRICE | MIN_QUANTITY | MAX_QUANTITY | STATUS      | ADDRESS                                                                                                                                |
+============================================================================================================================================================================================+
| ???   | ???          | ???          | Unreachable | /dns4/ac4hgzmsmekwekjbdl77brufqqbylddugzze4tel6qsnlympgmr46iid.onion/tcp/8765/p2p/12D3KooWPZ69DRp4wbGB3wJsxxsg1XW1EVZ2evtVwcARCF3a1nrx |
+-------+--------------+--------------+-------------+----------------------------------------------------------------------------------------------------------------------------------------+
```
3 years ago
Thomas Eizinger 09f395a26b
Don't print level and time for `list-sellers`
This is now consistent with the `buy-xmr` command.
3 years ago
Thomas Eizinger 40eccd089f
Change `--data-dir` for `--data-base-dir` 3 years ago
Thomas Eizinger 3b1789fe07
Make things private if possible 3 years ago
Daniel Karzel 91b0a0863b
Add script to list sellers and auto trigger swap
Uses best price to determine the seller to swap with.
3 years ago
bors[bot] 15751f8a0e
Merge #607
607: Tidy up tracing statements r=da-kami a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
Thomas Eizinger 8f50eb2f34
Utilize tracing's fields more 3 years ago
Thomas Eizinger 9119ce5cc4
Tidy up log messages across the codebase
1. Clearly separate the log messages from any fields that are
captured. The log message itself should be meaningful because it
depends on the underlying formatter, how/if the fields are displayed.
2. Some log messages had very little context, expand that.
3. Wording of errors was inconsistent, hopefully all errors should
now start with `Failed to ...`.
4. Some log messages were duplicated across multiple layers (like opening
the database).
5. Some log messages were split into two where one part is now an `error!`
and the 2nd part is an `info!` on what is happening next.
6. Where appropriate, punctuation has been removed to not interrupt
the reader's flow.
3 years ago
Thomas Eizinger 78480547d5
Don't import tracing's macros
Log statements end up getting changed constantly and having to clean
up imports after that is annoying, for example, if the last `info!`
in a file disappears, you end up with an unused import warning.

Fully qualifying tracing's macros prevents that and also communicates
clearly that we are using tracing and not log.
3 years ago
bors[bot] fa1a5e6efb
Merge #608
608: Smoothen the CLI's interface a bit r=da-kami a=thomaseizinger

- Add `--change-address` to the `buy-xmr` command.
- Remove `--receive-address` from the `resume` command.



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
3 years ago
Thomas Eizinger 1d0d38cd48
Explain why we clear the `bip32_derivation` map 3 years ago
bors[bot] c8b29aecd1
Merge #609
609: Replace xmr.to stagenet node with melo.tools node r=thomaseizinger a=binarybaron

XMR.to has abandoned their community services.

Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com>
3 years ago
binarybaron bdfa6e1f9f
Replace xmr.to stagenet node with melo.tools node
XMR.to has abandoned their community services.
3 years ago
bors[bot] 3a99b753ed
Merge #593
593: Integrate rendezvous protocol r=thomaseizinger a=rishflab

Open things:

- [x] Default parameters for CLI
- [x] Print a human-readable table of sellers if `--json` is not passed
- [x] Unresolved comments of review

Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
Co-authored-by: rishflab <rishflab@hotmail.com>
3 years ago
Thomas Eizinger acfd2dd6bb
Store Monero receive address in database and load it on resume 3 years ago
Thomas Eizinger 5463bde4f8
Add a mandatory `--change-address` parameter to `buy-xmr`
Fixes #513.
3 years ago
Thomas Eizinger 683d565679
Make variable naming consistent 3 years ago
Thomas Eizinger 8b59ac26ba
Replace sorting with slice pattern matching
Sorting `psbt.output` by `witness_script` is at times pointless
because it might be set to `None`. To be more robust, we pattern
match against the produced transaction.
3 years ago
Daniel Karzel 625ff4868a
Changelog entry for the rendezvous integration 3 years ago
Thomas Eizinger 348fca0827
Add isolated test for `list_sellers` function 3 years ago
Thomas Eizinger e642f5c148
Extend `SwarmExt` with ability to listen on TCP localhost
The CLI's transport doesn't support memory addresses and it also shouldn't support those by default. To be able to use it in tests, we extend the `SwarmExt` trait with the ability to listen on local TCP addresses with a random port.
3 years ago
rishflab 93a0692998
Integrate rendezvous protocol into ASB
The rendezvous protocol allows us to register all of our external
addresses. Hence, the first step is to allow the user to configure
external addresses as part of the config. In the future, there might
be an automated way of determining these.

To register with a rendezvous node, the user needs to configure which
one. CoBloX is running a rendezvous node that acts as the default by
every spec-compliant node will do the job just fine. This behaviour
is optional which is why our custom behaviour is wrapped in a `Toggle`.

We also want our node to re-register after half the time of the
registration has passed. To make this simpler and allow for testing in
isolation, we create a custom behaviour that wraps the libp2p rendezvous
behaviour.
3 years ago
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.
3 years ago
Daniel Karzel f45cde84ab
`comfy-table` instead of `prettytable-rs` 3 years ago
Thomas Eizinger b4fafeba6b
Allow large enum variant lint
The docs say one needs to measure the impact of this before taking
action. We didn't measure anything. Let's not take any action.
3 years ago
Thomas Eizinger e163942850
Merge transport and behaviour module into network 3 years ago
Daniel Karzel ff8cca2e27
Pass in CLI behaviour when creating swarm
This allows us to reuse the swarm setup with a different behaviour for discovering ASBs with a rendezvous node.
3 years ago