Merge ffe4e48785 into 2b850924b1

Merge pull request #1615 from comit-network/dependabot/github_actions/actions/checkout-4.1.4
build(deps): bump actions/checkout from 4.1.3 to 4.1.4
2024-04-29 21:06:44 -07:00 · 2024-04-28 20:23:14 +02:00 · 2024-04-25 11:42:46 +00:00 · 2024-02-28 09:38:10 +02:00 · 2023-01-14 07:58:12 +00:00 · 2023-01-13 09:04:47 +00:00
6 changed files with 46 additions and 11 deletions
--- a/.github/workflows/build-release-binaries.yml
+++ b/.github/workflows/build-release-binaries.yml
@ -45,7 +45,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout tagged commit
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4
        with:
          ref: ${{ github.event.release.target_commitish }}
          token: ${{ secrets.BOTTY_GITHUB_TOKEN }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: dtolnay/rust-toolchain@master
        with:
@ -35,7 +35,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: Swatinem/rust-cache@v2.7.3

@ -49,7 +49,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: Swatinem/rust-cache@v2.7.3

@ -76,7 +76,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: Swatinem/rust-cache@v2.7.3

@ -129,7 +129,7 @@ jobs:
          tool-cache: false

      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: Swatinem/rust-cache@v2.7.3

@ -166,7 +166,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: Swatinem/rust-cache@v2.7.3

@ -177,7 +177,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.4

      - uses: dtolnay/rust-toolchain@stable

--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@ -11,7 +11,7 @@ jobs:
    if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/')
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4

      - name: Extract version from branch name
        id: extract-version
--- a/.github/workflows/draft-new-release.yml
+++ b/.github/workflows/draft-new-release.yml
@ -12,7 +12,7 @@ jobs:
    name: "Draft a new release"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
        with:
          token: ${{ secrets.BOTTY_GITHUB_TOKEN }}

--- a/.github/workflows/preview-release.yml
+++ b/.github/workflows/preview-release.yml
@ -10,7 +10,7 @@ jobs:
    name: Create preview release
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4

      - name: Delete 'preview' release
        uses: larryjoelane/delete-release-action@v1.0.24
--- a/docs/asb/README.md
+++ b/docs/asb/README.md
@ -164,3 +164,38 @@ May 01 01:32:05.018  INFO Tor found. Setting up hidden service.
 May 01 01:32:07.475  INFO /onion3/z4findrdwtfbpoq64ayjtmxvr52vvxnsynerlenlfkmm52dqxsl4deyd:9939
 May 01 01:32:07.476  INFO /onion3/z4findrdwtfbpoq64ayjtmxvr52vvxnsynerlenlfkmm52dqxsl4deyd:9940
 ```
+
+### Exporting the Bitcoin wallet descriptor
+
+First use `swap` or `asb` with the `export-bitcoin-wallet` subcommand.
+
+Output example:
+
+```json
+{"descriptor":"wpkh(tprv8Zgredacted.../84'/1'/0'/0/*)","blockheight":2415616,"label":"asb-testnet"}
+```
+
+The wallet can theoretically be directly imported into
+[bdk-cli](https://bitcoindevkit.org/bdk-cli/installation/) but it is easier to
+use Sparrow Wallet.
+
+Sparrow wallet import works as follows:
+
+- File -> New wallet -> Give it a name
+- Select "New or Imported Software Wallet"
+- Click "Enter Private Key" for "Master Private Key (BIP32)"
+- Enter the `xprv...` or `tprv...` part of the descriptor (example above is `tprv8Zgredacted...`:
+
+![image](https://user-images.githubusercontent.com/351403/212085114-450725b3-3ff4-4010-a142-b7d39b3200d3.png)
+
+- Click "Import"
+- Leave the derivation path as `m/84'/0'/0'` and click "Import Keystore" button
+- Click "Apply" and then supply password
+
+![image](https://user-images.githubusercontent.com/351403/212085483-47ab7cc8-8d65-454a-877b-10b309d71bc6.png)
+
+- Click Transactions tab
+- ???
+- Profit!
+
+![image](https://user-images.githubusercontent.com/351403/212085966-d318011d-79bf-4e72-aced-4026499591c5.png)
Author	SHA1	Message	Date
icy-ux	beedf99386	Merge `ffe4e48785` into `2b850924b1`	2024-04-29 21:06:44 -07:00
Byron Hambly	2b850924b1	Merge pull request #1615 from comit-network/dependabot/github_actions/actions/checkout-4.1.4 build(deps): bump actions/checkout from 4.1.3 to 4.1.4	2024-04-28 20:23:14 +02:00
dependabot[bot]	8a88bde4f5	build(deps): bump actions/checkout from 4.1.3 to 4.1.4 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.3...v4.1.4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-04-25 11:42:46 +00:00
Byron Hambly	ffe4e48785	Merge branch 'master' into document-wallet-export	2024-02-28 09:38:10 +02:00
icyfestive	182f9d3e37	run	2023-01-14 07:58:12 +00:00
icyfestive	7f3feeded5	update bullet point formatting in asb/README.md	2023-01-13 09:04:47 +00:00
icyfestive	06b6f65fa7	bring asb/README.md into compliance with dprint	2023-01-12 17:49:23 +00:00
icyfestive	69bd59b043	Merge branch 'master' into document-wallet-export	2023-01-12 17:23:46 +00:00
icyfestive	8965ad892d	document use of asb export-bitcoin-wallet Add to the `asb` document @delta1's text on exporting the Bitcoin wallet descriptor and importing the descriptor into Sparrow Wallet. TODO: maybe it would make sense to add the images to Git, instead of linking to files on Github?	2023-01-12 17:07:50 +00:00