chore: build python wheels using manylinux_2_28_x86_64

This commit also introduces the sqlite store and removes the flat file
 store

.github/ISSUE_TEMPLATE/minor_release.md

@@ -1,85 +0,0 @@
----
-name: Minor Release
-about: Create a new minor release [for release managers only]
-title: 'Release MAJOR.MINOR+1.0'
-labels: 'release'
-assignees: ''
----
-
-## Create a new minor release
-## Bumping BDK Rust Version
-1. - [ ] Open a PR with an update to `Cargo.toml` to the new bdk release candidate and ensure all CI workflows run correctly. Fix errors if necessary.
-2. - [ ] Once the new bdk release is out, update the PR to replace the release candidate with the full release and merge.
-
-### Specific Libraries' Workflows
-#### _Android_
-3. - [ ] Update the API docs to reflect the changes in the API
-4. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch.
-5. - [ ] Build the library and run the tests, and adjust if necessary.
-```sh
-# start an emulator prior to running the tests
-cd ./bdk-android/
-./gradlew buildAndroidLib
-./gradlew connectedAndroidTest
-```
-6. - [ ] Update the readme if necessary
-#### _JVM_
-7. - [ ] Update the API docs to reflect the changes in the API
-8. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch
-9. - [ ] Build the library and run the tests, and adjust if necessary
-```sh
-cd ./bdk-jvm/
-./gradlew buildJvmLib
-./gradlew test
-```
-10. - [ ] Update the readme if necessary
-#### _Swift_
-11. - [ ] Run the tests and adjust if necessary
-```sh
-./bdk-swift/build-local-swift.sh
-cd ./bdk-swift/
-swift test
-```
-12. - [ ] Update the readme if necessary
-#### _Python_
-13. - [ ] Delete the `.tox`, `dist`, `build`, and `bdkpython.egg-info` and rust `target` directories to make sure you are building the library from scratch without any caches
-14. - [ ] Build the library
-```shell
-cd ./bdk-python/
-pip3 install --requirement requirements.txt
-bash ./generate.sh
-python3 setup.py --verbose bdist_wheel
-```
-15. - [ ] Run the tests and adjust if necessary
-```shell
-pip3 install ./dist/bdkpython-<yourversion>-py3-none-any.whl --force-reinstall
-python -m unittest --verbose tests/test_bdk.py
-```
-16. - [ ] Update the readme and `setup.py` if necessary
-
-### Release Workflow
-17. - [ ] Update the Android, JVM, Python, and Swift libraries as per the _Specific Libraries' Workflows_ section above. Open a single PR on master for all of these changes called `Prepare language bindings libraries for 0.X release`. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/315).
-- [ ] Create a new branch off of `master` called `release/version`
-18. - [ ] Open a PR to that branch to update the Android, JVM, and Python libraries' versions. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/316).
-    - [ ] Update bdk-android version from `SNAPSHOT` version to release version
-    - [ ] Update bdk-jvm version from `SNAPSHOT` version to release version
-    - [ ] Update bdk-python version from `.dev` version to release version
-19. - [ ] Merge the PR updating all the languages to their release versions
-20. - [ ] Create the tag and make sure to add the changelog info to the tag (works better if you prepare the tag message on the side in a text editor) and push it to GitHub.
-```sh
-git tag v0.6.0 --sign --edit
-git push upstream v0.6.0
-```
-21. - [ ] Aggregate all the changelog notices from the PRs and add them to the changelog file
-22. - [ ] Open a PR on master with the changes to the changelog file and the development versions bump. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/317).
-23. - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
-24. - [ ] Trigger manual releases for all 4 libraries (for Swift, simply add the version number in the text field when running the workflow manually. Note that the version number must not contain the `v`, i.e. `0.26.0`)
-25. - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
-26. - [ ] Build and publish API docs for JVM, Android, and Java on the website
-```bash!
-./gradlew dokkaHtml    # bdk-jvm (Dokka)
-./gradlew dokkaJavadoc # bdk-jvm (java-style documentation)
-./gradlew dokkaHtml    # bdk-android (Dokka)
-```
-27. - [ ] Tweet about the library
-28. - [ ] Post in the announcement channel

.github/ISSUE_TEMPLATE/patch_release.md

@@ -1,85 +0,0 @@
----
-name: Patch Release
-about: Create a new patch release [for release managers only]
-title: 'Release MAJOR.MINOR.PATCH+1'
-labels: 'release'
-assignees: ''
----
-
-# Creating a new patch release
-## Bumping BDK Rust Version
-1. - [ ] Open a PR with an update to `Cargo.toml` to the new bdk release candidate and ensure all CI workflows run correctly. Fix errors if necessary.
-2. - [ ] Once the new bdk release is out, update the PR to replace the release candidate with the full release and merge.
-
-### Specific Libraries' Workflows
-#### _Android_
-3. - [ ] Update the API docs to reflect the changes in the API
-4. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch.
-5. - [ ] Build the library and run the tests, and adjust if necessary.
-```sh
-# start an emulator prior to running the tests
-cd ./bdk-android/
-./gradlew buildAndroidLib
-./gradlew connectedAndroidTest
-```
-6. - [ ] Update the readme if necessary
-#### _JVM_
-7. - [ ] Update the API docs to reflect the changes in the API
-8. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch
-9. - [ ] Build the library and run the tests, and adjust if necessary
-```sh
-cd ./bdk-jvm/
-./gradlew buildJvmLib
-./gradlew test
-```
-10. - [ ] Update the readme if necessary
-#### _Swift_
-11. - [ ] Run the tests and adjust if necessary
-```sh
-./bdk-swift/build-local-swift.sh
-cd ./bdk-swift/
-swift test
-```
-12. - [ ] Update the readme if necessary
-#### _Python_
-13. - [ ] Delete the `.tox`, `dist`, `build`, and `bdkpython.egg-info` and rust `target` directories to make sure you are building the library from scratch without any caches
-14. - [ ] Build the library
-```shell
-cd ./bdk-python/
-pip3 install --requirement requirements.txt
-bash ./generate.sh
-python3 setup.py --verbose bdist_wheel
-```
-15. - [ ] Run the tests and adjust if necessary
-```shell
-pip3 install ./dist/bdkpython-<yourversion>-py3-none-any.whl --force-reinstall
-python -m unittest --verbose tests/test_bdk.py
-```
-16. - [ ] Update the readme and `setup.py` if necessary
-
-### Release Workflow
-17. - [ ] Update the Android, JVM, Python, and Swift libraries as per the _Specific Libraries' Workflows_ section above. Open a single PR on master for all of these changes called `Prepare language bindings libraries for 0.X release`. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/315).
-- [ ] Create a new branch off of `master` called `release/version`
-18. - [ ] Open a PR to that branch to update the Android, JVM, and Python libraries' versions. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/316).
-- [ ] Update bdk-android version from `SNAPSHOT` version to release version
-- [ ] Update bdk-jvm version from `SNAPSHOT` version to release version
-- [ ] Update bdk-python version from `.dev` version to release version
-19. - [ ] Merge the PR updating all the languages to their release versions
-20. - [ ] Create the tag and make sure to add the changelog info to the tag (works better if you prepare the tag message on the side in a text editor) and push it to GitHub.
-```sh
-git tag v0.6.0 --sign --edit
-git push upstream v0.6.0
-```
-21. - [ ] Aggregate all the changelog notices from the PRs and add them to the changelog file
-22. - [ ] Open a PR on master with the changes to the changelog file and the development versions bump. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/317).
-23. - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
-24. - [ ] Trigger manual releases for all 4 libraries (for Swift, simply add the version number in the text field when running the workflow manually. Note that the version number must not contain the `v`, i.e. `0.26.0`)
-25. - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
-26. - [ ] Build and publish API docs for JVM, Android, and Java on the website
-```bash!
-./gradlew dokkaHtml    # bdk-jvm (Dokka)
-./gradlew dokkaJavadoc # bdk-jvm (java-style documentation)
-./gradlew dokkaHtml    # bdk-android (Dokka)
-```
-27. - [ ] Tweet about the library
-28. - [ ] Post in the announcement channel

.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,95 @@
+---
+name: Release
+about: Create a new release [for release managers only]
+title: 'Release MAJOR.MINOR.PATCH'
+labels: 'release'
+assignees: ''
+---
+
+# Part 1: Bump BDK Rust Version
+
+1. - [ ] Open a PR with an update to `Cargo.toml` to the new bdk release candidate and ensure all CI workflows run correctly. Fix errors if necessary.
+2. - [ ] Once the new bdk release is out, update the PR to replace the release candidate with the full release and merge.
+
+# Part 2: Prepare Libraries for Release Branch
+
+### _Android_
+
+3. - [ ] Update the API docs to reflect the changes in the API
+4. - [ ] Delete the `target` directory in bdk-ffi and all `build` directories (in root, `lib`, and `plugins`) in the bdk-android directory to make sure you're building the library from scratch.
+5. - [ ] Build the library and run the offline and live tests, and adjust them if necessary (note that you'll need an Android emulator running).
+```shell
+# start an emulator prior to running the tests
+cd ./bdk-android/
+just clean
+just build
+just test
+```
+6. - [ ] Update the readme if necessary
+
+### _JVM_
+
+7. - [ ] Update the API docs to reflect the changes in the API
+8. - [ ] Delete the `target` directory in bdk-ffi and all `build` directories (in root, `lib`, and `plugins`) in bdk-jvm directory to make sure you're building the library from scratch.
+9. - [ ] Build the library and run the tests, and adjust if necessary
+```shell
+cd ./bdk-jvm/
+just clean
+just build
+just test
+```
+10.  - [ ] Update the readme if necessary
+
+### _Swift_
+
+11. - [ ] Delete the `target` directory in bdk-ffi
+12. - [ ] Run the tests and adjust if necessary
+```shell
+cd ./bdk-swift/
+just clean
+just build
+just test
+```
+13.  - [ ] Update the readme if necessary
+
+### _Python_
+
+14. - [ ] Delete the `dist`, `build`, and `bdkpython.egg-info` and rust `target` directories to make sure you are building the library from scratch without any caches
+15. - [ ] Build the library
+```shell
+cd ./bdk-python/
+just clean
+pip3 install --requirement requirements.txt
+bash ./scripts/generate-macos-arm64.sh # run the script for your particular platform
+python3 setup.py --verbose bdist_wheel
+```
+16.  - [ ] Run the tests and adjust if necessary
+```shell
+pip3 install ./dist/bdkpython-<yourversion>-py3-none-any.whl --force-reinstall
+python -m unittest --verbose
+```
+17.  - [ ] Update the readme and `setup.py` if necessary
+18. - [ ] Update the Android, JVM, Python, and Swift libraries as per the _Specific Libraries' Workflows_ section above. Open a single PR on master for all of these changes called `Prepare language bindings libraries for 0.X release`. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/315).
+
+## Part 3: Release Workflow
+
+19. - [ ] Create a new branch off of `master` called `release/<feature version>`, e.g. `release/0.31`
+20. - [ ] Update bdk-android version from `SNAPSHOT` version to release version
+21. - [ ] Update bdk-jvm version from `SNAPSHOT` version to release version
+22. - [ ] Update bdk-python version from `.dev` version to release version
+23. - [ ] Open a PR to that release branch that updates the Android, JVM, and Python libraries' versions in the three steps above. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/316).
+24. - [ ] Get a review and ACK and merge the PR updating all the languages to their release versions
+25. - [ ] Create the tag for the release and make sure to add the changelog info to the tag (works better if you prepare the tag message on the side in a text editor). Push the tag to GitHub.
+```shell
+git tag v0.6.0 --sign --edit
+git push upstream v0.6.0
+```
+26.  - [ ] Trigger manual releases for all 4 libraries (for Swift, go on the [bdk-swift](https://github.com/bitcoindevkit/bdk-swift) trigger the release on `master` and simply add the version number and tag name in the text fields when running the workflow manually. Note that the version number must not contain the `v`, i.e. `0.26.0`, but the tag will have it, i.e. `v0.26.0`).
+27.  - [ ] Make sure the released libraries work and contain the artifacts you would expect 
+28.  - [ ] Aggregate all the changelog notices from the PRs and add them to the changelog file
+29.  - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
+30.  - [ ] Apply changes to the minor_release and patch_release issue templates if they need any
+31.  - [ ] Open a PR on master with the changes in steps 29, 30, and 31. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/317). Get a review and merge the PR.
+32.  - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
+33.  - [ ] Post in the announcement channel
+34.  - [ ] Tweet about the library

.github/workflows/audit.yml

@@ -12,8 +12,14 @@ jobs:
   security_audit:
     name: Security audit
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: bdk-ffi
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Check out PR branch"
+        uses: actions/checkout@v3
+
+      - name: "Run audit"
+        run: |
+          cargo install cargo-audit
+          cargo-audit audit

.github/workflows/cont_integration.yml

@@ -9,23 +9,25 @@ on:
 
 jobs:
   build-test:
-    name: Build and test
+    name: "Build and test"
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: bdk-ffi
     strategy:
       matrix:
         rust:
-          - version: 1.63.0 # STABLE
+          - version: 1.77.1
             clippy: true
-          - version: 1.61.0 # MSRV
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: "Checkout"
+        uses: actions/checkout@v3
 
-      - name: Generate cache key
+      - name: "Generate cache key"
         run: echo "${{ matrix.rust.version }} ${{ matrix.features }}" | tee .cache_key
 
-      - name: Cache
-        uses: actions/cache@v2
+      - name: "Cache"
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
@@ -33,47 +35,50 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('.cache_key') }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
-      - name: Set default toolchain
+      - name: "Set default toolchain"
         run: rustup default ${{ matrix.rust.version }}
 
-      - name: Set profile
+      - name: "Set profile"
         run: rustup set profile minimal
 
-      - name: Add clippy
+      - name: "Add clippy"
         if: ${{ matrix.rust.clippy }}
         run: rustup component add clippy
 
-      - name: Update toolchain
+      - name: "Update toolchain"
         run: rustup update
 
-      - name: Build
+      - name: "Build"
         run: cargo build
 
-      - name: Clippy
+      - name: "Clippy"
         if: ${{ matrix.rust.clippy }}
         run: cargo clippy --all-targets --features "uniffi/bindgen-tests" -- -D warnings
 
-      - name: Test
-        run: CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test --features uniffi/bindgen-tests
+      - name: "Test"
+        run: CLASSPATH=./tests/jna/jna-5.14.0.jar cargo test --features uniffi/bindgen-tests
 
   fmt:
-    name: Rust fmt
-    runs-on: ubuntu-latest
+    name: "Rust fmt"
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: bdk-ffi
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: "Checkout"
+        uses: actions/checkout@v3
 
-      - name: Set default toolchain
+      - name: "Set default toolchain"
         run: rustup default nightly
 
-      - name: Set profile
+      - name: "Set profile"
         run: rustup set profile minimal
 
-      - name: Add rustfmt
+      - name: "Add rustfmt"
         run: rustup component add rustfmt
 
-      - name: Update toolchain
+      - name: "Update toolchain"
         run: rustup update
 
-      - name: Check fmt
+      - name: "Check fmt"
         run: cargo fmt --all -- --config format_code_in_doc_comments=true --check

.github/workflows/live-tests.yaml

@@ -0,0 +1,96 @@
+name: Run All Live Tests
+on: 
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0' # Once per week
+
+jobs:
+  jvm-tests:
+    name: "Build and test JVM library on Linux"
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Checkout publishing branch"
+        uses: actions/checkout@v3
+
+      - name: "Cache"
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./target
+          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
+
+      - name: "Set up JDK"
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
+
+      - name: "Build bdk-jvm library"
+        run: |
+          cd bdk-jvm
+          ./gradlew buildJvmLib
+
+      - name: "Run live JVM tests"
+        run: |
+          cd bdk-jvm
+          ./gradlew test
+
+  swift-tests:
+    name: "Build and test iOS library on macOS"
+    runs-on: macos-12
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v3
+
+      - name: "Build Swift package"
+        working-directory: bdk-swift
+        run: bash ./build-xcframework.sh
+
+      - name: "Run live Swift tests"
+        working-directory: bdk-swift
+        run: swift test
+
+  python-tests:
+    name: "Build and test Python library on Linux"
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: bdk-python
+    container:
+      image: quay.io/pypa/manylinux2014_x86_64
+      env:
+        PLAT: manylinux2014_x86_64
+        PYBIN: "/opt/python/${{ matrix.python }}/bin"
+    strategy:
+      matrix:
+        python:
+          - cp310-cp310
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: "Install Rust 1.77.1"
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.77.1
+
+      - name: "Generate bdk.py and binaries"
+        run: bash ./scripts/generate-linux.sh
+
+      - name: "Build wheel"
+        # Specifying the plat-name argument is necessary to build a wheel with the correct name,
+        # see issue #350 for more information
+        run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_17_x86_64 --verbose
+
+      - name: "Install wheel"
+        run: ${PYBIN}/pip install ./dist/*.whl
+
+      - name: "Run live Python tests"
+        run: ${PYBIN}/python -m unittest --verbose

.github/workflows/publish-android.yaml

@@ -2,28 +2,16 @@ name: Publish bdk-android to Maven Central
 on: [workflow_dispatch]
 
 # The default Android NDK on the ubuntu-22.04 image is 25.2.9519653
-# We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
-# with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930
-# For information on why this is needed at the moment see issues #242 and #243, and PR #282
-env:
-  ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - name: "Install Android NDK 21.4.7075529"
-        run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
-          SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-
       - name: "Check out PR branch"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
@@ -32,13 +20,13 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
 
       - name: "Install Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
@@ -48,7 +36,7 @@ jobs:
           cd bdk-android
           ./gradlew buildAndroidLib
 
-      - name: "Publish to Maven Local and Maven Central"
+      - name: "Publish to Maven Central"
         env:
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}

.github/workflows/publish-jvm.yaml

@@ -2,14 +2,14 @@ name: Publish bdk-jvm to Maven Central
 on: [workflow_dispatch]
 
 jobs:
-  build-jvm-macOS-M1-native-lib:
-    name: "Create M1 and x86_64 JVM native binaries"
+  build-macOS-native-libs:
+    name: "Create M1 and x86_64 native binaries"
     runs-on: macos-12
     steps:
       - name: "Checkout publishing branch"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Cache
+      - name: "Cache"
         uses: actions/cache@v3
         with:
           path: |
@@ -18,45 +18,68 @@ jobs:
             ./target
           key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - name: "Set up JDK"
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
 
-      - name: Install aarch64 Rust target
+      - name: "Install aarch64 Rust target"
         run: rustup target add aarch64-apple-darwin
 
-      - name: Build bdk-jvm library
+      - name: "Build bdk-jvm library"
         run: |
           cd bdk-jvm
           ./gradlew buildJvmLib
 
-      # build aarch64 + x86_64 native libraries and upload
-      - name: Upload macOS native libraries for reuse in publishing job
+      - name: "Upload macOS native libraries for reuse in publishing job"
         uses: actions/upload-artifact@v3
         with:
-          # name: no name is required because we upload the entire directory
-          # the default name "artifact" will be used
+          name: artifact-macos
           path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-jvm/lib/src/main/resources/
 
-  build-jvm-full-library:
+  build-windows-native-lib:
+    name: "Create Windows native binaries"
+    runs-on: windows-2022
+    steps:
+      - name: "Checkout publishing branch"
+        uses: actions/checkout@v3
+
+      - name: "Set up JDK"
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
+
+      - name: "Install x86_64-pc-windows-msvc Rust target"
+        run: rustup target add x86_64-pc-windows-msvc
+
+      - name: "Build bdk-jvm library"
+        run: |
+          cd bdk-jvm
+          ./gradlew buildJvmLib
+
+      - name: "Upload Windows native libraries for reuse in publishing job"
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifact-windows
+          path: D:\a\bdk-ffi\bdk-ffi\bdk-jvm\lib\src\main\resources\
+
+  build-full-library:
     name: Create full bdk-jvm library
-    needs: [build-jvm-macOS-M1-native-lib]
+    needs: [build-macOS-native-libs, build-windows-native-lib]
     runs-on: ubuntu-20.04
     steps:
-      - name: Checkout publishing branch
-        uses: actions/checkout@v2
+      - name: "Checkout publishing branch"
+        uses: actions/checkout@v3
 
-      - name: Update bdk-ffi git submodule
-        run: |
-          git submodule set-url bdk-ffi https://github.com/bitcoindevkit/bdk-ffi.git
-          git submodule update --init bdk-ffi
-
-      - name: Cache
+      - name: "Cache"
         uses: actions/cache@v3
         with:
           path: |
@@ -65,29 +88,39 @@ jobs:
             ./target
           key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - name: "Set up JDK"
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
 
-      - name: Build bdk-jvm library
+      - name: "Build bdk-jvm library"
         run: |
           cd bdk-jvm
           ./gradlew buildJvmLib
 
-      - name: Download macOS native libraries from previous job
+      - name: "Download macOS native binaries from previous job"
         uses: actions/download-artifact@v3
-        id: download
         with:
-          # download the artifact created in the prior job (named "artifact")
-          name: artifact
+          name: artifact-macos
           path: ./bdk-jvm/lib/src/main/resources/
 
-      - name: Publish to Maven Central
+      - name: "Download Windows native libraries from previous job"
+        uses: actions/download-artifact@v3
+        with:
+          name: artifact-windows
+          path: ./bdk-jvm/lib/src/main/resources/
+
+      - name: "Upload library code and binaries"
+        uses: actions/upload-artifact@v3
+        with:
+          name: artifact-full
+          path: ./bdk-jvm/lib/
+
+      - name: "Publish to Maven Central"
         env:
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}

.github/workflows/publish-python.yaml

@@ -1,22 +1,17 @@
-name: Build and publish Python wheels
+name: Publish bdkpython to PyPI
 on: [workflow_dispatch]
 
-# We use manylinux2014 because older CentOS versions used by 2010 and 1 have a very old glibc version, which
-# makes it very hard to use GitHub's javascript actions (checkout, upload-artifact, etc).
-# They mount their own nodejs interpreter inside your container, but since that's not statically linked it
-# tries to load glibc and fails because it requires a more recent version.
-
 jobs:
-  build-manylinux2014-x86_64-wheel:
-    name: "Build Manylinux 2014 x86_64 wheel"
+  build-manylinux_2_28-x86_64-wheels:
+    name: "Build Manylinux 2.28 x86_64 wheel"
     runs-on: ubuntu-20.04
     defaults:
       run:
         working-directory: bdk-python
     container:
-      image: quay.io/pypa/manylinux2014_x86_64
+      image: quay.io/pypa/manylinux_2_28_x86_64
       env:
-        PLAT: manylinux2014_x86_64
+        PLAT: manylinux_2_28_x86_64
         PYBIN: "/opt/python/${{ matrix.python }}/bin"
     strategy:
       matrix:
@@ -24,37 +19,35 @@ jobs:
           - cp38-cp38
           - cp39-cp39
           - cp310-cp310
+          - cp311-cp311
+          - cp312-cp312
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+
+      - name: "Install Rust 1.77.1"
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
-
-      - name: "Install requirements"
-        run: ${PYBIN}/pip install -r requirements.txt
-
+          toolchain: 1.77.1
+          
       - name: "Generate bdk.py and binaries"
-        run: bash generate.sh
+        run: bash ./scripts/generate-linux.sh
 
       - name: "Build wheel"
         # Specifying the plat-name argument is necessary to build a wheel with the correct name,
         # see issue #350 for more information
-        run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_17_x86_64 --verbose
+        run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_28_x86_64 --verbose
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
-          name: bdkpython-manylinux2014-x86_64-${{ matrix.python }}
+          name: bdkpython-manylinux_2_28_x86_64-${{ matrix.python }}
           path: /home/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
 
-  build-macos-universal-wheel:
-    name: "Build macOS universal wheel"
-    runs-on: macos-12
+  build-macos-arm64-wheels:
+    name: "Build macOS arm64 wheel"
+    runs-on: macos-13
     defaults:
       run:
         working-directory: bdk-python
@@ -64,35 +57,72 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+
+      - name: "Install Python"
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: "Generate bdk.py and binaries"
-        run: |
-          python3 --version
-          rustup target add aarch64-apple-darwin
-          pip3 install --user -r requirements.txt
-          bash generate.sh
+        run: bash ./scripts/generate-macos-arm64.sh
 
       - name: "Build wheel"
-        env:
-          ARCHFLAGS: "-arch x86_64 -arch arm64"
         # Specifying the plat-name argument is necessary to build a wheel with the correct name,
         # see issue #350 for more information
-        run: python3 setup.py bdist_wheel --plat-name macosx_12_0_universal2 --verbose
+        run: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 --verbose
 
-      - uses: actions/upload-artifact@v2
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v3
         with:
-          name: bdkpython-macos-${{ matrix.python }}
+          name: bdkpython-macos-arm64-${{ matrix.python }}
           path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
 
-  build-windows-wheel:
+  build-macos-x86_64-wheels:
+    name: "Build macOS x86_64 wheel"
+    runs-on: macos-13
+    defaults:
+      run:
+        working-directory: bdk-python
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: "Generate bdk.py and binaries"
+        run: bash ./scripts/generate-macos-x86_64.sh
+
+      - name: "Build wheel"
+        # Specifying the plat-name argument is necessary to build a wheel with the correct name,
+        # see issue #350 for more information
+        run: python3 setup.py bdist_wheel --plat-name macosx_11_0_x86_64 --verbose
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: bdkpython-macos-x86_64-${{ matrix.python }}
+          path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
+
+  build-windows-wheels:
     name: "Build Windows wheel"
     runs-on: windows-2022
     defaults:
@@ -104,25 +134,25 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: "Generate bdk.py and binaries"
-        run: |
-          python --version
-          pip install --user -r requirements.txt
-          bash generate.sh
+        run: bash ./scripts/generate-windows.sh
 
       - name: "Build wheel"
         run: python setup.py bdist_wheel --verbose
 
-      - uses: actions/upload-artifact@v2
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v3
         with:
           name: bdkpython-win-${{ matrix.python }}
           path: D:\a\bdk-ffi\bdk-ffi\bdk-python\dist\*.whl
@@ -133,13 +163,13 @@ jobs:
     defaults:
       run:
         working-directory: bdk-python
-    needs: [build-manylinux2014-x86_64-wheel, build-macos-universal-wheel, build-windows-wheel]
+    needs: [build-manylinux_2_28-x86_64-wheels, build-macos-arm64-wheels, build-macos-x86_64-wheels, build-windows-wheels]
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Download artifacts in dist/ directory"
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: dist/
 

.github/workflows/test-android.yaml

@@ -11,28 +11,19 @@ on:
       - "bdk-android/**"
 
 # The default Android NDK on the ubuntu-22.04 image is 25.2.9519653
-# We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
-# with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930
-# For information on why this is needed at the moment see issues #242 and #243, and PR #282
-env:
-  ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - name: "Install Android NDK 21.4.7075529"
-        run: |
-          ANDROID_ROOT=/usr/local/lib/android
-          ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
-          SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
-          echo "y" | $SDKMANAGER "ndk;21.4.7075529"
+      - name: "Show default version of NDK"
+        run: echo $ANDROID_NDK_ROOT
 
       - name: "Check out PR branch"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
@@ -41,13 +32,13 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
 
       - name: "Install Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
@@ -55,11 +46,12 @@ jobs:
       - name: "Build Android library"
         run: |
           cd bdk-android
-          ./gradlew buildAndroidLib
+          ./gradlew buildAndroidLib --console=plain
 
-# There are currently no unit tests for bdk-android and the integration tests require the macOS image
-# which is not working with the older NDK version we are using, so for now we just make sure that the library builds.
-#      - name: "Run Android unit tests"
+# There are currently no unit tests for bdk-android (see the tests in bdk-jvm instead) and the 
+# integration tests require the macOS image which is not working with the older NDK version we
+# are using, so for now we just make sure that the library builds and omit the connectedTest
+#      - name: "Run Android connected tests"
 #        run: |
 #          cd bdk-android
-#          ./gradlew test --console=rich
+#          ./gradlew connectedAndroidTest --console=plain

.github/workflows/test-jvm.yaml

@@ -14,11 +14,11 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - name: Check out PR branch
-        uses: actions/checkout@v2
+      - name: "Check out PR branch"
+        uses: actions/checkout@v3
 
-      - name: Cache
-        uses: actions/cache@v2
+      - name: "Cache"
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
@@ -26,16 +26,16 @@ jobs:
             ./target
           key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
 
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - name: "Set up JDK"
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.77.1"
+        run: rustup default 1.77.1
 
-      - name: Run JVM tests
+      - name: "Run JVM tests"
         run: |
           cd bdk-jvm
-          ./gradlew test --console=rich
+          ./gradlew test -P excludeConnectedTests

.github/workflows/test-python.yaml

@@ -10,22 +10,17 @@ on:
       - "bdk-ffi/**"
       - "bdk-python/**"
 
-# We use manylinux2014 because older CentOS versions used by 2010 and 1 have a very old glibc version, which
-# makes it very hard to use GitHub's javascript actions (checkout, upload-artifact, etc).
-# They mount their own nodejs interpreter inside your container, but since that's not statically linked it
-# tries to load glibc and fails because it requires a more recent version.
-
 jobs:
-  build-manylinux2014-x86_64-wheel:
-    name: "Build and test Manylinux 2014 x86_64 wheels"
+  build-manylinux_2_28-x86_64-wheels:
+    name: "Build and test Manylinux 2.28 x86_64 wheels"
     runs-on: ubuntu-20.04
     defaults:
       run:
         working-directory: bdk-python
     container:
-      image: quay.io/pypa/manylinux2014_x86_64
+      image: quay.io/pypa/manylinux_2_28_x86_64
       env:
-        PLAT: manylinux2014_x86_64
+        PLAT: manylinux_2_28_x86_64
         PYBIN: "/opt/python/${{ matrix.python }}/bin"
     strategy:
       matrix:
@@ -33,83 +28,128 @@ jobs:
           - cp38-cp38
           - cp39-cp39
           - cp310-cp310
+          - cp311-cp311
+          - cp312-cp312
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+
+      - name: "Install Rust 1.77.1"
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
-
-      - name: "Install requirements"
-        run: ${PYBIN}/pip install -r requirements.txt
-
+          toolchain: 1.77.1
+          
       - name: "Generate bdk.py and binaries"
-        run: bash generate.sh
+        run: bash ./scripts/generate-linux.sh
 
       - name: "Build wheel"
         # Specifying the plat-name argument is necessary to build a wheel with the correct name,
         # see issue #350 for more information
-        run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_17_x86_64 --verbose
+        run: ${PYBIN}/python setup.py bdist_wheel --plat-name manylinux_2_28_x86_64 --verbose
 
       - name: "Install wheel"
         run: ${PYBIN}/pip install ./dist/*.whl
 
       - name: "Run tests"
-        run: ${PYBIN}/python -m unittest tests/test_bdk.py --verbose
+        run: ${PYBIN}/python -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
 
       - name: "Upload artifact test"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: bdkpython-manylinux2014-x86_64-${{ matrix.python }}
+          name: bdkpython-manylinux_2_28_x86_64-${{ matrix.python }}
           path: /home/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
 
-  build-macos-universal-wheel:
-    name: "Build and test macOS wheels"
-    runs-on: macos-12
+  build-macos-arm64-wheels:
+    name: "Build and test macOS arm64 wheels"
+    runs-on: macos-13
     defaults:
       run:
         working-directory: bdk-python
     strategy:
       matrix:
         python:
-          # 3.8 returns an error for the macos-12 image when we try to install the wheel:
-          # bdkpython-0.28.0.dev0-cp38-cp38-macosx_12_0_universal2.whl is not a supported wheel on this platform.
-          # - "3.8"
+          - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: "Checkout"
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+
+      - name: "Install Python"
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: "Generate bdk.py and binaries"
-        run: | 
-          python3 --version
-          rustup target add aarch64-apple-darwin
-          pip3 install --user -r requirements.txt
-          bash generate.sh
+        run: bash ./scripts/generate-macos-arm64.sh
 
       - name: "Build wheel"
-        env:
-          ARCHFLAGS: "-arch x86_64 -arch arm64"
-        run: python3 setup.py bdist_wheel --plat-name macosx_12_0_universal2 --verbose
+        # Specifying the plat-name argument is necessary to build a wheel with the correct name,
+        # see issue #350 for more information
+        run: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 --verbose
+
+      # You can't install the arm64 wheel on the CI, so we skip these steps and simply test that the wheel builds
+      # - name: "Install wheel and run tests"
+      #   run: |
+      #     pip3 install ./dist/*.whl
+      #     python3 -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
+
+      - name: "Upload artifact test"
+        uses: actions/upload-artifact@v3
+        with:
+          name: bdkpython-macos-arm64-${{ matrix.python }}
+          path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
+
+  build-macos-x86_64-wheels:
+    name: "Build and test macOS x86_64 wheels"
+    runs-on: macos-13
+    defaults:
+      run:
+        working-directory: bdk-python
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: "Generate bdk.py and binaries"
+        run: bash ./scripts/generate-macos-x86_64.sh
+
+      - name: "Build wheel"
+        # Specifying the plat-name argument is necessary to build a wheel with the correct name,
+        # see issue #350 for more information
+        run: python3 setup.py bdist_wheel --plat-name macosx_11_0_x86_64 --verbose
 
       - name: "Install wheel"
         run: pip3 install ./dist/*.whl
 
       - name: "Run tests"
-        run: python3 -m unittest tests/test_bdk.py --verbose
+        run: python3 -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
 
-  build-windows-wheel:
+      - name: "Upload artifact test"
+        uses: actions/upload-artifact@v3
+        with:
+          name: bdkpython-macos-x86_64-${{ matrix.python }}
+          path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl
+
+  build-windows-wheels:
     name: "Build and test Windows wheels"
     runs-on: windows-2022
     defaults:
@@ -121,30 +161,34 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+
+      - name: "Install Python"
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
-      - name: "Generate bdk.py"
-        run: |
-          python --version
-          pip install --user -r requirements.txt
-          bash generate.sh
+      - name: "Generate bdk.py and binaries"
+        run: bash ./scripts/generate-windows.sh
 
       - name: "Build wheel"
         run: python setup.py bdist_wheel --verbose
 
-# TODO: On Windows the pip install ./dist/*.whl step fails with the following error:
-# Run pip install ./dist/*.whl
-# WARNING: Requirement './dist/*.whl' looks like a filename, but the file does not exist
-# ERROR: *.whl is not a valid wheel filename.*.whl is not a valid wheel name
-# So we skip the installing and the tests and simply test that the wheel builds
-      # - name: Install wheel
-      #   run: pip install ./dist/*.whl
-      # - name: Run tests
-      #   run: python -m unittest tests/test_bdk.py --verbose
+      - name: "Upload artifact test"
+        uses: actions/upload-artifact@v3
+        with:
+          name: bdkpython-windows-${{ matrix.python }}
+          path: D:\a\bdk-ffi\bdk-ffi\bdk-python\dist\*.whl
+
+      - name: "Install dependencies"
+        run: Get-ChildItem 'D:\a\bdk-ffi\bdk-ffi\bdk-python\dist\*.whl' | ForEach-Object {pip install $_.FullName}
+        shell: powershell
+
+      - name: "Run tests"
+        run: python -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose

.github/workflows/test-swift.yaml

@@ -12,44 +12,16 @@ on:
 
 jobs:
   build:
+    name: "Build and test"
     runs-on: macos-12
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: "Checkout"
+        uses: actions/checkout@v3
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
-
-      - name: Install Rust targets
-        run: |
-          rustup install nightly-x86_64-apple-darwin
-          rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
-          rustup target add aarch64-apple-darwin x86_64-apple-darwin
-
-      - name: Run bdk-ffi-bindgen
-        working-directory: bdk-ffi
-        run: cargo run --bin uniffi-bindgen generate src/bdk.udl --language swift --out-dir ../bdk-swift/Sources/BitcoinDevKit --no-format
-
-      - name: Build bdk-ffi for x86_64-apple-darwin
-        run: cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-darwin
-
-      - name: Build bdk-ffi for aarch64-apple-darwin
-        run: cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-darwin
-
-      - name: Create lipo-macos
-        run: |
-          mkdir -p target/lipo-macos/release-smaller
-          lipo target/aarch64-apple-darwin/release-smaller/libbdkffi.a target/x86_64-apple-darwin/release-smaller/libbdkffi.a -create -output target/lipo-macos/release-smaller/libbdkffi.a
-
-      - name: Create bdkFFI.xcframework
+      - name: "Build Swift package"
         working-directory: bdk-swift
-        run: |
-          mv Sources/BitcoinDevKit/bdk.swift Sources/BitcoinDevKit/BitcoinDevKit.swift
-          cp Sources/BitcoinDevKit/bdkFFI.h bdkFFI.xcframework/macos-arm64_x86_64/bdkFFI.framework/Headers
-          cp ../target/lipo-macos/release-smaller/libbdkffi.a bdkFFI.xcframework/macos-arm64_x86_64/bdkFFI.framework/bdkFFI
-          rm Sources/BitcoinDevKit/bdkFFI.h
-          rm Sources/BitcoinDevkit/bdkFFI.modulemap
+        run: bash ./build-xcframework.sh
 
-      - name: Run Swift tests
+      - name: "Run Swift tests"
         working-directory: bdk-swift
-        run: swift test
+        run: swift test --skip LiveElectrumClientTests --skip LiveMemoryWalletTests --skip LiveTransactionTests --skip LiveTxBuilderTests --skip LiveWalletTests

.gitignore

@@ -18,7 +18,7 @@ bdk.kt
 
 # Swift related
 /.build
-/.swiftpm
+.swiftpm
 /Packages
 /*.xcodeproj
 xcuserdata/
@@ -31,6 +31,8 @@ bdkFFI.h
 BitcoinDevKit.swift
 bdk.swift
 .build
+*.xcframework/
+Info.plist
 
 # Python related
 __pycache__

CHANGELOG.md

@@ -1,8 +1,70 @@
 # Changelog
 Changelog information can also be found in each release's git tag (which can be viewed with `git tag -ln100 "v*"`), as well as on the [GitHub releases](https://github.com/bitcoindevkit/bdk-ffi/releases) page. See [DEVELOPMENT_CYCLE.md](DEVELOPMENT_CYCLE.md) for more details.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v1.0.0-alpha.11]
+This release brings the latest alpha 11 release of the Rust bdk_wallet library, as well as the new Electrum client, the new memory wallet, and a whole lot of new types and APIs across the library. Also of note are the much simpler-to-use full_scan and sync workflows for syncing wallets.
+
+Added:
+  - `Amount` type [#533]
+  - `TxIn` type [#536]
+  - `Transaction.input()` method [#536]
+  - `Transaction.output()` method [#536]
+  - `Transaction.lock_time()` method [#536]
+  - `Electrum` client [#535]
+  - Memory wallet [#528]
+
+[#528]: https://github.com/bitcoindevkit/bdk-ffi/pull/528
+[#533]: https://github.com/bitcoindevkit/bdk-ffi/pull/533
+[#535]: https://github.com/bitcoindevkit/bdk-ffi/pull/535
+[#536]: https://github.com/bitcoindevkit/bdk-ffi/pull/536
+
+## [v1.0.0-alpha.7]
+This release brings back into the 1.0 API a number of APIs from the 0.31 release, and adds the new flat file persistence feature, as well as more fine-grain errors.
+
+## [v1.0.0-alpha.2a]
+This release is the first alpha release of the 1.0 API for the bindings libraries. Here is what is now available:
+- Create and recover wallets using descriptors, including the four descriptor templates
+- Sync a wallet using a blocking Esplora client
+- Query the wallet for balance and addresses
+- Create and sign transactions using the transaction builder
+- Broadcast transactions
+
+## [v0.31.0]
+This release updates the bindings libraries to bdk version 0.29.0, updating rust-bitcoin to version 0.30.2.
+
+- APIs Changed:
+  - `BumpFeeTxBuilder.allow_shrinking()` now takes a `Script` as its argument [#443]
+  - The `Address` constructor now takes a `Network` argument [#443]
+  - The `Payload::PubkeyHash` and `Payload::ScriptHash` now have string arguments instead of byte arrays [#443]
+- APIs Added:
+  - The `Address` type now has the `is_valid_for_network()` method [#443]
+
+[#443]: https://github.com/bitcoindevkit/bdk-ffi/pull/443
+
+## [v0.30.0]
+This release has a new API and a few internal optimizations and refactorings.
+
+- APIs Added
+  - Add BIP-86 descriptor templates [#388]
+
+[#388]: https://github.com/bitcoindevkit/bdk-ffi/pull/388
+
+## [v0.29.0]
+This release has a number of new APIs, and adds support for Windows in bdk-jvm.
+
+Changelog
+- Add support for Windows in bdk-jvm [#336]
+- Add support for older version of Linux distros in bdk-jvm [#345]
+- APIs added
+  - Expose `is_mine()` method on the `Wallet` type [#355]
+  - Expose `to_bytes()` method on the `Script` type [#369]
+
+[#336]: https://github.com/bitcoindevkit/bdk-ffi/pull/336
+[#345]: https://github.com/bitcoindevkit/bdk-ffi/pull/345
+[#355]: https://github.com/bitcoindevkit/bdk-ffi/pull/355
+[#369]: https://github.com/bitcoindevkit/bdk-ffi/pull/369
 
 ## [v0.28.0]
 - Update BDK to version 0.28.0 [#341]
@@ -200,6 +262,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [BIP 0174]:https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#encoding
 
+[v1.0.0-alpha.11]: https://github.com/bitcoindevkit/bdk-ffi/compare/v1.0.0-alpha.7...v1.0.0-alpha.11
+[v1.0.0-alpha.7]: https://github.com/bitcoindevkit/bdk-ffi/compare/v1.0.0-alpha.2a...v1.0.0-alpha.7
+[v1.0.0-alpha.2a]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.31.0...v1.0.0-alpha.2a
+[v0.31.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.30.0...v0.31.0
+[v0.30.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.29.0...v0.30.0
+[v0.29.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.28.0...v0.29.0
 [v0.28.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.27.1...v0.28.0
 [v0.27.1]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.26.0...v0.27.1
 [v0.26.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.25.0...v0.26.0

Cargo.toml

@@ -1,12 +0,0 @@
-[workspace]
-members = ["bdk-ffi"]
-default-members = ["bdk-ffi"]
-exclude = ["api-docs", "bdk-android", "bdk-jvm", "bdk-python", "bdk-swift"]
-
-[profile.release-smaller]
-inherits = "release"
-opt-level = 'z'     # Optimize for size.
-lto = true          # Enable Link Time Optimization
-codegen-units = 1   # Reduce number of codegen units to increase optimizations.
-panic = 'abort'     # Abort on panic
-strip = true        # Strip symbols from binary*

README.md

@@ -7,6 +7,10 @@
     <a href="https://discord.gg/d7NkDKm"><img alt="Chat on Discord" src="https://img.shields.io/discord/753336465005608961?logo=discord"></a>
 </p>
 
+## 🚨 Warning 🚨
+The `master` branch of this repository is being migrated to the [bdk 1.0 API](https://github.com/bitcoindevkit/bdk) and is incomplete. For production-ready libraries, use the [`0.31.X`](https://github.com/bitcoindevkit/bdk-ffi/tree/release/0.30) releases.
+
+## Readme
 The workspace in this repository creates the `libbdkffi` multi-language library for the Rust-based 
 [bdk] library from the [Bitcoin Dev Kit] project.
 
@@ -22,18 +26,21 @@ The below directories (a separate repository in the case of bdk-swift) include i
 | Swift    | iOS, macOS            | [bdk-swift (GitHub)]          | [Readme bdk-swift]     |                       |
 | Python   | linux, macOS, Windows | [bdk-python (PyPI)]           | [Readme bdk-python]    |                       |
 
+## Building and Testing the Libraries
+If you are familiar with the build tools for the specific languages you wish to build the libraries for, you can use their normal build/test workflows. We also include some [just](https://just.systems/) files to simplify the work across different languages. If you have the just tool installed on your system, you can simply call the commands defined in the `justfile`s, for example:
+```sh
+cd bdk-android
+
+just build
+just offlinetests
+just publishlocal
+```
+
+## Minimum Supported Rust Version (MSRV)
+This library should compile with any combination of features with Rust 1.77.1.
+
 ## Contributing
-
-### Adding new structs and functions
-See the [UniFFI User Guide](https://mozilla.github.io/uniffi-rs/)
-
-#### For pass by value objects
-1. Create new rust struct with only fields that are supported UniFFI types
-2. Update mapping `bdk.udl` file with new `dictionary`
-
-#### For pass by reference values
-1. Create wrapper rust struct/impl with only fields that are `Sync + Send`
-2. Update mapping `bdk.udl` file with new `interface`
+To add new structs and functions, see the [UniFFI User Guide](https://mozilla.github.io/uniffi-rs/) and the [uniffi-examples](https://thunderbiscuit.github.io/uniffi-examples/) repository.
 
 ## Goals
 1. Language bindings should feel idiomatic in target languages/platforms
@@ -49,8 +56,8 @@ See the [UniFFI User Guide](https://mozilla.github.io/uniffi-rs/)
 repositories {
     mavenCentral()
 }
-dependencies {
-  implementation("org.bitcoindevkit:bdk-android:<version>")
+dependencies { 
+    implementation("org.bitcoindevkit:bdk-android:<version>")
 }
 ```
 
@@ -60,8 +67,8 @@ dependencies {
 repositories {
     mavenCentral()
 }
-dependencies {
-  implementation("org.bitcoindevkit:bdk-jvm:<version>")
+dependencies { 
+    implementation("org.bitcoindevkit:bdk-jvm:<version>")
 }
 ```
 

api-docs/README.md

@@ -1,6 +0,0 @@
-# API documentation
-The Bitcoin Dev Kit language bindings make use of the [uniffi-rs](https://github.com/mozilla/uniffi-rs) library to produce their bindings. While efforts are ongoing to allow inline documentation on the Rust side to be ported to the bindings code, this is not currently possible.
-
-This directory contains our temporary solution to this problem. A set of files mimicking the bindings libraries in their function signatures, but without any implementation. This allows for documentation build tools to produce API docs similarly to how we would like them to be if they could be inlined.
-
-You can find the resulting API documentation websites in the ["API Reference" section of the sidebar](https://bitcoindevkit.org/getting-started/) under the "Docs" tab on the bitcoindevkit official website.

api-docs/kotlin/Module1.md

@@ -1,4 +0,0 @@
-# Module bdk-android
-The [bitcoindevkit](https://bitcoindevkit.org/) language bindings library for Android.
-
-# Package org.bitcoindevkit

api-docs/kotlin/Module2.md

@@ -1,4 +0,0 @@
-# Module bdk-jvm
-The [bitcoindevkit](https://bitcoindevkit.org/) language bindings library for Kotlin and Java on the JVM.
-
-# Package org.bitcoindevkit

api-docs/kotlin/build.gradle.kts

@@ -1,46 +0,0 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    kotlin("jvm") version "1.7.10"
-
-    // API docs
-    id("org.jetbrains.dokka") version "1.7.10"
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation(kotlin("test"))
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-// tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
-//     dokkaSourceSets {
-//         named("main") {
-//             moduleName.set("bdk-android")
-//             moduleVersion.set("0.11.0")
-//             includes.from("Module1.md")
-//             samples.from("src/test/kotlin/org/bitcoindevkit/Samples.kt")
-//         }
-//     }
-// }
-
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
-    dokkaSourceSets {
-        named("main") {
-            moduleName.set("bdk-jvm")
-            moduleVersion.set("0.11.0")
-            includes.from("Module2.md")
-            samples.from("src/test/kotlin/org/bitcoindevkit/Samples.kt")
-        }
-    }
-}

api-docs/kotlin/deploy.sh

@@ -1,8 +0,0 @@
-./gradlew dokkaHtml
-cd build/dokka/html
-git init .
-git add .
-git switch --create gh-pages
-git commit -m "Deploy"
-git remote add origin git@github.com:bitcoindevkit/bdk-kotlin.git
-git push --set-upstream origin gh-pages --force

api-docs/kotlin/gradle.properties

@@ -1 +0,0 @@
-kotlin.code.style=official

api-docs/kotlin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

api-docs/kotlin/gradlew

@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

api-docs/kotlin/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

api-docs/kotlin/settings.gradle.kts

@@ -1 +0,0 @@
-rootProject.name = "BDK Android and BDK JVM API Docs"

api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt

@@ -1,921 +0,0 @@
-package org.bitcoindevkit
-
-/**
- * The cryptocurrency to act on.
- *
- * @sample org.bitcoindevkit.networkSample
- */
-enum class Network {
-    /** Bitcoin's mainnet. */
-    BITCOIN,
-
-    /** Bitcoin’s testnet. */
-    TESTNET,
-
-    /** Bitcoin’s signet. */
-    SIGNET,
-
-    /** Bitcoin’s regtest. */
-    REGTEST,
-}
-
-/**
- * A derived address and the index it was found at.
- *
- * @property index Child index of this address.
- * @property address Address.
- * @property keychain Type of keychain.
- *
- * @sample org.bitcoindevkit.addressInfoSample
- */
-data class AddressInfo (
-    var index: UInt,
-    var address: Address,
-    var keychain: KeychainKind
-)
-
-/**
- * The address index selection strategy to use to derive an address from the wallet’s external descriptor.
- *
- * If you’re unsure which one to use, use `AddressIndex.New`.
- *
- * @sample org.bitcoindevkit.addressIndexSample
- */
-sealed class AddressIndex {
-    /** Return a new address after incrementing the current descriptor index. */
-    object New: AddressIndex(),
-
-    /**
-     * Return the address for the current descriptor index if it has not been used in a received transaction.
-     * Otherwise return a new address as with `AddressIndex.NEW`. Use with caution, if the wallet
-     * has not yet detected an address has been used it could return an already used address.
-     * This function is primarily meant for situations where the caller is untrusted;
-     * for example when deriving donation addresses on-demand for a public web page.
-     */
-    object LastUnused: AddressIndex(),
-
-    /**
-     * Return the address for a specific descriptor index. Does not change the current descriptor
-     * index used by [AddressIndex.New] and [AddressIndex.LastUsed].
-     * Use with caution, if an index is given that is less than the current descriptor index
-     * then the returned address may have already been used.
-     */
-    data class Peek(val index: UInt): AddressIndex(),
-
-    /**
-     * Return the address for a specific descriptor index and reset the current descriptor index
-     * used by [AddressIndex.New] and [AddressIndex.LastUsed] to this value.
-     * Use with caution, if an index is given that is less than the current descriptor index
-     * then the returned address and subsequent addresses returned by calls to [AddressIndex.New]
-     * and [AddressIndex.LastUsed] may have already been used. Also if the index is reset to a
-     * value earlier than the [Blockchain] stopGap (default is 20) then a
-     * larger stopGap should be used to monitor for all possibly used addresses.
-     */
-    data class Reset(val index: UInt): AddressIndex()
-}
-
-/**
- * Balance differentiated in various categories.
- *
- * @property immature All coinbase outputs not yet matured.
- * @property trustedPending Unconfirmed UTXOs generated by a wallet tx.
- * @property untrustedPending Unconfirmed UTXOs received from an external wallet.
- * @property confirmed Confirmed and immediately spendable balance.
- * @property spendable The sum of trustedPending and confirmed coins.
- * @property total The whole balance visible to the wallet.
- *
- * @sample org.bitcoindevkit.balanceSample
- */
-data class Balance (
-    var immature: ULong,
-    var trustedPending: ULong,
-    var untrustedPending: ULong,
-    var confirmed: ULong,
-    var spendable: ULong,
-    var total: ULong
-)
-
-/**
- * Type that can contain any of the database configurations defined by the library.
- *
- * @sample org.bitcoindevkit.memoryDatabaseConfigSample
- * @sample org.bitcoindevkit.sqliteDatabaseConfigSample
- */
-sealed class DatabaseConfig {
-    /** Configuration for an in-memory database. */
-    object Memory : DatabaseConfig()
-
-    /** Configuration for a Sled database. */
-    data class Sled(val config: SledDbConfiguration) : DatabaseConfig()
-
-    /** Configuration for a SQLite database. */
-    data class Sqlite(val config: SqliteDbConfiguration) : DatabaseConfig()
-}
-
-/**
- * Configuration type for a SQLite database.
- *
- * @property path Main directory of the DB.
- *
- * @sample org.bitcoindevkit.sqliteDatabaseConfigSample
- */
-data class SqliteDbConfiguration(
-    var path: String,
-)
-
-/**
- * Configuration type for a SledDB database.
- *
- * @property path Main directory of the DB.
- * @property treeName Name of the database tree, a separated namespace for the data.
- */
-data class SledDbConfiguration(
-    var path: String,
-    var treeName: String,
-)
-
-/**
- * Configuration for an Electrum blockchain.
- *
- * @property url URL of the Electrum server (such as ElectrumX, Esplora, BWT) may start with `ssl://` or `tcp://` and include a port, e.g. `ssl://electrum.blockstream.info:60002`.
- * @property socks5 URL of the socks5 proxy server or a Tor service.
- * @property retry Request retry count.
- * @property timeout Request timeout (seconds).
- * @property stopGap Stop searching addresses for transactions after finding an unused gap of this length.
- * @property validateDomain Validate the domain when using SSL.
- *
- * @sample org.bitcoindevkit.electrumBlockchainConfigSample
- */
-data class ElectrumConfig(
-    var url: String,
-    var socks5: String?,
-    var retry: UByte,
-    var timeout: UByte?,
-    var stopGap: ULong,
-    var validateDomain: Boolean
-)
-
-/**
- * Configuration for an Esplora blockchain.
- *
- * @property baseUrl Base URL of the esplora service, e.g. `https://blockstream.info/api/`.
- * @property proxy Optional URL of the proxy to use to make requests to the Esplora server.
- * @property concurrency Number of parallel requests sent to the esplora service (default: 4).
- * @property stopGap Stop searching addresses for transactions after finding an unused gap of this length.
- * @property timeout Socket timeout.
- *
- * @sample org.bitcoindevkit.esploraBlockchainConfigSample
- */
-data class EsploraConfig(
-    var baseUrl: String,
-    var proxy: String?,
-    var concurrency: UByte?,
-    var stopGap: ULong,
-    var timeout: ULong?
-)
-
-/**
- * Authentication mechanism for RPC connection to full node.
- */
-sealed class Auth {
-    /** No authentication */
-    object None: Auth()
-
-    /** Authentication with username and password, usually [Auth.Cookie] should be preferred */
-    data class UserPass(val username: String, val password: String): Auth()
-
-    /** Authentication with a cookie file */
-    data class Cookie(val file: String): Auth()
-}
-
-/**
- * Sync parameters for Bitcoin Core RPC.
- *
- * In general, BDK tries to sync `scriptPubKey`s cached in `Database` with
- * `scriptPubKey`s imported in the Bitcoin Core Wallet. These parameters are used for determining
- * how the `importdescriptors` RPC calls are to be made.
- *
- * @property startScriptCount The minimum number of scripts to scan for on initial sync.
- * @property startTime Time in unix seconds in which initial sync will start scanning from (0 to start from genesis).
- * @property forceStartTime Forces every sync to use `start_time` as import timestamp.
- * @property pollRateSec RPC poll rate (in seconds) to get state updates.
- */
-data class RcpSyncParams(
-    val startScriptCount: ULong,
-    val startTime: Ulong,
-    val forceStartTime: Boolean,
-    val pollRateSec: ULong,
-)
-
-/**
- * RpcBlockchain configuration options
- *
- * @property url The bitcoin node url.
- * @property auth The bicoin node authentication mechanism.
- * @property network The network we are using (it will be checked the bitcoin node network matches this).
- * @property walletName The wallet name in the bitcoin node.
- * @property syncParams Sync parameters.
- */
-data class RpcConfig(
-    val url: String,
-    val auth: Auth,
-    val network: Network,
-    val walletName: String,
-    val syncParams: RcpSyncParams?,
-)
-
-/**
- * Type that can contain any of the blockchain configurations defined by the library.
- *
- * @sample org.bitcoindevkit.electrumBlockchainConfigSample
- */
-sealed class BlockchainConfig {
-    /** Electrum client. */
-    data class Electrum(val config: ElectrumConfig) : BlockchainConfig()
-
-    /** Esplora client. */
-    data class Esplora(val config: EsploraConfig) : BlockchainConfig()
-
-    /** Bitcoin Core RPC client. */
-    data class Rpc(val config: RpcConfig) : BlockchainConfig()
-}
-
-/**
- * A wallet transaction.
- *
- * @property fee Fee value (sats) if available. The availability of the fee depends on the backend. It’s never None with an Electrum server backend, but it could be None with a Bitcoin RPC node without txindex that receive funds while offline.
- * @property received Received value (sats) Sum of owned outputs of this transaction.
- * @property sent Sent value (sats) Sum of owned inputs of this transaction.
- * @property txid Transaction id.
- * @property confirmationTime If the transaction is confirmed, [BlockTime] contains height and timestamp of the block containing the transaction. This property is null for unconfirmed transactions.
- */
-data class TransactionDetails (
-    var transaction?: Transaction,
-    var fee: ULong?,
-    var received: ULong,
-    var sent: ULong,
-    var txid: String,
-    var confirmationTime: BlockTime?
-)
-
-/**
- * A blockchain backend.
- *
- * @constructor Create the new blockchain client.
- *
- * @param config The blockchain configuration required.
- *
- * @sample org.bitcoindevkit.blockchainSample
- */
-class Blockchain(
-    config: BlockchainConfig
-) {
-    /** Broadcast a transaction. */
-    fun broadcast(transaction: Transaction) {}
-
-    /** Estimate the fee rate required to confirm a transaction in a given target of blocks. */
-    fun estimateFee(target: ULong): FeeRate {}
-
-    /** Get the current height of the blockchain. */
-    fun getHeight(): UInt {}
-
-    /** Get the block hash of a given block. */
-    fun getBlockHash(height: UInt): String {}
-}
-
-/**
- * A bitcoin transaction.
- *
- * @constructor Build a new Bitcoin Transaction.
- *
- * @param transactionBytes The transaction bytes, bitcoin consensus encoded.
- */
-class Transaction(transactionBytes: List<UByte>) {
-    /** Computes the txid. */
-    fun txid(): String {}
-
-    /**
-     * Returns the "weight" of this transaction, as defined by BIP141.
-     *
-     * For transactions with an empty witness, this is simply the consensus-serialized size times four.
-     * For transactions with a witness, this is the non-witness consensus-serialized size multiplied by three
-     * plus the with-witness consensus-serialized size.
-     */
-    fun weight(): ULong {}
-
-    /** Returns the regular byte-wise consensus-serialized size of this transaction. */
-    fun size(): ULong {}
-
-    /**
-     * Returns the "virtual size" (vsize) of this transaction.
-     *
-     * Will be ceil(weight / 4.0). Note this implements the virtual size as per BIP141, which is different to
-     * what is implemented in Bitcoin Core. The computation should be the same for any remotely sane transaction.
-     */
-    fun vsize(): ULong {}
-
-    /** Return the transaction bytes, bitcoin consensus encoded. */
-    fun serialize(): List<UByte> {}
-
-    /** Is this a coin base transaction? */
-    fun isCoinBase(): Boolean {}
-
-    /**
-     * Returns true if the transaction itself opted in to be BIP-125-replaceable (RBF).
-     * This does not cover the case where a transaction becomes replaceable due to ancestors being RBF.
-     */
-    fun isExplicitlyRbf(): Boolean {}
-
-    /** Returns true if this transactions nLockTime is enabled (BIP-65). */
-    fun isLockTimeEnabled(): Boolean {}
-
-    /** The protocol version, is currently expected to be 1 or 2 (BIP 68). */
-    fun version(): Int {}
-
-    /**
-     * Block height or timestamp. Transaction cannot be included in a block until this height/time.
-     * Relevant BIPs
-     *     BIP-65 OP_CHECKLOCKTIMEVERIFY
-     *     BIP-113 Median time-past as endpoint for lock-time calculations
-     */
-    fun lockTime(): UInt {}
-
-    /** List of transaction inputs. */
-    fun input(): List<TxIn> {}
-
-    /** List of transaction outputs. */
-    fun output(): List<TxOut> {}
-}
-
-/**
- * A partially signed bitcoin transaction.
- *
- * @constructor Build a new Partially Signed Bitcoin Transaction.
- *
- * @param psbtBase64 The PSBT in base64 format.
- */
-class PartiallySignedTransaction(psbtBase64: String) {
-    /** Return the PSBT in string format, using a base64 encoding. */
-    fun serialize(): String {}
-
-    /** Get the txid of the PSBT. */
-    fun txid(): String {}
-
-    /** Extract the transaction. */
-    fun extractTx(): Transaction {}
-
-    /**
-     * Combines this PartiallySignedTransaction with another PSBT as described by BIP 174.
-     * In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
-     */
-    fun combine(other: PartiallySignedTransaction): PartiallySignedTransaction
-
-    /** Serialize the PSBT data structure as a String of JSON. */
-    fun jsonSerialize(): String
-}
-
-/**
- * A reference to a transaction output.
- *
- * @property txid The referenced transaction’s txid.
- * @property vout The index of the referenced output in its transaction’s vout.
- */
-data class OutPoint (
-    var txid: String,
-    var vout: UInt
-)
-
-/**
- * A transaction output, which defines new coins to be created from old ones.
- *
- * @property value The value of the output, in satoshis.
- * @property scriptPubkey The script which must be satisfied for the output to be spent.
- */
-data class TxOut (
-    var value: ULong,
-    var scriptPubkey: Script
-)
-
-/**
- * Bitcoin transaction input.
- *
- * It contains the location of the previous transaction’s output, that it spends and set of scripts that satisfy its spending conditions.
- *
- * @property previousOutput The reference to the previous output that is being used an an input.
- * @property scriptSig The script which pushes values on the stack which will cause the referenced output’s script to be accepted.
- * @property sequence The sequence number, which suggests to miners which of two conflicting transactions should be preferred, or 0xFFFFFFFF to ignore this feature. This is generally never used since the miner behaviour cannot be enforced.
- * @property witness Witness data: an array of byte-arrays. Note that this field is not (de)serialized with the rest of the TxIn in Encodable/Decodable, as it is (de)serialized at the end of the full Transaction. It is (de)serialized with the rest of the TxIn in other (de)serialization routines.
- *
- */
-data class TxIn (
-    var previousOutput: OutPoint,
-    var scriptSig: Script,
-    var sequence: UInt,
-    var witness: List<List<UByte>>
-)
-
-/**
- * An unspent output owned by a [Wallet].
- *
- * @property outpoint Reference to a transaction output.
- * @property txout Transaction output.
- * @property keychain Type of keychain.
- * @property isSpent Whether this UTXO is spent or not.
- */
-data class LocalUtxo (
-    var outpoint: OutPoint,
-    var txout: TxOut,
-    var keychain: KeychainKind,
-    var isSpent: Boolean
-)
-
-/**
- * Types of keychains.
- */
-enum class KeychainKind {
-    /** External. */
-    EXTERNAL,
-
-    /** Internal, usually used for change outputs. */
-    INTERNAL,
-}
-
-/**
- * Block height and timestamp of a block.
- *
- * @property height Confirmation block height.
- * @property timestamp Confirmation block timestamp.
- */
-data class BlockTime (
-    var height: UInt,
-    var timestamp: ULong,
-)
-
-/**
- * A Bitcoin wallet.
- * The Wallet acts as a way of coherently interfacing with output descriptors and related transactions. Its main components are:
- * 1. Output descriptors from which it can derive addresses.
- * 2. A Database where it tracks transactions and utxos related to the descriptors.
- * 3. Signers that can contribute signatures to addresses instantiated from the descriptors.
- *
- * @constructor Create a BDK wallet.
- *
- * @param descriptor The main (or "external") descriptor.
- * @param changeDescriptor? The change (or "internal") descriptor.
- * @param network The network to act on.
- * @param databaseConfig The database configuration.
- *
- * @sample org.bitcoindevkit.walletSample
- */
-class Wallet(
-    descriptor: Descriptor,
-    changeDescriptor: Descriptor?,
-    network: Network,
-    databaseConfig: DatabaseConfig,
-) {
-    /**
-     * Return a derived address using the external descriptor, see [AddressIndex] for available address index
-     * selection strategies. If none of the keys in the descriptor are derivable (i.e. the descriptor does not end
-     * with a * character) then the same address will always be returned for any [AddressIndex].
-     */
-    fun getAddress(addressIndex: AddressIndex): AddressInfo {}
-
-    /**
-     * Return a derived address using the internal (change) descriptor.
-     * If the wallet doesn't have an internal descriptor it will use the external descriptor.
-     * See [AddressIndex] for available address index selection strategies. If none of the keys
-     * in the descriptor are derivable (i.e. does not end with /\*) then the same address will always
-     * be returned for any [AddressIndex].
-     */
-    fun getInternalAddress(addressIndex: AddressIndex): AddressInfo {}
-
-    /** Return whether or not a script is part of this wallet (either internal or external). */
-    fun isMine(script: Script): Boolean {}
-
-    /** Return the wallet's balance, across different categories. See [Balance] for the categories. Note that this method only operates on the internal database, which first needs to be [Wallet.sync] manually. */
-    fun getBalance(): Balance {}
-
-    /**
-     * Sign a transaction with all the wallet's signers, in the order specified by every signer's
-     * `SignerOrdering`.
-     *
-     * The `SignOptions` can be used to tweak the behavior of the software signers, and the way
-     * the transaction is finalized at the end. Note that it can't be guaranteed that *every*
-     * signers will follow the options, but the "software signers" (WIF keys and `xprv`) defined
-     * in this library will.
-     *
-     * @param psbt PSBT to be signed
-     * @param signOptions signing options
-     * @return true if the PSBT was finalized, or false otherwise
-     */
-    fun sign(psbt: PartiallySignedTransaction, signOptions: SignOptions?): Boolean {}
-
-    /** Return the list of transactions made and received by the wallet. Note that this method only operate on the internal database, which first needs to be [Wallet.sync] manually. */
-    fun listTransactions(includeRaw: Boolean): List<TransactionDetails> {}
-
-    /** Get the Bitcoin network the wallet is using. */
-    fun network(): Network {}
-
-    /** Sync the internal database with the blockchain. */
-    fun sync(blockchain: Blockchain, progress: Progress?) {}
-
-    /** Return the list of unspent outputs of this wallet. Note that this method only operates on the internal database, which first needs to be [Wallet.sync] manually. */
-    fun listUnspent(): List<LocalUtxo> {}
-}
-
-/**
- * Class that logs at level INFO every update received (if any).
- */
-class Progress {
-    /** Send a new progress update. The progress value should be in the range 0.0 - 100.0, and the message value is an optional text message that can be displayed to the user. */
-    fun update(progress: Float, message: String?) {}
-}
-
-/**
- * A transaction builder.
- *
- * After creating the TxBuilder, you set options on it until finally calling `.finish` to consume the builder and generate the transaction.
- *
- * Each method on the TxBuilder returns an instance of a new TxBuilder with the option set/added.
- *
- * @sample org.bitcoindevkit.txBuilderResultSample1
- * @sample org.bitcoindevkit.txBuilderResultSample2
- */
-class TxBuilder() {
-    /** Add data as an output using OP_RETURN. */
-    fun addData(data: List<UByte>): TxBuilder {}
-
-    /** Add a recipient to the internal list. */
-    fun addRecipient(script: Script, amount: ULong): TxBuilder {}
-
-    /** Set the list of recipients by providing a list of [ScriptAmount]. */
-    fun setRecipients(recipients: List<ScriptAmount>): TxBuilder {}
-
-    /** Add a utxo to the internal list of unspendable utxos. It’s important to note that the "must-be-spent" utxos added with [TxBuilder.addUtxo] have priority over this. See the Rust docs of the two linked methods for more details. */
-    fun addUnspendable(unspendable: OutPoint): TxBuilder {}
-
-    /** Add an outpoint to the internal list of UTXOs that must be spent. These have priority over the "unspendable" utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent. */
-    fun addUtxo(outpoint: OutPoint): TxBuilder {}
-
-    /**
-     * Add the list of outpoints to the internal list of UTXOs that must be spent. If an error
-     * occurs while adding any of the UTXOs then none of them are added and the error is returned.
-     * These have priority over the "unspendable" utxos, meaning that if a utxo is present both
-     * in the "utxos" and the "unspendable" list, it will be spent.
-     */
-    fun addUtxos(outpoints: List<OutPoint>): TxBuilder {}
-
-    /** Do not spend change outputs. This effectively adds all the change outputs to the "unspendable" list. See [TxBuilder.unspendable]. */
-    fun doNotSpendChange(): TxBuilder {}
-
-    /** Only spend utxos added by [add_utxo]. The wallet will not add additional utxos to the transaction even if they are needed to make the transaction valid. */
-    fun manuallySelectedOnly(): TxBuilder {}
-
-    /** Only spend change outputs. This effectively adds all the non-change outputs to the "unspendable" list. See [TxBuilder.unspendable]. */
-    fun onlySpendChange(): TxBuilder {}
-
-    /**
-     * Replace the internal list of unspendable utxos with a new list. It’s important to note that the "must-be-spent" utxos
-     * added with [TxBuilder.addUtxo] have priority over these. See the Rust docs of the two linked methods for more details.
-     */
-    fun unspendable(unspendable: List<OutPoint>): TxBuilder {}
-
-    /** Set a custom fee rate. */
-    fun feeRate(satPerVbyte: Float): TxBuilder {}
-
-    /** Set an absolute fee. */
-    fun feeAbsolute(feeAmount: ULong): TxBuilder {}
-
-    /** Spend all the available inputs. This respects filters like [TxBuilder.unspendable] and the change policy. */
-    fun drainWallet(): TxBuilder {}
-
-    /**
-     * Sets the address to drain excess coins to. Usually, when there are excess coins they are
-     * sent to a change address generated by the wallet. This option replaces the usual change address
-     * with an arbitrary ScriptPubKey of your choosing. Just as with a change output, if the
-     * drain output is not needed (the excess coins are too small) it will not be included in the resulting
-     * transaction. The only difference is that it is valid to use [drainTo] without setting any ordinary recipients
-     * with [addRecipient] (but it is perfectly fine to add recipients as well). If you choose not to set any
-     * recipients, you should either provide the utxos that the transaction should spend via [addUtxos], or set
-     * [drainWallet] to spend all of them. When bumping the fees of a transaction made with this option,
-     * you probably want to use [BumpFeeTxBuilder.allowShrinking] to allow this output to be reduced to pay for the extra fees.
-     */
-    fun drainTo(script: Script): TxBuilder {}
-
-    /** Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`. */
-    fun enableRbf(): TxBuilder {}
-
-    /**
-     * Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors
-     * contain an "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence`
-     * is higher than `0xFFFFFFFD` an error will be thrown, since it would not be a valid nSequence to signal RBF.
-     */
-    fun enableRbfWithSequence(nsequence: UInt): TxBuilder {}
-
-    /** Finish building the transaction. Returns a [TxBuilderResult]. */
-    fun finish(wallet: Wallet): TxBuilderResult {}
-}
-
-/**
- * Options for a software signer.
- *
- * Adjust the behavior of our software signers and the way a transaction is finalized.
- *
- * @property trustWitnessUtxo Whether the signer should trust the `witness_utxo`, if the `non_witness_utxo` hasn't been provided. Defaults to `false`.
- * @property assumeHeight Whether the wallet should assume a specific height has been reached when trying to finalize a transaction.
- * @property allowAllSighashes Whether the signer should use the sighash_type set in the PSBT when signing, no matter what its value is. Defaults to `false`.
- * @property removePartialSigs Whether to remove partial signatures from the PSBT inputs while finalizing PSBT. Defaults to `true`.
- * @property tryFinalize Whether to try finalizing the PSBT after the inputs are signed. Defaults to `true`.
- * @property signWithTapInternalKey Whether we should try to sign a taproot transaction with the taproot internal key or not. This option is ignored if we're signing a non-taproot PSBT. Defaults to `true`.
- * @property allowGrinding Whether we should grind ECDSA signature to ensure signing with low r or not. Defaults to `true`.
- */
-data class SignOptions (
-    var trustWitnessUtxo: Boolean,
-    var assumeHeight: UInt?,
-    var allowAllSighashes: Boolean,
-    var removePartialSigs: Boolean,
-    var tryFinalize: Boolean,
-    var signWithTapInternalKey: Boolean,
-    var allowGrinding: Boolean
-)
-
-/**
- * A object holding a ScriptPubKey and an amount.
- *
- * @property script The ScriptPubKey.
- * @property amount The amount.
- */
-data class ScriptAmount (
-    var script: Script,
-    var amount: ULong
-)
-
-/**
- * The BumpFeeTxBuilder is used to bump the fee on a transaction that has been broadcast and has its RBF flag set to true.
- */
-class BumpFeeTxBuilder() {
-    /**
-     * Explicitly tells the wallet that it is allowed to reduce the amount of the output matching this scriptPubKey
-     * in order to bump the transaction fee. Without specifying this the wallet will attempt to find a change output
-     * to shrink instead. Note that the output may shrink to below the dust limit and therefore be removed. If it is
-     * preserved then it is currently not guaranteed to be in the same position as it was originally. Returns an error
-     * if scriptPubkey can’t be found among the recipients of the transaction we are bumping.
-     */
-    fun allowShrinking(address: String): BumpFeeTxBuilder {}
-
-    /** Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`. */
-    fun enableRbf(): BumpFeeTxBuilder {}
-
-    /**
-     * Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors
-     * contain an "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence`
-     * is higher than `0xFFFFFFFD` an error will be thrown, since it would not be a valid nSequence to signal RBF.
-     */
-    fun enableRbfWithSequence(nsequence: UInt): BumpFeeTxBuilder {}
-
-    /** Finish building the transaction. Returns a [TxBuilderResult]. */
-    fun finish(wallet: Wallet): TxBuilderResult {}
-}
-
-/**
- * A BIP-32 derivation path.
- *
- * @param path The derivation path. Must start with `m`. Use this type to derive or extend a [DescriptorSecretKey]
- * or [DescriptorPublicKey].
- */
-class DerivationPath(path: String) {}
-
-/**
- * An extended secret key.
- *
- * @param network The network this DescriptorSecretKey is to be used on.
- * @param mnemonic The mnemonic.
- * @param password The optional passphrase that can be provided as per BIP-39.
- *
- * @sample org.bitcoindevkit.descriptorSecretKeyDeriveSample
- * @sample org.bitcoindevkit.descriptorSecretKeyExtendSample
- */
-class DescriptorSecretKey(network: Network, mnemonic: Mnemonic, password: String?) {
-    /** Build a DescriptorSecretKey from a String */
-    fun fromString(secretKey: String): DescriptorSecretKey {}
-
-    /** Derive a private descriptor at a given path. */
-    fun derive(path: DerivationPath): DescriptorSecretKey {}
-
-    /** Extend the private descriptor with a custom path. */
-    fun extend(path: DerivationPath): DescriptorSecretKey {}
-
-    /** Return the public version of the descriptor. */
-    fun asPublic(): DescriptorPublicKey {}
-
-    /** Return the raw private key as bytes. */
-    fun secretBytes(): List<UByte>
-
-    /** Return the private descriptor as a string. */
-    fun asString(): String {}
-}
-
-/**
- * An extended public key.
- *
- * @param network The network this DescriptorPublicKey is to be used on.
- * @param mnemonic The mnemonic.
- * @param password The optional passphrase that can be provided as per BIP-39.
- */
-class DescriptorPublicKey(network: Network, mnemonic: String, password: String?) {
-    /** Build a DescriptorPublicKey from a String */
-    fun fromString(publicKey: String): DescriptorPublicKey {}
-
-    /** Derive a public descriptor at a given path. */
-    fun derive(path: DerivationPath): DescriptorPublicKey
-
-    /** Extend the public descriptor with a custom path. */
-    fun extend(path: DerivationPath): DescriptorPublicKey
-
-    /** Return the public descriptor as a string. */
-    fun asString(): String
-}
-
-/**
- * A output descriptor.
- *
- * @param descriptor The descriptor in string format.
- * @param network The network this descriptor is to be used on.
- *
- * @sample org.bitcoindevkit.descriptorTemplates1
- * @sample org.bitcoindevkit.descriptorTemplates2
- */
-class Descriptor(descriptor: String, network: Network) {
-    /**
-     * BIP44 template. Expands to pkh(key/44'/{0,1}'/0'/{0,1}/\*)
-     * Since there are hardened derivation steps, this template requires a private derivable key (generally a xprv/tprv).
-     */
-    fun newBip44(secretKey: DescriptorSecretKey, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP44 public template. Expands to pkh(key/{0,1}/\*)
-     * This assumes that the key used has already been derived with m/44'/0'/0' for Mainnet or m/44'/1'/0' for Testnet.
-     * This template requires the parent fingerprint to populate correctly the metadata of PSBTs.
-     */
-    fun newBip44Public(publicKey: DescriptorPublicKey, fingerprint: String, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP49 template. Expands to sh(wpkh(key/49'/{0,1}'/0'/{0,1}/\*))
-     * Since there are hardened derivation steps, this template requires a private derivable key (generally a xprv/tprv).
-     */
-    fun newBip49(secretKey: DescriptorSecretKey, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP49 public template. Expands to sh(wpkh(key/{0,1}/\*))
-     * This assumes that the key used has already been derived with m/49'/0'/0' for Mainnet or m/49'/1'/0' for Testnet.
-     * This template requires the parent fingerprint to populate correctly the metadata of PSBTs.
-     */
-    fun newBip49Public(publicKey: DescriptorPublicKey, fingerprint: String, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP84 template. Expands to wpkh(key/84'/{0,1}'/0'/{0,1}/\*)
-     * Since there are hardened derivation steps, this template requires a private derivable key (generally a xprv/tprv).
-     */
-    fun newBip84(secretKey: DescriptorSecretKey, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP84 public template. Expands to wpkh(key/{0,1}/\*)
-     * This assumes that the key used has already been derived with m/84'/0'/0' for Mainnet or m/84'/1'/0' for Testnet.
-     * This template requires the parent fingerprint to populate correctly the metadata of PSBTs.
-     */
-    fun newBip84Public(publicKey: DescriptorPublicKey, fingerprint: String, keychain: KeychainKind, network: Network) {}
-
-    /** Return the public version of the output descriptor. */
-    fun asString(): String {}
-
-    /** Return the private version of the output descriptor if available, otherwise return the public version. */
-    fun asStringPrivate(): String {}
-}
-
-/**
- * An enum describing entropy length (aka word count) in the mnemonic.
- */
-enum class WordCount {
-    /** 12 words mnemonic (128 bits entropy). */
-    WORDS12,
-
-    /** 15 words mnemonic (160 bits entropy). */
-    WORDS15,
-
-    /** 18 words mnemonic (192 bits entropy). */
-    WORDS18,
-
-    /** 21 words mnemonic (224 bits entropy). */
-    WORDS21,
-
-    /** 24 words mnemonic (256 bits entropy). */
-    WORDS24,
-}
-
-/**
- * The value returned from calling the `.finish()` method on the [TxBuilder] or [BumpFeeTxBuilder].
- *
- * @property psbt The PSBT
- * @property transactionDetails The transaction details.
- *
- * @sample org.bitcoindevkit.txBuilderResultSample1
- * @sample org.bitcoindevkit.txBuilderResultSample2
- */
-data class TxBuilderResult (
-    var psbt: PartiallySignedTransaction,
-    var transactionDetails: TransactionDetails
-)
-
-/**
- * A bitcoin script.
- */
-class Script(rawOutputScript: List<UByte>) {
-    /** Return the script as bytes. */
-    fun toBytes(): List<UByte> {}
-}
-
-/**
- * A bitcoin address.
- *
- * @param address The address in string format.
- */
-class Address(address: String) {
-    /** Construct an [`Address`] from an output script. */
-    fun fromScript(script: Script, network: Network): Address {}
-
-    /** Return the Payload */
-    fun payload(): Payload
-
-    /** Return the Network. */
-    fun network(): Network
-
-    /** Return the ScriptPubKey. */
-    fun scriptPubkey(): Script
-
-    /**
-     * Creates a URI string bitcoin:address optimized to be encoded in QR codes.
-     *
-     * If the address is bech32, both the schema and the address become uppercase. If the address is base58, the schema is lowercase and the address is left mixed case.
-     *
-     * Quoting BIP 173 "inside QR codes uppercase SHOULD be used, as those permit the use of alphanumeric mode, which is 45% more compact than the normal byte mode."
-     */
-    fun toQrUri(): String
-
-    /** Return the address as a string. */
-    fun asString(): String
-}}
-
-/**
- * The method used to produce an address.
- */
-sealed class Payload {
-    /** P2PKH address. */
-    data class PubkeyHash(
-        val pubkeyHash: List<UByte>
-    ) : Payload()
-
-    /** P2SH address. */
-    data class ScriptHash(
-        val scriptHash: List<UByte>
-    ) : Payload()
-
-    /** Segwit address. */
-    data class WitnessProgram(
-        val version: WitnessVersion,
-        val program: List<UByte>
-    ) : Payload()
-}
-
-/**
- * Version of the witness program.
- *
- * Helps limit possible versions of the witness according to the specification. If a plain u8 type
- * was used instead it would mean that the version may be > 16, which would be incorrect.
- * First byte of scriptPubkey in transaction output for transactions starting with opcodes ranging
- * from 0 to 16 (inclusive).
- */
-enum class WitnessVersion {
-    V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13, V14, V15, V16
-}
-
-/**
- * Mnemonic phrases are a human-readable version of the private keys. Supported number of words are 12, 15, 18, 21 and 24.
- *
- * @constructor Generates Mnemonic with a random entropy.
- * @param mnemonic The mnemonic as a string of space-separated words.
- *
- * @sample org.bitcoindevkit.mnemonicSample
- */
-class Mnemonic(mnemonic: String) {
-    /* Returns Mnemonic as string */
-    fun asString(): String
-
-    /* Parse a Mnemonic from a given string. */
-    fun fromString(): Mnemonic
-
-    /*
-     * Create a new Mnemonic in the specified language from the given entropy. Entropy must be a
-     * multiple of 32 bits (4 bytes) and 128-256 bits in length.
-     */
-    fun fromEntropy(): Mnemonic
-}

api-docs/kotlin/src/test/kotlin/org/bitcoindevkit/Samples.kt

@@ -1,281 +0,0 @@
-package org.bitcoindevkit
-
-fun networkSample() {
-    val wallet = Wallet(
-        descriptor = descriptor,
-        changeDescriptor = changeDescriptor,
-        network = Network.TESTNET,
-        databaseConfig = DatabaseConfig.Memory
-    )
-}
-
-fun balanceSample() {
-    object LogProgress : Progress {
-        override fun update(progress: Float, message: String?) {}
-    }
-
-    val memoryDatabaseConfig = DatabaseConfig.Memory
-    private val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            "ssl://electrum.blockstream.info:60002",
-            null,
-            5u,
-            null,
-            200u
-        )
-    )
-    val wallet = Wallet(descriptor, null, Network.TESTNET, memoryDatabaseConfig)
-    val blockchain = Blockchain(blockchainConfig)
-    wallet.sync(blockchain, LogProgress)
-
-    val balance: Balance = wallet.getBalance()
-    println("Total wallet balance is ${balance.total}")
-}
-
-fun electrumBlockchainConfigSample() {
-    val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            url = "ssl://electrum.blockstream.info:60002",
-            socks5 = null,
-            retry = 5u,
-            timeout = null,
-            stopGap = 200u
-        )
-    )
-}
-
-fun esploraBlockchainConfigSample() {
-    val esploraURL: String = "http://10.0.2.2:3002"
-    val esploraConfig: EsploraConfig = EsploraConfig(
-        baseUrl = esploraURL,
-        proxy = null,
-        concurrency = 4u,
-        stopGap = 20UL,
-        timeout = null
-    )
-    val blockchainConfig = BlockchainConfig.Esplora(config = esploraConfig)
-}
-
-fun memoryDatabaseConfigSample() {
-    val memoryDatabaseConfig = DatabaseConfig.Memory
-}
-
-fun sqliteDatabaseConfigSample() {
-    val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration("bdk-sqlite"))
-}
-
-fun addressIndexSample() {
-    val wallet: Wallet = Wallet(
-        descriptor = descriptor,
-        changeDescriptor = changeDescriptor,
-        network = Network.TESTNET,
-        databaseConfig = DatabaseConfig.Memory
-    )
-
-    fun peekAddress100(): AddressInfo {
-        return wallet.getAddress(AddressIndex.Peek(100u))
-    }
-}
-
-fun addressInfoSample() {
-    val wallet: Wallet = Wallet(
-        descriptor = descriptor,
-        changeDescriptor = changeDescriptor,
-        network = Network.TESTNET,
-        databaseConfig = DatabaseConfig.Memory
-    )
-
-    val newAddress: AddressInfo = wallet.getAddress(AddressIndex.New)
-
-    println("New address at index ${newAddress.index} is ${newAddress.address.asString()}")
-}
-
-fun blockchainSample() {
-    val blockchainConfig: BlockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            electrumURL,
-            null,
-            5u,
-            null,
-            10u
-        )
-    )
-
-    val blockchain: Blockchain = Blockchain(blockchainConfig)
-
-    val feeRate: FeeRate = blockchain.estimateFee(3u)
-
-    val (psbt, txDetails) = TxBuilder()
-        .addRecipient(faucetAddress.scriptPubkey(), 1000uL)
-        .feeRate(feeRate.asSatPerVb())
-        .finish(wallet)
-
-    wallet.sign(psbt)
-
-    blockchain.broadcast(psbt)
-}
-
-
-fun txBuilderResultSample1() {
-    val faucetAddress = Address("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt")
-    // TxBuilderResult is a data class, which means you can use destructuring declarations on it to
-    // open it up into its component parts
-    val (psbt, txDetails) = TxBuilder()
-        .addRecipient(faucetAddress.scriptPubkey(), 1000uL)
-        .feeRate(1.2f)
-        .finish(wallet)
-
-    println("Txid is ${txDetails.txid}")
-    wallet.sign(psbt)
-}
-
-fun txBuilderResultSample2() {
-    val faucetAddress = Address("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt")
-    val txBuilderResult: TxBuilderResult = TxBuilder()
-        .addRecipient(faucetAddress.scriptPubkey(), 1000uL)
-        .feeRate(1.2f)
-        .finish(wallet)
-
-    val psbt = txBuilderResult.psbt
-    val txDetails = txBuilderResult.transactionDetails
-
-    println("Txid is ${txDetails.txid}")
-    wallet.sign(psbt)
-}
-
-fun descriptorSecretKeyExtendSample() {
-    // The `DescriptorSecretKey.extend()` method allows you to extend a key to any given path.
-
-    // val mnemonic: String = generateMnemonic(WordCount.WORDS12)
-    val mnemonic: Mnemonic = Mnemonic("scene change clap smart together mind wheel knee clip normal trial unusual")
-
-    // the initial DescriptorSecretKey will always be at the "master" node,
-    // i.e. the derivation path is empty
-    val bip32RootKey: DescriptorSecretKey = DescriptorSecretKey(
-        network = Network.TESTNET,
-        mnemonic = mnemonic,
-        password = ""
-    )
-    println(bip32RootKey.asString())
-    // tprv8ZgxMBicQKsPfM8Trx2apvdEkmxbJkYY3ZsmcgKb2bfnLNcBhtCstqQTeFesMRLEJXpjGDinAUJUHprXMwph8dQBdS1HAoxEis8Knimxovf/*
-
-    // the derive method will also automatically apply the wildcard (*) to your path,
-    // i.e the following will generate the typical testnet BIP84 external wallet path
-    // m/84h/1h/0h/0/*
-    val bip84ExternalPath: DerivationPath = DerivationPath("m/84h/1h/0h/0")
-    val externalExtendedKey: DescriptorSecretKey = bip32RootKey.extend(bip84ExternalPath).asString()
-    println(externalExtendedKey)
-    // tprv8ZgxMBicQKsPfM8Trx2apvdEkmxbJkYY3ZsmcgKb2bfnLNcBhtCstqQTeFesMRLEJXpjGDinAUJUHprXMwph8dQBdS1HAoxEis8Knimxovf/84'/1'/0'/0/*
-
-    // to create the descriptor you'll need to use this extended key in a descriptor function,
-    // i.e. wpkh(), tr(), etc.
-    val externalDescriptor = "wpkh($externalExtendedKey)"
-}
-
-fun descriptorSecretKeyDeriveSample() {
-    // The DescriptorSecretKey.derive() method allows you to derive an extended key for a given
-    // node in the derivation tree (for example to create an xpub for a particular account)
-
-    val mnemonic: Mnemonic = Mnemonic("scene change clap smart together mind wheel knee clip normal trial unusual")
-    val bip32RootKey: DescriptorSecretKey = DescriptorSecretKey(
-        network = Network.TESTNET,
-        mnemonic = mnemonic,
-        password = ""
-    )
-
-    val bip84Account0: DerivationPath = DerivationPath("m/84h/1h/0h")
-    val xpubAccount0: DescriptorSecretKey = bip32RootKey.derive(bip84Account0)
-    println(xpubAccount0.asString())
-    // [5512949b/84'/1'/0']tprv8ghw3FWfWTeLCEXcr8f8Q8Lz4QPCELYv3jhBXjAm7XagA6R5hreeWLTJeLBfMj7Ni6Q3PdV1o8NbvNBHE59W97EkRJSU4JkvTQjaNUmQubE/*
-
-    val internalPath: DerivationPath = DerivationPath("m/0")
-    val externalExtendedKey = xpubAccount0.extend(internalPath).asString()
-    println(externalExtendedKey)
-    // [5512949b/84'/1'/0']tprv8ghw3FWfWTeLCEXcr8f8Q8Lz4QPCELYv3jhBXjAm7XagA6R5hreeWLTJeLBfMj7Ni6Q3PdV1o8NbvNBHE59W97EkRJSU4JkvTQjaNUmQubE/0/*
-
-    // to create the descriptor you'll need to use this extended key in a descriptor function,
-    // i.e. wpkh(), tr(), etc.
-    val externalDescriptor = "wpkh($externalExtendedKey)"
-}
-
-fun createTransaction() {
-    val wallet = BdkWallet(
-        descriptor = externalDescriptor,
-        changeDescriptor = internalDescriptor,
-        network = Network.TESTNET,
-        databaseConfig = memoryDatabaseConfig,
-    )
-    val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            "ssl://electrum.blockstream.info:60002",
-            null,
-            5u,
-            null,
-            200u
-        )
-    )
-
-    val paymentAddress: Address = Address("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt")
-    val (psbt, txDetails) = TxBuilder()
-        .addRecipient(faucetAddress.scriptPubkey(), 1000uL)
-        .feeRate(1.2f)
-        .finish(wallet)
-
-    wallet.sign(psbt)
-    blockchain.broadcast(psbt)
-}
-
-fun walletSample() {
-    val externalDescriptor = "wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEfVULesmhEfZYyBXdE/84h/1h/0h/0/*)"
-    val internalDescriptor = "wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEfVULesmhEfZYyBXdE/84h/1h/0h/1/*)"
-    val sqliteDatabaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration("bdk-sqlite"))
-
-    val wallet = Wallet(
-        descriptor = externalDescriptor,
-        changeDescriptor = internalDescriptor,
-        network = Network.TESTNET,
-        databaseConfig = sqliteDatabaseConfig,
-    )
-}
-
-fun mnemonicSample() {
-    val mnemonic0: Mnemonic = Mnemonic(WordCount.WORDS12)
-
-    val mnemonic1: Mnemonic = Mnemonic.fromString("scene change clap smart together mind wheel knee clip normal trial unusual")
-
-    val entropy: List<UByte> = listOf<UByte>(0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)
-    val mnemonic2: Mnemonic = Mnemonic.fromEntropy(entropy)
-
-    println(mnemonic0.asString(), mnemonic1.asString(), mnemonic2.asString())
-}
-
-fun descriptorTemplates1() {
-    // Bip84 private descriptor
-    val recoveryPhrase: String = "scene change clap smart together mind wheel knee clip normal trial unusual"
-    val mnemonic = Mnemonic.fromString(recoveryPhrase)
-    val bip32ExtendedRootKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
-    val bip84ExternalDescriptor: Descriptor = Descriptor.newBip84(bip32ExtendedRootKey, KeychainKind.EXTERNAL, Network.TESTNET)
-}
-
-fun descriptorTemplates2() {
-    // Bip49 public descriptor
-    // assume we already have the xpub for m/49'/0'/1' created on an external device that only shared the xpub with the wallet
-    // using the template requires the parent fingerprint to populate correctly the metadata of PSBTs, which the external device would provide
-    // the xpub (tpub for testnet): tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR
-    // the fingerprint: d1d04177
-    val descriptorPublicKey: DescriptorPublicKey = DescriptorPublicKey.fromString("tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR")
-    val bip49PublicDescriptor: Descriptor = Descriptor.newBip49Public(
-        publicKey = descriptorPublicKey,
-        fingerprint = "d1d04177",
-        keychain = KeychainKind.EXTERNAL,
-        network = Network.TESTNET,
-    )
-    println(bip49PublicDescriptor.asString())        // sh(wpkh([d1d04177/49'/1'/0']tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR/0/*))#a7lxzefl
-    println(bip49PublicDescriptor.asStringPrivate()) // sh(wpkh([d1d04177/49'/1'/0']tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR/0/*))#a7lxzefl
-
-    // Creating it starting from the full xprv derived from a mnemonic will give you the same public descriptor
-    val mnemonic = Mnemonic.fromString("chaos fabric time speed sponsor all flat solution wisdom trophy crack object robot pave observe combine where aware bench orient secret primary cable detect")
-    val bip32ExtendedRootKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
-    val bip49PrivateDescriptor: Descriptor = Descriptor.newBip49(bip32ExtendedRootKey, KeychainKind.EXTERNAL, Network.TESTNET)
-    println(bip49PrivateDescriptor.asString()) // sh(wpkh([d1d04177/49'/1'/0']tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR/0/*))#a7lxzefl
-}

bdk-android/README.md

@@ -8,29 +8,11 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-  implementation("org.bitcoindevkit:bdk-android:<version>")
+dependencies { 
+    implementation("org.bitcoindevkit:bdk-android:<version>")
 }
 ```
 
-You may then import and use the `org.bitcoindevkit` library in your Kotlin code. For example:
-```kotlin
-import org.bitcoindevkit.*
-
-// ...
-
-val externalDescriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)", Network.TESTNET)
-val internalDescriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)", Network.TESTNET)
-
-val databaseConfig = DatabaseConfig.Memory
-
-val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 10u, true)
-    )
-val wallet = Wallet(externalDescriptor, internalDescriptor, Network.TESTNET, databaseConfig, blockchainConfig)
-val newAddress = wallet.getAddress(AddressIndex.LastUnused)
-```
-
 ### Snapshot releases
 To use a snapshot release, specify the snapshot repository url in the `repositories` block and use the snapshot version in the `dependencies` block:
 ```kotlin
@@ -38,46 +20,52 @@ repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
 }
 
-dependencies {
-  implementation("org.bitcoindevkit:bdk-android:<version-SNAPSHOT>")
+dependencies { 
+    implementation("org.bitcoindevkit:bdk-android:<version-SNAPSHOT>")
 }
 ```
 
 ### Example Projects
+* [bdk-kotlin-example-wallet](https://github.com/bitcoindevkit/bdk-kotlin-example-wallet)
 * [Devkit Wallet](https://github.com/thunderbiscuit/devkit-wallet)
 * [Padawan Wallet](https://github.com/thunderbiscuit/padawan-wallet)
 
 ### How to build
-_Note that Kotlin version `1.6.10` or later is required to build the library._
+_Note that Kotlin version `1.9.23` or later is required to build the library._
 
 1. Clone this repository.
 ```shell
 git clone https://github.com/bitcoindevkit/bdk-ffi
 ```
 2. Follow the "General" bdk-ffi ["Getting Started (Developer)"] instructions. 
-3. Install Rust (note that we are currently building using Rust 1.67.0):
+3. Install Rust (note that we are currently building using Rust 1.77.1):
 ```shell
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-rustup default 1.67.0
+rustup default 1.77.1
 ```
 4. Install required targets
 ```sh
 rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
 ```
 5. Install Android SDK and Build-Tools for API level 30+
-6. Setup `$ANDROID_SDK_ROOT` and `$ANDROID_NDK_ROOT` path variables (which are required by the
-   build tool), for example (note that currently, NDK version 21.4.7075529 is required):
+6. Setup `ANDROID_SDK_ROOT` and `ANDROID_NDK_ROOT` path variables which are required by the build tool. Note that currently, NDK version 25.2.9519653 or above is required. For example:
 ```shell
-export ANDROID_SDK_ROOT=~/Android/Sdk
-export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
+# macOS
+export ANDROID_SDK_ROOT=~/Library/Android/sdk
+export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.2.9519653
+
+# linux
+export ANDROID_SDK_ROOT=/usr/local/lib/android/sdk
+export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.2.9519653
 ```
+
 7. Build kotlin bindings
  ```sh
  # build Android library
  cd bdk-android
  ./gradlew buildAndroidLib
  ```
-8. Start android emulator (must be x86_64) and run tests
+1. Start android emulator and run tests
 ```sh
 ./gradlew connectedAndroidTest
 ```
@@ -85,7 +73,7 @@ export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
 ## How to publish to your local Maven repo
 ```shell
 cd bdk-android
-./gradlew publishToMavenLocal --exclude-task signMavenPublication
+./gradlew publishToMavenLocal -P localBuild
 ```
 
 Note that the commands assume you don't need the local libraries to be signed. If you do wish to sign them, simply set your `~/.gradle/gradle.properties` signing key values like so:
@@ -94,7 +82,7 @@ signing.gnupg.keyName=<YOUR_GNUPG_ID>
 signing.gnupg.passphrase=<YOUR_GNUPG_PASSPHRASE>
 ```
 
-and use the `publishToMavenLocal` task without excluding the signing task:
+and use the `publishToMavenLocal` task without the `localBuild` flag:
 ```shell
 ./gradlew publishToMavenLocal
 ```

bdk-android/build.gradle.kts

@@ -1,14 +1,10 @@
-buildscript {
-    repositories {
-        google()
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
-    }
-}
-
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("com.android.library").version("8.3.1").apply(false)
+    id("org.jetbrains.kotlin.android").version("1.9.23").apply(false)
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
+    id("org.bitcoindevkit.plugins.generate-android-bindings").apply(false)
+    id("io.github.gradle-nexus.publish-plugin").version("1.1.0").apply(true)
 }
 
 // library version is defined in gradle.properties

bdk-android/gradle.properties

@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-libraryVersion=0.29.0-SNAPSHOT
+libraryVersion=1.0.0-alpha.12-SNAPSHOT

bdk-android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

bdk-android/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

bdk-android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

bdk-android/justfile

@@ -0,0 +1,20 @@
+default:
+  just --list
+
+build:
+  ./gradlew buildAndroidLib
+
+clean:
+  rm -rf ../bdk-ffi/target/
+  rm -rf ./build/
+  rm -rf ./lib/build/
+  rm -rf ./plugins/build/
+
+publish-local:
+  ./gradlew publishToMavenLocal -P localBuild
+
+test:
+  ./gradlew connectedAndroidTest
+
+test-specific TEST:
+  ./gradlew test --tests {{TEST}}

bdk-android/lib/build.gradle.kts

@@ -5,25 +5,21 @@ val libraryVersion: String by project
 
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android") version "1.6.10"
-    id("maven-publish")
-    id("signing")
+    id("org.jetbrains.kotlin.android")
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
 
     // Custom plugin to generate the native libs and bindings file
     id("org.bitcoindevkit.plugins.generate-android-bindings")
 }
 
-repositories {
-    mavenCentral()
-    google()
-}
-
 android {
-    compileSdk = 31
+    namespace = "org.bitcoindevkit"
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 31
+        minSdk = 24
+        targetSdk = 34
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -43,8 +39,22 @@ android {
     }
 }
 
+kotlin {
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
-    implementation("net.java.dev.jna:jna:5.8.0@aar")
+    implementation("net.java.dev.jna:jna:5.14.0@aar")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7")
     implementation("androidx.appcompat:appcompat:1.4.0")
     implementation("androidx.core:core-ktx:1.7.0")
@@ -53,7 +63,8 @@ dependencies {
     androidTestImplementation("com.github.tony19:logback-android:2.0.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
+    androidTestImplementation("org.jetbrains.kotlin:kotlin-test:1.6.10")
+    androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.10")
 }
 
 afterEvaluate {
@@ -81,14 +92,9 @@ afterEvaluate {
                     }
                     developers {
                         developer {
-                            id.set("notmandatory")
-                            name.set("Steve Myers")
-                            email.set("notmandatory@noreply.github.org")
-                        }
-                        developer {
-                            id.set("artfuldev")
-                            name.set("Sudarsan Balaji")
-                            email.set("sudarsan.balaji@artfuldev.com")
+                            id.set("bdkdevelopers")
+                            name.set("Bitcoin Dev Kit Developers")
+                            email.set("dev@bitcoindevkit.org")
                         }
                     }
                     scm {
@@ -100,9 +106,22 @@ afterEvaluate {
             }
         }
     }
+    
+    // This is required because we must ensure the moveNativeAndroidLibs task is executed after
+    // the mergeReleaseJniLibFolders (hard requirement introduced by our upgrade to Gradle 8.7)
+    tasks.named("mergeReleaseJniLibFolders") {
+        dependsOn(":lib:moveNativeAndroidLibs")
+    }
+    tasks.named("mergeDebugJniLibFolders") {
+        dependsOn(":lib:moveNativeAndroidLibs")
+    }
 }
 
 signing {
+    if (project.hasProperty("localBuild")) {
+        isRequired = false
+    }
+
     val signingKeyId: String? by project
     val signingKey: String? by project
     val signingPassword: String? by project
@@ -110,8 +129,7 @@ signing {
     sign(publishing.publications)
 }
 
-// This task dependency ensures that we build the bindings
-// binaries before running the tests
+// This task dependency ensures that we build the bindings binaries before running the tests
 tasks.withType<KotlinCompile> {
     dependsOn("buildAndroidLib")
 }

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt

@@ -1,81 +0,0 @@
-package org.bitcoindevkit
-
-import org.junit.Assert.*
-import org.junit.Test
-import android.app.Application
-import android.content.Context.MODE_PRIVATE
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.runner.RunWith
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import java.io.File
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class AndroidLibTest {
-
-    private fun getTestDataDir(): String {
-        val context = ApplicationProvider.getApplicationContext<Application>()
-        return context.getDir("bdk-test", MODE_PRIVATE).toString()
-    }
-
-    private fun cleanupTestDataDir(testDataDir: String) {
-        File(testDataDir).deleteRecursively()
-    }
-
-    class LogProgress : Progress {
-        private val log: Logger = LoggerFactory.getLogger(AndroidLibTest::class.java)
-
-        override fun update(progress: Float, message: String?) {
-            log.debug("Syncing...")
-        }
-    }
-
-    private val descriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)", Network.TESTNET)
-
-    private val databaseConfig = DatabaseConfig.Memory
-
-    private val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            "ssl://electrum.blockstream.info:60002",
-            null,
-            5u,
-            null,
-            100u,
-            true,
-        )
-    )
-
-    @Test
-    fun memoryWalletNewAddress() {
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val address = wallet.getAddress(AddressIndex.New).address.asString()
-        assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
-    }
-
-    @Test
-    fun memoryWalletSyncGetBalance() {
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val blockchain = Blockchain(blockchainConfig)
-        wallet.sync(blockchain, LogProgress())
-        val balance: Balance = wallet.getBalance()
-        assertTrue(balance.total > 0u)
-    }
-
-    @Test
-    fun sqliteWalletSyncGetBalance() {
-        val testDataDir = getTestDataDir() + "/bdk-wallet.sqlite"
-        val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir))
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val blockchain = Blockchain(blockchainConfig)
-        wallet.sync(blockchain, LogProgress())
-        val balance: Balance = wallet.getBalance()
-        assertTrue(balance.total > 0u)
-        cleanupTestDataDir(testDataDir)
-    }
-}

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt

@@ -0,0 +1,82 @@
+package org.bitcoindevkit
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.File
+import kotlin.test.AfterTest
+import kotlin.test.assertTrue
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+@RunWith(AndroidJUnit4::class)
+class LiveTxBuilderTest {
+    private val persistenceFilePath = InstrumentationRegistry.getInstrumentation().targetContext.filesDir.path + "/bdk_persistence3.sqlite"
+    private val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.SIGNET)
+    private val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.SIGNET)
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testTxBuilder() {
+        val wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+        val psbt: Psbt = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), Amount.fromSat(4200uL))
+            .feeRate(FeeRate.fromSatPerVb(2uL))
+            .finish(wallet)
+
+        println(psbt.serialize())
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+
+    @Test
+    fun complexTxBuilder() {
+        val wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient1: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+        val recipient2: Address = Address("tb1qw2c3lxufxqe2x9s4rdzh65tpf4d7fssjgh8nv6", Network.SIGNET)
+        val allRecipients: List<ScriptAmount> = listOf(
+            ScriptAmount(recipient1.scriptPubkey(), Amount.fromSat(4200uL)),
+            ScriptAmount(recipient2.scriptPubkey(), Amount.fromSat(4200uL)),
+        )
+
+        val psbt: Psbt = TxBuilder()
+            .setRecipients(allRecipients)
+            .feeRate(FeeRate.fromSatPerVb(4uL))
+            .changePolicy(ChangeSpendPolicy.CHANGE_FORBIDDEN)
+            .enableRbf()
+            .finish(wallet)
+
+        wallet.sign(psbt)
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+}

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt

@@ -0,0 +1,91 @@
+package org.bitcoindevkit
+
+import org.junit.Test
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.runner.RunWith
+import java.io.File
+import kotlin.test.AfterTest
+import kotlin.test.assertTrue
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+@RunWith(AndroidJUnit4::class)
+class LiveWalletTest {
+    private val persistenceFilePath = InstrumentationRegistry
+        .getInstrumentation().targetContext.filesDir.path + "/bdk_persistence2.sqlite"
+    private val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.SIGNET)
+    private val changeDescriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.SIGNET)
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testSyncedBalance() {
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+        val balance: Balance = wallet.balance()
+        println("Balance: $balance")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        println("Transactions count: ${wallet.transactions().count()}")
+        val transactions = wallet.transactions().take(3)
+        for (tx in transactions) {
+            val sentAndReceived = wallet.sentAndReceived(tx.transaction)
+            println("Transaction: ${tx.transaction.computeTxid()}")
+            println("Sent ${sentAndReceived.sent}")
+            println("Received ${sentAndReceived.received}")
+        }
+    }
+
+    @Test
+    fun testBroadcastTransaction() {
+        val wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+
+        val psbt: Psbt = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), Amount.fromSat(4200uL))
+            .feeRate(FeeRate.fromSatPerVb(4uL))
+            .finish(wallet)
+
+        println(psbt.serialize())
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+
+        val walletDidSign = wallet.sign(psbt)
+        assertTrue(walletDidSign)
+
+        val tx: Transaction = psbt.extractTx()
+        println("Txid is: ${tx.computeTxid()}")
+
+        val txFee: Amount = wallet.calculateFee(tx)
+        println("Tx fee is: ${txFee.toSat()}")
+
+        val feeRate: FeeRate = wallet.calculateFeeRate(tx)
+        println("Tx fee rate is: ${feeRate.toSatPerVbCeil()} sat/vB")
+
+        esploraClient.broadcast(tx)
+    }
+}

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt

@@ -0,0 +1,21 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OfflineDescriptorTest {
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic.fromString("space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertEquals(
+            expected = "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx",
+            actual = descriptor.toString()
+        )
+    }
+}

bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineWalletTest.kt

@@ -0,0 +1,70 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.assertFalse
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.runner.RunWith
+import java.io.File
+import kotlin.test.AfterTest
+
+@RunWith(AndroidJUnit4::class)
+class OfflineWalletTest {
+    private val persistenceFilePath = InstrumentationRegistry
+        .getInstrumentation().targetContext.filesDir.path + "/bdk_persistence1.sqlite"
+    private val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+    private val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET)
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic(WordCount.WORDS12)
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertTrue(descriptor.toString().startsWith("tr"), "Bip86 Descriptor does not start with 'tr'")
+    }
+
+   @Test
+    fun testNewAddress() {
+        val wallet: Wallet = Wallet(
+            descriptor,
+            changeDescriptor,
+            Network.TESTNET
+        )
+        val addressInfo: AddressInfo = wallet.revealNextAddress(KeychainKind.EXTERNAL)
+
+        assertTrue(addressInfo.address.isValidForNetwork(Network.TESTNET), "Address is not valid for testnet network")
+        assertTrue(addressInfo.address.isValidForNetwork(Network.SIGNET), "Address is not valid for signet network")
+        assertFalse(addressInfo.address.isValidForNetwork(Network.REGTEST), "Address is valid for regtest network, but it shouldn't be")
+        assertFalse(addressInfo.address.isValidForNetwork(Network.BITCOIN), "Address is valid for bitcoin network, but it shouldn't be")
+
+        assertEquals(
+            expected = "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989",
+            actual = addressInfo.address.toString()
+        )
+    }
+
+    @Test
+    fun testBalance() {
+        val wallet: Wallet = Wallet(
+            descriptor,
+            changeDescriptor,
+            Network.TESTNET
+        )
+
+        assertEquals(
+            expected = 0uL,
+            actual = wallet.balance().total.toSat()
+        )
+    }
+}

bdk-android/lib/src/main/AndroidManifest.xml

@@ -1,6 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.bitcoindevkit">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>

bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt

@@ -1,6 +1,5 @@
 package org.bitcoindevkit.plugins
 
-
 val operatingSystem: OS = when {
     System.getProperty("os.name").contains("mac", ignoreCase = true) -> OS.MAC
     System.getProperty("os.name").contains("linux", ignoreCase = true) -> OS.LINUX

bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt

@@ -17,6 +17,11 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
             OS.OTHER -> throw Error("Cannot build Android library from current architecture")
         }
 
+        // if ANDROID_NDK_ROOT is not set, stop build
+        if (System.getenv("ANDROID_NDK_ROOT") == null) {
+            throw IllegalStateException("ANDROID_NDK_ROOT environment variable is not set; cannot build library")
+        }
+
         // arm64-v8a is the most popular hardware architecture for Android
         val buildAndroidAarch64Binary by tasks.register<Exec>("buildAndroidAarch64Binary") {
 
@@ -26,20 +31,13 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
             executable("cargo")
             args(cargoArgs)
 
-            // if ANDROID_NDK_ROOT is not set then set it to github actions default
-            if (System.getenv("ANDROID_NDK_ROOT") == null) {
-                environment(
-                    Pair("ANDROID_NDK_ROOT", "${System.getenv("ANDROID_SDK_ROOT")}/ndk-bundle")
-                )
-            }
-
             environment(
                 // add build toolchain to PATH
                 Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
-                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
+                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=24"),
                 Pair("AR", "llvm-ar"),
-                Pair("CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER", "aarch64-linux-android21-clang"),
-                Pair("CC", "aarch64-linux-android21-clang")
+                Pair("CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER", "aarch64-linux-android24-clang"),
+                Pair("CC", "aarch64-linux-android24-clang")
             )
 
             doLast {
@@ -56,20 +54,13 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
             executable("cargo")
             args(cargoArgs)
 
-            // if ANDROID_NDK_ROOT is not set then set it to github actions default
-            if (System.getenv("ANDROID_NDK_ROOT") == null) {
-                environment(
-                    Pair("ANDROID_NDK_ROOT", "${System.getenv("ANDROID_SDK_ROOT")}/ndk-bundle")
-                )
-            }
-
             environment(
                 // add build toolchain to PATH
                 Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
-                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
+                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=24"),
                 Pair("AR", "llvm-ar"),
-                Pair("CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER", "x86_64-linux-android21-clang"),
-                Pair("CC", "x86_64-linux-android21-clang")
+                Pair("CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER", "x86_64-linux-android24-clang"),
+                Pair("CC", "x86_64-linux-android24-clang")
             )
 
             doLast {
@@ -86,20 +77,13 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
             executable("cargo")
             args(cargoArgs)
 
-            // if ANDROID_NDK_ROOT is not set then set it to github actions default
-            if (System.getenv("ANDROID_NDK_ROOT") == null) {
-                environment(
-                    Pair("ANDROID_NDK_ROOT", "${System.getenv("ANDROID_SDK_ROOT")}/ndk-bundle")
-                )
-            }
-
             environment(
                 // add build toolchain to PATH
                 Pair("PATH", "${System.getenv("PATH")}:${System.getenv("ANDROID_NDK_ROOT")}/toolchains/llvm/prebuilt/$llvmArchPath/bin"),
-                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=21"),
+                Pair("CFLAGS", "-D__ANDROID_MIN_SDK_VERSION__=24"),
                 Pair("AR", "llvm-ar"),
-                Pair("CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER", "armv7a-linux-androideabi21-clang"),
-                Pair("CC", "armv7a-linux-androideabi21-clang")
+                Pair("CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER", "armv7a-linux-androideabi24-clang"),
+                Pair("CC", "armv7a-linux-androideabi24-clang")
             )
 
             doLast {
@@ -113,19 +97,21 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
         val moveNativeAndroidLibs by tasks.register<Copy>("moveNativeAndroidLibs") {
 
             dependsOn(buildAndroidAarch64Binary)
+            dependsOn(buildAndroidArmv7Binary)
+            dependsOn(buildAndroidX86_64Binary)
 
             into("${project.projectDir}/../lib/src/main/jniLibs/")
 
             into("arm64-v8a") {
-                from("${project.projectDir}/../../target/aarch64-linux-android/release-smaller/libbdkffi.so")
+                from("${project.projectDir}/../../bdk-ffi/target/aarch64-linux-android/release-smaller/libbdkffi.so")
             }
 
             into("x86_64") {
-                from("${project.projectDir}/../../target/x86_64-linux-android/release-smaller/libbdkffi.so")
+                from("${project.projectDir}/../../bdk-ffi/target/x86_64-linux-android/release-smaller/libbdkffi.so")
             }
 
             into("armeabi-v7a") {
-                from("${project.projectDir}/../../target/armv7-linux-androideabi/release-smaller/libbdkffi.so")
+                from("${project.projectDir}/../../bdk-ffi/target/armv7-linux-androideabi/release-smaller/libbdkffi.so")
             }
 
             doLast {
@@ -137,8 +123,14 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
         val generateAndroidBindings by tasks.register<Exec>("generateAndroidBindings") {
             dependsOn(moveNativeAndroidLibs)
 
+            val libraryPath = "${project.projectDir}/../../bdk-ffi/target/aarch64-linux-android/release-smaller/libbdkffi.so"
             workingDir("${project.projectDir}/../../bdk-ffi")
-            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
+            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
+
+            // The code above worked for uniffi 0.24.3 using the --library flag
+            // The code below works for uniffi 0.23.0
+            // workingDir("${project.projectDir}/../../bdk-ffi")
+            // val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--config", "uniffi-android.toml", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
 
             executable("cargo")
             args(cargoArgs)

bdk-android/settings.gradle.kts

@@ -2,3 +2,17 @@ rootProject.name = "bdk-android"
 
 include(":lib")
 includeBuild("plugins")
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}

bdk-ffi/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "bdk-ffi"
-version = "0.29.0"
-authors = ["Steve Myers <steve@notmandatory.org>", "Sudarsan Balaji <sudarsan.balaji@artfuldev.com>"]
+version = "1.0.0-alpha.11"
+homepage = "https://bitcoindevkit.org"
+repository = "https://github.com/bitcoindevkit/bdk"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 
@@ -17,12 +18,30 @@ path = "uniffi-bindgen.rs"
 default = ["uniffi/cli"]
 
 [dependencies]
-bdk = { version = "0.28", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled", "rpc"] }
-uniffi = { version = "0.23.0" }
+bdk_wallet = { version = "1.0.0-alpha.13", features = ["all-keys", "keys-bip39"] }
+bdk_esplora = { version = "0.15.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
+# NOTE: This is a temporary workaround to use the electrum-client with the use-rustls-ring feature. It points to a fork
+#       of bdk in which the bdk_electrum library uses the electrum-client with the use-rustls-ring feature.
+bdk_electrum = { git = "https://github.com/thunderbiscuit/bdk/", package = "bdk_electrum", branch = "feature/electrum-client-ring-ffi-alpha13", default-features = false, features = ["use-rustls-ring"] }
+# bdk_electrum = { version = "0.15.0" }
+bdk_sqlite = { version = "0.2.0" }
+bdk_bitcoind_rpc = { version = "0.12.0" }
+bitcoin-internals = { version = "0.2.0", features = ["alloc"] }
+
+uniffi = { version = "=0.28.0" }
+thiserror = "1.0.58"
 
 [build-dependencies]
-uniffi = { version = "0.23.0", features = ["build"] }
+uniffi = { version = "=0.28.0", features = ["build"] }
 
 [dev-dependencies]
-uniffi = { version = "0.23.0", features = ["bindgen-tests"] }
+uniffi = { version = "=0.28.0", features = ["bindgen-tests"] }
 assert_matches = "1.5.0"
+
+[profile.release-smaller]
+inherits = "release"
+opt-level = 'z'     # Optimize for size.
+lto = true          # Enable Link Time Optimization
+codegen-units = 1   # Reduce number of codegen units to increase optimizations.
+panic = "abort"     # Abort on panic
+strip = "debuginfo" # Partially strip symbols from binary

bdk-ffi/justfile

@@ -0,0 +1,12 @@
+default:
+  just --list
+
+build:
+  cargo build
+
+check:
+   cargo fmt
+   cargo clippy
+
+test:
+  cargo test --lib

bdk-ffi/src/bitcoin.rs

@@ -0,0 +1,679 @@
+use crate::error::{
+    AddressParseError, FeeRateError, FromScriptError, PsbtError, PsbtParseError, TransactionError,
+};
+
+use bdk_bitcoind_rpc::bitcoincore_rpc::jsonrpc::serde_json;
+use bdk_wallet::bitcoin::address::{NetworkChecked, NetworkUnchecked};
+use bdk_wallet::bitcoin::amount::ParseAmountError;
+use bdk_wallet::bitcoin::consensus::encode::serialize;
+use bdk_wallet::bitcoin::consensus::Decodable;
+use bdk_wallet::bitcoin::io::Cursor;
+use bdk_wallet::bitcoin::psbt::ExtractTxError;
+use bdk_wallet::bitcoin::Address as BdkAddress;
+use bdk_wallet::bitcoin::Amount as BdkAmount;
+use bdk_wallet::bitcoin::FeeRate as BdkFeeRate;
+use bdk_wallet::bitcoin::Network;
+use bdk_wallet::bitcoin::OutPoint as BdkOutPoint;
+use bdk_wallet::bitcoin::Psbt as BdkPsbt;
+use bdk_wallet::bitcoin::ScriptBuf as BdkScriptBuf;
+use bdk_wallet::bitcoin::Transaction as BdkTransaction;
+use bdk_wallet::bitcoin::TxIn as BdkTxIn;
+use bdk_wallet::bitcoin::TxOut as BdkTxOut;
+use bdk_wallet::bitcoin::Txid;
+
+use std::fmt::Display;
+use std::ops::Deref;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Amount(pub(crate) BdkAmount);
+
+impl Amount {
+    pub fn from_sat(sat: u64) -> Self {
+        Amount(BdkAmount::from_sat(sat))
+    }
+
+    pub fn from_btc(btc: f64) -> Result<Self, ParseAmountError> {
+        let bdk_amount = BdkAmount::from_btc(btc).map_err(ParseAmountError::from)?;
+        Ok(Amount(bdk_amount))
+    }
+
+    pub fn to_sat(&self) -> u64 {
+        self.0.to_sat()
+    }
+
+    pub fn to_btc(&self) -> f64 {
+        self.0.to_btc()
+    }
+}
+
+impl From<Amount> for BdkAmount {
+    fn from(amount: Amount) -> Self {
+        amount.0
+    }
+}
+
+impl From<BdkAmount> for Amount {
+    fn from(amount: BdkAmount) -> Self {
+        Amount(amount)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Script(pub(crate) BdkScriptBuf);
+
+impl Script {
+    pub fn new(raw_output_script: Vec<u8>) -> Self {
+        let script: BdkScriptBuf = raw_output_script.into();
+        Script(script)
+    }
+
+    pub fn to_bytes(&self) -> Vec<u8> {
+        self.0.to_bytes()
+    }
+}
+
+impl From<BdkScriptBuf> for Script {
+    fn from(script: BdkScriptBuf) -> Self {
+        Script(script)
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct Address(BdkAddress<NetworkChecked>);
+
+impl Address {
+    pub fn new(address: String, network: Network) -> Result<Self, AddressParseError> {
+        let parsed_address = address.parse::<bdk_wallet::bitcoin::Address<NetworkUnchecked>>()?;
+        let network_checked_address = parsed_address.require_network(network)?;
+
+        Ok(Address(network_checked_address))
+    }
+
+    pub fn from_script(script: Arc<Script>, network: Network) -> Result<Self, FromScriptError> {
+        let address = BdkAddress::from_script(&script.0.clone(), network)?;
+
+        Ok(Address(address))
+    }
+
+    pub fn script_pubkey(&self) -> Arc<Script> {
+        Arc::new(Script(self.0.script_pubkey()))
+    }
+
+    pub fn to_qr_uri(&self) -> String {
+        self.0.to_qr_uri()
+    }
+
+    pub fn is_valid_for_network(&self, network: Network) -> bool {
+        let address_str = self.0.to_string();
+        if let Ok(unchecked_address) = address_str.parse::<BdkAddress<NetworkUnchecked>>() {
+            unchecked_address.is_valid_for_network(network)
+        } else {
+            false
+        }
+    }
+}
+
+impl Display for Address {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<Address> for BdkAddress {
+    fn from(address: Address) -> Self {
+        address.0
+    }
+}
+
+impl From<BdkAddress> for Address {
+    fn from(address: BdkAddress) -> Self {
+        Address(address)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Transaction(BdkTransaction);
+
+impl Transaction {
+    pub fn new(transaction_bytes: Vec<u8>) -> Result<Self, TransactionError> {
+        let mut decoder = Cursor::new(transaction_bytes);
+        let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)?;
+        Ok(Transaction(tx))
+    }
+
+    pub fn compute_txid(&self) -> String {
+        self.0.compute_txid().to_string()
+    }
+
+    pub fn weight(&self) -> u64 {
+        self.0.weight().to_wu()
+    }
+
+    pub fn total_size(&self) -> u64 {
+        self.0.total_size() as u64
+    }
+
+    pub fn vsize(&self) -> u64 {
+        self.0.vsize() as u64
+    }
+
+    pub fn is_coinbase(&self) -> bool {
+        self.0.is_coinbase()
+    }
+
+    pub fn is_explicitly_rbf(&self) -> bool {
+        self.0.is_explicitly_rbf()
+    }
+
+    pub fn is_lock_time_enabled(&self) -> bool {
+        self.0.is_lock_time_enabled()
+    }
+
+    pub fn version(&self) -> i32 {
+        self.0.version.0
+    }
+
+    pub fn serialize(&self) -> Vec<u8> {
+        serialize(&self.0)
+    }
+
+    pub fn input(&self) -> Vec<TxIn> {
+        self.0.input.iter().map(|tx_in| tx_in.into()).collect()
+    }
+
+    pub fn output(&self) -> Vec<TxOut> {
+        self.0.output.iter().map(|tx_out| tx_out.into()).collect()
+    }
+
+    pub fn lock_time(&self) -> u32 {
+        self.0.lock_time.to_consensus_u32()
+    }
+}
+
+impl From<BdkTransaction> for Transaction {
+    fn from(tx: BdkTransaction) -> Self {
+        Transaction(tx)
+    }
+}
+
+impl From<&BdkTransaction> for Transaction {
+    fn from(tx: &BdkTransaction) -> Self {
+        Transaction(tx.clone())
+    }
+}
+
+impl From<&Transaction> for BdkTransaction {
+    fn from(tx: &Transaction) -> Self {
+        tx.0.clone()
+    }
+}
+
+pub struct Psbt(pub(crate) Mutex<BdkPsbt>);
+
+impl Psbt {
+    pub(crate) fn new(psbt_base64: String) -> Result<Self, PsbtParseError> {
+        let psbt: BdkPsbt = BdkPsbt::from_str(&psbt_base64)?;
+        Ok(Psbt(Mutex::new(psbt)))
+    }
+
+    pub(crate) fn serialize(&self) -> String {
+        let psbt = self.0.lock().unwrap().clone();
+        psbt.to_string()
+    }
+
+    pub(crate) fn extract_tx(&self) -> Result<Arc<Transaction>, ExtractTxError> {
+        let tx: BdkTransaction = self.0.lock().unwrap().clone().extract_tx()?;
+        let transaction: Transaction = tx.into();
+        Ok(Arc::new(transaction))
+    }
+
+    pub(crate) fn fee(&self) -> Result<u64, PsbtError> {
+        self.0
+            .lock()
+            .unwrap()
+            .fee()
+            .map(|fee| fee.to_sat())
+            .map_err(PsbtError::from)
+    }
+
+    pub(crate) fn combine(&self, other: Arc<Psbt>) -> Result<Arc<Psbt>, PsbtError> {
+        let mut original_psbt = self.0.lock().unwrap().clone();
+        let other_psbt = other.0.lock().unwrap().clone();
+        original_psbt.combine(other_psbt)?;
+        Ok(Arc::new(Psbt(Mutex::new(original_psbt))))
+    }
+
+    pub(crate) fn json_serialize(&self) -> String {
+        let psbt = self.0.lock().unwrap();
+        serde_json::to_string(psbt.deref()).unwrap()
+    }
+}
+
+impl From<BdkPsbt> for Psbt {
+    fn from(psbt: BdkPsbt) -> Self {
+        Psbt(Mutex::new(psbt))
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct OutPoint {
+    pub txid: String,
+    pub vout: u32,
+}
+
+impl From<&OutPoint> for BdkOutPoint {
+    fn from(outpoint: &OutPoint) -> Self {
+        BdkOutPoint {
+            txid: Txid::from_str(&outpoint.txid).unwrap(),
+            vout: outpoint.vout,
+        }
+    }
+}
+
+impl From<&BdkOutPoint> for OutPoint {
+    fn from(outpoint: &BdkOutPoint) -> Self {
+        OutPoint {
+            txid: outpoint.txid.to_string(),
+            vout: outpoint.vout,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct TxIn {
+    pub previous_output: OutPoint,
+    pub script_sig: Arc<Script>,
+    pub sequence: u32,
+    pub witness: Vec<Vec<u8>>,
+}
+
+impl From<&BdkTxIn> for TxIn {
+    fn from(tx_in: &BdkTxIn) -> Self {
+        TxIn {
+            previous_output: OutPoint {
+                txid: tx_in.previous_output.txid.to_string(),
+                vout: tx_in.previous_output.vout,
+            },
+            script_sig: Arc::new(Script(tx_in.script_sig.clone())),
+            sequence: tx_in.sequence.0,
+            witness: tx_in.witness.to_vec(),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct TxOut {
+    pub value: u64,
+    pub script_pubkey: Arc<Script>,
+}
+
+impl From<&BdkTxOut> for TxOut {
+    fn from(tx_out: &BdkTxOut) -> Self {
+        TxOut {
+            value: tx_out.value.to_sat(),
+            script_pubkey: Arc::new(Script(tx_out.script_pubkey.clone())),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct FeeRate(pub(crate) BdkFeeRate);
+
+impl FeeRate {
+    pub fn from_sat_per_vb(sat_per_vb: u64) -> Result<Self, FeeRateError> {
+        let fee_rate: Option<BdkFeeRate> = BdkFeeRate::from_sat_per_vb(sat_per_vb);
+        match fee_rate {
+            Some(fee_rate) => Ok(FeeRate(fee_rate)),
+            None => Err(FeeRateError::ArithmeticOverflow),
+        }
+    }
+
+    pub fn from_sat_per_kwu(sat_per_kwu: u64) -> Self {
+        FeeRate(BdkFeeRate::from_sat_per_kwu(sat_per_kwu))
+    }
+
+    pub fn to_sat_per_vb_ceil(&self) -> u64 {
+        self.0.to_sat_per_vb_ceil()
+    }
+
+    pub fn to_sat_per_vb_floor(&self) -> u64 {
+        self.0.to_sat_per_vb_floor()
+    }
+
+    pub fn to_sat_per_kwu(&self) -> u64 {
+        self.0.to_sat_per_kwu()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::bitcoin::Address;
+    use crate::bitcoin::Network;
+
+    #[test]
+    fn test_is_valid_for_network() {
+        // ====Docs tests====
+        // https://docs.rs/bitcoin/0.29.2/src/bitcoin/util/address.rs.html#798-802
+
+        let docs_address_testnet_str = "2N83imGV3gPwBzKJQvWJ7cRUY2SpUyU6A5e";
+        let docs_address_testnet =
+            Address::new(docs_address_testnet_str.to_string(), Network::Testnet).unwrap();
+        assert!(
+            docs_address_testnet.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            docs_address_testnet.is_valid_for_network(Network::Signet),
+            "Address should be valid for Signet"
+        );
+        assert!(
+            docs_address_testnet.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+
+        let docs_address_mainnet_str = "32iVBEu4dxkUQk9dJbZUiBiQdmypcEyJRf";
+        let docs_address_mainnet =
+            Address::new(docs_address_mainnet_str.to_string(), Network::Bitcoin).unwrap();
+        assert!(
+            docs_address_mainnet.is_valid_for_network(Network::Bitcoin),
+            "Address should be valid for Bitcoin"
+        );
+
+        // ====Bech32====
+
+        //     | Network         | Prefix  | Address Type |
+        //     |-----------------|---------|--------------|
+        //     | Bitcoin Mainnet | `bc1`   | Bech32       |
+        //     | Bitcoin Testnet | `tb1`   | Bech32       |
+        //     | Bitcoin Signet  | `tb1`   | Bech32       |
+        //     | Bitcoin Regtest | `bcrt1` | Bech32       |
+
+        // Bech32 - Bitcoin
+        // Valid for:
+        // - Bitcoin
+        // Not valid for:
+        // - Testnet
+        // - Signet
+        // - Regtest
+        let bitcoin_mainnet_bech32_address_str = "bc1qxhmdufsvnuaaaer4ynz88fspdsxq2h9e9cetdj";
+        let bitcoin_mainnet_bech32_address = Address::new(
+            bitcoin_mainnet_bech32_address_str.to_string(),
+            Network::Bitcoin,
+        )
+        .unwrap();
+        assert!(
+            bitcoin_mainnet_bech32_address.is_valid_for_network(Network::Bitcoin),
+            "Address should be valid for Bitcoin"
+        );
+        assert!(
+            !bitcoin_mainnet_bech32_address.is_valid_for_network(Network::Testnet),
+            "Address should not be valid for Testnet"
+        );
+        assert!(
+            !bitcoin_mainnet_bech32_address.is_valid_for_network(Network::Signet),
+            "Address should not be valid for Signet"
+        );
+        assert!(
+            !bitcoin_mainnet_bech32_address.is_valid_for_network(Network::Regtest),
+            "Address should not be valid for Regtest"
+        );
+
+        // Bech32 - Testnet
+        // Valid for:
+        // - Testnet
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        // - Regtest
+        let bitcoin_testnet_bech32_address_str =
+            "tb1p4nel7wkc34raczk8c4jwk5cf9d47u2284rxn98rsjrs4w3p2sheqvjmfdh";
+        let bitcoin_testnet_bech32_address = Address::new(
+            bitcoin_testnet_bech32_address_str.to_string(),
+            Network::Testnet,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_testnet_bech32_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_testnet_bech32_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_testnet_bech32_address.is_valid_for_network(Network::Signet),
+            "Address should be valid for Signet"
+        );
+        assert!(
+            !bitcoin_testnet_bech32_address.is_valid_for_network(Network::Regtest),
+            "Address should not not be valid for Regtest"
+        );
+
+        // Bech32 - Signet
+        // Valid for:
+        // - Signet
+        // - Testnet
+        // Not valid for:
+        // - Bitcoin
+        // - Regtest
+        let bitcoin_signet_bech32_address_str =
+            "tb1pwzv7fv35yl7ypwj8w7al2t8apd6yf4568cs772qjwper74xqc99sk8x7tk";
+        let bitcoin_signet_bech32_address = Address::new(
+            bitcoin_signet_bech32_address_str.to_string(),
+            Network::Signet,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_signet_bech32_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_signet_bech32_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_signet_bech32_address.is_valid_for_network(Network::Signet),
+            "Address should be valid for Signet"
+        );
+        assert!(
+            !bitcoin_signet_bech32_address.is_valid_for_network(Network::Regtest),
+            "Address should not not be valid for Regtest"
+        );
+
+        // Bech32 - Regtest
+        // Valid for:
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        // - Testnet
+        // - Signet
+        let bitcoin_regtest_bech32_address_str = "bcrt1q39c0vrwpgfjkhasu5mfke9wnym45nydfwaeems";
+        let bitcoin_regtest_bech32_address = Address::new(
+            bitcoin_regtest_bech32_address_str.to_string(),
+            Network::Regtest,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_regtest_bech32_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            !bitcoin_regtest_bech32_address.is_valid_for_network(Network::Testnet),
+            "Address should not be valid for Testnet"
+        );
+        assert!(
+            !bitcoin_regtest_bech32_address.is_valid_for_network(Network::Signet),
+            "Address should not be valid for Signet"
+        );
+        assert!(
+            bitcoin_regtest_bech32_address.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+
+        // ====P2PKH====
+
+        //     | Network                            | Prefix for P2PKH | Prefix for P2SH |
+        //     |------------------------------------|------------------|-----------------|
+        //     | Bitcoin Mainnet                    | `1`              | `3`             |
+        //     | Bitcoin Testnet, Regtest, Signet   | `m` or `n`       | `2`             |
+
+        // P2PKH - Bitcoin
+        // Valid for:
+        // - Bitcoin
+        // Not valid for:
+        // - Testnet
+        // - Regtest
+        let bitcoin_mainnet_p2pkh_address_str = "1FfmbHfnpaZjKFvyi1okTjJJusN455paPH";
+        let bitcoin_mainnet_p2pkh_address = Address::new(
+            bitcoin_mainnet_p2pkh_address_str.to_string(),
+            Network::Bitcoin,
+        )
+        .unwrap();
+        assert!(
+            bitcoin_mainnet_p2pkh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should be valid for Bitcoin"
+        );
+        assert!(
+            !bitcoin_mainnet_p2pkh_address.is_valid_for_network(Network::Testnet),
+            "Address should not be valid for Testnet"
+        );
+        assert!(
+            !bitcoin_mainnet_p2pkh_address.is_valid_for_network(Network::Regtest),
+            "Address should not be valid for Regtest"
+        );
+
+        // P2PKH - Testnet
+        // Valid for:
+        // - Testnet
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        let bitcoin_testnet_p2pkh_address_str = "mucFNhKMYoBQYUAEsrFVscQ1YaFQPekBpg";
+        let bitcoin_testnet_p2pkh_address = Address::new(
+            bitcoin_testnet_p2pkh_address_str.to_string(),
+            Network::Testnet,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_testnet_p2pkh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_testnet_p2pkh_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_testnet_p2pkh_address.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+
+        // P2PKH - Regtest
+        // Valid for:
+        // - Testnet
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        let bitcoin_regtest_p2pkh_address_str = "msiGFK1PjCk8E6FXeoGkQPTscmcpyBdkgS";
+        let bitcoin_regtest_p2pkh_address = Address::new(
+            bitcoin_regtest_p2pkh_address_str.to_string(),
+            Network::Regtest,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_regtest_p2pkh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_regtest_p2pkh_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_regtest_p2pkh_address.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+
+        // ====P2SH====
+
+        //     | Network                            | Prefix for P2PKH | Prefix for P2SH |
+        //     |------------------------------------|------------------|-----------------|
+        //     | Bitcoin Mainnet                    | `1`              | `3`             |
+        //     | Bitcoin Testnet, Regtest, Signet   | `m` or `n`       | `2`             |
+
+        // P2SH - Bitcoin
+        // Valid for:
+        // - Bitcoin
+        // Not valid for:
+        // - Testnet
+        // - Regtest
+        let bitcoin_mainnet_p2sh_address_str = "3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy";
+        let bitcoin_mainnet_p2sh_address = Address::new(
+            bitcoin_mainnet_p2sh_address_str.to_string(),
+            Network::Bitcoin,
+        )
+        .unwrap();
+        assert!(
+            bitcoin_mainnet_p2sh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should be valid for Bitcoin"
+        );
+        assert!(
+            !bitcoin_mainnet_p2sh_address.is_valid_for_network(Network::Testnet),
+            "Address should not be valid for Testnet"
+        );
+        assert!(
+            !bitcoin_mainnet_p2sh_address.is_valid_for_network(Network::Regtest),
+            "Address should not be valid for Regtest"
+        );
+
+        // P2SH - Testnet
+        // Valid for:
+        // - Testnet
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        let bitcoin_testnet_p2sh_address_str = "2NFUBBRcTJbYc1D4HSCbJhKZp6YCV4PQFpQ";
+        let bitcoin_testnet_p2sh_address = Address::new(
+            bitcoin_testnet_p2sh_address_str.to_string(),
+            Network::Testnet,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_testnet_p2sh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_testnet_p2sh_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_testnet_p2sh_address.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+
+        // P2SH - Regtest
+        // Valid for:
+        // - Testnet
+        // - Regtest
+        // Not valid for:
+        // - Bitcoin
+        let bitcoin_regtest_p2sh_address_str = "2NEb8N5B9jhPUCBchz16BB7bkJk8VCZQjf3";
+        let bitcoin_regtest_p2sh_address = Address::new(
+            bitcoin_regtest_p2sh_address_str.to_string(),
+            Network::Regtest,
+        )
+        .unwrap();
+        assert!(
+            !bitcoin_regtest_p2sh_address.is_valid_for_network(Network::Bitcoin),
+            "Address should not be valid for Bitcoin"
+        );
+        assert!(
+            bitcoin_regtest_p2sh_address.is_valid_for_network(Network::Testnet),
+            "Address should be valid for Testnet"
+        );
+        assert!(
+            bitcoin_regtest_p2sh_address.is_valid_for_network(Network::Regtest),
+            "Address should be valid for Regtest"
+        );
+    }
+}

bdk-ffi/src/blockchain.rs

@@ -1,201 +0,0 @@
-// use crate::BlockchainConfig;
-use crate::{BdkError, Transaction};
-use bdk::bitcoin::Network;
-use bdk::blockchain::any::{AnyBlockchain, AnyBlockchainConfig};
-use bdk::blockchain::rpc::Auth as BdkAuth;
-use bdk::blockchain::rpc::RpcSyncParams as BdkRpcSyncParams;
-use bdk::blockchain::Blockchain as BdkBlockchain;
-use bdk::blockchain::GetBlockHash;
-use bdk::blockchain::GetHeight;
-use bdk::blockchain::{
-    electrum::ElectrumBlockchainConfig, esplora::EsploraBlockchainConfig,
-    rpc::RpcConfig as BdkRpcConfig, ConfigurableBlockchain,
-};
-use bdk::FeeRate;
-use std::convert::{From, TryFrom};
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex, MutexGuard};
-
-pub(crate) struct Blockchain {
-    blockchain_mutex: Mutex<AnyBlockchain>,
-}
-
-impl Blockchain {
-    pub(crate) fn new(blockchain_config: BlockchainConfig) -> Result<Self, BdkError> {
-        let any_blockchain_config = match blockchain_config {
-            BlockchainConfig::Electrum { config } => {
-                AnyBlockchainConfig::Electrum(ElectrumBlockchainConfig {
-                    retry: config.retry,
-                    socks5: config.socks5,
-                    timeout: config.timeout,
-                    url: config.url,
-                    stop_gap: usize::try_from(config.stop_gap).unwrap(),
-                    validate_domain: config.validate_domain,
-                })
-            }
-            BlockchainConfig::Esplora { config } => {
-                AnyBlockchainConfig::Esplora(EsploraBlockchainConfig {
-                    base_url: config.base_url,
-                    proxy: config.proxy,
-                    concurrency: config.concurrency,
-                    stop_gap: usize::try_from(config.stop_gap).unwrap(),
-                    timeout: config.timeout,
-                })
-            }
-            BlockchainConfig::Rpc { config } => AnyBlockchainConfig::Rpc(BdkRpcConfig {
-                url: config.url,
-                auth: config.auth.into(),
-                network: config.network,
-                wallet_name: config.wallet_name,
-                sync_params: config.sync_params.map(|p| p.into()),
-            }),
-        };
-        let blockchain = AnyBlockchain::from_config(&any_blockchain_config)?;
-        Ok(Self {
-            blockchain_mutex: Mutex::new(blockchain),
-        })
-    }
-
-    pub(crate) fn get_blockchain(&self) -> MutexGuard<AnyBlockchain> {
-        self.blockchain_mutex.lock().expect("blockchain")
-    }
-
-    pub(crate) fn broadcast(&self, transaction: &Transaction) -> Result<(), BdkError> {
-        let tx = &transaction.internal;
-        self.get_blockchain().broadcast(tx)
-    }
-
-    pub(crate) fn estimate_fee(&self, target: u64) -> Result<Arc<FeeRate>, BdkError> {
-        let result: Result<FeeRate, bdk::Error> =
-            self.get_blockchain().estimate_fee(target as usize);
-        result.map(Arc::new)
-    }
-
-    pub(crate) fn get_height(&self) -> Result<u32, BdkError> {
-        self.get_blockchain().get_height()
-    }
-
-    pub(crate) fn get_block_hash(&self, height: u32) -> Result<String, BdkError> {
-        self.get_blockchain()
-            .get_block_hash(u64::from(height))
-            .map(|hash| hash.to_string())
-    }
-}
-
-/// Configuration for an ElectrumBlockchain
-pub struct ElectrumConfig {
-    /// URL of the Electrum server (such as ElectrumX, Esplora, BWT) may start with ssl:// or tcp:// and include a port
-    /// e.g. ssl://electrum.blockstream.info:60002
-    pub url: String,
-    /// URL of the socks5 proxy server or a Tor service
-    pub socks5: Option<String>,
-    /// Request retry count
-    pub retry: u8,
-    /// Request timeout (seconds)
-    pub timeout: Option<u8>,
-    /// Stop searching addresses for transactions after finding an unused gap of this length
-    pub stop_gap: u64,
-    /// Validate the domain when using SSL
-    pub validate_domain: bool,
-}
-
-/// Configuration for an EsploraBlockchain
-pub struct EsploraConfig {
-    /// Base URL of the esplora service
-    /// e.g. https://blockstream.info/api/
-    pub base_url: String,
-    /// Optional URL of the proxy to use to make requests to the Esplora server
-    /// The string should be formatted as: <protocol>://<user>:<password>@host:<port>.
-    /// Note that the format of this value and the supported protocols change slightly between the
-    /// sync version of esplora (using ureq) and the async version (using reqwest). For more
-    /// details check with the documentation of the two crates. Both of them are compiled with
-    /// the socks feature enabled.
-    /// The proxy is ignored when targeting wasm32.
-    pub proxy: Option<String>,
-    /// Number of parallel requests sent to the esplora service (default: 4)
-    pub concurrency: Option<u8>,
-    /// Stop searching addresses for transactions after finding an unused gap of this length.
-    pub stop_gap: u64,
-    /// Socket timeout.
-    pub timeout: Option<u64>,
-}
-
-pub enum Auth {
-    /// No authentication
-    None,
-    /// Authentication with username and password, usually [Auth::Cookie] should be preferred
-    UserPass {
-        /// Username
-        username: String,
-        /// Password
-        password: String,
-    },
-    /// Authentication with a cookie file
-    Cookie {
-        /// Cookie file
-        file: String,
-    },
-}
-
-impl From<Auth> for BdkAuth {
-    fn from(auth: Auth) -> Self {
-        match auth {
-            Auth::None => BdkAuth::None,
-            Auth::UserPass { username, password } => BdkAuth::UserPass { username, password },
-            Auth::Cookie { file } => BdkAuth::Cookie {
-                file: PathBuf::from(file),
-            },
-        }
-    }
-}
-
-/// Sync parameters for Bitcoin Core RPC.
-///
-/// In general, BDK tries to sync `scriptPubKey`s cached in `Database` with
-/// `scriptPubKey`s imported in the Bitcoin Core Wallet. These parameters are used for determining
-/// how the `importdescriptors` RPC calls are to be made.
-pub struct RpcSyncParams {
-    /// The minimum number of scripts to scan for on initial sync.
-    pub start_script_count: u64,
-    /// Time in unix seconds in which initial sync will start scanning from (0 to start from genesis).
-    pub start_time: u64,
-    /// Forces every sync to use `start_time` as import timestamp.
-    pub force_start_time: bool,
-    /// RPC poll rate (in seconds) to get state updates.
-    pub poll_rate_sec: u64,
-}
-
-impl From<RpcSyncParams> for BdkRpcSyncParams {
-    fn from(params: RpcSyncParams) -> Self {
-        BdkRpcSyncParams {
-            start_script_count: params.start_script_count as usize,
-            start_time: params.start_time,
-            force_start_time: params.force_start_time,
-            poll_rate_sec: params.poll_rate_sec,
-        }
-    }
-}
-
-/// RpcBlockchain configuration options
-pub struct RpcConfig {
-    /// The bitcoin node url
-    pub url: String,
-    /// The bitcoin node authentication mechanism
-    pub auth: Auth,
-    /// The network we are using (it will be checked the bitcoin node network matches this)
-    pub network: Network,
-    /// The wallet name in the bitcoin node, consider using [crate::wallet::wallet_name_from_descriptor] for this
-    pub wallet_name: String,
-    /// Sync parameters
-    pub sync_params: Option<RpcSyncParams>,
-}
-
-/// Type that can contain any of the blockchain configurations defined by the library.
-pub enum BlockchainConfig {
-    /// Electrum client
-    Electrum { config: ElectrumConfig },
-    /// Esplora client
-    Esplora { config: EsploraConfig },
-    /// Bitcoin Core RPC client
-    Rpc { config: RpcConfig },
-}

bdk-ffi/src/database.rs

@@ -1,14 +0,0 @@
-use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration};
-
-/// Type that can contain any of the database configurations defined by the library
-/// This allows storing a single configuration that can be loaded into an AnyDatabaseConfig
-/// instance. Wallets that plan to offer users the ability to switch blockchain backend at runtime
-/// will find this particularly useful.
-pub enum DatabaseConfig {
-    /// Memory database has no config
-    Memory,
-    /// Simple key-value embedded database based on sled
-    Sled { config: SledDbConfiguration },
-    /// Sqlite embedded database using rusqlite
-    Sqlite { config: SqliteDbConfiguration },
-}

bdk-ffi/src/descriptor.rs

@@ -1,27 +1,30 @@
-use crate::{BdkError, DescriptorPublicKey, DescriptorSecretKey};
-use bdk::bitcoin::secp256k1::Secp256k1;
-use bdk::bitcoin::util::bip32::Fingerprint;
-use bdk::bitcoin::Network;
-use bdk::descriptor::{ExtendedDescriptor, IntoWalletDescriptor, KeyMap};
-use bdk::keys::{
-    DescriptorPublicKey as BdkDescriptorPublicKey, DescriptorSecretKey as BdkDescriptorSecretKey,
+use crate::error::DescriptorError;
+use crate::keys::DescriptorPublicKey;
+use crate::keys::DescriptorSecretKey;
+use std::fmt::Display;
+
+use bdk_wallet::bitcoin::bip32::Fingerprint;
+use bdk_wallet::bitcoin::key::Secp256k1;
+use bdk_wallet::bitcoin::Network;
+use bdk_wallet::descriptor::{ExtendedDescriptor, IntoWalletDescriptor};
+use bdk_wallet::keys::DescriptorPublicKey as BdkDescriptorPublicKey;
+use bdk_wallet::keys::{DescriptorSecretKey as BdkDescriptorSecretKey, KeyMap};
+use bdk_wallet::template::{
+    Bip44, Bip44Public, Bip49, Bip49Public, Bip84, Bip84Public, Bip86, Bip86Public,
+    DescriptorTemplate,
 };
-use bdk::template::{
-    Bip44, Bip44Public, Bip49, Bip49Public, Bip84, Bip84Public, DescriptorTemplate,
-};
-use bdk::KeychainKind;
-use std::ops::Deref;
+use bdk_wallet::KeychainKind;
+
 use std::str::FromStr;
-use std::sync::Arc;
 
 #[derive(Debug)]
-pub(crate) struct Descriptor {
-    pub(crate) extended_descriptor: ExtendedDescriptor,
-    pub(crate) key_map: KeyMap,
+pub struct Descriptor {
+    pub extended_descriptor: ExtendedDescriptor,
+    pub key_map: KeyMap,
 }
 
 impl Descriptor {
-    pub(crate) fn new(descriptor: String, network: Network) -> Result<Self, BdkError> {
+    pub(crate) fn new(descriptor: String, network: Network) -> Result<Self, DescriptorError> {
         let secp = Secp256k1::new();
         let (extended_descriptor, key_map) = descriptor.into_wallet_descriptor(&secp, network)?;
         Ok(Self {
@@ -31,13 +34,16 @@ impl Descriptor {
     }
 
     pub(crate) fn new_bip44(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
-        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();
+        let derivable_key = &secret_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorSecretKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -47,22 +53,25 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorSecretKey::Single(_) => {
+            BdkDescriptorSecretKey::MultiXPrv(_) => {
                 unreachable!()
             }
         }
     }
 
     pub(crate) fn new_bip44_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
         let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();
+        let derivable_key = &public_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorPublicKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -75,20 +84,23 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorPublicKey::Single(_) => {
+            BdkDescriptorPublicKey::MultiXPub(_) => {
                 unreachable!()
             }
         }
     }
 
     pub(crate) fn new_bip49(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
-        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();
+        let derivable_key = &secret_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorSecretKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -98,22 +110,25 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorSecretKey::Single(_) => {
+            BdkDescriptorSecretKey::MultiXPrv(_) => {
                 unreachable!()
             }
         }
     }
 
     pub(crate) fn new_bip49_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
         let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();
+        let derivable_key = &public_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorPublicKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -126,20 +141,23 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorPublicKey::Single(_) => {
+            BdkDescriptorPublicKey::MultiXPub(_) => {
                 unreachable!()
             }
         }
     }
 
     pub(crate) fn new_bip84(
-        secret_key: Arc<DescriptorSecretKey>,
+        secret_key: &DescriptorSecretKey,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
-        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();
+        let derivable_key = &secret_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorSecretKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -149,22 +167,25 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorSecretKey::Single(_) => {
+            BdkDescriptorSecretKey::MultiXPrv(_) => {
                 unreachable!()
             }
         }
     }
 
     pub(crate) fn new_bip84_public(
-        public_key: Arc<DescriptorPublicKey>,
+        public_key: &DescriptorPublicKey,
         fingerprint: String,
         keychain_kind: KeychainKind,
         network: Network,
     ) -> Self {
         let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();
+        let derivable_key = &public_key.0;
 
-        match derivable_key.deref() {
+        match derivable_key {
+            BdkDescriptorPublicKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                 let derivable_key = descriptor_x_key.xkey;
                 let (extended_descriptor, key_map, _) =
@@ -177,158 +198,205 @@ impl Descriptor {
                     key_map,
                 }
             }
-            BdkDescriptorPublicKey::Single(_) => {
+            BdkDescriptorPublicKey::MultiXPub(_) => {
                 unreachable!()
             }
         }
     }
 
-    pub(crate) fn as_string_private(&self) -> String {
+    pub(crate) fn new_bip86(
+        secret_key: &DescriptorSecretKey,
+        keychain_kind: KeychainKind,
+        network: Network,
+    ) -> Self {
+        let derivable_key = &secret_key.0;
+
+        match derivable_key {
+            BdkDescriptorSecretKey::Single(_) => {
+                unreachable!()
+            }
+            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
+                let derivable_key = descriptor_x_key.xkey;
+                let (extended_descriptor, key_map, _) =
+                    Bip86(derivable_key, keychain_kind).build(network).unwrap();
+                Self {
+                    extended_descriptor,
+                    key_map,
+                }
+            }
+            BdkDescriptorSecretKey::MultiXPrv(_) => {
+                unreachable!()
+            }
+        }
+    }
+
+    pub(crate) fn new_bip86_public(
+        public_key: &DescriptorPublicKey,
+        fingerprint: String,
+        keychain_kind: KeychainKind,
+        network: Network,
+    ) -> Self {
+        let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
+        let derivable_key = &public_key.0;
+
+        match derivable_key {
+            BdkDescriptorPublicKey::Single(_) => {
+                unreachable!()
+            }
+            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
+                let derivable_key = descriptor_x_key.xkey;
+                let (extended_descriptor, key_map, _) =
+                    Bip86Public(derivable_key, fingerprint, keychain_kind)
+                        .build(network)
+                        .unwrap();
+
+                Self {
+                    extended_descriptor,
+                    key_map,
+                }
+            }
+            BdkDescriptorPublicKey::MultiXPub(_) => {
+                unreachable!()
+            }
+        }
+    }
+
+    pub(crate) fn to_string_with_secret(&self) -> String {
         let descriptor = &self.extended_descriptor;
         let key_map = &self.key_map;
         descriptor.to_string_with_secret(key_map)
     }
+}
 
-    pub(crate) fn as_string(&self) -> String {
-        self.extended_descriptor.to_string()
+impl Display for Descriptor {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.extended_descriptor)
     }
 }
 
-// The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// crate.
 #[cfg(test)]
 mod test {
-    use crate::database::DatabaseConfig;
     use crate::*;
     use assert_matches::assert_matches;
-    use bdk::descriptor::DescriptorError::Key;
-    use bdk::keys::KeyError::InvalidNetwork;
+    use bdk_wallet::bitcoin::Network;
+    use bdk_wallet::KeychainKind;
 
     fn get_descriptor_secret_key() -> DescriptorSecretKey {
         let mnemonic = Mnemonic::from_string("chaos fabric time speed sponsor all flat solution wisdom trophy crack object robot pave observe combine where aware bench orient secret primary cable detect".to_string()).unwrap();
-        DescriptorSecretKey::new(Network::Testnet, Arc::new(mnemonic), None)
+        DescriptorSecretKey::new(Network::Testnet, &mnemonic, None)
     }
 
     #[test]
     fn test_descriptor_templates() {
-        let master: Arc<DescriptorSecretKey> = Arc::new(get_descriptor_secret_key());
+        let master: DescriptorSecretKey = get_descriptor_secret_key();
         println!("Master: {:?}", master.as_string());
         // tprv8ZgxMBicQKsPdWuqM1t1CDRvQtQuBPyfL6GbhQwtxDKgUAVPbxmj71pRA8raTqLrec5LyTs5TqCxdABcZr77bt2KyWA5bizJHnC4g4ysm4h
         let handmade_public_44 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/44h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/44h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 44: {}", handmade_public_44.as_string());
         // Public 44: [d1d04177/44'/1'/0']tpubDCoPjomfTqh1e7o1WgGpQtARWtkueXQAepTeNpWiitS3Sdv8RKJ1yvTrGHcwjDXp2SKyMrTEca4LoN7gEUiGCWboyWe2rz99Kf4jK4m2Zmx/*
         let handmade_public_49 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/49h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/49h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 49: {}", handmade_public_49.as_string());
         // Public 49: [d1d04177/49'/1'/0']tpubDC65ZRvk1NDddHrVAUAZrUPJ772QXzooNYmPywYF9tMyNLYKf5wpKE7ZJvK9kvfG3FV7rCsHBNXy1LVKW95jrmC7c7z4hq7a27aD2sRrAhR/*
         let handmade_public_84 = master
-            .derive(Arc::new(
-                DerivationPath::new("m/84h/1h/0h".to_string()).unwrap(),
-            ))
+            .derive(&DerivationPath::new("m/84h/1h/0h".to_string()).unwrap())
             .unwrap()
             .as_public();
         println!("Public 84: {}", handmade_public_84.as_string());
         // Public 84: [d1d04177/84'/1'/0']tpubDDNxbq17egjFk2edjv8oLnzxk52zny9aAYNv9CMqTzA4mQDiQq818sEkNe9Gzmd4QU8558zftqbfoVBDQorG3E4Wq26tB2JeE4KUoahLkx6/*
+        let handmade_public_86 = master
+            .derive(&DerivationPath::new("m/86h/1h/0h".to_string()).unwrap())
+            .unwrap()
+            .as_public();
+        println!("Public 86: {}", handmade_public_86.as_string());
+        // Public 86: [d1d04177/86'/1'/0']tpubDCJzjbcGbdEfXMWaL6QmgVmuSfXkrue7m2YNoacWwyc7a2XjXaKojRqNEbo41CFL3PyYmKdhwg2fkGpLX4SQCbQjCGxAkWHJTw9WEeenrJb/*
         let template_private_44 =
-            Descriptor::new_bip44(master.clone(), KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip44(&master, KeychainKind::External, Network::Testnet);
         let template_private_49 =
-            Descriptor::new_bip49(master.clone(), KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip49(&master, KeychainKind::External, Network::Testnet);
         let template_private_84 =
-            Descriptor::new_bip84(master, KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip84(&master, KeychainKind::External, Network::Testnet);
+        let template_private_86 =
+            Descriptor::new_bip86(&master, KeychainKind::External, Network::Testnet);
         // the extended public keys are the same when creating them manually as they are with the templates
-        println!("Template 49: {}", template_private_49.as_string());
-        println!("Template 44: {}", template_private_44.as_string());
-        println!("Template 84: {}", template_private_84.as_string());
-        // for the public versions of the templates these are incorrect, bug report and fix in bitcoindevkit/bdk#817 and bitcoindevkit/bdk#818
+        println!("Template 49: {}", template_private_49);
+        println!("Template 44: {}", template_private_44);
+        println!("Template 84: {}", template_private_84);
+        println!("Template 86: {}", template_private_86);
         let template_public_44 = Descriptor::new_bip44_public(
-            handmade_public_44,
+            &handmade_public_44,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
         let template_public_49 = Descriptor::new_bip49_public(
-            handmade_public_49,
+            &handmade_public_49,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
         let template_public_84 = Descriptor::new_bip84_public(
-            handmade_public_84,
+            &handmade_public_84,
             "d1d04177".to_string(),
             KeychainKind::External,
             Network::Testnet,
         );
-        println!("Template public 49: {}", template_public_49.as_string());
-        println!("Template public 44: {}", template_public_44.as_string());
-        println!("Template public 84: {}", template_public_84.as_string());
-        // when using a public key, both as_string and as_string_private return the same string
+        let template_public_86 = Descriptor::new_bip86_public(
+            &handmade_public_86,
+            "d1d04177".to_string(),
+            KeychainKind::External,
+            Network::Testnet,
+        );
+        println!("Template public 49: {}", template_public_49);
+        println!("Template public 44: {}", template_public_44);
+        println!("Template public 84: {}", template_public_84);
+        println!("Template public 86: {}", template_public_86);
+        // when using a public key, both to_string and as_string_private return the same string
         assert_eq!(
-            template_public_44.as_string_private(),
-            template_public_44.as_string()
+            template_public_44.to_string_with_secret(),
+            template_public_44.to_string()
         );
         assert_eq!(
-            template_public_49.as_string_private(),
-            template_public_49.as_string()
+            template_public_49.to_string_with_secret(),
+            template_public_49.to_string()
         );
         assert_eq!(
-            template_public_84.as_string_private(),
-            template_public_84.as_string()
-        );
-        // when using as_string on a private key, we get the same result as when using it on a public key
-        assert_eq!(
-            template_private_44.as_string(),
-            template_public_44.as_string()
+            template_public_84.to_string_with_secret(),
+            template_public_84.to_string()
         );
         assert_eq!(
-            template_private_49.as_string(),
-            template_public_49.as_string()
+            template_public_86.to_string_with_secret(),
+            template_public_86.to_string()
+        );
+        // when using to_string on a private key, we get the same result as when using it on a public key
+        assert_eq!(
+            template_private_44.to_string(),
+            template_public_44.to_string()
         );
         assert_eq!(
-            template_private_84.as_string(),
-            template_public_84.as_string()
+            template_private_49.to_string(),
+            template_public_49.to_string()
+        );
+        assert_eq!(
+            template_private_84.to_string(),
+            template_public_84.to_string()
+        );
+        assert_eq!(
+            template_private_86.to_string(),
+            template_public_86.to_string()
         );
     }
     #[test]
     fn test_descriptor_from_string() {
         let descriptor1 = Descriptor::new("wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEftEaNzz7dPGhWuKFU4VULesmhEfZYyBXdE/0/*)".to_string(), Network::Testnet);
         let descriptor2 = Descriptor::new("wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEftEaNzz7dPGhWuKFU4VULesmhEfZYyBXdE/0/*)".to_string(), Network::Bitcoin);
-        // Creating a Descriptor using an extended key that doesn't match the network provided will throw and InvalidNetwork Error
+        // Creating a Descriptor using an extended key that doesn't match the network provided will throw a DescriptorError::Key with inner InvalidNetwork error
         assert!(descriptor1.is_ok());
-        assert_matches!(
-            descriptor2.unwrap_err(),
-            bdk::Error::Descriptor(Key(InvalidNetwork))
-        )
-    }
-    #[test]
-    fn test_wallet_from_descriptor() {
-        let descriptor1 = Descriptor::new("wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEftEaNzz7dPGhWuKFU4VULesmhEfZYyBXdE/0/*)".to_string(), Network::Testnet).unwrap();
-        let wallet1 = Wallet::new(
-            Arc::new(Descriptor::new("wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEftEaNzz7dPGhWuKFU4VULesmhEfZYyBXdE/0/*)".to_string(), Network::Testnet).unwrap()),
-            None,
-            Network::Testnet,
-            DatabaseConfig::Memory
-        );
-        let wallet2 = Wallet::new(
-            Arc::new(descriptor1),
-            None,
-            Network::Bitcoin,
-            DatabaseConfig::Memory,
-        );
-        // Creating a wallet using a Descriptor with an extended key that doesn't match the network provided in the wallet constructor will throw and InvalidNetwork Error
-        assert!(wallet1.is_ok());
-        assert_matches!(
-            wallet2.unwrap_err(),
-            bdk::Error::Descriptor(Key(InvalidNetwork))
-        )
+        assert_matches!(descriptor2.unwrap_err(), DescriptorError::Key { .. });
     }
 }

bdk-ffi/src/electrum.rs

@@ -0,0 +1,101 @@
+use crate::bitcoin::Transaction;
+use crate::error::ElectrumError;
+use crate::types::{FullScanRequest, SyncRequest};
+use crate::wallet::Update;
+
+use bdk_electrum::BdkElectrumClient as BdkBdkElectrumClient;
+use bdk_electrum::{ElectrumFullScanResult, ElectrumSyncResult};
+use bdk_wallet::bitcoin::Transaction as BdkTransaction;
+use bdk_wallet::chain::spk_client::FullScanRequest as BdkFullScanRequest;
+use bdk_wallet::chain::spk_client::FullScanResult as BdkFullScanResult;
+use bdk_wallet::chain::spk_client::SyncRequest as BdkSyncRequest;
+use bdk_wallet::chain::spk_client::SyncResult as BdkSyncResult;
+use bdk_wallet::wallet::Update as BdkUpdate;
+use bdk_wallet::KeychainKind;
+
+use std::collections::BTreeMap;
+use std::sync::Arc;
+
+// NOTE: We are keeping our naming convention where the alias of the inner type is the Rust type
+//       prefixed with `Bdk`. In this case the inner type is `BdkElectrumClient`, so the alias is
+//       funnily enough named `BdkBdkElectrumClient`.
+pub struct ElectrumClient(BdkBdkElectrumClient<bdk_electrum::electrum_client::Client>);
+
+impl ElectrumClient {
+    pub fn new(url: String) -> Result<Self, ElectrumError> {
+        let inner_client: bdk_electrum::electrum_client::Client =
+            bdk_electrum::electrum_client::Client::new(url.as_str())?;
+        let client = BdkBdkElectrumClient::new(inner_client);
+        Ok(Self(client))
+    }
+
+    pub fn full_scan(
+        &self,
+        request: Arc<FullScanRequest>,
+        stop_gap: u64,
+        batch_size: u64,
+        fetch_prev_txouts: bool,
+    ) -> Result<Arc<Update>, ElectrumError> {
+        // using option and take is not ideal but the only way to take full ownership of the request
+        let request: BdkFullScanRequest<KeychainKind> = request
+            .0
+            .lock()
+            .unwrap()
+            .take()
+            .ok_or(ElectrumError::RequestAlreadyConsumed)?;
+
+        let electrum_result: ElectrumFullScanResult<KeychainKind> = self.0.full_scan(
+            request,
+            stop_gap as usize,
+            batch_size as usize,
+            fetch_prev_txouts,
+        )?;
+        let full_scan_result: BdkFullScanResult<KeychainKind> =
+            electrum_result.with_confirmation_time_height_anchor(&self.0)?;
+
+        let update = BdkUpdate {
+            last_active_indices: full_scan_result.last_active_indices,
+            graph: full_scan_result.graph_update,
+            chain: Some(full_scan_result.chain_update),
+        };
+
+        Ok(Arc::new(Update(update)))
+    }
+
+    pub fn sync(
+        &self,
+        request: Arc<SyncRequest>,
+        batch_size: u64,
+        fetch_prev_txouts: bool,
+    ) -> Result<Arc<Update>, ElectrumError> {
+        // using option and take is not ideal but the only way to take full ownership of the request
+        let request: BdkSyncRequest = request
+            .0
+            .lock()
+            .unwrap()
+            .take()
+            .ok_or(ElectrumError::RequestAlreadyConsumed)?;
+
+        let electrum_result: ElectrumSyncResult =
+            self.0
+                .sync(request, batch_size as usize, fetch_prev_txouts)?;
+        let sync_result: BdkSyncResult =
+            electrum_result.with_confirmation_time_height_anchor(&self.0)?;
+
+        let update = BdkUpdate {
+            last_active_indices: BTreeMap::default(),
+            graph: sync_result.graph_update,
+            chain: Some(sync_result.chain_update),
+        };
+
+        Ok(Arc::new(Update(update)))
+    }
+
+    pub fn broadcast(&self, transaction: &Transaction) -> Result<String, ElectrumError> {
+        let bdk_transaction: BdkTransaction = transaction.into();
+        self.0
+            .transaction_broadcast(&bdk_transaction)
+            .map_err(ElectrumError::from)
+            .map(|txid| txid.to_string())
+    }
+}

bdk-ffi/src/esplora.rs

@@ -0,0 +1,84 @@
+use crate::bitcoin::Transaction;
+use crate::error::EsploraError;
+use crate::types::{FullScanRequest, SyncRequest};
+use crate::wallet::Update;
+
+use bdk_esplora::esplora_client::{BlockingClient, Builder};
+use bdk_esplora::EsploraExt;
+use bdk_wallet::bitcoin::Transaction as BdkTransaction;
+use bdk_wallet::chain::spk_client::FullScanRequest as BdkFullScanRequest;
+use bdk_wallet::chain::spk_client::FullScanResult as BdkFullScanResult;
+use bdk_wallet::chain::spk_client::SyncRequest as BdkSyncRequest;
+use bdk_wallet::chain::spk_client::SyncResult as BdkSyncResult;
+use bdk_wallet::wallet::Update as BdkUpdate;
+use bdk_wallet::KeychainKind;
+
+use std::collections::BTreeMap;
+use std::sync::Arc;
+
+pub struct EsploraClient(BlockingClient);
+
+impl EsploraClient {
+    pub fn new(url: String) -> Self {
+        let client = Builder::new(url.as_str()).build_blocking();
+        Self(client)
+    }
+
+    pub fn full_scan(
+        &self,
+        request: Arc<FullScanRequest>,
+        stop_gap: u64,
+        parallel_requests: u64,
+    ) -> Result<Arc<Update>, EsploraError> {
+        // using option and take is not ideal but the only way to take full ownership of the request
+        let request: BdkFullScanRequest<KeychainKind> = request
+            .0
+            .lock()
+            .unwrap()
+            .take()
+            .ok_or(EsploraError::RequestAlreadyConsumed)?;
+
+        let result: BdkFullScanResult<KeychainKind> =
+            self.0
+                .full_scan(request, stop_gap as usize, parallel_requests as usize)?;
+
+        let update = BdkUpdate {
+            last_active_indices: result.last_active_indices,
+            graph: result.graph_update,
+            chain: Some(result.chain_update),
+        };
+
+        Ok(Arc::new(Update(update)))
+    }
+
+    pub fn sync(
+        &self,
+        request: Arc<SyncRequest>,
+        parallel_requests: u64,
+    ) -> Result<Arc<Update>, EsploraError> {
+        // using option and take is not ideal but the only way to take full ownership of the request
+        let request: BdkSyncRequest = request
+            .0
+            .lock()
+            .unwrap()
+            .take()
+            .ok_or(EsploraError::RequestAlreadyConsumed)?;
+
+        let result: BdkSyncResult = self.0.sync(request, parallel_requests as usize)?;
+
+        let update = BdkUpdate {
+            last_active_indices: BTreeMap::default(),
+            graph: result.graph_update,
+            chain: Some(result.chain_update),
+        };
+
+        Ok(Arc::new(Update(update)))
+    }
+
+    pub fn broadcast(&self, transaction: &Transaction) -> Result<(), EsploraError> {
+        let bdk_transaction: BdkTransaction = transaction.into();
+        self.0
+            .broadcast(&bdk_transaction)
+            .map_err(EsploraError::from)
+    }
+}

bdk-ffi/src/keys.rs

@@ -1,104 +1,105 @@
-use crate::BdkError;
+use crate::error::{Bip32Error, Bip39Error, DescriptorKeyError};
+use std::fmt::Display;
 
-use bdk::bitcoin::secp256k1::Secp256k1;
-use bdk::bitcoin::util::bip32::DerivationPath as BdkDerivationPath;
-use bdk::bitcoin::Network;
-use bdk::descriptor::DescriptorXKey;
-use bdk::keys::bip39::{Language, Mnemonic as BdkMnemonic, WordCount};
-use bdk::keys::{
+use bdk_wallet::bitcoin::bip32::DerivationPath as BdkDerivationPath;
+use bdk_wallet::bitcoin::key::Secp256k1;
+use bdk_wallet::bitcoin::secp256k1::rand;
+use bdk_wallet::bitcoin::secp256k1::rand::Rng;
+use bdk_wallet::bitcoin::Network;
+use bdk_wallet::keys::bip39::WordCount;
+use bdk_wallet::keys::bip39::{Language, Mnemonic as BdkMnemonic};
+use bdk_wallet::keys::{
     DerivableKey, DescriptorPublicKey as BdkDescriptorPublicKey,
     DescriptorSecretKey as BdkDescriptorSecretKey, ExtendedKey, GeneratableKey, GeneratedKey,
 };
-use bdk::miniscript::BareCtx;
+use bdk_wallet::miniscript::descriptor::{DescriptorXKey, Wildcard};
+use bdk_wallet::miniscript::BareCtx;
+
 use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
-/// Mnemonic phrases are a human-readable version of the private keys.
-/// Supported number of words are 12, 15, 18, 21 and 24.
-pub(crate) struct Mnemonic {
-    internal: BdkMnemonic,
-}
+pub(crate) struct Mnemonic(BdkMnemonic);
 
 impl Mnemonic {
-    /// Generates Mnemonic with a random entropy
     pub(crate) fn new(word_count: WordCount) -> Self {
+        // TODO 4: I DON'T KNOW IF THIS IS A DECENT WAY TO GENERATE ENTROPY PLEASE CONFIRM
+        let mut rng = rand::thread_rng();
+        let mut entropy = [0u8; 32];
+        rng.fill(&mut entropy);
+
         let generated_key: GeneratedKey<_, BareCtx> =
-            BdkMnemonic::generate((word_count, Language::English)).unwrap();
+            BdkMnemonic::generate_with_entropy((word_count, Language::English), entropy).unwrap();
         let mnemonic = BdkMnemonic::parse_in(Language::English, generated_key.to_string()).unwrap();
-        Mnemonic { internal: mnemonic }
+        Mnemonic(mnemonic)
     }
 
-    /// Parse a Mnemonic with given string
-    pub(crate) fn from_string(mnemonic: String) -> Result<Self, BdkError> {
+    pub(crate) fn from_string(mnemonic: String) -> Result<Self, Bip39Error> {
         BdkMnemonic::from_str(&mnemonic)
-            .map(|m| Mnemonic { internal: m })
-            .map_err(|e| BdkError::Generic(e.to_string()))
+            .map(Mnemonic)
+            .map_err(Bip39Error::from)
     }
 
-    /// Create a new Mnemonic in the specified language from the given entropy.
-    /// Entropy must be a multiple of 32 bits (4 bytes) and 128-256 bits in length.
-    pub(crate) fn from_entropy(entropy: Vec<u8>) -> Result<Self, BdkError> {
+    pub(crate) fn from_entropy(entropy: Vec<u8>) -> Result<Self, Bip39Error> {
         BdkMnemonic::from_entropy(entropy.as_slice())
-            .map(|m| Mnemonic { internal: m })
-            .map_err(|e| BdkError::Generic(e.to_string()))
+            .map(Mnemonic)
+            .map_err(Bip39Error::from)
     }
+}
 
-    /// Returns Mnemonic as string
-    pub(crate) fn as_string(&self) -> String {
-        self.internal.to_string()
+impl Display for Mnemonic {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
     }
 }
 
 pub(crate) struct DerivationPath {
-    derivation_path_mutex: Mutex<BdkDerivationPath>,
+    inner_mutex: Mutex<BdkDerivationPath>,
 }
 
 impl DerivationPath {
-    pub(crate) fn new(path: String) -> Result<Self, BdkError> {
+    pub(crate) fn new(path: String) -> Result<Self, Bip32Error> {
         BdkDerivationPath::from_str(&path)
             .map(|x| DerivationPath {
-                derivation_path_mutex: Mutex::new(x),
+                inner_mutex: Mutex::new(x),
             })
-            .map_err(|e| BdkError::Generic(e.to_string()))
+            .map_err(Bip32Error::from)
     }
 }
 
 #[derive(Debug)]
-pub(crate) struct DescriptorSecretKey {
-    pub(crate) descriptor_secret_key_mutex: Mutex<BdkDescriptorSecretKey>,
-}
+pub struct DescriptorSecretKey(pub(crate) BdkDescriptorSecretKey);
 
 impl DescriptorSecretKey {
-    pub(crate) fn new(network: Network, mnemonic: Arc<Mnemonic>, password: Option<String>) -> Self {
-        let mnemonic = mnemonic.internal.clone();
+    pub(crate) fn new(network: Network, mnemonic: &Mnemonic, password: Option<String>) -> Self {
+        let mnemonic = mnemonic.0.clone();
         let xkey: ExtendedKey = (mnemonic, password).into_extended_key().unwrap();
         let descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
             origin: None,
             xkey: xkey.into_xprv(network).unwrap(),
             derivation_path: BdkDerivationPath::master(),
-            wildcard: bdk::descriptor::Wildcard::Unhardened,
+            wildcard: Wildcard::Unhardened,
         });
-        Self {
-            descriptor_secret_key_mutex: Mutex::new(descriptor_secret_key),
-        }
+        Self(descriptor_secret_key)
     }
 
-    pub(crate) fn from_string(private_key: String) -> Result<Self, BdkError> {
+    pub(crate) fn from_string(private_key: String) -> Result<Self, DescriptorKeyError> {
         let descriptor_secret_key = BdkDescriptorSecretKey::from_str(private_key.as_str())
-            .map_err(|e| BdkError::Generic(e.to_string()))?;
-        Ok(Self {
-            descriptor_secret_key_mutex: Mutex::new(descriptor_secret_key),
-        })
+            .map_err(DescriptorKeyError::from)?;
+        Ok(Self(descriptor_secret_key))
     }
 
-    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn derive(&self, path: &DerivationPath) -> Result<Arc<Self>, DescriptorKeyError> {
         let secp = Secp256k1::new();
-        let descriptor_secret_key = self.descriptor_secret_key_mutex.lock().unwrap();
-        let path = path.derivation_path_mutex.lock().unwrap().deref().clone();
-        match descriptor_secret_key.deref() {
+        let descriptor_secret_key = &self.0;
+        let path = path.inner_mutex.lock().unwrap().deref().clone();
+        match descriptor_secret_key {
+            BdkDescriptorSecretKey::Single(_) => Err(DescriptorKeyError::InvalidKeyType),
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
-                let derived_xprv = descriptor_x_key.xkey.derive_priv(&secp, &path)?;
+                let derived_xprv = descriptor_x_key
+                    .xkey
+                    .derive_priv(&secp, &path)
+                    .map_err(DescriptorKeyError::from)?;
                 let key_source = match descriptor_x_key.origin.clone() {
                     Some((fingerprint, origin_path)) => (fingerprint, origin_path.extend(path)),
                     None => (descriptor_x_key.xkey.fingerprint(&secp), path),
@@ -109,20 +110,17 @@ impl DescriptorSecretKey {
                     derivation_path: BdkDerivationPath::default(),
                     wildcard: descriptor_x_key.wildcard,
                 });
-                Ok(Arc::new(Self {
-                    descriptor_secret_key_mutex: Mutex::new(derived_descriptor_secret_key),
-                }))
+                Ok(Arc::new(Self(derived_descriptor_secret_key)))
             }
-            BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
-                "Cannot derive from a single key".to_string(),
-            )),
+            BdkDescriptorSecretKey::MultiXPrv(_) => Err(DescriptorKeyError::InvalidKeyType),
         }
     }
 
-    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
-        let descriptor_secret_key = self.descriptor_secret_key_mutex.lock().unwrap();
-        let path = path.derivation_path_mutex.lock().unwrap().deref().clone();
-        match descriptor_secret_key.deref() {
+    pub(crate) fn extend(&self, path: &DerivationPath) -> Result<Arc<Self>, DescriptorKeyError> {
+        let descriptor_secret_key = &self.0;
+        let path = path.inner_mutex.lock().unwrap().deref().clone();
+        match descriptor_secret_key {
+            BdkDescriptorSecretKey::Single(_) => Err(DescriptorKeyError::InvalidKeyType),
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                 let extended_path = descriptor_x_key.derivation_path.extend(path);
                 let extended_descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
@@ -131,37 +129,28 @@ impl DescriptorSecretKey {
                     derivation_path: extended_path,
                     wildcard: descriptor_x_key.wildcard,
                 });
-                Ok(Arc::new(Self {
-                    descriptor_secret_key_mutex: Mutex::new(extended_descriptor_secret_key),
-                }))
+                Ok(Arc::new(Self(extended_descriptor_secret_key)))
             }
-            BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
-                "Cannot extend from a single key".to_string(),
-            )),
+            BdkDescriptorSecretKey::MultiXPrv(_) => Err(DescriptorKeyError::InvalidKeyType),
         }
     }
 
     pub(crate) fn as_public(&self) -> Arc<DescriptorPublicKey> {
         let secp = Secp256k1::new();
-        let descriptor_public_key = self
-            .descriptor_secret_key_mutex
-            .lock()
-            .unwrap()
-            .to_public(&secp)
-            .unwrap();
-        Arc::new(DescriptorPublicKey {
-            descriptor_public_key_mutex: Mutex::new(descriptor_public_key),
-        })
+        let descriptor_public_key = self.0.to_public(&secp).unwrap();
+        Arc::new(DescriptorPublicKey(descriptor_public_key))
     }
 
-    /// Get the private key as bytes.
     pub(crate) fn secret_bytes(&self) -> Vec<u8> {
-        let descriptor_secret_key = self.descriptor_secret_key_mutex.lock().unwrap();
-        let secret_bytes: Vec<u8> = match descriptor_secret_key.deref() {
+        let inner = &self.0;
+        let secret_bytes: Vec<u8> = match inner {
+            BdkDescriptorSecretKey::Single(_) => {
+                unreachable!()
+            }
             BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                 descriptor_x_key.xkey.private_key.secret_bytes().to_vec()
             }
-            BdkDescriptorSecretKey::Single(_) => {
+            BdkDescriptorSecretKey::MultiXPrv(_) => {
                 unreachable!()
             }
         };
@@ -170,32 +159,32 @@ impl DescriptorSecretKey {
     }
 
     pub(crate) fn as_string(&self) -> String {
-        self.descriptor_secret_key_mutex.lock().unwrap().to_string()
+        self.0.to_string()
     }
 }
 
 #[derive(Debug)]
-pub(crate) struct DescriptorPublicKey {
-    pub(crate) descriptor_public_key_mutex: Mutex<BdkDescriptorPublicKey>,
-}
+pub struct DescriptorPublicKey(pub(crate) BdkDescriptorPublicKey);
 
 impl DescriptorPublicKey {
-    pub(crate) fn from_string(public_key: String) -> Result<Self, BdkError> {
+    pub(crate) fn from_string(public_key: String) -> Result<Self, DescriptorKeyError> {
         let descriptor_public_key = BdkDescriptorPublicKey::from_str(public_key.as_str())
-            .map_err(|e| BdkError::Generic(e.to_string()))?;
-        Ok(Self {
-            descriptor_public_key_mutex: Mutex::new(descriptor_public_key),
-        })
+            .map_err(DescriptorKeyError::from)?;
+        Ok(Self(descriptor_public_key))
     }
 
-    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
+    pub(crate) fn derive(&self, path: &DerivationPath) -> Result<Arc<Self>, DescriptorKeyError> {
         let secp = Secp256k1::new();
-        let descriptor_public_key = self.descriptor_public_key_mutex.lock().unwrap();
-        let path = path.derivation_path_mutex.lock().unwrap().deref().clone();
+        let descriptor_public_key = &self.0;
+        let path = path.inner_mutex.lock().unwrap().deref().clone();
 
-        match descriptor_public_key.deref() {
+        match descriptor_public_key {
+            BdkDescriptorPublicKey::Single(_) => Err(DescriptorKeyError::InvalidKeyType),
             BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
-                let derived_xpub = descriptor_x_key.xkey.derive_pub(&secp, &path)?;
+                let derived_xpub = descriptor_x_key
+                    .xkey
+                    .derive_pub(&secp, &path)
+                    .map_err(DescriptorKeyError::from)?;
                 let key_source = match descriptor_x_key.origin.clone() {
                     Some((fingerprint, origin_path)) => (fingerprint, origin_path.extend(path)),
                     None => (descriptor_x_key.xkey.fingerprint(), path),
@@ -206,20 +195,17 @@ impl DescriptorPublicKey {
                     derivation_path: BdkDerivationPath::default(),
                     wildcard: descriptor_x_key.wildcard,
                 });
-                Ok(Arc::new(Self {
-                    descriptor_public_key_mutex: Mutex::new(derived_descriptor_public_key),
-                }))
+                Ok(Arc::new(Self(derived_descriptor_public_key)))
             }
-            BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
-                "Cannot derive from a single key".to_string(),
-            )),
+            BdkDescriptorPublicKey::MultiXPub(_) => Err(DescriptorKeyError::InvalidKeyType),
         }
     }
 
-    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
-        let descriptor_public_key = self.descriptor_public_key_mutex.lock().unwrap();
-        let path = path.derivation_path_mutex.lock().unwrap().deref().clone();
-        match descriptor_public_key.deref() {
+    pub(crate) fn extend(&self, path: &DerivationPath) -> Result<Arc<Self>, DescriptorKeyError> {
+        let descriptor_public_key = &self.0;
+        let path = path.inner_mutex.lock().unwrap().deref().clone();
+        match descriptor_public_key {
+            BdkDescriptorPublicKey::Single(_) => Err(DescriptorKeyError::InvalidKeyType),
             BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                 let extended_path = descriptor_x_key.derivation_path.extend(path);
                 let extended_descriptor_public_key = BdkDescriptorPublicKey::XPub(DescriptorXKey {
@@ -228,79 +214,71 @@ impl DescriptorPublicKey {
                     derivation_path: extended_path,
                     wildcard: descriptor_x_key.wildcard,
                 });
-                Ok(Arc::new(Self {
-                    descriptor_public_key_mutex: Mutex::new(extended_descriptor_public_key),
-                }))
+                Ok(Arc::new(Self(extended_descriptor_public_key)))
             }
-            BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
-                "Cannot extend from a single key".to_string(),
-            )),
+            BdkDescriptorPublicKey::MultiXPub(_) => Err(DescriptorKeyError::InvalidKeyType),
         }
     }
 
     pub(crate) fn as_string(&self) -> String {
-        self.descriptor_public_key_mutex.lock().unwrap().to_string()
+        self.0.to_string()
     }
 }
 
-// The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// crate.
 #[cfg(test)]
 mod test {
+    use crate::error::DescriptorKeyError;
     use crate::keys::{DerivationPath, DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
-    use crate::BdkError;
-    use bdk::bitcoin::hashes::hex::ToHex;
-    use bdk::bitcoin::Network;
+    use bdk_wallet::bitcoin::Network;
     use std::sync::Arc;
 
-    fn get_descriptor_secret_key() -> DescriptorSecretKey {
+    fn get_inner() -> DescriptorSecretKey {
         let mnemonic = Mnemonic::from_string("chaos fabric time speed sponsor all flat solution wisdom trophy crack object robot pave observe combine where aware bench orient secret primary cable detect".to_string()).unwrap();
-        DescriptorSecretKey::new(Network::Testnet, Arc::new(mnemonic), None)
+        DescriptorSecretKey::new(Network::Testnet, &mnemonic, None)
     }
 
     fn derive_dsk(
         key: &DescriptorSecretKey,
         path: &str,
-    ) -> Result<Arc<DescriptorSecretKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.derive(path)
+    ) -> Result<Arc<DescriptorSecretKey>, DescriptorKeyError> {
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.derive(&path)
     }
 
     fn extend_dsk(
         key: &DescriptorSecretKey,
         path: &str,
-    ) -> Result<Arc<DescriptorSecretKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.extend(path)
+    ) -> Result<Arc<DescriptorSecretKey>, DescriptorKeyError> {
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.extend(&path)
     }
 
     fn derive_dpk(
         key: &DescriptorPublicKey,
         path: &str,
-    ) -> Result<Arc<DescriptorPublicKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.derive(path)
+    ) -> Result<Arc<DescriptorPublicKey>, DescriptorKeyError> {
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.derive(&path)
     }
 
     fn extend_dpk(
         key: &DescriptorPublicKey,
         path: &str,
-    ) -> Result<Arc<DescriptorPublicKey>, BdkError> {
-        let path = Arc::new(DerivationPath::new(path.to_string()).unwrap());
-        key.extend(path)
+    ) -> Result<Arc<DescriptorPublicKey>, DescriptorKeyError> {
+        let path = DerivationPath::new(path.to_string()).unwrap();
+        key.extend(&path)
     }
 
     #[test]
     fn test_generate_descriptor_secret_key() {
-        let master_dsk = get_descriptor_secret_key();
+        let master_dsk = get_inner();
         assert_eq!(master_dsk.as_string(), "tprv8ZgxMBicQKsPdWuqM1t1CDRvQtQuBPyfL6GbhQwtxDKgUAVPbxmj71pRA8raTqLrec5LyTs5TqCxdABcZr77bt2KyWA5bizJHnC4g4ysm4h/*");
         assert_eq!(master_dsk.as_public().as_string(), "tpubD6NzVbkrYhZ4WywdEfYbbd62yuvqLjAZuPsNyvzCNV85JekAEMbKHWSHLF9h3j45SxewXDcLv328B1SEZrxg4iwGfmdt1pDFjZiTkGiFqGa/*");
     }
 
     #[test]
     fn test_derive_self() {
-        let master_dsk = get_descriptor_secret_key();
+        let master_dsk = get_inner();
         let derived_dsk: &DescriptorSecretKey = &derive_dsk(&master_dsk, "m").unwrap();
         assert_eq!(derived_dsk.as_string(), "[d1d04177]tprv8ZgxMBicQKsPdWuqM1t1CDRvQtQuBPyfL6GbhQwtxDKgUAVPbxmj71pRA8raTqLrec5LyTs5TqCxdABcZr77bt2KyWA5bizJHnC4g4ysm4h/*");
         let master_dpk: &DescriptorPublicKey = &master_dsk.as_public();
@@ -310,7 +288,7 @@ mod test {
 
     #[test]
     fn test_derive_descriptors_keys() {
-        let master_dsk = get_descriptor_secret_key();
+        let master_dsk = get_inner();
         let derived_dsk: &DescriptorSecretKey = &derive_dsk(&master_dsk, "m/0").unwrap();
         assert_eq!(derived_dsk.as_string(), "[d1d04177/0]tprv8d7Y4JLmD25jkKbyDZXcdoPHu1YtMHuH21qeN7mFpjfumtSU7eZimFYUCSa3MYzkEYfSNRBV34GEr2QXwZCMYRZ7M1g6PUtiLhbJhBZEGYJ/*");
         let master_dpk: &DescriptorPublicKey = &master_dsk.as_public();
@@ -320,7 +298,7 @@ mod test {
 
     #[test]
     fn test_extend_descriptor_keys() {
-        let master_dsk = get_descriptor_secret_key();
+        let master_dsk = get_inner();
         let extended_dsk: &DescriptorSecretKey = &extend_dsk(&master_dsk, "m/0").unwrap();
         assert_eq!(extended_dsk.as_string(), "tprv8ZgxMBicQKsPdWuqM1t1CDRvQtQuBPyfL6GbhQwtxDKgUAVPbxmj71pRA8raTqLrec5LyTs5TqCxdABcZr77bt2KyWA5bizJHnC4g4ysm4h/0/*");
         let master_dpk: &DescriptorPublicKey = &master_dsk.as_public();
@@ -328,13 +306,13 @@ mod test {
         assert_eq!(extended_dpk.as_string(), "tpubD6NzVbkrYhZ4WywdEfYbbd62yuvqLjAZuPsNyvzCNV85JekAEMbKHWSHLF9h3j45SxewXDcLv328B1SEZrxg4iwGfmdt1pDFjZiTkGiFqGa/0/*");
         let wif = "L2wTu6hQrnDMiFNWA5na6jB12ErGQqtXwqpSL7aWquJaZG8Ai3ch";
         let extended_key = DescriptorSecretKey::from_string(wif.to_string()).unwrap();
-        let result = extended_key.derive(Arc::new(DerivationPath::new("m/0".to_string()).unwrap()));
+        let result = extended_key.derive(&DerivationPath::new("m/0".to_string()).unwrap());
         dbg!(&result);
         assert!(result.is_err());
     }
 
     #[test]
-    fn test_from_str_descriptor_secret_key() {
+    fn test_from_str_inner() {
         let key1 = "L2wTu6hQrnDMiFNWA5na6jB12ErGQqtXwqpSL7aWquJaZG8Ai3ch";
         let key2 = "tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/1/1/1/*";
         let private_descriptor_key1 = DescriptorSecretKey::from_string(key1.to_string()).unwrap();
@@ -347,8 +325,8 @@ mod test {
     }
 
     #[test]
-    fn test_derive_and_extend_descriptor_secret_key() {
-        let master_dsk = get_descriptor_secret_key();
+    fn test_derive_and_extend_inner() {
+        let master_dsk = get_inner();
         // derive DescriptorSecretKey with path "m/0" from master
         let derived_dsk: &DescriptorSecretKey = &derive_dsk(&master_dsk, "m/0").unwrap();
         assert_eq!(derived_dsk.as_string(), "[d1d04177/0]tprv8d7Y4JLmD25jkKbyDZXcdoPHu1YtMHuH21qeN7mFpjfumtSU7eZimFYUCSa3MYzkEYfSNRBV34GEr2QXwZCMYRZ7M1g6PUtiLhbJhBZEGYJ/*");
@@ -359,18 +337,21 @@ mod test {
 
     #[test]
     fn test_derive_hardened_path_using_public() {
-        let master_dpk = get_descriptor_secret_key().as_public();
+        let master_dpk = get_inner().as_public();
         let derived_dpk = &derive_dpk(&master_dpk, "m/84h/1h/0h");
         assert!(derived_dpk.is_err());
     }
 
-    #[test]
-    fn test_retrieve_master_secret_key() {
-        let master_dpk = get_descriptor_secret_key();
-        let master_private_key = master_dpk.secret_bytes().to_hex();
-        assert_eq!(
-            master_private_key,
-            "e93315d6ce401eb4db803a56232f0ed3e69b053774e6047df54f1bd00e5ea936"
-        )
-    }
+    // TODO 7: It appears that the to_hex() method is not available anymore.
+    //       Look into the correct way to pull the hex out of the DescriptorSecretKey.
+    //       Note: ToHex was removed in bitcoin_hashes 0.12.0
+    // #[test]
+    // fn test_retrieve_master_secret_key() {
+    //     let master_dpk = get_inner();
+    //     let master_private_key = master_dpk.secret_bytes().to_hex();
+    //     assert_eq!(
+    //         master_private_key,
+    //         "e93315d6ce401eb4db803a56232f0ed3e69b053774e6047df54f1bd00e5ea936"
+    //     )
+    // }
 }

bdk-ffi/src/lib.rs

@@ -1,501 +1,73 @@
-mod blockchain;
-mod database;
+mod bitcoin;
 mod descriptor;
+mod electrum;
+mod error;
+mod esplora;
 mod keys;
-mod psbt;
+mod store;
+mod types;
 mod wallet;
 
-use crate::blockchain::{
-    Auth, Blockchain, BlockchainConfig, ElectrumConfig, EsploraConfig, RpcConfig, RpcSyncParams,
-};
-use crate::database::DatabaseConfig;
+use crate::bitcoin::Address;
+use crate::bitcoin::Amount;
+use crate::bitcoin::FeeRate;
+use crate::bitcoin::OutPoint;
+use crate::bitcoin::Psbt;
+use crate::bitcoin::Script;
+use crate::bitcoin::Transaction;
+use crate::bitcoin::TxIn;
+use crate::bitcoin::TxOut;
 use crate::descriptor::Descriptor;
+use crate::electrum::ElectrumClient;
+use crate::error::AddressParseError;
+use crate::error::Bip32Error;
+use crate::error::Bip39Error;
+use crate::error::CalculateFeeError;
+use crate::error::CannotConnectError;
+use crate::error::CreateTxError;
+use crate::error::DescriptorError;
+use crate::error::DescriptorKeyError;
+use crate::error::ElectrumError;
+use crate::error::EsploraError;
+use crate::error::ExtractTxError;
+use crate::error::FeeRateError;
+use crate::error::FromScriptError;
+use crate::error::InspectError;
+use crate::error::ParseAmountError;
+use crate::error::PersistenceError;
+use crate::error::PsbtError;
+use crate::error::PsbtParseError;
+use crate::error::SignerError;
+use crate::error::SqliteError;
+use crate::error::TransactionError;
+use crate::error::TxidParseError;
+use crate::error::WalletCreationError;
+use crate::esplora::EsploraClient;
 use crate::keys::DerivationPath;
-use crate::keys::{DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
-use crate::psbt::PartiallySignedTransaction;
-use crate::wallet::SignOptions;
-use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet};
-use bdk::bitcoin::blockdata::script::Script as BdkScript;
-use bdk::bitcoin::blockdata::transaction::TxIn as BdkTxIn;
-use bdk::bitcoin::blockdata::transaction::TxOut as BdkTxOut;
-use bdk::bitcoin::consensus::Decodable;
-use bdk::bitcoin::psbt::serialize::Serialize;
-use bdk::bitcoin::util::address::{Payload as BdkPayload, WitnessVersion};
-use bdk::bitcoin::{
-    Address as BdkAddress, Network, OutPoint as BdkOutPoint, Transaction as BdkTransaction, Txid,
-};
-use bdk::blockchain::Progress as BdkProgress;
-use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration};
-use bdk::keys::bip39::WordCount;
-use bdk::wallet::AddressIndex as BdkAddressIndex;
-use bdk::wallet::AddressInfo as BdkAddressInfo;
-use bdk::LocalUtxo as BdkLocalUtxo;
-use bdk::TransactionDetails as BdkTransactionDetails;
-use bdk::{Balance as BdkBalance, BlockTime, Error as BdkError, FeeRate, KeychainKind};
-use std::convert::From;
-use std::fmt;
-use std::fmt::Debug;
-use std::io::Cursor;
-use std::str::FromStr;
-use std::sync::Arc;
+use crate::keys::DescriptorPublicKey;
+use crate::keys::DescriptorSecretKey;
+use crate::keys::Mnemonic;
+use crate::store::SqliteStore;
+use crate::types::AddressInfo;
+use crate::types::Balance;
+use crate::types::CanonicalTx;
+use crate::types::ChainPosition;
+use crate::types::ChangeSet;
+use crate::types::FullScanRequest;
+use crate::types::FullScanScriptInspector;
+use crate::types::LocalOutput;
+use crate::types::ScriptAmount;
+use crate::types::SyncRequest;
+use crate::types::SyncScriptInspector;
+use crate::wallet::BumpFeeTxBuilder;
+use crate::wallet::SentAndReceivedValues;
+use crate::wallet::TxBuilder;
+use crate::wallet::Update;
+use crate::wallet::Wallet;
+
+use bdk_wallet::bitcoin::Network;
+use bdk_wallet::keys::bip39::WordCount;
+use bdk_wallet::wallet::tx_builder::ChangeSpendPolicy;
+use bdk_wallet::KeychainKind;
 
 uniffi::include_scaffolding!("bdk");
-
-/// A output script and an amount of satoshis.
-pub struct ScriptAmount {
-    pub script: Arc<Script>,
-    pub amount: u64,
-}
-
-/// A derived address and the index it was found at.
-pub struct AddressInfo {
-    /// Child index of this address.
-    pub index: u32,
-    /// Address.
-    pub address: Arc<Address>,
-    /// Type of keychain.
-    pub keychain: KeychainKind,
-}
-
-impl From<BdkAddressInfo> for AddressInfo {
-    fn from(address_info: BdkAddressInfo) -> Self {
-        AddressInfo {
-            index: address_info.index,
-            address: Arc::new(Address::from(address_info.address)),
-            keychain: address_info.keychain,
-        }
-    }
-}
-
-/// The address index selection strategy to use to derived an address from the wallet's external
-/// descriptor.
-pub enum AddressIndex {
-    /// Return a new address after incrementing the current descriptor index.
-    New,
-    /// Return the address for the current descriptor index if it has not been used in a received
-    /// transaction. Otherwise return a new address as with AddressIndex::New.
-    /// Use with caution, if the wallet has not yet detected an address has been used it could
-    /// return an already used address. This function is primarily meant for situations where the
-    /// caller is untrusted; for example when deriving donation addresses on-demand for a public
-    /// web page.
-    LastUnused,
-    /// Return the address for a specific descriptor index. Does not change the current descriptor
-    /// index used by `AddressIndex::New` and `AddressIndex::LastUsed`.
-    /// Use with caution, if an index is given that is less than the current descriptor index
-    /// then the returned address may have already been used.
-    Peek { index: u32 },
-    /// Return the address for a specific descriptor index and reset the current descriptor index
-    /// used by `AddressIndex::New` and `AddressIndex::LastUsed` to this value.
-    /// Use with caution, if an index is given that is less than the current descriptor index
-    /// then the returned address and subsequent addresses returned by calls to `AddressIndex::New`
-    /// and `AddressIndex::LastUsed` may have already been used. Also if the index is reset to a
-    /// value earlier than the [`Blockchain`] stop_gap (default is 20) then a
-    /// larger stop_gap should be used to monitor for all possibly used addresses.
-    Reset { index: u32 },
-}
-
-impl From<AddressIndex> for BdkAddressIndex {
-    fn from(address_index: AddressIndex) -> Self {
-        match address_index {
-            AddressIndex::New => BdkAddressIndex::New,
-            AddressIndex::LastUnused => BdkAddressIndex::LastUnused,
-            AddressIndex::Peek { index } => BdkAddressIndex::Peek(index),
-            AddressIndex::Reset { index } => BdkAddressIndex::Reset(index),
-        }
-    }
-}
-
-/// A wallet transaction
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub struct TransactionDetails {
-    pub transaction: Option<Arc<Transaction>>,
-    /// Transaction id.
-    pub txid: String,
-    /// Received value (sats)
-    /// Sum of owned outputs of this transaction.
-    pub received: u64,
-    /// Sent value (sats)
-    /// Sum of owned inputs of this transaction.
-    pub sent: u64,
-    /// Fee value (sats) if confirmed.
-    /// The availability of the fee depends on the backend. It's never None with an Electrum
-    /// Server backend, but it could be None with a Bitcoin RPC node without txindex that receive
-    /// funds while offline.
-    pub fee: Option<u64>,
-    /// If the transaction is confirmed, contains height and timestamp of the block containing the
-    /// transaction, unconfirmed transaction contains `None`.
-    pub confirmation_time: Option<BlockTime>,
-}
-
-impl From<BdkTransactionDetails> for TransactionDetails {
-    fn from(tx_details: BdkTransactionDetails) -> Self {
-        let optional_tx: Option<Arc<Transaction>> =
-            tx_details.transaction.map(|tx| Arc::new(tx.into()));
-
-        TransactionDetails {
-            transaction: optional_tx,
-            fee: tx_details.fee,
-            txid: tx_details.txid.to_string(),
-            received: tx_details.received,
-            sent: tx_details.sent,
-            confirmation_time: tx_details.confirmation_time,
-        }
-    }
-}
-
-/// A reference to a transaction output.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct OutPoint {
-    /// The referenced transaction's txid.
-    txid: String,
-    /// The index of the referenced output in its transaction's vout.
-    vout: u32,
-}
-
-impl From<&OutPoint> for BdkOutPoint {
-    fn from(outpoint: &OutPoint) -> Self {
-        BdkOutPoint {
-            txid: Txid::from_str(&outpoint.txid).unwrap(),
-            vout: outpoint.vout,
-        }
-    }
-}
-
-pub struct Balance {
-    // All coinbase outputs not yet matured
-    pub immature: u64,
-    /// Unconfirmed UTXOs generated by a wallet tx
-    pub trusted_pending: u64,
-    /// Unconfirmed UTXOs received from an external wallet
-    pub untrusted_pending: u64,
-    /// Confirmed and immediately spendable balance
-    pub confirmed: u64,
-    /// Get sum of trusted_pending and confirmed coins
-    pub spendable: u64,
-    /// Get the whole balance visible to the wallet
-    pub total: u64,
-}
-
-impl From<BdkBalance> for Balance {
-    fn from(bdk_balance: BdkBalance) -> Self {
-        Balance {
-            immature: bdk_balance.immature,
-            trusted_pending: bdk_balance.trusted_pending,
-            untrusted_pending: bdk_balance.untrusted_pending,
-            confirmed: bdk_balance.confirmed,
-            spendable: bdk_balance.get_spendable(),
-            total: bdk_balance.get_total(),
-        }
-    }
-}
-
-/// A transaction output, which defines new coins to be created from old ones.
-#[derive(Debug, Clone)]
-pub struct TxOut {
-    /// The value of the output, in satoshis.
-    value: u64,
-    /// The address of the output.
-    script_pubkey: Arc<Script>,
-}
-
-impl From<&BdkTxOut> for TxOut {
-    fn from(tx_out: &BdkTxOut) -> Self {
-        TxOut {
-            value: tx_out.value,
-            script_pubkey: Arc::new(Script {
-                script: tx_out.script_pubkey.clone(),
-            }),
-        }
-    }
-}
-
-pub struct LocalUtxo {
-    outpoint: OutPoint,
-    txout: TxOut,
-    keychain: KeychainKind,
-    is_spent: bool,
-}
-
-impl From<BdkLocalUtxo> for LocalUtxo {
-    fn from(local_utxo: BdkLocalUtxo) -> Self {
-        LocalUtxo {
-            outpoint: OutPoint {
-                txid: local_utxo.outpoint.txid.to_string(),
-                vout: local_utxo.outpoint.vout,
-            },
-            txout: TxOut {
-                value: local_utxo.txout.value,
-                script_pubkey: Arc::new(Script {
-                    script: local_utxo.txout.script_pubkey,
-                }),
-            },
-            keychain: local_utxo.keychain,
-            is_spent: local_utxo.is_spent,
-        }
-    }
-}
-
-/// Trait that logs at level INFO every update received (if any).
-pub trait Progress: Send + Sync + 'static {
-    /// Send a new progress update. The progress value should be in the range 0.0 - 100.0, and the message value is an
-    /// optional text message that can be displayed to the user.
-    fn update(&self, progress: f32, message: Option<String>);
-}
-
-struct ProgressHolder {
-    progress: Box<dyn Progress>,
-}
-
-impl BdkProgress for ProgressHolder {
-    fn update(&self, progress: f32, message: Option<String>) -> Result<(), BdkError> {
-        self.progress.update(progress, message);
-        Ok(())
-    }
-}
-
-impl Debug for ProgressHolder {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ProgressHolder").finish_non_exhaustive()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct TxIn {
-    pub previous_output: OutPoint,
-    pub script_sig: Arc<Script>,
-    pub sequence: u32,
-    pub witness: Vec<Vec<u8>>,
-}
-
-impl From<&BdkTxIn> for TxIn {
-    fn from(tx_in: &BdkTxIn) -> Self {
-        TxIn {
-            previous_output: OutPoint {
-                txid: tx_in.previous_output.txid.to_string(),
-                vout: tx_in.previous_output.vout,
-            },
-            script_sig: Arc::new(Script {
-                script: tx_in.script_sig.clone(),
-            }),
-            sequence: tx_in.sequence.0,
-            witness: tx_in.witness.to_vec(),
-        }
-    }
-}
-
-/// A Bitcoin transaction.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Transaction {
-    internal: BdkTransaction,
-}
-
-impl Transaction {
-    fn new(transaction_bytes: Vec<u8>) -> Result<Self, BdkError> {
-        let mut decoder = Cursor::new(transaction_bytes);
-        let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)?;
-        Ok(Transaction { internal: tx })
-    }
-
-    fn txid(&self) -> String {
-        self.internal.txid().to_string()
-    }
-
-    fn weight(&self) -> u64 {
-        self.internal.weight() as u64
-    }
-
-    fn size(&self) -> u64 {
-        self.internal.size() as u64
-    }
-
-    fn vsize(&self) -> u64 {
-        self.internal.vsize() as u64
-    }
-
-    fn serialize(&self) -> Vec<u8> {
-        self.internal.serialize()
-    }
-
-    fn is_coin_base(&self) -> bool {
-        self.internal.is_coin_base()
-    }
-
-    fn is_explicitly_rbf(&self) -> bool {
-        self.internal.is_explicitly_rbf()
-    }
-
-    fn is_lock_time_enabled(&self) -> bool {
-        self.internal.is_lock_time_enabled()
-    }
-
-    fn version(&self) -> i32 {
-        self.internal.version
-    }
-
-    fn lock_time(&self) -> u32 {
-        self.internal.lock_time.0
-    }
-
-    fn input(&self) -> Vec<TxIn> {
-        self.internal.input.iter().map(|x| x.into()).collect()
-    }
-
-    fn output(&self) -> Vec<TxOut> {
-        self.internal.output.iter().map(|x| x.into()).collect()
-    }
-}
-
-impl From<BdkTransaction> for Transaction {
-    fn from(tx: BdkTransaction) -> Self {
-        Transaction { internal: tx }
-    }
-}
-
-/// A Bitcoin address.
-#[derive(Debug, PartialEq, Eq)]
-pub struct Address {
-    address: BdkAddress,
-}
-
-impl Address {
-    fn new(address: String) -> Result<Self, BdkError> {
-        BdkAddress::from_str(address.as_str())
-            .map(|a| Address { address: a })
-            .map_err(|e| BdkError::Generic(e.to_string()))
-    }
-
-    /// alternative constructor
-    fn from_script(script: Arc<Script>, network: Network) -> Result<Self, BdkError> {
-        BdkAddress::from_script(&script.script, network)
-            .map(|a| Address { address: a })
-            .map_err(|e| BdkError::Generic(e.to_string()))
-    }
-
-    fn payload(&self) -> Payload {
-        match &self.address.payload.clone() {
-            BdkPayload::PubkeyHash(pubkey_hash) => Payload::PubkeyHash {
-                pubkey_hash: pubkey_hash.to_vec(),
-            },
-            BdkPayload::ScriptHash(script_hash) => Payload::ScriptHash {
-                script_hash: script_hash.to_vec(),
-            },
-            BdkPayload::WitnessProgram { version, program } => Payload::WitnessProgram {
-                version: *version,
-                program: program.clone(),
-            },
-        }
-    }
-
-    fn network(&self) -> Network {
-        self.address.network
-    }
-
-    fn script_pubkey(&self) -> Arc<Script> {
-        Arc::new(Script {
-            script: self.address.script_pubkey(),
-        })
-    }
-
-    fn to_qr_uri(&self) -> String {
-        self.address.to_qr_uri()
-    }
-
-    fn as_string(&self) -> String {
-        self.address.to_string()
-    }
-}
-
-impl From<BdkAddress> for Address {
-    fn from(address: BdkAddress) -> Self {
-        Address { address }
-    }
-}
-
-/// The method used to produce an address.
-#[derive(Debug)]
-pub enum Payload {
-    /// P2PKH address.
-    PubkeyHash { pubkey_hash: Vec<u8> },
-    /// P2SH address.
-    ScriptHash { script_hash: Vec<u8> },
-    /// Segwit address.
-    WitnessProgram {
-        /// The witness program version.
-        version: WitnessVersion,
-        /// The witness program.
-        program: Vec<u8>,
-    },
-}
-
-/// A Bitcoin script.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Script {
-    script: BdkScript,
-}
-
-impl Script {
-    fn new(raw_output_script: Vec<u8>) -> Self {
-        let script: BdkScript = BdkScript::from(raw_output_script);
-        Script { script }
-    }
-
-    fn to_bytes(&self) -> Vec<u8> {
-        self.script.to_bytes()
-    }
-}
-
-impl From<BdkScript> for Script {
-    fn from(bdk_script: BdkScript) -> Self {
-        Script { script: bdk_script }
-    }
-}
-
-#[derive(Clone, Debug)]
-enum RbfValue {
-    Default,
-    Value(u32),
-}
-
-/// The result after calling the TxBuilder finish() function. Contains unsigned PSBT and
-/// transaction details.
-pub struct TxBuilderResult {
-    pub(crate) psbt: Arc<PartiallySignedTransaction>,
-    pub transaction_details: TransactionDetails,
-}
-
-uniffi::deps::static_assertions::assert_impl_all!(Wallet: Sync, Send);
-
-// The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// crate.
-#[cfg(test)]
-mod test {
-    use super::Transaction;
-    use crate::Network::Regtest;
-    use crate::{Address, Payload};
-    use assert_matches::assert_matches;
-    use bdk::bitcoin::hashes::hex::FromHex;
-    use bdk::bitcoin::util::address::WitnessVersion;
-
-    // Verify that bdk-ffi Transaction can be created from valid bytes and serialized back into the same bytes.
-    #[test]
-    fn test_transaction_serde() {
-        let test_tx_bytes = Vec::from_hex("020000000001031cfbc8f54fbfa4a33a30068841371f80dbfe166211242213188428f437445c91000000006a47304402206fbcec8d2d2e740d824d3d36cc345b37d9f65d665a99f5bd5c9e8d42270a03a8022013959632492332200c2908459547bf8dbf97c65ab1a28dec377d6f1d41d3d63e012103d7279dfb90ce17fe139ba60a7c41ddf605b25e1c07a4ddcb9dfef4e7d6710f48feffffff476222484f5e35b3f0e43f65fc76e21d8be7818dd6a989c160b1e5039b7835fc00000000171600140914414d3c94af70ac7e25407b0689e0baa10c77feffffffa83d954a62568bbc99cc644c62eb7383d7c2a2563041a0aeb891a6a4055895570000000017160014795d04cc2d4f31480d9a3710993fbd80d04301dffeffffff06fef72f000000000017a91476fd7035cd26f1a32a5ab979e056713aac25796887a5000f00000000001976a914b8332d502a529571c6af4be66399cd33379071c588ac3fda0500000000001976a914fc1d692f8de10ae33295f090bea5fe49527d975c88ac522e1b00000000001976a914808406b54d1044c429ac54c0e189b0d8061667e088ac6eb68501000000001976a914dfab6085f3a8fb3e6710206a5a959313c5618f4d88acbba20000000000001976a914eb3026552d7e3f3073457d0bee5d4757de48160d88ac0002483045022100bee24b63212939d33d513e767bc79300051f7a0d433c3fcf1e0e3bf03b9eb1d70220588dc45a9ce3a939103b4459ce47500b64e23ab118dfc03c9caa7d6bfc32b9c601210354fd80328da0f9ae6eef2b3a81f74f9a6f66761fadf96f1d1d22b1fd6845876402483045022100e29c7e3a5efc10da6269e5fc20b6a1cb8beb92130cc52c67e46ef40aaa5cac5f0220644dd1b049727d991aece98a105563416e10a5ac4221abac7d16931842d5c322012103960b87412d6e169f30e12106bdf70122aabb9eb61f455518322a18b920a4dfa887d30700").unwrap();
-        let new_tx_from_bytes = Transaction::new(test_tx_bytes.clone()).unwrap();
-        let serialized_tx_to_bytes = new_tx_from_bytes.serialize();
-        assert_eq!(test_tx_bytes, serialized_tx_to_bytes);
-    }
-
-    // Verify that bdk-ffi Address.payload includes expected WitnessProgram variant, version and program bytes.
-    #[test]
-    fn test_address_witness_program() {
-        let address =
-            Address::new("bcrt1qqjn9gky9mkrm3c28e5e87t5akd3twg6xezp0tv".to_string()).unwrap();
-        let payload = address.payload();
-        assert_matches!(payload, Payload::WitnessProgram { version, program } => {
-            assert_eq!(version,WitnessVersion::V0);
-            assert_eq!(program, Vec::from_hex("04a6545885dd87b8e147cd327f2e9db362b72346").unwrap());
-        });
-        assert_eq!(address.network(), Regtest);
-    }
-}

bdk-ffi/src/psbt.rs

@@ -1,119 +0,0 @@
-use bdk::bitcoin::hashes::hex::ToHex;
-use bdk::bitcoin::util::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction;
-use bdk::bitcoincore_rpc::jsonrpc::serde_json;
-use bdk::psbt::PsbtUtils;
-use std::ops::Deref;
-use std::str::FromStr;
-use std::sync::{Arc, Mutex};
-
-use crate::{BdkError, FeeRate, Transaction};
-
-#[derive(Debug)]
-pub(crate) struct PartiallySignedTransaction {
-    pub(crate) internal: Mutex<BdkPartiallySignedTransaction>,
-}
-
-impl PartiallySignedTransaction {
-    pub(crate) fn new(psbt_base64: String) -> Result<Self, BdkError> {
-        let psbt: BdkPartiallySignedTransaction =
-            BdkPartiallySignedTransaction::from_str(&psbt_base64)?;
-        Ok(PartiallySignedTransaction {
-            internal: Mutex::new(psbt),
-        })
-    }
-
-    pub(crate) fn serialize(&self) -> String {
-        let psbt = self.internal.lock().unwrap().clone();
-        psbt.to_string()
-    }
-
-    pub(crate) fn txid(&self) -> String {
-        let tx = self.internal.lock().unwrap().clone().extract_tx();
-        let txid = tx.txid();
-        txid.to_hex()
-    }
-
-    /// Return the transaction.
-    pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
-        let tx = self.internal.lock().unwrap().clone().extract_tx();
-        Arc::new(tx.into())
-    }
-
-    /// Combines this PartiallySignedTransaction with other PSBT as described by BIP 174.
-    ///
-    /// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
-    pub(crate) fn combine(
-        &self,
-        other: Arc<PartiallySignedTransaction>,
-    ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
-        let other_psbt = other.internal.lock().unwrap().clone();
-        let mut original_psbt = self.internal.lock().unwrap().clone();
-
-        original_psbt.combine(other_psbt)?;
-        Ok(Arc::new(PartiallySignedTransaction {
-            internal: Mutex::new(original_psbt),
-        }))
-    }
-
-    /// The total transaction fee amount, sum of input amounts minus sum of output amounts, in Sats.
-    /// If the PSBT is missing a TxOut for an input returns None.
-    pub(crate) fn fee_amount(&self) -> Option<u64> {
-        self.internal.lock().unwrap().fee_amount()
-    }
-
-    /// The transaction's fee rate. This value will only be accurate if calculated AFTER the
-    /// `PartiallySignedTransaction` is finalized and all witness/signature data is added to the
-    /// transaction.
-    /// If the PSBT is missing a TxOut for an input returns None.
-    pub(crate) fn fee_rate(&self) -> Option<Arc<FeeRate>> {
-        self.internal.lock().unwrap().fee_rate().map(Arc::new)
-    }
-
-    /// Serialize the PSBT data structure as a String of JSON.
-    pub(crate) fn json_serialize(&self) -> String {
-        let psbt = self.internal.lock().unwrap();
-        serde_json::to_string(psbt.deref()).unwrap()
-    }
-}
-
-// The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// crate.
-#[cfg(test)]
-mod test {
-    use crate::wallet::{TxBuilder, Wallet};
-    use bdk::wallet::get_funded_wallet;
-    use std::sync::Mutex;
-
-    #[test]
-    fn test_psbt_fee() {
-        let test_wpkh = "wpkh(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
-        let (funded_wallet, _, _) = get_funded_wallet(test_wpkh);
-        let test_wallet = Wallet {
-            wallet_mutex: Mutex::new(funded_wallet),
-        };
-        let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
-        let drain_to_script = crate::Address::new(drain_to_address)
-            .unwrap()
-            .script_pubkey();
-
-        let tx_builder = TxBuilder::new()
-            .fee_rate(2.0)
-            .drain_wallet()
-            .drain_to(drain_to_script.clone());
-        //dbg!(&tx_builder);
-        assert!(tx_builder.drain_wallet);
-        assert_eq!(tx_builder.drain_to, Some(drain_to_script.script.clone()));
-
-        let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();
-
-        assert!(tx_builder_result.psbt.fee_rate().is_some());
-        assert_eq!(
-            tx_builder_result.psbt.fee_rate().unwrap().as_sat_per_vb(),
-            2.682927
-        );
-
-        assert!(tx_builder_result.psbt.fee_amount().is_some());
-        assert_eq!(tx_builder_result.psbt.fee_amount().unwrap(), 220);
-    }
-}

bdk-ffi/src/store.rs

@@ -0,0 +1,39 @@
+use crate::error::SqliteError;
+use crate::types::ChangeSet;
+
+use bdk_sqlite::rusqlite::Connection;
+use bdk_sqlite::{Store as BdkSqliteStore, Store};
+use bdk_wallet::chain::ConfirmationTimeHeightAnchor;
+use bdk_wallet::KeychainKind;
+
+use std::sync::{Arc, Mutex, MutexGuard};
+
+pub struct SqliteStore(Mutex<BdkSqliteStore<KeychainKind, ConfirmationTimeHeightAnchor>>);
+
+impl SqliteStore {
+    pub fn new(path: String) -> Result<Self, SqliteError> {
+        let connection = Connection::open(path)?;
+        let db = Store::new(connection)?;
+        Ok(Self(Mutex::new(db)))
+    }
+
+    pub(crate) fn get_store(
+        &self,
+    ) -> MutexGuard<BdkSqliteStore<KeychainKind, ConfirmationTimeHeightAnchor>> {
+        self.0.lock().expect("sqlite store")
+    }
+
+    pub fn write(&self, changeset: &ChangeSet) -> Result<(), SqliteError> {
+        self.get_store()
+            .write(&changeset.0)
+            .map_err(SqliteError::from)
+    }
+
+    pub fn read(&self) -> Result<Option<Arc<ChangeSet>>, SqliteError> {
+        self.get_store()
+            .read()
+            .map_err(SqliteError::from)
+            .map(|optional_bdk_change_set| optional_bdk_change_set.map(ChangeSet::from))
+            .map(|optional_change_set| optional_change_set.map(Arc::new))
+    }
+}

bdk-ffi/src/types.rs

@@ -0,0 +1,173 @@
+use crate::bitcoin::Amount;
+use crate::bitcoin::{Address, OutPoint, Script, Transaction, TxOut};
+use crate::InspectError;
+
+use bdk_wallet::bitcoin::ScriptBuf as BdkScriptBuf;
+use bdk_wallet::bitcoin::Transaction as BdkTransaction;
+use bdk_wallet::chain::spk_client::FullScanRequest as BdkFullScanRequest;
+use bdk_wallet::chain::spk_client::SyncRequest as BdkSyncRequest;
+use bdk_wallet::chain::tx_graph::CanonicalTx as BdkCanonicalTx;
+use bdk_wallet::chain::{ChainPosition as BdkChainPosition, ConfirmationTimeHeightAnchor};
+use bdk_wallet::wallet::AddressInfo as BdkAddressInfo;
+use bdk_wallet::wallet::Balance as BdkBalance;
+use bdk_wallet::KeychainKind;
+use bdk_wallet::LocalOutput as BdkLocalOutput;
+
+use bdk_electrum::bdk_chain::CombinedChangeSet;
+use std::sync::{Arc, Mutex};
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ChainPosition {
+    Confirmed { height: u32, timestamp: u64 },
+    Unconfirmed { timestamp: u64 },
+}
+
+pub struct CanonicalTx {
+    pub transaction: Arc<Transaction>,
+    pub chain_position: ChainPosition,
+}
+
+impl From<BdkCanonicalTx<'_, Arc<BdkTransaction>, ConfirmationTimeHeightAnchor>> for CanonicalTx {
+    fn from(tx: BdkCanonicalTx<'_, Arc<BdkTransaction>, ConfirmationTimeHeightAnchor>) -> Self {
+        let chain_position = match tx.chain_position {
+            BdkChainPosition::Confirmed(anchor) => ChainPosition::Confirmed {
+                height: anchor.confirmation_height,
+                timestamp: anchor.confirmation_time,
+            },
+            BdkChainPosition::Unconfirmed(timestamp) => ChainPosition::Unconfirmed { timestamp },
+        };
+
+        CanonicalTx {
+            transaction: Arc::new(Transaction::from(tx.tx_node.tx.as_ref().clone())),
+            chain_position,
+        }
+    }
+}
+
+pub struct ScriptAmount {
+    pub script: Arc<Script>,
+    pub amount: Arc<Amount>,
+}
+
+pub struct AddressInfo {
+    pub index: u32,
+    pub address: Arc<Address>,
+    pub keychain: KeychainKind,
+}
+
+impl From<BdkAddressInfo> for AddressInfo {
+    fn from(address_info: BdkAddressInfo) -> Self {
+        AddressInfo {
+            index: address_info.index,
+            address: Arc::new(address_info.address.into()),
+            keychain: address_info.keychain,
+        }
+    }
+}
+
+pub struct Balance {
+    pub immature: Arc<Amount>,
+    pub trusted_pending: Arc<Amount>,
+    pub untrusted_pending: Arc<Amount>,
+    pub confirmed: Arc<Amount>,
+    pub trusted_spendable: Arc<Amount>,
+    pub total: Arc<Amount>,
+}
+
+impl From<BdkBalance> for Balance {
+    fn from(bdk_balance: BdkBalance) -> Self {
+        Balance {
+            immature: Arc::new(bdk_balance.immature.into()),
+            trusted_pending: Arc::new(bdk_balance.trusted_pending.into()),
+            untrusted_pending: Arc::new(bdk_balance.untrusted_pending.into()),
+            confirmed: Arc::new(bdk_balance.confirmed.into()),
+            trusted_spendable: Arc::new(bdk_balance.trusted_spendable().into()),
+            total: Arc::new(bdk_balance.total().into()),
+        }
+    }
+}
+
+pub struct ChangeSet(pub(crate) CombinedChangeSet<KeychainKind, ConfirmationTimeHeightAnchor>);
+
+impl From<CombinedChangeSet<KeychainKind, ConfirmationTimeHeightAnchor>> for ChangeSet {
+    fn from(change_set: CombinedChangeSet<KeychainKind, ConfirmationTimeHeightAnchor>) -> Self {
+        ChangeSet(change_set)
+    }
+}
+
+pub struct LocalOutput {
+    pub outpoint: OutPoint,
+    pub txout: TxOut,
+    pub keychain: KeychainKind,
+    pub is_spent: bool,
+}
+
+impl From<BdkLocalOutput> for LocalOutput {
+    fn from(local_utxo: BdkLocalOutput) -> Self {
+        LocalOutput {
+            outpoint: OutPoint {
+                txid: local_utxo.outpoint.txid.to_string(),
+                vout: local_utxo.outpoint.vout,
+            },
+            txout: TxOut {
+                value: local_utxo.txout.value.to_sat(),
+                script_pubkey: Arc::new(Script(local_utxo.txout.script_pubkey)),
+            },
+            keychain: local_utxo.keychain,
+            is_spent: local_utxo.is_spent,
+        }
+    }
+}
+
+// Callback for the FullScanRequest
+pub trait FullScanScriptInspector: Sync + Send {
+    fn inspect(&self, keychain: KeychainKind, index: u32, script: Arc<Script>);
+}
+
+// Callback for the SyncRequest
+pub trait SyncScriptInspector: Sync + Send {
+    fn inspect(&self, script: Arc<Script>, total: u64);
+}
+
+pub struct FullScanRequest(pub(crate) Mutex<Option<BdkFullScanRequest<KeychainKind>>>);
+
+pub struct SyncRequest(pub(crate) Mutex<Option<BdkSyncRequest>>);
+
+impl SyncRequest {
+    pub fn inspect_spks(
+        &self,
+        inspector: Arc<dyn SyncScriptInspector>,
+    ) -> Result<Arc<Self>, InspectError> {
+        let mut guard = self.0.lock().unwrap();
+        if let Some(sync_request) = guard.take() {
+            let total = sync_request.spks.len() as u64;
+            let sync_request = sync_request.inspect_spks(move |spk| {
+                inspector.inspect(Arc::new(BdkScriptBuf::from(spk).into()), total)
+            });
+            Ok(Arc::new(SyncRequest(Mutex::new(Some(sync_request)))))
+        } else {
+            Err(InspectError::RequestAlreadyConsumed)
+        }
+    }
+}
+
+impl FullScanRequest {
+    pub fn inspect_spks_for_all_keychains(
+        &self,
+        inspector: Arc<dyn FullScanScriptInspector>,
+    ) -> Result<Arc<Self>, InspectError> {
+        let mut guard = self.0.lock().unwrap();
+        if let Some(full_scan_request) = guard.take() {
+            let inspector = Arc::new(inspector);
+            let full_scan_request =
+                full_scan_request.inspect_spks_for_all_keychains(move |k, spk_i, script| {
+                    inspector.inspect(k, spk_i, Arc::new(BdkScriptBuf::from(script).into()))
+                });
+            Ok(Arc::new(FullScanRequest(Mutex::new(Some(
+                full_scan_request,
+            )))))
+        } else {
+            Err(InspectError::RequestAlreadyConsumed)
+        }
+    }
+}

bdk-ffi/tests/README.md

@@ -5,7 +5,7 @@ supported bindings languages.
 
 To skip integration tests and only run unit tests use `cargo test --lib`. 
 
-To run all tests including integration tests use `CLASSPATH=./tests/jna/jna-5.8.0.jar cargo test`. 
+To run all tests including integration tests use `CLASSPATH=./tests/jna/jna-5.14.0.jar cargo test`. 
 
 Before running integration tests you must install the following development tools:
 

bdk-ffi/tests/bindings/test.swift

@@ -4,6 +4,6 @@
  */
 
 import Foundation
-import bdk
+import BitcoinDevKit
 
 let network = Network.testnet

bdk-ffi/uniffi-android.toml

@@ -0,0 +1,3 @@
+[bindings.kotlin]
+android = true
+android_cleaner = true

bdk-ffi/uniffi.toml

@@ -5,8 +5,6 @@ cdylib_name = "bdkffi"
 [bindings.python]
 cdylib_name = "bdkffi"
 
-[bindings.ruby]
-cdylib_name = "bdkffi"
-
 [bindings.swift]
+module_name = "BitcoinDevKit"
 cdylib_name = "bdkffi"

bdk-jvm/README.md

@@ -1,5 +1,5 @@
 # bdk-jvm
-This project builds a .jar package for the JVM platform that provide Kotlin language bindings for the [`bdk`] library. The Kotlin language bindings are created by the `bdk-ffi` project which is included in the root of this repository.
+This project builds a .jar package for the JVM platform that provides Kotlin language bindings for the [`bdk`] library. The Kotlin language bindings are created by the `bdk-ffi` project which is included in the root of this repository.
 
 ## How to Use
 To use the Kotlin language bindings for [`bdk`] in your JVM project add the following to your gradle dependencies:
@@ -13,24 +13,6 @@ dependencies {
 }
 ```
 
-You may then import and use the `org.bitcoindevkit` library in your Kotlin code. For example:
-```kotlin
-import org.bitcoindevkit.*
-
-// ...
-
-val externalDescriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)", Network.TESTNET)
-val internalDescriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)", Network.TESTNET)
-
-val databaseConfig = DatabaseConfig.Memory
-
-val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 10u, true)
-    )
-val wallet = Wallet(externalDescriptor, internalDescriptor, Network.TESTNET, databaseConfig, blockchainConfig)
-val newAddress = wallet.getAddress(AddressIndex.LastUnused)
-```
-
 ### Snapshot releases
 To use a snapshot release, specify the snapshot repository url in the `repositories` block and use the snapshot version in the `dependencies` block:
 ```kotlin
@@ -38,8 +20,8 @@ repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
 }
 
-dependencies {
-  implementation("org.bitcoindevkit:bdk-jvm:<version-SNAPSHOT>")
+dependencies { 
+    implementation("org.bitcoindevkit:bdk-jvm:<version-SNAPSHOT>")
 }
 ```
 
@@ -47,17 +29,17 @@ dependencies {
 * [Tatooine Faucet](https://github.com/thunderbiscuit/tatooine)
 
 ## How to build
-_Note that Kotlin version `1.6.10` or later is required to build the library._
-1. Install JDK 11. It must be version 11 (not 17), otherwise it won't build. For example, with SDKMAN!:
+_Note that Kotlin version `1.9.23` or later is required to build the library._
+1. Install JDK 17. For example, with SDKMAN!:
 ```shell
 curl -s "https://get.sdkman.io" | bash
 source "$HOME/.sdkman/bin/sdkman-init.sh"
-sdk install java 11.0.19-tem
+sdk install java 17.0.2-tem
 ```
-2. Install Rust (note that we are currently building using Rust 1.67.0):
+2. Install Rust (note that we are currently building using Rust 1.77.1):
 ```shell
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-rustup default 1.67.0
+rustup default 1.77.1
 ```
 3. Clone this repository.
 ```shell
@@ -75,7 +57,7 @@ rustup target add x86_64-apple-darwin aarch64-apple-darwin
 ## How to publish to your local Maven repo
 ```shell
 cd bdk-jvm
-./gradlew publishToMavenLocal --exclude-task signMavenPublication
+./gradlew publishToMavenLocal -P localBuild
 ```
 
 Note that the commands assume you don't need the local libraries to be signed. If you do wish to sign them, simply set your `~/.gradle/gradle.properties` signing key values like so:
@@ -84,7 +66,7 @@ signing.gnupg.keyName=<YOUR_GNUPG_ID>
 signing.gnupg.passphrase=<YOUR_GNUPG_PASSPHRASE>
 ```
 
-and use the `publishToMavenLocal` task without excluding the signing task:
+and use the `publishToMavenLocal` task without the `localBuild` flag:
 ```shell
 ./gradlew publishToMavenLocal
 ```
@@ -95,6 +77,7 @@ Depending on the JVM version you use, you might not have the JNA dependency on y
 ```shell
 class file for com.sun.jna.Pointer not found
 ```
+
 The solution is to add JNA as a dependency like so:
 ```kotlin
 dependencies {

bdk-jvm/build.gradle.kts

@@ -1,4 +1,9 @@
 plugins {
+    id("org.jetbrains.kotlin.jvm").version("1.9.23").apply(false)
+    id("org.gradle.java-library")
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
+    id("org.bitcoindevkit.plugins.generate-jvm-bindings").apply(false)
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
 

bdk-jvm/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 kotlin.code.style=official
-libraryVersion=0.29.0-SNAPSHOT
+libraryVersion=1.0.0-alpha.12-SNAPSHOT

bdk-jvm/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

bdk-jvm/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

bdk-jvm/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

bdk-jvm/justfile

@@ -0,0 +1,23 @@
+default:
+  just --list
+
+build:
+  ./gradlew buildJvmLib
+
+clean:
+  rm -rf ../bdk-ffi/target/
+  rm -rf ./build/
+  rm -rf ./lib/build/
+  rm -rf ./plugins/build/
+
+publish-local:
+  ./gradlew publishToMavenLocal -P localBuild
+
+test:
+  ./gradlew test
+
+test-offline:
+  ./gradlew test -P excludeConnectedTests
+
+test-specific TEST:
+  ./gradlew test --tests {{TEST}}

bdk-jvm/lib/build.gradle.kts

@@ -6,19 +6,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val libraryVersion: String by project
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.6.10"
-    id("java-library")
-    id("maven-publish")
-    id("signing")
+    id("org.jetbrains.kotlin.jvm")
+    id("org.gradle.java-library")
+    id("org.gradle.maven-publish")
+    id("org.gradle.signing")
 
     // Custom plugin to generate the native libs and bindings file
     id("org.bitcoindevkit.plugins.generate-jvm-bindings")
 }
 
-repositories {
-    mavenCentral()
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
@@ -26,25 +22,48 @@ java {
     withJavadocJar()
 }
 
-tasks.withType<Test> {
-    useJUnitPlatform()
+// This block ensures that the tests that require access to a blockchain are not
+// run if the -P excludeConnectedTests flag is passed to gradle.
+// This ensures our CI runs are not fickle by not requiring access to testnet or signet.
+// This is a workaround until we have a proper regtest setup for the CI.
+// Note that the command in the CI is ./gradlew test -P excludeConnectedTests
+tasks.test {
+    if (project.hasProperty("excludeConnectedTests")) {
+        exclude("**/LiveElectrumClientTest.class")
+        exclude("**/LiveMemoryWalletTest.class")
+        exclude("**/LiveTransactionTest.class")
+        exclude("**/LiveTxBuilderTest.class")
+        exclude("**/LiveWalletTest.class")
+    }
+}
 
+testing {
+    suites {
+        val test by getting(JvmTestSuite::class) {
+            useKotlinTest("1.9.23")
+        }
+    }
+}
+
+tasks.withType<Test> {
     testLogging {
         events(PASSED, SKIPPED, FAILED, STANDARD_OUT, STANDARD_ERROR)
         exceptionFormat = FULL
         showExceptions = true
-        showCauses = true
         showStackTraces = true
+        showCauses = true
     }
 }
 
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7")
-    implementation("net.java.dev.jna:jna:5.8.0")
+    implementation("net.java.dev.jna:jna:5.14.0")
     api("org.slf4j:slf4j-api:1.7.30")
-    testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.8.2")
+
+    // testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    // testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
+    // testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.8.2")
     testImplementation("ch.qos.logback:logback-classic:1.2.3")
     testImplementation("ch.qos.logback:logback-core:1.2.3")
 }
@@ -74,14 +93,9 @@ afterEvaluate {
                     }
                     developers {
                         developer {
-                            id.set("notmandatory")
-                            name.set("Steve Myers")
-                            email.set("notmandatory@noreply.github.org")
-                        }
-                        developer {
-                            id.set("artfuldev")
-                            name.set("Sudarsan Balaji")
-                            email.set("sudarsan.balaji@artfuldev.com")
+                            id.set("bdkdevelopers")
+                            name.set("Bitcoin Dev Kit Developers")
+                            email.set("dev@bitcoindevkit.org")
                         }
                     }
                     scm {
@@ -96,6 +110,10 @@ afterEvaluate {
 }
 
 signing {
+    if (project.hasProperty("localBuild")) {
+        isRequired = false
+    }
+
     val signingKeyId: String? by project
     val signingKey: String? by project
     val signingPassword: String? by project

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt

@@ -1,73 +0,0 @@
-package org.bitcoindevkit
-
-import org.junit.Assert.*
-import org.junit.Test
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import java.io.File
-import java.nio.file.Files
-
-/**
- * Library test, which will execute on linux host.
- */
-class JvmLibTest {
-
-    private fun getTestDataDir(): String {
-        return Files.createTempDirectory("bdk-test").toString()
-    }
-
-    private fun cleanupTestDataDir(testDataDir: String) {
-        File(testDataDir).deleteRecursively()
-    }
-
-    class LogProgress : Progress {
-        private val log: Logger = LoggerFactory.getLogger(JvmLibTest::class.java)
-
-        override fun update(progress: Float, message: String?) {
-            log.debug("Syncing...")
-        }
-    }
-
-    private val descriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)", Network.TESTNET)
-
-    private val databaseConfig = DatabaseConfig.Memory
-
-    private val blockchainConfig = BlockchainConfig.Electrum(
-        ElectrumConfig(
-            "ssl://electrum.blockstream.info:60002",
-            null,
-            5u,
-            null,
-            100u,
-            true,
-        )
-    )
-
-    @Test
-    fun memoryWalletNewAddress() {
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val address = wallet.getAddress(AddressIndex.New).address.asString()
-        assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
-    }
-
-    @Test
-    fun memoryWalletSyncGetBalance() {
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val blockchain = Blockchain(blockchainConfig)
-        wallet.sync(blockchain, LogProgress())
-        val balance: Balance = wallet.getBalance()
-        assertTrue(balance.total > 0u)
-    }
-
-    @Test
-    fun sqliteWalletSyncGetBalance() {
-        val testDataDir = getTestDataDir() + "/bdk-wallet.sqlite"
-        val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir))
-        val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
-        val blockchain = Blockchain(blockchainConfig)
-        wallet.sync(blockchain, LogProgress())
-        val balance: Balance = wallet.getBalance()
-        assertTrue(balance.total > 0u)
-        cleanupTestDataDir(testDataDir)
-    }
-}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveElectrumClientTest.kt

@@ -0,0 +1,39 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+
+private const val SIGNET_ELECTRUM_URL = "ssl://mempool.space:60602"
+
+class LiveElectrumClientTest {
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @Test
+    fun testSyncedBalance() {
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val electrumClient: ElectrumClient = ElectrumClient(SIGNET_ELECTRUM_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = electrumClient.fullScan(fullScanRequest, 10uL, 10uL, false)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        println("Transactions count: ${wallet.transactions().count()}")
+        val transactions = wallet.transactions().take(3)
+        for (tx in transactions) {
+            val sentAndReceived = wallet.sentAndReceived(tx.transaction)
+            println("Transaction: ${tx.transaction.computeTxid()}")
+            println("Sent ${sentAndReceived.sent.toSat()}")
+            println("Received ${sentAndReceived.received.toSat()}")
+        }
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveMemoryWalletTest.kt

@@ -0,0 +1,67 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+class LiveMemoryWalletTest {
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @Test
+    fun testSyncedBalance() {
+        val descriptor: Descriptor = Descriptor(
+            "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+            Network.SIGNET
+        )
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        println("Transactions count: ${wallet.transactions().count()}")
+        val transactions = wallet.transactions().take(3)
+        for (tx in transactions) {
+            val sentAndReceived = wallet.sentAndReceived(tx.transaction)
+            println("Transaction: ${tx.transaction.computeTxid()}")
+            println("Sent ${sentAndReceived.sent.toSat()}")
+            println("Received ${sentAndReceived.received.toSat()}")
+        }
+    }
+
+    @Test
+    fun testScriptInspector() {
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+
+        val scriptInspector: FullScriptInspector = FullScriptInspector()
+        val fullScanRequest: FullScanRequest = wallet.startFullScan().inspectSpksForAllKeychains(scriptInspector)
+        val update = esploraClient.fullScan(fullScanRequest, 21uL, 1uL)
+
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+    }
+}
+
+class FullScriptInspector: FullScanScriptInspector {
+    override fun inspect(keychain: KeychainKind, index: UInt, script: Script){
+        println("Inspecting index $index for keychain $keychain")
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTransactionTests.kt

@@ -0,0 +1,47 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+class LiveTransactionTests {
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @Test
+    fun testSyncedBalance() {
+        val descriptor: Descriptor = Descriptor(
+            "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+            Network.SIGNET
+        )
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Wallet balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val transaction: Transaction = wallet.transactions().first().transaction
+        println("First transaction:")
+        println("Txid: ${transaction.computeTxid()}")
+        println("Version: ${transaction.version()}")
+        println("Total size: ${transaction.totalSize()}")
+        println("Vsize: ${transaction.vsize()}")
+        println("Weight: ${transaction.weight()}")
+        println("Coinbase transaction: ${transaction.isCoinbase()}")
+        println("Is explicitly RBF: ${transaction.isExplicitlyRbf()}")
+        println("Inputs: ${transaction.input()}")
+        println("Outputs: ${transaction.output()}")
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt

@@ -0,0 +1,88 @@
+package org.bitcoindevkit
+
+import java.io.File
+import kotlin.test.AfterTest
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+class LiveTxBuilderTest {
+    private val persistenceFilePath = run {
+        val currentDirectory = System.getProperty("user.dir")
+        "$currentDirectory/bdk_persistence.sqlite"
+    }
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testTxBuilder() {
+        val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+        val wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+        val psbt: Psbt = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), Amount.fromSat(4200uL))
+            .feeRate(FeeRate.fromSatPerVb(2uL))
+            .finish(wallet)
+
+        println(psbt.serialize())
+
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+
+    @Test
+    fun complexTxBuilder() {
+        val wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient1: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+        val recipient2: Address = Address("tb1qw2c3lxufxqe2x9s4rdzh65tpf4d7fssjgh8nv6", Network.SIGNET)
+        val allRecipients: List<ScriptAmount> = listOf(
+            ScriptAmount(recipient1.scriptPubkey(), Amount.fromSat(4200uL)),
+            ScriptAmount(recipient2.scriptPubkey(), Amount.fromSat(4200uL)),
+        )
+
+        val psbt: Psbt = TxBuilder()
+            .setRecipients(allRecipients)
+            .feeRate(FeeRate.fromSatPerVb(4uL))
+            .changePolicy(ChangeSpendPolicy.CHANGE_FORBIDDEN)
+            .enableRbf()
+            .finish(wallet)
+
+        wallet.sign(psbt)
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt

@@ -0,0 +1,94 @@
+package org.bitcoindevkit
+
+import java.io.File
+import kotlin.test.AfterTest
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+private const val SIGNET_ESPLORA_URL = "http://signet.bitcoindevkit.net"
+private const val TESTNET_ESPLORA_URL = "https://esplora.testnet.kuutamo.cloud"
+
+class LiveWalletTest {
+    private val persistenceFilePath = run {
+        val currentDirectory = System.getProperty("user.dir")
+        "$currentDirectory/bdk_persistence.sqlite"
+    }
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testSyncedBalance() {
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient: EsploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        println("Transactions count: ${wallet.transactions().count()}")
+        val transactions = wallet.transactions().take(3)
+        for (tx in transactions) {
+            val sentAndReceived = wallet.sentAndReceived(tx.transaction)
+            println("Transaction: ${tx.transaction.computeTxid()}")
+            println("Sent ${sentAndReceived.sent}")
+            println("Received ${sentAndReceived.received}")
+        }
+    }
+
+    @Test
+    fun testBroadcastTransaction() {
+        val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.SIGNET)
+        val wallet: Wallet = Wallet(descriptor, changeDescriptor, Network.SIGNET)
+        val esploraClient = EsploraClient(SIGNET_ESPLORA_URL)
+        val fullScanRequest: FullScanRequest = wallet.startFullScan()
+        val update = esploraClient.fullScan(fullScanRequest, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.balance().total.toSat()}")
+
+        assert(wallet.balance().total.toSat() > 0uL) {
+            "Wallet balance must be greater than 0! Please send funds to ${wallet.revealNextAddress(KeychainKind.EXTERNAL).address} and try again."
+        }
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.SIGNET)
+
+        val psbt: Psbt = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), Amount.fromSat(4200uL))
+            .feeRate(FeeRate.fromSatPerVb(2uL))
+            .finish(wallet)
+
+        println(psbt.serialize())
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+
+        val walletDidSign = wallet.sign(psbt)
+        assertTrue(walletDidSign)
+
+        val tx: Transaction = psbt.extractTx()
+        println("Txid is: ${tx.computeTxid()}")
+
+        val txFee: Amount = wallet.calculateFee(tx)
+        println("Tx fee is: ${txFee}")
+
+        val feeRate: FeeRate = wallet.calculateFeeRate(tx)
+        println("Tx fee rate is: ${feeRate.toSatPerVbCeil()} sat/vB")
+
+        esploraClient.broadcast(tx)
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt

@@ -0,0 +1,18 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class OfflineDescriptorTest {
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic.fromString("space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertEquals(
+            expected = "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx",
+            actual = descriptor.toString()
+        )
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflinePersistenceTest.kt

@@ -0,0 +1,45 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class OfflinePersistenceTest {
+    private val persistenceFilePath = run {
+        val currentDirectory = System.getProperty("user.dir")
+        val dbFileName = "pre_existing_wallet_persistence_test.sqlite"
+        "$currentDirectory/src/test/resources/$dbFileName"
+    }
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.SIGNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.SIGNET
+    )
+
+    @Test
+    fun testPersistence() {
+        val sqliteStore: SqliteStore = SqliteStore(persistenceFilePath)
+        val initialChangeSet: ChangeSet? = sqliteStore.read()
+        requireNotNull(initialChangeSet) { "ChangeSet should not be null after loading a valid database" }
+
+        val wallet: Wallet = Wallet.newOrLoad(
+            descriptor,
+            changeDescriptor,
+            initialChangeSet,
+            Network.SIGNET,
+        )
+        val addressInfo: AddressInfo = wallet.revealNextAddress(KeychainKind.EXTERNAL)
+        println("Address: $addressInfo")
+
+        assertEquals(
+            expected = 7u,
+            actual = addressInfo.index,
+        )
+        assertEquals(
+            expected = "tb1qan3lldunh37ma6c0afeywgjyjgnyc8uz975zl2",
+            actual = addressInfo.address.toString(),
+        )
+    }
+}

bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineWalletTest.kt

@@ -0,0 +1,74 @@
+package org.bitcoindevkit
+
+import java.io.File
+import kotlin.test.AfterTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.assertFalse
+
+class OfflineWalletTest {
+    private val persistenceFilePath = run {
+        val currentDirectory = System.getProperty("user.dir")
+        "$currentDirectory/bdk_persistence.sqlite"
+    }
+    private val descriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)",
+        Network.TESTNET
+    )
+    private val changeDescriptor: Descriptor = Descriptor(
+        "wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)",
+        Network.TESTNET
+    )
+
+    @AfterTest
+    fun cleanup() {
+        val file = File(persistenceFilePath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
+
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic(WordCount.WORDS12)
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertTrue(descriptor.toString().startsWith("tr"), "Bip86 Descriptor does not start with 'tr'")
+    }
+
+   @Test
+    fun testNewAddress() {
+        val wallet: Wallet = Wallet(
+            descriptor,
+            changeDescriptor,
+            Network.TESTNET
+        )
+        val addressInfo: AddressInfo = wallet.revealNextAddress(KeychainKind.EXTERNAL)
+
+        assertTrue(addressInfo.address.isValidForNetwork(Network.TESTNET), "Address is not valid for testnet network")
+        assertTrue(addressInfo.address.isValidForNetwork(Network.SIGNET), "Address is not valid for signet network")
+        assertFalse(addressInfo.address.isValidForNetwork(Network.REGTEST), "Address is valid for regtest network, but it shouldn't be")
+        assertFalse(addressInfo.address.isValidForNetwork(Network.BITCOIN), "Address is valid for bitcoin network, but it shouldn't be")
+
+        assertEquals(
+            expected = "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989",
+            actual = addressInfo.address.toString()
+        )
+    }
+
+    @Test
+    fun testBalance() {
+        val wallet: Wallet = Wallet(
+            descriptor,
+            changeDescriptor,
+            Network.TESTNET
+        )
+
+        assertEquals(
+            expected = 0uL,
+            actual = wallet.balance().total.toSat()
+        )
+    }
+}

bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt

@@ -8,6 +8,8 @@ import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.register
 
+// TODO 18: Migrate hard coded strings to constants all in the same location so they're at least easy
+//          to find and reason about.
 internal class UniFfiJvmPlugin : Plugin<Project> {
     override fun apply(target: Project): Unit = target.run {
 
@@ -95,7 +97,7 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
                 doFirst {
                     copy {
                         with(it) {
-                            from("${project.projectDir}/../../target/${this.targetDir}/release-smaller/${libName}.${this.ext}")
+                            from("${project.projectDir}/../../bdk-ffi/target/${this.targetDir}/release-smaller/${libName}.${this.ext}")
                             into("${project.projectDir}/../../bdk-jvm/lib/src/main/resources/${this.resDir}/")
                         }
                     }
@@ -108,9 +110,22 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
 
             dependsOn(moveNativeJvmLibs)
 
-            workingDir("${project.projectDir}/../../bdk-ffi")
-            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-jvm/lib/src/main/kotlin", "--no-format")
+            // TODO 2: Is the Windows name the correct one?
+            // TODO 3: This will not work on mac Intel (x86_64 architecture)
+            val libraryPath = when (operatingSystem) {
+                OS.LINUX   -> "./target/x86_64-unknown-linux-gnu/release-smaller/libbdkffi.so"
+                OS.MAC     -> "./target/aarch64-apple-darwin/release-smaller/libbdkffi.dylib"
+                OS.WINDOWS -> "./target/x86_64-pc-windows-msvc/release-smaller/bdkffi.dll"
+                else       -> throw Exception("Unsupported OS")
+            }
 
+            workingDir("${project.projectDir}/../../bdk-ffi/")
+            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "../bdk-jvm/lib/src/main/kotlin/", "--no-format")
+
+            // The code above was for the migration to uniffi 0.24.3 using the --library flag
+            // The code below works with uniffi 0.23.0
+            // workingDir("${project.projectDir}/../../bdk-ffi/")
+            // val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-jvm/lib/src/main/kotlin", "--no-format")
             executable("cargo")
             args(cargoArgs)
 

bdk-jvm/settings.gradle.kts

@@ -2,3 +2,15 @@ rootProject.name = "bdk-jvm"
 
 include(":lib")
 includeBuild("plugins")
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+}

bdk-python/MANIFEST.in

@@ -1,2 +1,3 @@
 include ./src/bdkpython/libbdkffi.dylib
 include ./src/bdkpython/libbdkffi.so
+include ./src/bdkpython/bdkffi.dll

bdk-python/README.md

@@ -12,10 +12,10 @@ pip install bdkpython
 ## Run the tests
 ```shell
 pip install --requirement requirements.txt
-bash ./generate.sh
+bash ./scripts/generate-linux.sh # here you should run the script appropriate for your platform
 python setup.py bdist_wheel --verbose
-pip install ./dist/bdkpython-<yourversion>-py3-none-any.whl --force-reinstall
-python -m unittest --verbose tests/test_bdk.py
+pip install ./dist/bdkpython-<yourversion>.whl --force-reinstall
+python -m unittest --verbose
 ```
 
 ## Build the package
@@ -23,26 +23,14 @@ python -m unittest --verbose tests/test_bdk.py
 # Install dependencies
 pip install --requirement requirements.txt
 
-# Generate the bindings
-bash generate.sh
+# Generate the bindings (use the script appropriate for your platform)
+bash ./scripts/generate-linux.sh
 
 # Build the wheel
 python setup.py --verbose bdist_wheel
 ```
 
-## Run tox to build and test locally
-```shell
-# install dev requirements
-pip install --requirement requirements-dev.txt
-
-# build bindings glue code (located at ./src/bdkpython/bdk.py)
-source ./generate.sh
-
-# build and test
-tox -vv
-```
-
 ## Install locally
 ```shell
-pip install ./dist/bdkpython-<yourversion>-py3-none-any.whl
+pip install ./dist/bdkpython-<yourversion>.whl
 ```

bdk-python/generate.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-OS=$(uname -s)
-
-echo "Generating bdk.py..."
-cd ../bdk-ffi/
-cargo run --bin uniffi-bindgen generate src/bdk.udl --language python --out-dir ../bdk-python/src/bdkpython/ --no-format
-
-echo "Generating native binaries..."
-cargo build --profile release-smaller
-case $OS in
-  "Darwin")
-    echo "Copying macOS libbdkffi.dylib..."
-    cp ../target/release-smaller/libbdkffi.dylib ../bdk-python/src/bdkpython/libbdkffi.dylib
-    ;;
-  "Linux")
-    echo "Copying linux libbdkffi.so..."
-    cp ../target/release-smaller/libbdkffi.so ../bdk-python/src/bdkpython/libbdkffi.so
-    ;;
-esac
-cd ../bdk-python/
-
-echo "All done!"

bdk-python/justfile

@@ -0,0 +1,14 @@
+default:
+  just --list
+
+build-local-mac:
+  bash ./scripts/generate-macos-arm64.sh && python3 setup.py bdist_wheel --verbose
+
+clean:
+  rm -rf ../bdk-ffi/target/
+  rm -rf ./bdkpython.egg-info/
+  rm -rf ./build/
+  rm -rf ./dist/
+
+test:
+  python3 -m unittest --verbose

bdk-python/scripts/generate-linux.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+${PYBIN}/python --version
+${PYBIN}/pip install -r requirements.txt
+
+cd ../bdk-ffi/
+rustup default 1.77.1
+
+echo "Generating native binaries..."
+cargo build --profile release-smaller
+
+echo "Generating bdk.py..."
+cargo run --bin uniffi-bindgen generate --library ./target/release-smaller/libbdkffi.so --language python --out-dir ../bdk-python/src/bdkpython/ --no-format
+
+echo "Copying linux libbdkffi.so..."
+cp ./target/release-smaller/libbdkffi.so ../bdk-python/src/bdkpython/libbdkffi.so
+
+echo "All done!"

bdk-python/scripts/generate-macos-arm64.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+python3 --version
+pip install -r requirements.txt
+
+cd ../bdk-ffi/
+rustup default 1.77.1
+rustup target add aarch64-apple-darwin
+
+echo "Generating native binaries..."
+cargo build --profile release-smaller --target aarch64-apple-darwin
+
+echo "Generating bdk.py..."
+cargo run --bin uniffi-bindgen generate --library ./target/aarch64-apple-darwin/release-smaller/libbdkffi.dylib --language python --out-dir ../bdk-python/src/bdkpython/ --no-format
+
+echo "Copying libraries libbdkffi.dylib..."
+cp ./target/aarch64-apple-darwin/release-smaller/libbdkffi.dylib ../bdk-python/src/bdkpython/libbdkffi.dylib
+
+echo "All done!"

bdk-python/scripts/generate-macos-x86_64.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+python3 --version
+pip install -r requirements.txt
+
+cd ../bdk-ffi/
+rustup default 1.77.1
+rustup target add x86_64-apple-darwin
+
+echo "Generating native binaries..."
+cargo build --profile release-smaller --target x86_64-apple-darwin
+
+echo "Generating bdk.py..."
+cargo run --bin uniffi-bindgen generate --library ./target/x86_64-apple-darwin/release-smaller/libbdkffi.dylib --language python --out-dir ../bdk-python/src/bdkpython/ --no-format
+
+echo "Copying libraries libbdkffi.dylib..."
+cp ./target/x86_64-apple-darwin/release-smaller/libbdkffi.dylib ../bdk-python/src/bdkpython/libbdkffi.dylib
+
+echo "All done!"

bdk-python/scripts/generate-windows.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+python3 --version
+pip install -r requirements.txt
+
+cd ../bdk-ffi/
+rustup default 1.77.1
+rustup target add x86_64-pc-windows-msvc
+
+echo "Generating native binaries..."
+cargo build --profile release-smaller --target x86_64-pc-windows-msvc
+
+echo "Generating bdk.py..."
+cargo run --bin uniffi-bindgen generate --library ./target/x86_64-pc-windows-msvc/release-smaller/bdkffi.dll --language python --out-dir ../bdk-python/src/bdkpython/ --no-format
+
+echo "Copying libraries bdkffi.dll..."
+cp ./target/x86_64-pc-windows-msvc/release-smaller/bdkffi.dll ../bdk-python/src/bdkpython/bdkffi.dll
+
+echo "All done!"