mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-10-01 01:45:40 -04:00
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 /> [](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 = "serde_with::base64::Base64")] value: Vec<u8>, #[serde_as(as = "Base64<Bcrypt, Unpadded>")] bcrypt_unpadded: Vec<u8>, <p>// JSON "value": "SGVsbG8gV29ybGQ=", "bcrypt_unpadded": "QETqZE6eT07wZEO", </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 /> [](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 /> [](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 /> [](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 /> [](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>
This commit is contained in:
bors[bot]
GitHub
commit
d52f4f7727
2
.github/workflows/draft-new-release.yml
vendored
2
.github/workflows/draft-new-release.yml
vendored
@ -54,7 +54,7 @@ jobs:
|
||||
run: git push origin release/${{ github.event.inputs.version }} --force
|
||||
|
||||
- name: Create pull request
|
||||
uses: thomaseizinger/create-pull-request@1.2.1
|
||||
uses: thomaseizinger/create-pull-request@1.2.2
|
||||
with:
|
||||
GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }}
|
||||
head: release/${{ github.event.inputs.version }}
|
||||
|
||||
@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- The ASB to no longer work as a rendezvous server.
|
||||
The ASB can still register with rendezvous server as usual.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Mitigate CloseNotify bug #797 by retrying getting ScriptStatus if it fail and using a more stable public mainnet electrum server.
|
||||
|
||||
## [0.9.0] - 2021-10-07
|
||||
|
||||
### Changed
|
||||
|
||||
20
Cargo.lock
generated
20
Cargo.lock
generated
@ -111,9 +111,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.51"
|
||||
version = "0.1.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
|
||||
checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -3209,9 +3209,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rust_decimal_macros"
|
||||
version = "1.16.0"
|
||||
version = "1.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5732c6adfbb4bbf262b7625832174ef76ccec1786bf8badfcfd11c494214f1a9"
|
||||
checksum = "f2a71e447554613b11da876d63d04e78fc3e8e86769488d3b58887671e23bc86"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"rust_decimal",
|
||||
@ -3517,9 +3517,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "1.10.0"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "062b87e45d8f26714eacfaef0ed9a583e2bfd50ebd96bdd3c200733bd5758e2c"
|
||||
checksum = "ad6056b4cb69b6e43e3a0f055def223380baecc99da683884f205bf347f7c4b3"
|
||||
dependencies = [
|
||||
"rustversion",
|
||||
"serde",
|
||||
@ -3880,9 +3880,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.23"
|
||||
version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa"
|
||||
checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"lazy_static",
|
||||
@ -3891,9 +3891,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "structopt-derive"
|
||||
version = "0.4.16"
|
||||
version = "0.4.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba"
|
||||
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
|
||||
@ -58,7 +58,7 @@ impl GetDefaults for Mainnet {
|
||||
data_dir: default_asb_data_dir()?.join("mainnet"),
|
||||
listen_address_tcp: Multiaddr::from_str("/ip4/0.0.0.0/tcp/9939")?,
|
||||
listen_address_ws: Multiaddr::from_str("/ip4/0.0.0.0/tcp/9940/ws")?,
|
||||
electrum_rpc_url: Url::parse("ssl://electrum.blockstream.info:50002")?,
|
||||
electrum_rpc_url: Url::parse("ssl://blockstream.info:700")?,
|
||||
monero_wallet_rpc_url: Url::parse("http://127.0.0.1:18083/json_rpc")?,
|
||||
price_ticker_ws_url: Url::parse("wss://ws.kraken.com")?,
|
||||
bitcoin_confirmation_target: 3,
|
||||
|
||||
@ -149,18 +149,21 @@ impl Wallet {
|
||||
Ok(new_status) => new_status,
|
||||
Err(error) => {
|
||||
tracing::warn!(%txid, "Failed to get status of script: {:#}", error);
|
||||
return;
|
||||
ScriptStatus::Retrying
|
||||
}
|
||||
};
|
||||
|
||||
if new_status != ScriptStatus::Retrying
|
||||
{
|
||||
last_status = Some(print_status_change(txid, last_status, new_status));
|
||||
|
||||
last_status = Some(print_status_change(txid, last_status, new_status));
|
||||
|
||||
let all_receivers_gone = sender.send(new_status).is_err();
|
||||
|
||||
if all_receivers_gone {
|
||||
tracing::debug!(%txid, "All receivers gone, removing subscription");
|
||||
client.lock().await.subscriptions.remove(&(txid, script));
|
||||
return;
|
||||
let all_receivers_gone = sender.send(new_status).is_err();
|
||||
|
||||
if all_receivers_gone {
|
||||
tracing::debug!(%txid, "All receivers gone, removing subscription");
|
||||
client.lock().await.subscriptions.remove(&(txid, script));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -823,6 +826,7 @@ pub enum ScriptStatus {
|
||||
Unseen,
|
||||
InMempool,
|
||||
Confirmed(Confirmed),
|
||||
Retrying,
|
||||
}
|
||||
|
||||
impl ScriptStatus {
|
||||
@ -898,6 +902,7 @@ impl fmt::Display for ScriptStatus {
|
||||
match self {
|
||||
ScriptStatus::Unseen => write!(f, "unseen"),
|
||||
ScriptStatus::InMempool => write!(f, "in mempool"),
|
||||
ScriptStatus::Retrying => write!(f, "retrying"),
|
||||
ScriptStatus::Confirmed(inner) => {
|
||||
write!(f, "confirmed with {} blocks", inner.confirmations())
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ pub const DEFAULT_MONERO_DAEMON_ADDRESS: &str = "node.melo.tools:18081";
|
||||
pub const DEFAULT_MONERO_DAEMON_ADDRESS_STAGENET: &str = "stagenet.melo.tools:38081";
|
||||
|
||||
// See: https://1209k.com/bitcoin-eye/ele.php?chain=btc
|
||||
const DEFAULT_ELECTRUM_RPC_URL: &str = "ssl://electrum.blockstream.info:50002";
|
||||
const DEFAULT_ELECTRUM_RPC_URL: &str = "ssl://blockstream.info:700";
|
||||
// See: https://1209k.com/bitcoin-eye/ele.php?chain=tbtc
|
||||
pub const DEFAULT_ELECTRUM_RPC_URL_TESTNET: &str = "ssl://electrum.blockstream.info:60002";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user