739: Bump serde_json from 1.0.66 to 1.0.67 r=thomaseizinger a=dependabot[bot]
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.66 to 1.0.67.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/serde-rs/json/releases">serde_json's releases</a>.</em></p>
<blockquote>
<h2>v1.0.67</h2>
<ul>
<li>Fix inconsistency of deserialization of unknown fields in a struct variant from bytes vs from Value (<a href="https://github-redirect.dependabot.com/serde-rs/json/issues/795">#795</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="f6bbab4835"><code>f6bbab4</code></a> Release 1.0.67</li>
<li><a href="55efb3f0f2"><code>55efb3f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/json/issues/796">#796</a> from dtolnay/visitobject</li>
<li><a href="c7b7186957"><code>c7b7186</code></a> Detect unknown struct variant fields deserializing from Value</li>
<li><a href="12207ed2a3"><code>12207ed</code></a> Add regression test for issue 795</li>
<li><a href="7b4585fbff"><code>7b4585f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/json/issues/794">#794</a> from dtolnay/visitarray</li>
<li><a href="89cfb456ff"><code>89cfb45</code></a> Use existing helpers for running visit_seq over a Vec/slice</li>
<li><a href="604d5cf6fe"><code>604d5cf</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/json/issues/793">#793</a> from dtolnay/valuede</li>
<li><a href="cdc2ad3781"><code>cdc2ad3</code></a> Delete Deserializer impl from value:🇩🇪:MapRefDeserializer</li>
<li><a href="cb1e7301d6"><code>cb1e730</code></a> Delete Deserializer impl from value:🇩🇪:SeqRefDeserializer</li>
<li><a href="fcd94f0a90"><code>fcd94f0</code></a> Delete Deserializer impl from value:🇩🇪:SeqDeserializer</li>
<li>Additional commits viewable in <a href="https://github.com/serde-rs/json/compare/v1.0.66...v1.0.67">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>
734: Bump torut from 0.1.10 to 0.2.0 r=thomaseizinger a=dependabot[bot]
Bumps [torut](https://github.com/teawithsand/torut) from 0.1.10 to 0.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/teawithsand/torut/releases">torut's releases</a>.</em></p>
<blockquote>
<h2>Release 0.2.0</h2>
<p>Updates old dependencies and drops support tor v2 onion services as well as dependencies, used to handle these.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="2abeb89db1"><code>2abeb89</code></a> Version bump</li>
<li><a href="15820d713b"><code>15820d7</code></a> Removed too specific versioning from dependencies while preserving semver com...</li>
<li><a href="bbc11a71fa"><code>bbc11a7</code></a> Removed v2 onion service support</li>
<li><a href="37e7f7855c"><code>37e7f78</code></a> Fixed compilation warnings</li>
<li><a href="83be9b0dcf"><code>83be9b0</code></a> Update/dependencies (<a href="https://github-redirect.dependabot.com/teawithsand/torut/issues/14">#14</a>)</li>
<li><a href="39b8289223"><code>39b8289</code></a> Change tokio version to 1 (<a href="https://github-redirect.dependabot.com/teawithsand/torut/issues/13">#13</a>)</li>
<li><a href="eba9df3ad9"><code>eba9df3</code></a> Changed README.MD</li>
<li>See full diff in <a href="https://github.com/teawithsand/torut/compare/v0.1.10...v0.2.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>
691: Bump time from 0.2.27 to 0.3.2 r=thomaseizinger a=dependabot[bot]
Bumps [time](https://github.com/time-rs/time) from 0.2.27 to 0.3.2.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/time-rs/time/blob/main/CHANGELOG.md">time's changelog</a>.</em></p>
<blockquote>
<h2>0.3.2 [2021-08-25]</h2>
<h3>Added</h3>
<ul>
<li><code>Instant</code> is now <code>#[repr(transparent)]</code></li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Constructing a <code>Date</code> from its ISO year, week, and weekday now returns the correct value in all
circumstances. Previously, dates with an ISO year less than zero may have returned incorrect
values. This affects both the <code>Date::from_iso_week_date</code> method and the <code>date!</code> macro.</li>
</ul>
<h2>0.3.1 [2021-08-06]</h2>
<h3>Added</h3>
<ul>
<li><code>Month</code> now implements <code>TryFrom<u8></code></li>
<li><code>From<Month></code> is now implemented for <code>u8</code></li>
<li>The parser now accepts "5 PM" and similar as a valid time. Only the 12-hour clock hour and the
AM/PM suffix may be present; any other components representing a time will cause an error (this
exact behavior is not guaranteed).</li>
<li>The <code>time!</code> macro accepts the "5 PM" syntax with the same restriction.</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Macros that have a time component (<code>time!</code> and <code>datetime!</code>) no longer accept "0:00 AM" and
similar. This was previously erroneously accepted.</li>
</ul>
<h2>0.3.0 [2021-07-30]</h2>
<h3>Added</h3>
<ul>
<li><code>datetime!</code> macro, which allows the construction of a statically verified <code>PrimitiveDateTime</code> or
<code>OffsetDateTime</code>.</li>
<li><code>PrimitiveDateTime::replace_time</code></li>
<li><code>PrimitiveDateTime::replace_date</code></li>
<li><code>OffsetDateTime::replace_time</code></li>
<li><code>OffsetDateTime::replace_date</code></li>
<li><code>OffsetDateTime::replace_date_time</code></li>
<li><code>OffsetDateTime::replace_offset</code></li>
<li><code>#![no_alloc]</code> support</li>
<li><code>Date::to_iso_week_date</code>, replacing <code>Date::iso_year_week</code></li>
<li><code>Date::MIN</code></li>
<li><code>Date::MAX</code></li>
<li><code>UtcOffset::from_hms</code></li>
<li><code>UtcOffset::from_whole_seconds</code></li>
<li><code>UtcOffset::as_hms</code></li>
<li><code>UtcOffset::whole_hours</code></li>
<li><code>UtcOffset::whole_minutes</code></li>
<li><code>UtcOffset::minutes_past_hour</code></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="4020fd632f"><code>4020fd6</code></a> v0.3.2 release</li>
<li><a href="ffb028e4d6"><code>ffb028e</code></a> Fix constructing dates with negative ISO year</li>
<li><a href="635ef21646"><code>635ef21</code></a> Add additional roundtrip tests</li>
<li><a href="fefc8c765e"><code>fefc8c7</code></a> Warn on future deprecations</li>
<li><a href="a83996974f"><code>a839969</code></a> Use <code>cargo-criterion</code> for benchmarks</li>
<li><a href="6117ab74a2"><code>6117ab7</code></a> Pin trybuild</li>
<li><a href="12673bfd18"><code>12673bf</code></a> Make <code>Instant</code> <code>#[repr(transparent)]</code></li>
<li><a href="e52e355689"><code>e52e355</code></a> Use more consistent measure for benchmarks</li>
<li><a href="102437e1d0"><code>102437e</code></a> Update CI for trybuild</li>
<li><a href="656f7d98ce"><code>656f7d9</code></a> Move to trybuild</li>
<li>Additional commits viewable in <a href="https://github.com/time-rs/time/compare/v0.2.27...v0.3.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>
669: Bump serde_cbor from 0.11.1 to 0.11.2 r=thomaseizinger a=dependabot[bot]
Bumps [serde_cbor](https://github.com/pyfisch/cbor) from 0.11.1 to 0.11.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/pyfisch/cbor/releases">serde_cbor's releases</a>.</em></p>
<blockquote>
<h2>PROJECT IS ARCHIVED</h2>
<p>After almost 6 years it is time to retire this crate. This implementation of CBOR for serde is used in hundreds of projects with widely differing needs. Besides the standard features it contains code for no-std environments, a packed encoding and CBOR tags.
However while these features are useful to many people they sometimes interact poorly with each others and with optional features of serde itself. Because I don't use the crate myself and because of the potential for new errors I have been reluctant to accept any changes or additional features for the crate. Since this situation is unlikely to change anytime soon and no one else stepped up to maintain this crate I am archiving the repository today. If the crate works for you there is no need to switch to another implementation. However if you encounter problems or for new projects I recommend you take a look at these crates:</p>
<ul>
<li><a href="https://crates.io/crates/ciborium">ciborium</a></li>
<li><a href="https://crates.io/crates/minicbor">minicbor</a></li>
</ul>
<h2>Update to serde 1.0.0</h2>
<p>No release notes provided.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="347a3f096d"><code>347a3f0</code></a> Final commit, archive project</li>
<li><a href="a218403a52"><code>a218403</code></a> Fix rustfmt issues in CI jobs (<a href="https://github-redirect.dependabot.com/pyfisch/cbor/issues/192">#192</a>)</li>
<li><a href="d012830653"><code>d012830</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pyfisch/cbor/issues/176">#176</a> from ctm/packed_clarification_and_minimization</li>
<li><a href="3d6d7a2de7"><code>3d6d7a2</code></a> Clarify packed format and provide an example that also uses legacy_enums()</li>
<li>See full diff in <a href="https://github.com/pyfisch/cbor/compare/v0.11.1...v0.11.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>
731: Release version 0.8.3 r=rishflab a=comit-botty-mc-botface
Hi `@rishflab!`
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/1196685695.
I've updated the changelog and bumped the versions in the manifest files in this commit: 4ff74a3940.
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>
727: Release version 0.8.3 r=rishflab a=comit-botty-mc-botface
Hi `@rishflab!`
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/1193551539.
I've updated the changelog and bumped the versions in the manifest files in this commit: deadb7d4c8.
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>
726: Release version 0.8.3 r=rishflab a=comit-botty-mc-botface
Hi `@rishflab!`
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/1192970084.
I've updated the changelog and bumped the versions in the manifest files in this commit: 2a4ffaeacb.
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>
724: Handle errors when waiting for subscriptions r=rishflab a=rishflab
We were not thorough enough in PR #705 and there were some remaining
unhandled errors.
Co-authored-by: rishflab <rishflab@hotmail.com>
716: Release version 0.8.2 r=rishflab a=comit-botty-mc-botface
Hi `@rishflab!`
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/1188401341.
I've updated the changelog and bumped the versions in the manifest files in this commit: fb0a20106856597ab75239548396d6a9ff52c5dc.
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>
704: Allow withdrawing and viewing of the bitcoin balance on swap-cli r=rishflab a=devbordecraft
Same mechanics of the ASB but on swap-cli as discussed in #694
Co-authored-by: devbordecraft <devbordecraft>
705: Handle Results of waiting for timelocks to expire r=rishflab a=da-kami
Fixes an issue where the CLI is transitioning into a `CancelTimelockExpired` state but the timelock is actually not expired yet.
This happened because watching for confirmations errored and the error was not handled but the same behaviour as reaching the cancel timelock height was applied.
For now this PR will fail the execution in case of the block height watching logic failing. Eventually there should be a more resilient strategy that includes retries.
Co-authored-by: Daniel Karzel <daniel@comit.network>
Co-authored-by: rishflab <rishflab@hotmail.com>
Bob was timing out if the encrypted signature could not be sent in 60
seconds. This behaviour is unnecessary because we are racing against
the cancel timelock anyway. By timing out before this, we remove the
opportunity for bob and alice to re-establish a connection.
657: Load wallet in monero-wallet-rpc on demand if necessary r=thomaseizinger a=thomaseizinger
cc `@sethsimmons`
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
Previously, we relied on the wallet in the `monero-wallet-rpc` daemon
to be loaded as we do on startup. As a consequence of this expectation,
restarting `monero-wallet-rpc` to fix bugs like #652 resulted in the
ASB no longer operating correctly.
To fix this, we now load the wallet on-demand in case the daemon responds
with the error code -13.
Ideally, we would implement this behaviour generically using the proxy
pattern on the `MoneroWalletRpc` trait. Unfortunately, when attempting
to do so we uncover a limitation in the design of `jsonrpc_client`.
This limitation is tracked in https://github.com/thomaseizinger/rust-jsonrpc-client/issues/47.
Once fixed, we can implement this logic in a more robust way that is not
tied to the `check_tx_key` RPC call but applies to any RPC call automatically.
681: Move "Lost connection" log line from WARN to Debug r=thomaseizinger a=sethsimmons
Per #660, moving the log line on a peer closing connection outside of a swap to DEBUG instead of WARN, as there is no action that can be taken by the ASB owner.
Fixes#660.
Co-authored-by: Seth Simmons <sethsimmons@protonmail.com>
Per #660, moving the log line on a peer closing connection outside of a swap to DEBUG instead of WARN, as there is no action that can be taken by the ASB owner.
