Browse Source

Merge #747

747: Bump bdk from 0.13.0 to 0.14.0 r=thomaseizinger a=dependabot[bot]

Bumps [bdk](https://github.com/bitcoindevkit/bdk) from 0.13.0 to 0.14.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/bitcoindevkit/bdk/releases">bdk's releases</a>.</em></p>
<blockquote>
<h2>Release 0.14.0</h2>
<p>Notable changes in this release include adding a new method to <code>TxBuilder</code> to embed data in a transaction vai <code>OP_RETURN</code> and updating the <code>Database</code> trait to store the last sync timestamp and block height. Other internal improvements include a change in the <code>keys</code> module dependencies from <code>tiny-bip39</code> to using <code>rust-bip39</code>, renaming <code>ConfirmationTime</code> to <code>BlockTime</code> to more clearly describe the data that struct contains, and using a borrowed transaction when broadcasting.  And finally we have updated our integration test framework to verify support for <strong>sending to</strong> Taproot addresses 🥕 ! See below for all the details:</p>
<h2>What's Changed</h2>
<ul>
<li>Fix/ci update 1.56 by <a href="https://github.com/afilini"><code>`@​afilini</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/454">bitcoindevkit/bdk#454</a></li>
<li>Borrow instead of moving transaction when broadcasting by <a href="https://github.com/klochowicz"><code>`@​klochowicz</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/452">bitcoindevkit/bdk#452</a></li>
<li>Release/0.13.0 by <a href="https://github.com/notmandatory"><code>`@​notmandatory</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/453">bitcoindevkit/bdk#453</a></li>
<li>Use rust-bip39 instead of tiny-bip39 by <a href="https://github.com/rajarshimaitra"><code>`@​rajarshimaitra</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/462">bitcoindevkit/bdk#462</a></li>
<li>Update codecov@v2 by <a href="https://github.com/rajarshimaitra"><code>`@​rajarshimaitra</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/458">bitcoindevkit/bdk#458</a></li>
<li>Post bip39 updates by <a href="https://github.com/rajarshimaitra"><code>`@​rajarshimaitra</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/464">bitcoindevkit/bdk#464</a></li>
<li>Add data as output (via OP_RETURN) by <a href="https://github.com/RCasatta"><code>`@​RCasatta</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/460">bitcoindevkit/bdk#460</a></li>
<li>Store the last sync time and block height by <a href="https://github.com/afilini"><code>`@​afilini</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/459">bitcoindevkit/bdk#459</a></li>
<li>[test] add tests to verify support for sending to bech32m address by <a href="https://github.com/sandipndev"><code>`@​sandipndev</code></a>` in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/402">bitcoindevkit/bdk#402</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/klochowicz"><code>`@​klochowicz</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/452">bitcoindevkit/bdk#452</a></li>
<li><a href="https://github.com/sandipndev"><code>`@​sandipndev</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/bitcoindevkit/bdk/pull/402">bitcoindevkit/bdk#402</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/bitcoindevkit/bdk/compare/v0.13.0...v0.14.0">https://github.com/bitcoindevkit/bdk/compare/v0.13.0...v0.14.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/bitcoindevkit/bdk/blob/v0.14.0/CHANGELOG.md">bdk's changelog</a>.</em></p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="c175dd2aae"><code>c175dd2</code></a> Bump version to 0.14.0</li>
<li><a href="6b1cbcc4b7"><code>6b1cbcc</code></a> Bump version to 0.14.0-rc.1</li>
<li><a href="afa1ab4ff8"><code>afa1ab4</code></a> Fix blockchain_tests::test_send_to_bech32m_addr</li>
<li><a href="632422a3ab"><code>632422a</code></a> Added wallet blockchain test to send to Bech32m address</li>
<li><a href="54f61d17f2"><code>54f61d1</code></a> Added a wallet unit test to send to a Bech32m address</li>
<li><a href="5830226216"><code>5830226</code></a> [database] Wrap <code>BlockTime</code> in another struct to allow adding more</li>
<li><a href="2c77329333"><code>2c77329</code></a> Rename <code>ConfirmationTime</code> to <code>BlockTime</code></li>
<li><a href="3e5bb077ac"><code>3e5bb07</code></a> Update CHANGELOG.md</li>
<li><a href="7c06f52a07"><code>7c06f52</code></a> [wallet] Store the block height and timestamp after syncing</li>
<li><a href="12e51b3c06"><code>12e51b3</code></a> [wallet] Expose an immutable reference to a wallet's database</li>
<li>Additional commits viewable in <a href="https://github.com/bitcoindevkit/bdk/compare/v0.13.0...v0.14.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=bdk&package-manager=cargo&previous-version=0.13.0&new-version=0.14.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually 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>
feature/force-stop-button
bors[bot] 3 years ago
committed by GitHub
parent
commit
31c85db775
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      Cargo.lock
  2. 2
      daemon/Cargo.toml
  3. 4
      daemon/src/wallet.rs

6
Cargo.lock

@ -207,9 +207,9 @@ dependencies = [
[[package]]
name = "bdk"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f687a9504efaa1650148b9e891b4c111adb31ceeb9011dec578941b00f18c9f"
checksum = "a6ec4da3dbaa41bb6d6cffe40b113ea8651566da7f96beebe9c0e87fc92b9094"
dependencies = [
"ahash",
"async-trait",
@ -1441,7 +1441,7 @@ dependencies = [
[[package]]
name = "maia"
version = "0.1.0"
source = "git+https://github.com/comit-network/maia#70fc548da0fe4f34478fb34ec437fa9a434c7ee3"
source = "git+https://github.com/comit-network/maia#4dd8adaf88f4c9ec244412319ac5e4ed67b509ec"
dependencies = [
"anyhow",
"bdk",

2
daemon/Cargo.toml

@ -7,7 +7,7 @@ edition = "2021"
anyhow = "1"
async-trait = "0.1.51"
atty = "0.2"
bdk = { version = "0.13", default-features = false, features = ["sqlite", "electrum"] }
bdk = { version = "0.14", default-features = false, features = ["sqlite", "electrum"] }
bytes = "1"
chrono = { version = "0.4", features = ["serde"] }
clap = "3.0.0-beta.5"

4
daemon/src/wallet.rs

@ -147,7 +147,7 @@ impl Actor {
let wallet = self.wallet.lock().await;
let txid = tx.txid();
let result = wallet.broadcast(tx.clone());
let result = wallet.broadcast(&tx);
if let Err(&bdk::Error::Electrum(electrum_client::Error::Protocol(ref value))) =
result.as_ref()
@ -215,7 +215,7 @@ impl Actor {
wallet.sign(&mut psbt, SignOptions::default())?;
let txid = wallet.broadcast(psbt.extract_tx())?;
let txid = wallet.broadcast(&psbt.extract_tx())?;
tracing::info!(%txid, "Withdraw successful");

Loading…
Cancel
Save