Fix library naming and bump Python version to 0.28.3

Add library build task to Android test CI workflow
Remove support for Python 3.6 and 3.7
2023-04-25 10:22:09 -04:00 · 2023-04-24 16:09:45 -04:00 · 2023-04-24 16:09:15 -04:00 · 2023-04-24 16:08:54 -04:00 · 2023-04-24 16:08:32 -04:00 · 2023-04-24 16:08:16 -04:00
46 changed files with 890 additions and 1426 deletions
--- a/.github/ISSUE_TEMPLATE/enhancement_request.md
+++ b/.github/ISSUE_TEMPLATE/enhancement_request.md
@@ -1,17 +0,0 @@
---
-name: Enhancement request
-about: Request a new feature or change to an existing feature
-title: ''
-labels: 'enhancement'
-assignees: ''
-
---
-
-**Describe the enhancement**  
-<!-- A clear and concise description of what you would like added or changed. -->
-
-**Use case**  
-<!-- Tell us how you or others will use this new feature or change to an existing feature. --> 
-
-**Additional context**
-<!-- Add any other context about the enhancement here. --> 
--- a/.github/ISSUE_TEMPLATE/minor_release.md
+++ b/.github/ISSUE_TEMPLATE/minor_release.md
@@ -7,81 +7,77 @@ assignees: ''
 ---

 ## Create a new minor release
-## Bumping BDK Rust Version
+### _Main Workflow_
 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.
-```shell
-# 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
-```shell
-cd ./bdk-jvm/
-./gradlew buildJvmLib
-./gradlew test
-```
-10. - [ ] Update the readme if necessary
-#### _Swift_
-11. - [ ] Run the tests and adjust if necessary
-```shell
-./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 ./scripts/generate-macos-arm64.sh # run the script for your particular platform
-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).
+3. - [ ] Update the Android, JVM, Python, and Swift libraries as per the ["**_Sub-Workflows_**" section below](#Sub-Workflows). Open a single PR on master for all of these changes called `Prepare language bindings libraries for 0.X release`
 18. - [ ] Create a new branch off of `master` called `release/version`
-19. - [ ] Update bdk-android version from `SNAPSHOT` version to release version
-20. - [ ] Update bdk-jvm version from `SNAPSHOT` version to release version
-21. - [ ] Update bdk-python version from `.dev` version to release version
-22. - [ ] Open a PR to that release branch that updates the Android, JVM, and Python libraries' versions in step 19, 20, and 21. See [example PR here](https://github.com/bitcoindevkit/bdk-ffi/pull/316).
-23. - [ ] Get a review and ACK and merge the PR updating all the languages to their release versions
-24. - [ ] 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
+19. - [ ] Checkout that branch and open a PR to update the Android, JVM, and Python libraries' versions
+  - [ ] 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
+20. - [ ] Merge the PR updating all of the languages to their release versions
+21. - [ ] 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
 ```
-25. - [ ] Trigger manual releases for all 4 libraries (for Swift, trigger the release on `master` and 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`)
-26. - [ ] Make sure the released libraries work and contain the artifacts you would expect 
-27. - [ ] Aggregate all the changelog notices from the PRs and add them to the changelog file
-28. - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
-29. - [ ] Apply changes to the minor_release and patch_release issue templates if they need any
-30. - [ ] 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.
-31. - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
-32. - [ ] Build and publish API docs for JVM, Android, and Java on the website
-```shell
+22. - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
+23. - [ ] 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`)
+24. - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
+25. - [ ] 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)
 ```
-33. - [ ] Post in the announcement channel
-34. - [ ] Tweet about the library
+26. - [ ] Tweet about the library
+27. - [ ] Post in the announcement channel
+
+### _Sub Workflows_
+#### _Android_
+4. - [ ] Update the API docs to reflect the changes in the API
+5. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch
+6. - [ ] 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
+```
+7. - [ ] Update the readme if necessary
+
+#### _JVM_
+8. - [ ] Update the API docs to reflect the changes in the API
+9. - [ ] Delete the `target` directory in bdk-ffi and all previous artifacts to make sure you're building the library from scratch
+10. - [ ] Build the library and run the tests, and adjust if necessary
+```sh
+cd bdk-jvm
+./gradlew buildJvmLib
+./gradlew test
+```
+11. - [ ] Update the readme if necessary
+
+#### _Swift_
+12. - [ ] Run the tests and adjust if necessary
+```sh
+./bdk-swift/build-local-swift.sh
+cd bdk-swift
+swift test
+```
+13. - [ ] Update the readme if necessary
+
+#### _Python_
+14. - [ ] 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
+15. - [ ] Build the library
+```shell
+pip3 install --requirement requirements.txt
+bash ./generate.sh
+python3 setup.py --verbose bdist_wheel
+```
+16. - [ ] Run the tests and adjust if necessary
+```shell
+pip3 install ./dist/bdkpython-<yourversion>-py3-none-any.whl
+python -m unittest --verbose tests/test_bdk.py
+```
+17. - [ ] Update the readme and `setup.py` if necessary
--- a/.github/ISSUE_TEMPLATE/patch_release.md
+++ b/.github/ISSUE_TEMPLATE/patch_release.md
@@ -0,0 +1,84 @@
+---
+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`
+- [ ] Create a new branch off of `master` called `release/version`
+18. - [ ] Checkout that branch and open a PR to update the Android, JVM, and Python libraries' versions
+    - [ ] 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 of 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. - [ ] Make release on GitHub (set as pre-release and generate auto release notes between the previous tag and the new one)
+22. - [ ] 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`)
+23. - [ ] Bump the versions on master from `0.9.0-SNAPSHOT` to `0.10.0-SNAPSHOT`, `0.6.0.dev0` to `0.7.0.dev0`
+24. - [ ] 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)
+```
+25. - [ ] Tweet about the library
+26. - [ ] Post in the announcement channel
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -13,7 +13,7 @@ jobs:
    name: Security audit
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - uses: actions-rs/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/cont_integration.yml
+++ b/.github/workflows/cont_integration.yml
@@ -14,18 +14,18 @@ jobs:
    strategy:
      matrix:
        rust:
-          - version: 1.71.0 # STABLE
+          - version: 1.63.0 # STABLE
            clippy: true
          - version: 1.61.0 # MSRV
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: Generate cache key
        run: echo "${{ matrix.rust.version }} ${{ matrix.features }}" | tee .cache_key

      - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: |
            ~/.cargo/registry
@@ -46,12 +46,6 @@ jobs:
      - name: Update toolchain
        run: rustup update

-      - name: Pin dependencies for MSRV
-        if: matrix.rust.version == '1.61.0'
-        run: |
-          cargo update -p hashlink --precise "0.8.1"
-          cargo update -p tokio --precise "1.29.1"
-          cargo update -p flate2 --precise "1.0.26"
      - name: Build
        run: cargo build

@@ -67,7 +61,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: Set default toolchain
        run: rustup default nightly
--- a/.github/workflows/publish-android.yaml
+++ b/.github/workflows/publish-android.yaml
@@ -20,10 +20,10 @@ jobs:
          echo "y" | $SDKMANAGER "ndk;21.4.7075529"

      - name: "Check out PR branch"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: "Cache"
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: |
            ~/.cargo/registry
@@ -32,7 +32,7 @@ jobs:
          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}

      - name: "Set up JDK"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
          java-version: 11
--- a/.github/workflows/publish-jvm.yaml
+++ b/.github/workflows/publish-jvm.yaml
@@ -2,14 +2,14 @@ name: Publish bdk-jvm to Maven Central
 on: [workflow_dispatch]

 jobs:
-  build-macOS-native-libs:
-    name: "Create M1 and x86_64 native binaries"
+  build-jvm-macOS-M1-native-lib:
+    name: "Create M1 and x86_64 JVM native binaries"
    runs-on: macos-12
    steps:
      - name: "Checkout publishing branch"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

-      - name: "Cache"
+      - name: Cache
        uses: actions/cache@v3
        with:
          path: |
@@ -18,8 +18,8 @@ jobs:
            ./target
          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}

-      - name: "Set up JDK"
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
          java-version: 11
@@ -27,59 +27,36 @@ jobs:
      - name: "Set default Rust version to 1.67.0"
        run: rustup default 1.67.0

-      - 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

-      - name: "Upload macOS native libraries for reuse in publishing job"
+      # build aarch64 + x86_64 native libraries and upload
+      - name: Upload macOS native libraries for reuse in publishing job
        uses: actions/upload-artifact@v3
        with:
-          name: artifact-macos
+          # name: no name is required because we upload the entire directory
+          # the default name "artifact" will be used
          path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-jvm/lib/src/main/resources/

-  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: 11
-
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
-
-      - 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:
+  build-jvm-full-library:
    name: Create full bdk-jvm library
-    needs: [build-macOS-native-libs, build-windows-native-lib]
+    needs: [build-jvm-macOS-M1-native-lib]
    runs-on: ubuntu-20.04
    steps:
-      - name: "Checkout publishing branch"
-        uses: actions/checkout@v3
+      - name: Checkout publishing branch
+        uses: actions/checkout@v2

-      - name: "Cache"
+      - 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
        uses: actions/cache@v3
        with:
          path: |
@@ -88,8 +65,8 @@ jobs:
            ./target
          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}

-      - name: "Set up JDK"
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
          java-version: 11
@@ -97,30 +74,20 @@ jobs:
      - name: "Set default Rust version to 1.67.0"
        run: rustup default 1.67.0

-      - name: "Build bdk-jvm library"
+      - name: Build bdk-jvm library
        run: |
          cd bdk-jvm
          ./gradlew buildJvmLib

-      - name: "Download macOS native binaries from previous job"
+      - name: Download macOS native libraries from previous job
        uses: actions/download-artifact@v3
+        id: download
        with:
-          name: artifact-macos
+          # download the artifact created in the prior job (named "artifact")
+          name: artifact
          path: ./bdk-jvm/lib/src/main/resources/

-      - 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"
+      - name: Publish to Maven Central
        env:
          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_KEY_ID }}
          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET_KEY }}
--- a/.github/workflows/publish-python.yaml
+++ b/.github/workflows/publish-python.yaml
@@ -1,4 +1,4 @@
-name: Publish bdkpython to PyPI
+name: Build and publish Python wheels
 on: [workflow_dispatch]

 # We use manylinux2014 because older CentOS versions used by 2010 and 1 have a very old glibc version, which
@@ -7,7 +7,7 @@ on: [workflow_dispatch]
 # tries to load glibc and fails because it requires a more recent version.

 jobs:
-  build-manylinux2014-x86_64-wheels:
+  build-manylinux2014-x86_64-wheel:
    name: "Build Manylinux 2014 x86_64 wheel"
    runs-on: ubuntu-20.04
    defaults:
@@ -26,29 +26,35 @@ jobs:
          - cp310-cp310
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          submodules: true
      - uses: actions-rs/toolchain@v1
        with:
          toolchain: stable

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-linux.sh
+      - 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
+
+      - name: "Generate bdk.py"
+        run: bash generate.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

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v2
        with:
          name: bdkpython-manylinux2014-x86_64-${{ matrix.python }}
          path: /home/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl

-  build-macos-arm64-wheels:
-    name: "Build macOS arm64 wheel"
-    runs-on: macos-13
+  build-macos-universal-wheel:
+    name: "Build macOS universal wheel"
+    runs-on: macos-12
    defaults:
      run:
        working-directory: bdk-python
@@ -60,66 +66,33 @@ jobs:
          - "3.10"
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          submodules: true
-
-      - name: "Install Python"
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python }}

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-macos-arm64.sh
+      - name: "Generate bdk.py"
+        run: |
+          python3 --version
+          rustup target add aarch64-apple-darwin
+          pip3 install --user -r requirements.txt
+          bash generate.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_11_0_arm64 --verbose
+        run: python3 setup.py bdist_wheel --plat-name macosx_12_0_universal2 --verbose

-      - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v2
        with:
-          name: bdkpython-macos-arm64-${{ matrix.python }}
+          name: bdkpython-macos-${{ matrix.python }}
          path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl

-  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"
-    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:
+  build-windows-wheel:
    name: "Build Windows wheel"
    runs-on: windows-2022
    defaults:
@@ -133,21 +106,23 @@ jobs:
          - "3.10"
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          submodules: true
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python }}

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-windows.sh
+      - name: "Generate bdk.py"
+        run: |
+          python --version
+          pip install --user -r requirements.txt
+          bash generate.sh

      - name: "Build wheel"
        run: python setup.py bdist_wheel --verbose

-      - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v2
        with:
          name: bdkpython-win-${{ matrix.python }}
          path: D:\a\bdk-ffi\bdk-ffi\bdk-python\dist\*.whl
@@ -158,13 +133,13 @@ jobs:
    defaults:
      run:
        working-directory: bdk-python
-    needs: [build-manylinux2014-x86_64-wheels, build-macos-arm64-wheels, build-macos-x86_64-wheels, build-windows-wheels]
+    needs: [build-manylinux2014-x86_64-wheel, build-macos-universal-wheel, build-windows-wheel]
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: "Download artifacts in dist/ directory"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
        with:
          path: dist/

--- a/.github/workflows/test-android.yaml
+++ b/.github/workflows/test-android.yaml
@@ -29,10 +29,10 @@ jobs:
          echo "y" | $SDKMANAGER "ndk;21.4.7075529"

      - name: "Check out PR branch"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: "Cache"
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: |
            ~/.cargo/registry
@@ -41,7 +41,7 @@ jobs:
          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}

      - name: "Set up JDK"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
          java-version: 11
--- a/.github/workflows/test-jvm.yaml
+++ b/.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@v3
+      - name: Check out PR branch
+        uses: actions/checkout@v2

-      - name: "Cache"
-        uses: actions/cache@v3
+      - name: Cache
+        uses: actions/cache@v2
        with:
          path: |
            ~/.cargo/registry
@@ -26,8 +26,8 @@ jobs:
            ./target
          key: ${{ runner.os }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}

-      - name: "Set up JDK"
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
          java-version: 11
@@ -35,7 +35,7 @@ jobs:
      - name: "Set default Rust version to 1.67.0"
        run: rustup default 1.67.0

-      - name: "Run JVM tests"
+      - name: Run JVM tests
        run: |
          cd bdk-jvm
-          ./gradlew test
+          ./gradlew test --console=rich
--- a/.github/workflows/test-python.yaml
+++ b/.github/workflows/test-python.yaml
@@ -16,7 +16,7 @@ on:
 # tries to load glibc and fails because it requires a more recent version.

 jobs:
-  build-manylinux2014-x86_64-wheels:
+  build-manylinux2014-x86_64-wheel:
    name: "Build and test Manylinux 2014 x86_64 wheels"
    runs-on: ubuntu-20.04
    defaults:
@@ -35,36 +35,42 @@ jobs:
          - cp310-cp310
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          submodules: true
      - uses: actions-rs/toolchain@v1
        with:
          toolchain: stable

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-linux.sh
+      - 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
+
+      - name: "Generate bdk.py"
+        run: bash generate.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 --verbose

      - name: "Install wheel"
        run: ${PYBIN}/pip install ./dist/*.whl

      - name: "Run tests"
-        run: ${PYBIN}/python -m unittest tests/test_bdk.py --verbose
+        # Specifying the plat-name argument is necessary to build a wheel with the correct name,
+        # see issue #350 for more information
+        run: ${PYBIN}/python -m unittest tests/test_bdk.py --plat-name manylinux_2_17_x86_64 --verbose

      - name: "Upload artifact test"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
        with:
          name: bdkpython-manylinux2014-x86_64-${{ matrix.python }}
          path: /home/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl

-  build-macos-arm64-wheels:
-    name: "Build and test macOS arm64 wheels"
-    runs-on: macos-13
+  build-macos-universal-wheel:
+    name: "Build and test macOS wheels"
+    runs-on: macos-12
    defaults:
      run:
        working-directory: bdk-python
@@ -75,64 +81,25 @@ jobs:
          - "3.9"
          - "3.10"
    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v2
        with:
          submodules: true
-
-      - name: "Install Python"
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python }}

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-macos-arm64.sh
+      - name: "Generate bdk.py"
+        run: | 
+          python3 --version
+          rustup target add aarch64-apple-darwin
+          pip3 install --user -r requirements.txt
+          bash generate.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_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 tests/test_bdk.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"
-    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
+        env:
+          ARCHFLAGS: "-arch x86_64 -arch arm64"
+        run: python3 setup.py bdist_wheel --verbose

      - name: "Install wheel"
        run: pip3 install ./dist/*.whl
@@ -140,13 +107,7 @@ jobs:
      - name: "Run tests"
        run: python3 -m unittest tests/test_bdk.py --verbose

-      - 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:
+  build-windows-wheel:
    name: "Build and test Windows wheels"
    runs-on: windows-2022
    defaults:
@@ -160,30 +121,28 @@ jobs:
          - "3.10"
    steps:
      - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          submodules: true
-
-      - name: "Install Python"
-        uses: actions/setup-python@v4
+      - uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python }}

-      - name: "Generate bdk.py and binaries"
-        run: bash ./scripts/generate-windows.sh
+      - name: "Generate bdk.py"
+        run: |
+          python --version
+          pip install --user -r requirements.txt
+          bash generate.sh

      - name: "Build wheel"
        run: python setup.py bdist_wheel --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 tests/test_bdk.py --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
--- a/.github/workflows/test-swift.yaml
+++ b/.github/workflows/test-swift.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: macos-12
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: "Set default Rust version to 1.67.0"
        run: rustup default 1.67.0
@@ -36,7 +36,7 @@ jobs:
      - 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
+      - name: Create lipo-ios-sim and 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,54 +1,14 @@
 # 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.
+All notable changes to this project prior to release **0.9.0** are documented in this file. Future
+changelog information can be found in each release's git tag and can be viewed with `git tag -ln100 "v*"`.
+Changelog info is also documented 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).

-## [0.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
-
-## [0.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]
- Drop support of pypy releases of Python libraries [#351]
- Drop support for Python 3.6 and 3.7 [#351]
- Drop support for very old Linux versions that do not support the manylinux_2_17_x86_64 platform tag [#351]
- APIs changed:
-  - Expose Address payload and network properties. [#325]
-  - Add SignOptions to Wallet.sign() params. [#326]
-  - address field on `AddressInfo` type is now of type `Address` [#333]
-  - new PartiallySignedTransaction.json_serialize() function to get JSON serialized value of all PSBT fields. [#334]
-  - Add from_script constructor to `Address` type [#337]
-
-[#325]: https://github.com/bitcoindevkit/bdk-ffi/pull/325
-[#326]: https://github.com/bitcoindevkit/bdk-ffi/pull/326
-[#333]: https://github.com/bitcoindevkit/bdk-ffi/pull/333
-[#334]: https://github.com/bitcoindevkit/bdk-ffi/pull/334
-[#337]: https://github.com/bitcoindevkit/bdk-ffi/pull/337
-[#341]: https://github.com/bitcoindevkit/bdk-ffi/pull/341
-[#351]: https://github.com/bitcoindevkit/bdk-ffi/pull/351
-
 ## [v0.27.1]
- Update BDK to version 0.27.1 [#312]
+- Update BDK to latest version 0.27.1 [#312]
 - APIs changed
  - `PartiallySignedTransaction.extract_tx()` returns a `Transaction` instead of the transaction bytes. [#296]
  - `Blockchain.broadcast()` takes a `Transaction` instead of a `PartiallySignedTransaction`. [#296]
@@ -63,7 +23,7 @@ Changelog
 [#312]: https://github.com/bitcoindevkit/bdk-ffi/pull/312

 ## [v0.26.0]
- Update BDK to version 0.26.0 [#288]
+- Update BDK to latest version 0.26.0 [#288]
 - APIs changed
  - The descriptor and change_descriptor arguments on the wallet constructor now take a `Descriptor` instead of a `String`. [#260]
  - TxBuilder.drain_to() argument is now `Script` instead of address `String`. [#279]
@@ -86,7 +46,7 @@ Changelog
 [#288]: https://github.com/bitcoindevkit/bdk-ffi/pull/288

 ## [v0.25.0]
- Update BDK to version 0.25.0 [#272]
+- Update BDK to latest version 0.25.0 [#272]
 - APIs Added:
  - from_string() constructors now available on DescriptorSecretKey and DescriptorPublicKey [#247]

@@ -94,7 +54,7 @@ Changelog
 [#272]: https://github.com/bitcoindevkit/bdk-ffi/pull/272

 ## [v0.11.0]
- Update BDK to version 0.24.0 [#221]
+- Update BDK to latest version 0.24.0 [#221]
 - APIs changed
  - The constructor on the DescriptorSecretKey type now takes a Mnemonic instead of a String.
 - APIs added
@@ -110,7 +70,7 @@ Changelog
 [#221]: https://github.com/bitcoindevkit/bdk-ffi/pull/221

 ## [v0.10.0]
- Update BDK to version 0.23.0 [#204]
+- Update BDK to latest version 0.23.0 [#204]
 - Update uniffi-rs to latest version 0.21.0 [#216]
 - Breaking Changes
  - Changed `TxBuilder.finish()` to return new `TxBuilderResult` [#209]
@@ -143,7 +103,7 @@ Changelog
 - APIs Added [#154]
  - `generate_mnemonic()`, returns string mnemonic
  - `interface DescriptorSecretKey`
-    - `new(Network, string_mnenoinc, password)`, constructs DescriptorSecretKey
+    - `new(Network, string_mnenoinc, password)`, contructs DescriptorSecretKey
    - `derive(DerivationPath)`, derives and returns child DescriptorSecretKey
    - `extend(DerivationPath)`, extends and returns DescriptorSecretKey
    - `as_public()`, returns DescriptorSecretKey as DescriptorPublicKey
@@ -223,9 +183,8 @@ Changelog

 [BIP 0174]:https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#encoding

-[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.2.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
 [v0.25.0]: https://github.com/bitcoindevkit/bdk-ffi/compare/v0.11.0...v0.25.0
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,4 +9,4 @@ 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
+strip = true        # Strip symbols from binary*
--- a/README.md
+++ b/README.md
@@ -22,21 +22,6 @@ 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]    |                       |

-## Minimum Supported Rust Version (MSRV)
-
-This library should compile with any combination of features with Rust 1.61.0.
-
-To build with the MSRV you will need to pin dependencies as follows:
-
-```shell
-# required for sqlite feature, hashlink 0.8.2 has MSRV 1.61.0
-cargo update -p hashlink --precise "0.8.1"
-# tokio 1.30.0 has MSRV 1.63.0
-cargo update -p tokio --precise "1.29.1"
-# flate2 1.0.27 and up do not work with Rust 1.61.0, but 1.0.26 does
-cargo update -p flate2 --precise "1.0.26"
-```
-
 ## Contributing

 ### Adding new structs and functions
@@ -64,8 +49,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>")
 }
 ```

@@ -75,8 +60,8 @@ dependencies {
 repositories {
    mavenCentral()
 }
-dependencies { 
-    implementation("org.bitcoindevkit:bdk-jvm:<version>")
+dependencies {
+  implementation("org.bitcoindevkit:bdk-jvm:<version>")
 }
 ```

--- a/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt
+++ b/api-docs/kotlin/src/main/kotlin/org/bitcoindevkit/bdk.kt
@@ -489,9 +489,6 @@ class Wallet(
     */
    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 {}

@@ -785,19 +782,6 @@ class Descriptor(descriptor: String, network: Network) {
     */
    fun newBip84Public(publicKey: DescriptorPublicKey, fingerprint: String, keychain: KeychainKind, network: Network) {}

-    /**
-     * BIP86 template. Expands to wpkh(key/86'/{0,1}'/0'/{0,1}/\*)
-     * Since there are hardened derivation steps, this template requires a private derivable key (generally a xprv/tprv).
-     */
-    fun newBip86(secretKey: DescriptorSecretKey, keychain: KeychainKind, network: Network) {}
-
-    /**
-     * BIP86 public template. Expands to wpkh(key/{0,1}/\*)
-     * This assumes that the key used has already been derived with m/86'/0'/0' for Mainnet or m/86'/1'/0' for Testnet.
-     * This template requires the parent fingerprint to populate correctly the metadata of PSBTs.
-     */
-    fun newBip86Public(publicKey: DescriptorPublicKey, fingerprint: String, keychain: KeychainKind, network: Network) {}
-
    /** Return the public version of the output descriptor. */
    fun asString(): String {}

@@ -842,10 +826,7 @@ data class TxBuilderResult (
 /**
 * A bitcoin script.
 */
-class Script(rawOutputScript: List<UByte>) {
-    /** Return the script as bytes. */
-    fun toBytes(): List<UByte> {}
-}
+class Script(rawOutputScript: List<UByte>)

 /**
 * A bitcoin address.
--- a/bdk-android/README.md
+++ b/bdk-android/README.md
@@ -8,8 +8,8 @@ repositories {
    mavenCentral()
 }

-dependencies { 
-    implementation("org.bitcoindevkit:bdk-android:<version>")
+dependencies {
+  implementation("org.bitcoindevkit:bdk-android:<version>")
 }
 ```

@@ -38,8 +38,8 @@ 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>")
 }
 ```

@@ -54,23 +54,19 @@ _Note that Kotlin version `1.6.10` or later is required to build the library._
 ```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):
-```shell
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-rustup default 1.67.0
-```
+2. Follow the "General" bdk-ffi ["Getting Started (Developer)"] instructions.
+3. If building on macOS install required intel and m1 jvm targets
 4. Install required targets
-```sh
-rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
-```
+ ```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):
-```shell
-export ANDROID_SDK_ROOT=~/Android/Sdk
-export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.4.7075529
-```
+   build tool), for example (NDK major version 21 is required):
+ ```shell
+ export ANDROID_SDK_ROOT=~/Android/Sdk
+ export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/21.<NDK_VERSION>
+ ```
 7. Build kotlin bindings
 ```sh
 # build Android library
--- a/bdk-android/gradle.properties
+++ b/bdk-android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-libraryVersion=0.31.1
+libraryVersion=0.28.0
--- a/bdk-ffi/Cargo.toml
+++ b/bdk-ffi/Cargo.toml
@@ -1,12 +1,14 @@
 [package]
 name = "bdk-ffi"
-version = "0.31.1"
+version = "0.28.0"
 authors = ["Steve Myers <steve@notmandatory.org>", "Sudarsan Balaji <sudarsan.balaji@artfuldev.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
+#crate-type = ["staticlib", "cdylib"]
+#crate-type = ["cdylib"]
 name = "bdkffi"

 [[bin]]
@@ -17,12 +19,12 @@ path = "uniffi-bindgen.rs"
 default = ["uniffi/cli"]

 [dependencies]
-bdk = { version = "0.29.0", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled", "rpc"] }
-uniffi = { version = "=0.23.0" }
+bdk = { version = "0.28", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled", "rpc"] }
+uniffi = { version = "0.23.0" }

 [build-dependencies]
-uniffi = { version = "=0.23.0", features = ["build"] }
+uniffi = { version = "0.23.0", features = ["build"] }

 [dev-dependencies]
-uniffi = { version = "=0.23.0", features = ["bindgen-tests"] }
+uniffi = { version = "0.23.0", features = ["bindgen-tests"] }
 assert_matches = "1.5.0"
--- a/bdk-ffi/src/bdk.udl
+++ b/bdk-ffi/src/bdk.udl
@@ -46,7 +46,6 @@ enum BdkError {
  "Sled",
  "Rusqlite",
  "Rpc",
-  "HardenedIndex"
 };

 dictionary AddressInfo {
@@ -222,31 +221,28 @@ interface Wallet {
  [Throws=BdkError]
  constructor(Descriptor descriptor, Descriptor? change_descriptor, Network network, DatabaseConfig database_config);

-  Network network();
-
  [Throws=BdkError]
  AddressInfo get_address(AddressIndex address_index);

  [Throws=BdkError]
  AddressInfo get_internal_address(AddressIndex address_index);

-  [Throws=BdkError]
-  boolean is_mine(Script script);
-
-  [Throws=BdkError]
-  sequence<LocalUtxo> list_unspent();
-
-  [Throws=BdkError]
-  sequence<TransactionDetails> list_transactions(boolean include_raw);
-
  [Throws=BdkError]
  Balance get_balance();

  [Throws=BdkError]
  boolean sign([ByRef] PartiallySignedTransaction psbt, SignOptions? sign_options);

+  [Throws=BdkError]
+  sequence<TransactionDetails> list_transactions(boolean include_raw);
+
+  Network network();
+
  [Throws=BdkError]
  void sync([ByRef] Blockchain blockchain, Progress? progress);
+
+  [Throws=BdkError]
+  sequence<LocalUtxo> list_unspent();
 };

 interface FeeRate {
@@ -362,7 +358,7 @@ interface TxBuilder {
 interface BumpFeeTxBuilder {
  constructor(string txid, float new_fee_rate);

-  BumpFeeTxBuilder allow_shrinking(Script script_pubkey);
+  BumpFeeTxBuilder allow_shrinking(string address);

  BumpFeeTxBuilder enable_rbf();

@@ -443,12 +439,6 @@ interface Descriptor {
  [Name=new_bip84_public]
  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);

-  [Name=new_bip86]
-  constructor(DescriptorSecretKey secret_key, KeychainKind keychain, Network network);
-
-  [Name=new_bip86_public]
-  constructor(DescriptorPublicKey public_key, string fingerprint, KeychainKind keychain, Network network);
-
  string as_string();

  string as_string_private();
@@ -456,7 +446,7 @@ interface Descriptor {

 interface Address {
  [Throws=BdkError]
-  constructor(string address, Network network);
+  constructor(string address);

  [Name=from_script, Throws=BdkError]
  constructor(Script script, Network network);
@@ -469,16 +459,14 @@ interface Address {

  string to_qr_uri();

-  boolean is_valid_for_network(Network network);
-
  string as_string();
 };

 [Enum]
 interface Payload {
-  PubkeyHash(string pubkey_hash);
+  PubkeyHash(sequence<u8> pubkey_hash);

-  ScriptHash(string script_hash);
+  ScriptHash(sequence<u8> script_hash);

  WitnessProgram(WitnessVersion version, sequence<u8> program);
 };
@@ -505,6 +493,4 @@ enum WitnessVersion {

 interface Script {
  constructor(sequence<u8> raw_output_script);
-
-  sequence<u8> to_bytes();
 };
--- a/bdk-ffi/src/blockchain.rs
+++ b/bdk-ffi/src/blockchain.rs
@@ -1,6 +1,6 @@
 // use crate::BlockchainConfig;
-use crate::Network;
 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;
@@ -17,7 +17,7 @@ use std::path::PathBuf;
 use std::sync::{Arc, Mutex, MutexGuard};

 pub(crate) struct Blockchain {
-    inner_mutex: Mutex<AnyBlockchain>,
+    blockchain_mutex: Mutex<AnyBlockchain>,
 }

 impl Blockchain {
@@ -45,23 +45,23 @@ impl Blockchain {
            BlockchainConfig::Rpc { config } => AnyBlockchainConfig::Rpc(BdkRpcConfig {
                url: config.url,
                auth: config.auth.into(),
-                network: config.network.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 {
-            inner_mutex: Mutex::new(blockchain),
+            blockchain_mutex: Mutex::new(blockchain),
        })
    }

    pub(crate) fn get_blockchain(&self) -> MutexGuard<AnyBlockchain> {
-        self.inner_mutex.lock().expect("blockchain")
+        self.blockchain_mutex.lock().expect("blockchain")
    }

    pub(crate) fn broadcast(&self, transaction: &Transaction) -> Result<(), BdkError> {
-        let tx = &transaction.inner;
+        let tx = &transaction.internal;
        self.get_blockchain().broadcast(tx)
    }

--- a/bdk-ffi/src/descriptor.rs
+++ b/bdk-ffi/src/descriptor.rs
@@ -1,17 +1,16 @@
-use crate::Network;
 use crate::{BdkError, DescriptorPublicKey, DescriptorSecretKey};
-use bdk::bitcoin::bip32::Fingerprint;
 use bdk::bitcoin::secp256k1::Secp256k1;
-use bdk::descriptor::{ExtendedDescriptor, IntoWalletDescriptor};
+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,
-    KeyMap,
 };
 use bdk::template::{
-    Bip44, Bip44Public, Bip49, Bip49Public, Bip84, Bip84Public, Bip86, Bip86Public,
-    DescriptorTemplate,
+    Bip44, Bip44Public, Bip49, Bip49Public, Bip84, Bip84Public, DescriptorTemplate,
 };
 use bdk::KeychainKind;
+use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::Arc;

@@ -24,8 +23,7 @@ pub(crate) struct Descriptor {
 impl Descriptor {
    pub(crate) fn new(descriptor: String, network: Network) -> Result<Self, BdkError> {
        let secp = Secp256k1::new();
-        let (extended_descriptor, key_map) =
-            descriptor.into_wallet_descriptor(&secp, network.into())?;
+        let (extended_descriptor, key_map) = descriptor.into_wallet_descriptor(&secp, network)?;
        Ok(Self {
            extended_descriptor,
            key_map,
@@ -37,14 +35,13 @@ impl Descriptor {
        keychain_kind: KeychainKind,
        network: Network,
    ) -> Self {
-        let derivable_key = &secret_key.inner;
+        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
-                let (extended_descriptor, key_map, _) = Bip44(derivable_key, keychain_kind)
-                    .build(network.into())
-                    .unwrap();
+                let (extended_descriptor, key_map, _) =
+                    Bip44(derivable_key, keychain_kind).build(network).unwrap();
                Self {
                    extended_descriptor,
                    key_map,
@@ -53,9 +50,6 @@ impl Descriptor {
            BdkDescriptorSecretKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorSecretKey::MultiXPrv(_) => {
-                unreachable!()
-            }
        }
    }

@@ -66,14 +60,14 @@ impl Descriptor {
        network: Network,
    ) -> Self {
        let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = &public_key.inner;
+        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
                let (extended_descriptor, key_map, _) =
                    Bip44Public(derivable_key, fingerprint, keychain_kind)
-                        .build(network.into())
+                        .build(network)
                        .unwrap();

                Self {
@@ -84,9 +78,6 @@ impl Descriptor {
            BdkDescriptorPublicKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorPublicKey::MultiXPub(_) => {
-                unreachable!()
-            }
        }
    }

@@ -95,14 +86,13 @@ impl Descriptor {
        keychain_kind: KeychainKind,
        network: Network,
    ) -> Self {
-        let derivable_key = &secret_key.inner;
+        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
-                let (extended_descriptor, key_map, _) = Bip49(derivable_key, keychain_kind)
-                    .build(network.into())
-                    .unwrap();
+                let (extended_descriptor, key_map, _) =
+                    Bip49(derivable_key, keychain_kind).build(network).unwrap();
                Self {
                    extended_descriptor,
                    key_map,
@@ -111,9 +101,6 @@ impl Descriptor {
            BdkDescriptorSecretKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorSecretKey::MultiXPrv(_) => {
-                unreachable!()
-            }
        }
    }

@@ -124,14 +111,14 @@ impl Descriptor {
        network: Network,
    ) -> Self {
        let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = &public_key.inner;
+        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
                let (extended_descriptor, key_map, _) =
                    Bip49Public(derivable_key, fingerprint, keychain_kind)
-                        .build(network.into())
+                        .build(network)
                        .unwrap();

                Self {
@@ -142,9 +129,6 @@ impl Descriptor {
            BdkDescriptorPublicKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorPublicKey::MultiXPub(_) => {
-                unreachable!()
-            }
        }
    }

@@ -153,14 +137,13 @@ impl Descriptor {
        keychain_kind: KeychainKind,
        network: Network,
    ) -> Self {
-        let derivable_key = &secret_key.inner;
+        let derivable_key = secret_key.descriptor_secret_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
-                let (extended_descriptor, key_map, _) = Bip84(derivable_key, keychain_kind)
-                    .build(network.into())
-                    .unwrap();
+                let (extended_descriptor, key_map, _) =
+                    Bip84(derivable_key, keychain_kind).build(network).unwrap();
                Self {
                    extended_descriptor,
                    key_map,
@@ -169,9 +152,6 @@ impl Descriptor {
            BdkDescriptorSecretKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorSecretKey::MultiXPrv(_) => {
-                unreachable!()
-            }
        }
    }

@@ -182,14 +162,14 @@ impl Descriptor {
        network: Network,
    ) -> Self {
        let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = &public_key.inner;
+        let derivable_key = public_key.descriptor_public_key_mutex.lock().unwrap();

-        match derivable_key {
+        match derivable_key.deref() {
            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                let derivable_key = descriptor_x_key.xkey;
                let (extended_descriptor, key_map, _) =
                    Bip84Public(derivable_key, fingerprint, keychain_kind)
-                        .build(network.into())
+                        .build(network)
                        .unwrap();

                Self {
@@ -200,67 +180,6 @@ impl Descriptor {
            BdkDescriptorPublicKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorPublicKey::MultiXPub(_) => {
-                unreachable!()
-            }
-        }
-    }
-
-    pub(crate) fn new_bip86(
-        secret_key: Arc<DescriptorSecretKey>,
-        keychain_kind: KeychainKind,
-        network: Network,
-    ) -> Self {
-        let derivable_key = &secret_key.inner;
-
-        match derivable_key {
-            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
-                let derivable_key = descriptor_x_key.xkey;
-                let (extended_descriptor, key_map, _) = Bip86(derivable_key, keychain_kind)
-                    .build(network.into())
-                    .unwrap();
-                Self {
-                    extended_descriptor,
-                    key_map,
-                }
-            }
-            BdkDescriptorSecretKey::Single(_) => {
-                unreachable!()
-            }
-            BdkDescriptorSecretKey::MultiXPrv(_) => {
-                unreachable!()
-            }
-        }
-    }
-
-    pub(crate) fn new_bip86_public(
-        public_key: Arc<DescriptorPublicKey>,
-        fingerprint: String,
-        keychain_kind: KeychainKind,
-        network: Network,
-    ) -> Self {
-        let fingerprint = Fingerprint::from_str(fingerprint.as_str()).unwrap();
-        let derivable_key = &public_key.inner;
-
-        match derivable_key {
-            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.into())
-                        .unwrap();
-
-                Self {
-                    extended_descriptor,
-                    key_map,
-                }
-            }
-            BdkDescriptorPublicKey::Single(_) => {
-                unreachable!()
-            }
-            BdkDescriptorPublicKey::MultiXPub(_) => {
-                unreachable!()
-            }
        }
    }

@@ -320,27 +239,17 @@ mod test {
            .as_public();
        println!("Public 84: {}", handmade_public_84.as_string());
        // Public 84: [d1d04177/84'/1'/0']tpubDDNxbq17egjFk2edjv8oLnzxk52zny9aAYNv9CMqTzA4mQDiQq818sEkNe9Gzmd4QU8558zftqbfoVBDQorG3E4Wq26tB2JeE4KUoahLkx6/*
-        let handmade_public_86 = master
-            .derive(Arc::new(
-                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);
        let template_private_49 =
            Descriptor::new_bip49(master.clone(), KeychainKind::External, Network::Testnet);
        let template_private_84 =
-            Descriptor::new_bip84(master.clone(), KeychainKind::External, Network::Testnet);
-        let template_private_86 =
-            Descriptor::new_bip86(master, KeychainKind::External, Network::Testnet);
+            Descriptor::new_bip84(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());
-        println!("Template 86: {}", template_private_86.as_string());
+        // for the public versions of the templates these are incorrect, bug report and fix in bitcoindevkit/bdk#817 and bitcoindevkit/bdk#818
        let template_public_44 = Descriptor::new_bip44_public(
            handmade_public_44,
            "d1d04177".to_string(),
@@ -359,16 +268,9 @@ mod test {
            KeychainKind::External,
            Network::Testnet,
        );
-        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.as_string());
        println!("Template public 44: {}", template_public_44.as_string());
        println!("Template public 84: {}", template_public_84.as_string());
-        println!("Template public 86: {}", template_public_86.as_string());
        // when using a public key, both as_string and as_string_private return the same string
        assert_eq!(
            template_public_44.as_string_private(),
@@ -382,10 +284,6 @@ mod test {
            template_public_84.as_string_private(),
            template_public_84.as_string()
        );
-        assert_eq!(
-            template_public_86.as_string_private(),
-            template_public_86.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(),
@@ -399,10 +297,6 @@ mod test {
            template_private_84.as_string(),
            template_public_84.as_string()
        );
-        assert_eq!(
-            template_private_86.as_string(),
-            template_public_86.as_string()
-        );
    }
    #[test]
    fn test_descriptor_from_string() {
--- a/bdk-ffi/src/keys.rs
+++ b/bdk-ffi/src/keys.rs
@@ -1,14 +1,14 @@
 use crate::BdkError;

-use crate::Network;
-use bdk::bitcoin::bip32::DerivationPath as BdkDerivationPath;
 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::{
    DerivableKey, DescriptorPublicKey as BdkDescriptorPublicKey,
    DescriptorSecretKey as BdkDescriptorSecretKey, ExtendedKey, GeneratableKey, GeneratedKey,
 };
-use bdk::miniscript::descriptor::{DescriptorXKey, Wildcard};
 use bdk::miniscript::BareCtx;
 use std::ops::Deref;
 use std::str::FromStr;
@@ -17,7 +17,7 @@ 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 {
-    inner: BdkMnemonic,
+    internal: BdkMnemonic,
 }

 impl Mnemonic {
@@ -26,13 +26,13 @@ impl Mnemonic {
        let generated_key: GeneratedKey<_, BareCtx> =
            BdkMnemonic::generate((word_count, Language::English)).unwrap();
        let mnemonic = BdkMnemonic::parse_in(Language::English, generated_key.to_string()).unwrap();
-        Mnemonic { inner: mnemonic }
+        Mnemonic { internal: mnemonic }
    }

    /// Parse a Mnemonic with given string
    pub(crate) fn from_string(mnemonic: String) -> Result<Self, BdkError> {
        BdkMnemonic::from_str(&mnemonic)
-            .map(|m| Mnemonic { inner: m })
+            .map(|m| Mnemonic { internal: m })
            .map_err(|e| BdkError::Generic(e.to_string()))
    }

@@ -40,25 +40,25 @@ impl Mnemonic {
    /// 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> {
        BdkMnemonic::from_entropy(entropy.as_slice())
-            .map(|m| Mnemonic { inner: m })
+            .map(|m| Mnemonic { internal: m })
            .map_err(|e| BdkError::Generic(e.to_string()))
    }

    /// Returns Mnemonic as string
    pub(crate) fn as_string(&self) -> String {
-        self.inner.to_string()
+        self.internal.to_string()
    }
 }

 pub(crate) struct DerivationPath {
-    inner_mutex: Mutex<BdkDerivationPath>,
+    derivation_path_mutex: Mutex<BdkDerivationPath>,
 }

 impl DerivationPath {
    pub(crate) fn new(path: String) -> Result<Self, BdkError> {
        BdkDerivationPath::from_str(&path)
            .map(|x| DerivationPath {
-                inner_mutex: Mutex::new(x),
+                derivation_path_mutex: Mutex::new(x),
            })
            .map_err(|e| BdkError::Generic(e.to_string()))
    }
@@ -66,21 +66,21 @@ impl DerivationPath {

 #[derive(Debug)]
 pub(crate) struct DescriptorSecretKey {
-    pub(crate) inner: BdkDescriptorSecretKey,
+    pub(crate) descriptor_secret_key_mutex: Mutex<BdkDescriptorSecretKey>,
 }

 impl DescriptorSecretKey {
    pub(crate) fn new(network: Network, mnemonic: Arc<Mnemonic>, password: Option<String>) -> Self {
-        let mnemonic = mnemonic.inner.clone();
+        let mnemonic = mnemonic.internal.clone();
        let xkey: ExtendedKey = (mnemonic, password).into_extended_key().unwrap();
        let descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
            origin: None,
-            xkey: xkey.into_xprv(network.into()).unwrap(),
+            xkey: xkey.into_xprv(network).unwrap(),
            derivation_path: BdkDerivationPath::master(),
-            wildcard: Wildcard::Unhardened,
+            wildcard: bdk::descriptor::Wildcard::Unhardened,
        });
        Self {
-            inner: descriptor_secret_key,
+            descriptor_secret_key_mutex: Mutex::new(descriptor_secret_key),
        }
    }

@@ -88,15 +88,15 @@ impl DescriptorSecretKey {
        let descriptor_secret_key = BdkDescriptorSecretKey::from_str(private_key.as_str())
            .map_err(|e| BdkError::Generic(e.to_string()))?;
        Ok(Self {
-            inner: descriptor_secret_key,
+            descriptor_secret_key_mutex: Mutex::new(descriptor_secret_key),
        })
    }

    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
        let secp = Secp256k1::new();
-        let descriptor_secret_key = &self.inner;
-        let path = path.inner_mutex.lock().unwrap().deref().clone();
-        match descriptor_secret_key {
+        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() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                let derived_xprv = descriptor_x_key.xkey.derive_priv(&secp, &path)?;
                let key_source = match descriptor_x_key.origin.clone() {
@@ -110,22 +110,19 @@ impl DescriptorSecretKey {
                    wildcard: descriptor_x_key.wildcard,
                });
                Ok(Arc::new(Self {
-                    inner: derived_descriptor_secret_key,
+                    descriptor_secret_key_mutex: Mutex::new(derived_descriptor_secret_key),
                }))
            }
            BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
                "Cannot derive from a single key".to_string(),
            )),
-            BdkDescriptorSecretKey::MultiXPrv(_) => Err(BdkError::Generic(
-                "Cannot derive from a multi key".to_string(),
-            )),
        }
    }

    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
-        let descriptor_secret_key = &self.inner;
-        let path = path.inner_mutex.lock().unwrap().deref().clone();
-        match descriptor_secret_key {
+        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() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                let extended_path = descriptor_x_key.derivation_path.extend(path);
                let extended_descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
@@ -135,52 +132,51 @@ impl DescriptorSecretKey {
                    wildcard: descriptor_x_key.wildcard,
                });
                Ok(Arc::new(Self {
-                    inner: extended_descriptor_secret_key,
+                    descriptor_secret_key_mutex: Mutex::new(extended_descriptor_secret_key),
                }))
            }
            BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
                "Cannot extend from a single key".to_string(),
            )),
-            BdkDescriptorSecretKey::MultiXPrv(_) => Err(BdkError::Generic(
-                "Cannot extend from a multi key".to_string(),
-            )),
        }
    }

    pub(crate) fn as_public(&self) -> Arc<DescriptorPublicKey> {
        let secp = Secp256k1::new();
-        let descriptor_public_key = self.inner.to_public(&secp).unwrap();
+        let descriptor_public_key = self
+            .descriptor_secret_key_mutex
+            .lock()
+            .unwrap()
+            .to_public(&secp)
+            .unwrap();
        Arc::new(DescriptorPublicKey {
-            inner: descriptor_public_key,
+            descriptor_public_key_mutex: Mutex::new(descriptor_public_key),
        })
    }

    /// Get the private key as bytes.
    pub(crate) fn secret_bytes(&self) -> Vec<u8> {
-        let inner = &self.inner;
-        let secret_bytes: Vec<u8> = match inner {
+        let descriptor_secret_key = self.descriptor_secret_key_mutex.lock().unwrap();
+        let secret_bytes: Vec<u8> = match descriptor_secret_key.deref() {
            BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
                descriptor_x_key.xkey.private_key.secret_bytes().to_vec()
            }
            BdkDescriptorSecretKey::Single(_) => {
                unreachable!()
            }
-            BdkDescriptorSecretKey::MultiXPrv(_) => {
-                unreachable!()
-            }
        };

        secret_bytes
    }

    pub(crate) fn as_string(&self) -> String {
-        self.inner.to_string()
+        self.descriptor_secret_key_mutex.lock().unwrap().to_string()
    }
 }

 #[derive(Debug)]
 pub(crate) struct DescriptorPublicKey {
-    pub(crate) inner: BdkDescriptorPublicKey,
+    pub(crate) descriptor_public_key_mutex: Mutex<BdkDescriptorPublicKey>,
 }

 impl DescriptorPublicKey {
@@ -188,16 +184,16 @@ impl DescriptorPublicKey {
        let descriptor_public_key = BdkDescriptorPublicKey::from_str(public_key.as_str())
            .map_err(|e| BdkError::Generic(e.to_string()))?;
        Ok(Self {
-            inner: descriptor_public_key,
+            descriptor_public_key_mutex: Mutex::new(descriptor_public_key),
        })
    }

    pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
        let secp = Secp256k1::new();
-        let descriptor_public_key = &self.inner;
-        let path = path.inner_mutex.lock().unwrap().deref().clone();
+        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 {
+        match descriptor_public_key.deref() {
            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                let derived_xpub = descriptor_x_key.xkey.derive_pub(&secp, &path)?;
                let key_source = match descriptor_x_key.origin.clone() {
@@ -211,22 +207,19 @@ impl DescriptorPublicKey {
                    wildcard: descriptor_x_key.wildcard,
                });
                Ok(Arc::new(Self {
-                    inner: derived_descriptor_public_key,
+                    descriptor_public_key_mutex: Mutex::new(derived_descriptor_public_key),
                }))
            }
            BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
                "Cannot derive from a single key".to_string(),
            )),
-            BdkDescriptorPublicKey::MultiXPub(_) => Err(BdkError::Generic(
-                "Cannot derive from a multi key".to_string(),
-            )),
        }
    }

    pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
-        let descriptor_public_key = &self.inner;
-        let path = path.inner_mutex.lock().unwrap().deref().clone();
-        match descriptor_public_key {
+        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() {
            BdkDescriptorPublicKey::XPub(descriptor_x_key) => {
                let extended_path = descriptor_x_key.derivation_path.extend(path);
                let extended_descriptor_public_key = BdkDescriptorPublicKey::XPub(DescriptorXKey {
@@ -236,20 +229,17 @@ impl DescriptorPublicKey {
                    wildcard: descriptor_x_key.wildcard,
                });
                Ok(Arc::new(Self {
-                    inner: extended_descriptor_public_key,
+                    descriptor_public_key_mutex: Mutex::new(extended_descriptor_public_key),
                }))
            }
            BdkDescriptorPublicKey::Single(_) => Err(BdkError::Generic(
                "Cannot extend from a single key".to_string(),
            )),
-            BdkDescriptorPublicKey::MultiXPub(_) => Err(BdkError::Generic(
-                "Cannot extend from a multi key".to_string(),
-            )),
        }
    }

    pub(crate) fn as_string(&self) -> String {
-        self.inner.to_string()
+        self.descriptor_public_key_mutex.lock().unwrap().to_string()
    }
 }

@@ -260,10 +250,11 @@ impl DescriptorPublicKey {
 mod test {
    use crate::keys::{DerivationPath, DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
    use crate::BdkError;
-    use crate::Network;
+    use bdk::bitcoin::hashes::hex::ToHex;
+    use bdk::bitcoin::Network;
    use std::sync::Arc;

-    fn get_inner() -> DescriptorSecretKey {
+    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)
    }
@@ -302,14 +293,14 @@ mod test {

    #[test]
    fn test_generate_descriptor_secret_key() {
-        let master_dsk = get_inner();
+        let master_dsk = get_descriptor_secret_key();
        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_inner();
+        let master_dsk = get_descriptor_secret_key();
        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();
@@ -319,7 +310,7 @@ mod test {

    #[test]
    fn test_derive_descriptors_keys() {
-        let master_dsk = get_inner();
+        let master_dsk = get_descriptor_secret_key();
        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();
@@ -329,7 +320,7 @@ mod test {

    #[test]
    fn test_extend_descriptor_keys() {
-        let master_dsk = get_inner();
+        let master_dsk = get_descriptor_secret_key();
        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();
@@ -343,7 +334,7 @@ mod test {
    }

    #[test]
-    fn test_from_str_inner() {
+    fn test_from_str_descriptor_secret_key() {
        let key1 = "L2wTu6hQrnDMiFNWA5na6jB12ErGQqtXwqpSL7aWquJaZG8Ai3ch";
        let key2 = "tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/1/1/1/*";
        let private_descriptor_key1 = DescriptorSecretKey::from_string(key1.to_string()).unwrap();
@@ -356,8 +347,8 @@ mod test {
    }

    #[test]
-    fn test_derive_and_extend_inner() {
-        let master_dsk = get_inner();
+    fn test_derive_and_extend_descriptor_secret_key() {
+        let master_dsk = get_descriptor_secret_key();
        // 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/*");
@@ -368,8 +359,18 @@ mod test {

    #[test]
    fn test_derive_hardened_path_using_public() {
-        let master_dpk = get_inner().as_public();
+        let master_dpk = get_descriptor_secret_key().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"
+        )
+    }
 }
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -15,19 +15,17 @@ use crate::keys::{DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
 use crate::psbt::PartiallySignedTransaction;
 use crate::wallet::SignOptions;
 use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet};
-use bdk::bitcoin::address::{NetworkUnchecked, Payload as BdkPayload, WitnessVersion};
-use bdk::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf;
+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::encode::serialize;
 use bdk::bitcoin::consensus::Decodable;
-use bdk::bitcoin::network::constants::Network as BdkNetwork;
+use bdk::bitcoin::psbt::serialize::Serialize;
+use bdk::bitcoin::util::address::{Payload as BdkPayload, WitnessVersion};
 use bdk::bitcoin::{
-    Address as BdkAddress, OutPoint as BdkOutPoint, Transaction as BdkTransaction, Txid,
+    Address as BdkAddress, Network, OutPoint as BdkOutPoint, Transaction as BdkTransaction, Txid,
 };
 use bdk::blockchain::Progress as BdkProgress;
-use bdk::database::any::SledDbConfiguration;
-use bdk::database::any::SqliteDbConfiguration;
+use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration};
 use bdk::keys::bip39::WordCount;
 use bdk::wallet::AddressIndex as BdkAddressIndex;
 use bdk::wallet::AddressInfo as BdkAddressInfo;
@@ -43,26 +41,6 @@ use std::sync::Arc;

 uniffi::include_scaffolding!("bdk");

-#[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)
-    }
-}
-
 /// A output script and an amount of satoshis.
 pub struct ScriptAmount {
    pub script: Arc<Script>,
@@ -224,7 +202,9 @@ impl From<&BdkTxOut> for TxOut {
    fn from(tx_out: &BdkTxOut) -> Self {
        TxOut {
            value: tx_out.value,
-            script_pubkey: Arc::new(Script(tx_out.script_pubkey.clone())),
+            script_pubkey: Arc::new(Script {
+                script: tx_out.script_pubkey.clone(),
+            }),
        }
    }
 }
@@ -245,7 +225,9 @@ impl From<BdkLocalUtxo> for LocalUtxo {
            },
            txout: TxOut {
                value: local_utxo.txout.value,
-                script_pubkey: Arc::new(Script(local_utxo.txout.script_pubkey)),
+                script_pubkey: Arc::new(Script {
+                    script: local_utxo.txout.script_pubkey,
+                }),
            },
            keychain: local_utxo.keychain,
            is_spent: local_utxo.is_spent,
@@ -292,7 +274,9 @@ impl From<&BdkTxIn> for TxIn {
                txid: tx_in.previous_output.txid.to_string(),
                vout: tx_in.previous_output.vout,
            },
-            script_sig: Arc::new(Script(tx_in.script_sig.clone())),
+            script_sig: Arc::new(Script {
+                script: tx_in.script_sig.clone(),
+            }),
            sequence: tx_in.sequence.0,
            witness: tx_in.witness.to_vec(),
        }
@@ -302,144 +286,128 @@ impl From<&BdkTxIn> for TxIn {
 /// A Bitcoin transaction.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Transaction {
-    inner: BdkTransaction,
+    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 { inner: tx })
+        Ok(Transaction { internal: tx })
    }

    fn txid(&self) -> String {
-        self.inner.txid().to_string()
+        self.internal.txid().to_string()
    }

    fn weight(&self) -> u64 {
-        self.inner.weight().to_wu()
+        self.internal.weight() as u64
    }

    fn size(&self) -> u64 {
-        self.inner.size() as u64
+        self.internal.size() as u64
    }

    fn vsize(&self) -> u64 {
-        self.inner.vsize() as u64
+        self.internal.vsize() as u64
    }

    fn serialize(&self) -> Vec<u8> {
-        serialize(&self.inner)
+        self.internal.serialize()
    }

    fn is_coin_base(&self) -> bool {
-        self.inner.is_coin_base()
+        self.internal.is_coin_base()
    }

    fn is_explicitly_rbf(&self) -> bool {
-        self.inner.is_explicitly_rbf()
+        self.internal.is_explicitly_rbf()
    }

    fn is_lock_time_enabled(&self) -> bool {
-        self.inner.is_lock_time_enabled()
+        self.internal.is_lock_time_enabled()
    }

    fn version(&self) -> i32 {
-        self.inner.version
+        self.internal.version
    }

    fn lock_time(&self) -> u32 {
-        self.inner.lock_time.to_consensus_u32()
+        self.internal.lock_time.0
    }

    fn input(&self) -> Vec<TxIn> {
-        self.inner.input.iter().map(|x| x.into()).collect()
+        self.internal.input.iter().map(|x| x.into()).collect()
    }

    fn output(&self) -> Vec<TxOut> {
-        self.inner.output.iter().map(|x| x.into()).collect()
+        self.internal.output.iter().map(|x| x.into()).collect()
    }
 }

 impl From<BdkTransaction> for Transaction {
    fn from(tx: BdkTransaction) -> Self {
-        Transaction { inner: tx }
+        Transaction { internal: tx }
    }
 }

 /// A Bitcoin address.
 #[derive(Debug, PartialEq, Eq)]
 pub struct Address {
-    inner: BdkAddress,
+    address: BdkAddress,
 }

 impl Address {
-    pub fn new(address: String, network: Network) -> Result<Self, BdkError> {
-        let parsed_address = address
-            .parse::<bdk::bitcoin::Address<NetworkUnchecked>>()
-            .map_err(|e| BdkError::Generic(e.to_string()))?;
-
-        let network_checked_address = parsed_address
-            .require_network(network.into())
-            .map_err(|e| BdkError::Generic(e.to_string()))?;
-
-        Ok(Address {
-            inner: network_checked_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.0, network.into())
-            .map(|a| Address { inner: a })
+        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.inner.payload.clone() {
+        match &self.address.payload.clone() {
            BdkPayload::PubkeyHash(pubkey_hash) => Payload::PubkeyHash {
-                pubkey_hash: pubkey_hash.to_string(),
+                pubkey_hash: pubkey_hash.to_vec(),
            },
            BdkPayload::ScriptHash(script_hash) => Payload::ScriptHash {
-                script_hash: script_hash.to_string(),
+                script_hash: script_hash.to_vec(),
            },
-            BdkPayload::WitnessProgram(witness_program) => Payload::WitnessProgram {
-                version: witness_program.version(),
-                program: Vec::from(witness_program.program().as_bytes()),
+            BdkPayload::WitnessProgram { version, program } => Payload::WitnessProgram {
+                version: *version,
+                program: program.clone(),
            },
-            _ => panic!("Unsupported address payload type"),
        }
    }

    fn network(&self) -> Network {
-        self.inner.network.into()
+        self.address.network
    }

    fn script_pubkey(&self) -> Arc<Script> {
-        Arc::new(Script(self.inner.script_pubkey()))
+        Arc::new(Script {
+            script: self.address.script_pubkey(),
+        })
    }

    fn to_qr_uri(&self) -> String {
-        self.inner.to_qr_uri()
-    }
-
-    pub fn is_valid_for_network(&self, network: Network) -> bool {
-        let address_str = self.inner.to_string();
-        if let Ok(unchecked_address) = address_str.parse::<BdkAddress<NetworkUnchecked>>() {
-            unchecked_address.is_valid_for_network(network.into())
-        } else {
-            false
-        }
+        self.address.to_qr_uri()
    }

    fn as_string(&self) -> String {
-        self.inner.to_string()
+        self.address.to_string()
    }
 }

 impl From<BdkAddress> for Address {
    fn from(address: BdkAddress) -> Self {
-        Address { inner: address }
+        Address { address }
    }
 }

@@ -447,9 +415,9 @@ impl From<BdkAddress> for Address {
 #[derive(Debug)]
 pub enum Payload {
    /// P2PKH address.
-    PubkeyHash { pubkey_hash: String },
+    PubkeyHash { pubkey_hash: Vec<u8> },
    /// P2SH address.
-    ScriptHash { script_hash: String },
+    ScriptHash { script_hash: Vec<u8> },
    /// Segwit address.
    WitnessProgram {
        /// The witness program version.
@@ -459,6 +427,25 @@ pub enum Payload {
    },
 }

+/// 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 }
+    }
+}
+
+impl From<BdkScript> for Script {
+    fn from(bdk_script: BdkScript) -> Self {
+        Script { script: bdk_script }
+    }
+}
+
 #[derive(Clone, Debug)]
 enum RbfValue {
    Default,
@@ -472,37 +459,6 @@ pub struct TxBuilderResult {
    pub transaction_details: TransactionDetails,
 }

-#[derive(PartialEq, Debug)]
-pub enum Network {
-    Bitcoin,
-    Testnet,
-    Signet,
-    Regtest,
-}
-
-impl From<Network> for BdkNetwork {
-    fn from(network: Network) -> Self {
-        match network {
-            Network::Bitcoin => BdkNetwork::Bitcoin,
-            Network::Testnet => BdkNetwork::Testnet,
-            Network::Signet => BdkNetwork::Signet,
-            Network::Regtest => BdkNetwork::Regtest,
-        }
-    }
-}
-
-impl From<BdkNetwork> for Network {
-    fn from(network: BdkNetwork) -> Self {
-        match network {
-            BdkNetwork::Bitcoin => Network::Bitcoin,
-            BdkNetwork::Testnet => Network::Testnet,
-            BdkNetwork::Signet => Network::Signet,
-            BdkNetwork::Regtest => Network::Regtest,
-            _ => panic!("Network {} not supported", network),
-        }
-    }
-}
-
 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.
@@ -510,33 +466,30 @@ uniffi::deps::static_assertions::assert_impl_all!(Wallet: Sync, Send);
 // crate.
 #[cfg(test)]
 mod test {
+    use super::Transaction;
    use crate::Network::Regtest;
    use crate::{Address, Payload};
    use assert_matches::assert_matches;
-    use bdk::bitcoin::address::WitnessVersion;
    use bdk::bitcoin::hashes::hex::FromHex;
-    use bdk::bitcoin::Network;
+    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);
-    // }
+    #[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(),
-            Network::Regtest.into(),
-        )
-        .unwrap();
+        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!(version,WitnessVersion::V0);
            assert_eq!(program, Vec::from_hex("04a6545885dd87b8e147cd327f2e9db362b72346").unwrap());
        });
        assert_eq!(address.network(), Regtest);
--- a/bdk-ffi/src/psbt.rs
+++ b/bdk-ffi/src/psbt.rs
@@ -1,4 +1,5 @@
-use bdk::bitcoin::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction;
+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;
@@ -9,7 +10,7 @@ use crate::{BdkError, FeeRate, Transaction};

 #[derive(Debug)]
 pub(crate) struct PartiallySignedTransaction {
-    pub(crate) inner: Mutex<BdkPartiallySignedTransaction>,
+    pub(crate) internal: Mutex<BdkPartiallySignedTransaction>,
 }

 impl PartiallySignedTransaction {
@@ -17,24 +18,24 @@ impl PartiallySignedTransaction {
        let psbt: BdkPartiallySignedTransaction =
            BdkPartiallySignedTransaction::from_str(&psbt_base64)?;
        Ok(PartiallySignedTransaction {
-            inner: Mutex::new(psbt),
+            internal: Mutex::new(psbt),
        })
    }

    pub(crate) fn serialize(&self) -> String {
-        let psbt = self.inner.lock().unwrap().clone();
+        let psbt = self.internal.lock().unwrap().clone();
        psbt.to_string()
    }

    pub(crate) fn txid(&self) -> String {
-        let tx = self.inner.lock().unwrap().clone().extract_tx();
+        let tx = self.internal.lock().unwrap().clone().extract_tx();
        let txid = tx.txid();
-        txid.to_string()
+        txid.to_hex()
    }

    /// Return the transaction.
    pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
-        let tx = self.inner.lock().unwrap().clone().extract_tx();
+        let tx = self.internal.lock().unwrap().clone().extract_tx();
        Arc::new(tx.into())
    }

@@ -45,19 +46,19 @@ impl PartiallySignedTransaction {
        &self,
        other: Arc<PartiallySignedTransaction>,
    ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
-        let other_psbt = other.inner.lock().unwrap().clone();
-        let mut original_psbt = self.inner.lock().unwrap().clone();
+        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 {
-            inner: Mutex::new(original_psbt),
+            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.inner.lock().unwrap().fee_amount()
+        self.internal.lock().unwrap().fee_amount()
    }

    /// The transaction's fee rate. This value will only be accurate if calculated AFTER the
@@ -65,12 +66,12 @@ impl PartiallySignedTransaction {
    /// transaction.
    /// If the PSBT is missing a TxOut for an input returns None.
    pub(crate) fn fee_rate(&self) -> Option<Arc<FeeRate>> {
-        self.inner.lock().unwrap().fee_rate().map(Arc::new)
+        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.inner.lock().unwrap();
+        let psbt = self.internal.lock().unwrap();
        serde_json::to_string(psbt.deref()).unwrap()
    }
 }
@@ -81,7 +82,6 @@ impl PartiallySignedTransaction {
 #[cfg(test)]
 mod test {
    use crate::wallet::{TxBuilder, Wallet};
-    use crate::Network;
    use bdk::wallet::get_funded_wallet;
    use std::sync::Mutex;

@@ -90,10 +90,10 @@ mod test {
        let test_wpkh = "wpkh(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
        let (funded_wallet, _, _) = get_funded_wallet(test_wpkh);
        let test_wallet = Wallet {
-            inner_mutex: Mutex::new(funded_wallet),
+            wallet_mutex: Mutex::new(funded_wallet),
        };
        let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
-        let drain_to_script = crate::Address::new(drain_to_address, Network::Testnet)
+        let drain_to_script = crate::Address::new(drain_to_address)
            .unwrap()
            .script_pubkey();

@@ -103,7 +103,7 @@ mod test {
            .drain_to(drain_to_script.clone());
        //dbg!(&tx_builder);
        assert!(tx_builder.drain_wallet);
-        assert_eq!(tx_builder.drain_to, Some(drain_to_script.0.clone()));
+        assert_eq!(tx_builder.drain_to, Some(drain_to_script.script.clone()));

        let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();

--- a/bdk-ffi/src/wallet.rs
+++ b/bdk-ffi/src/wallet.rs
@@ -1,6 +1,5 @@
-use bdk::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf;
-use bdk::bitcoin::script::PushBytesBuf;
-use bdk::bitcoin::{OutPoint as BdkOutPoint, Sequence, Txid};
+use bdk::bitcoin::blockdata::script::Script as BdkScript;
+use bdk::bitcoin::{Address as BdkAddress, Network, OutPoint as BdkOutPoint, Sequence, Txid};
 use bdk::database::any::AnyDatabase;
 use bdk::database::{AnyDatabaseConfig, ConfigurableDatabase};
 use bdk::wallet::tx_builder::ChangeSpendPolicy;
@@ -9,7 +8,6 @@ use bdk::{
    SyncOptions as BdkSyncOptions, Wallet as BdkWallet,
 };
 use std::collections::HashSet;
-use std::convert::TryFrom;
 use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, MutexGuard};
@@ -18,7 +16,6 @@ use crate::blockchain::Blockchain;
 use crate::database::DatabaseConfig;
 use crate::descriptor::Descriptor;
 use crate::psbt::PartiallySignedTransaction;
-use crate::Network;
 use crate::{
    AddressIndex, AddressInfo, Balance, BdkError, LocalUtxo, OutPoint, Progress, ProgressHolder,
    RbfValue, Script, ScriptAmount, TransactionDetails, TxBuilderResult,
@@ -26,7 +23,7 @@ use crate::{

 #[derive(Debug)]
 pub(crate) struct Wallet {
-    pub(crate) inner_mutex: Mutex<BdkWallet<AnyDatabase>>,
+    pub(crate) wallet_mutex: Mutex<BdkWallet<AnyDatabase>>,
 }

 /// A Bitcoin wallet.
@@ -53,26 +50,19 @@ impl Wallet {
        let wallet_mutex = Mutex::new(BdkWallet::new(
            &descriptor,
            change_descriptor.as_ref(),
-            network.into(),
+            network,
            database,
        )?);
-        Ok(Wallet {
-            inner_mutex: wallet_mutex,
-        })
+        Ok(Wallet { wallet_mutex })
    }

    pub(crate) fn get_wallet(&self) -> MutexGuard<BdkWallet<AnyDatabase>> {
-        self.inner_mutex.lock().expect("wallet")
+        self.wallet_mutex.lock().expect("wallet")
    }

    /// Get the Bitcoin network the wallet is using.
    pub(crate) fn network(&self) -> Network {
-        self.get_wallet().network().into()
-    }
-
-    /// Return whether or not a script is part of this wallet (either internal or external).
-    pub(crate) fn is_mine(&self, script: Arc<Script>) -> Result<bool, BdkError> {
-        self.get_wallet().is_mine(&script.0)
+        self.get_wallet().network()
    }

    /// Sync the internal database with the blockchain.
@@ -136,7 +126,7 @@ impl Wallet {
        psbt: &PartiallySignedTransaction,
        sign_options: Option<SignOptions>,
    ) -> Result<bool, BdkError> {
-        let mut psbt = psbt.inner.lock().unwrap();
+        let mut psbt = psbt.internal.lock().unwrap();
        self.get_wallet().sign(
            &mut psbt,
            sign_options.map(SignOptions::into).unwrap_or_default(),
@@ -243,7 +233,7 @@ impl From<SignOptions> for BdkSignOptions {
 /// Each method on the TxBuilder returns an instance of a new TxBuilder with the option set/added.
 #[derive(Clone, Debug)]
 pub(crate) struct TxBuilder {
-    pub(crate) recipients: Vec<(BdkScriptBuf, u64)>,
+    pub(crate) recipients: Vec<(BdkScript, u64)>,
    pub(crate) utxos: Vec<OutPoint>,
    pub(crate) unspendable: HashSet<OutPoint>,
    pub(crate) change_policy: ChangeSpendPolicy,
@@ -251,7 +241,7 @@ pub(crate) struct TxBuilder {
    pub(crate) fee_rate: Option<f32>,
    pub(crate) fee_absolute: Option<u64>,
    pub(crate) drain_wallet: bool,
-    pub(crate) drain_to: Option<BdkScriptBuf>,
+    pub(crate) drain_to: Option<BdkScript>,
    pub(crate) rbf: Option<RbfValue>,
    pub(crate) data: Vec<u8>,
 }
@@ -275,8 +265,8 @@ impl TxBuilder {

    /// Add a recipient to the internal list.
    pub(crate) fn add_recipient(&self, script: Arc<Script>, amount: u64) -> Arc<Self> {
-        let mut recipients: Vec<(BdkScriptBuf, u64)> = self.recipients.clone();
-        recipients.append(&mut vec![(script.0.clone(), amount)]);
+        let mut recipients: Vec<(BdkScript, u64)> = self.recipients.clone();
+        recipients.append(&mut vec![(script.script.clone(), amount)]);
        Arc::new(TxBuilder {
            recipients,
            ..self.clone()
@@ -286,7 +276,7 @@ impl TxBuilder {
    pub(crate) fn set_recipients(&self, recipients: Vec<ScriptAmount>) -> Arc<Self> {
        let recipients = recipients
            .iter()
-            .map(|script_amount| (script_amount.script.0.clone(), script_amount.amount))
+            .map(|script_amount| (script_amount.script.script.clone(), script_amount.amount))
            .collect();
        Arc::new(TxBuilder {
            recipients,
@@ -391,7 +381,7 @@ impl TxBuilder {
    /// to allow this output to be reduced to pay for the extra fees.
    pub(crate) fn drain_to(&self, script: Arc<Script>) -> Arc<Self> {
        Arc::new(TxBuilder {
-            drain_to: Some(script.0.clone()),
+            drain_to: Some(script.script.clone()),
            ..self.clone()
        })
    }
@@ -466,17 +456,14 @@ impl TxBuilder {
            }
        }
        if !&self.data.is_empty() {
-            let push_bytes = PushBytesBuf::try_from(self.data.clone()).map_err(|_| {
-                BdkError::Generic("Failed to convert data to PushBytes".to_string())
-            })?;
-            tx_builder.add_data(&push_bytes);
+            tx_builder.add_data(self.data.as_slice());
        }

        tx_builder
            .finish()
            .map(|(psbt, tx_details)| TxBuilderResult {
                psbt: Arc::new(PartiallySignedTransaction {
-                    inner: Mutex::new(psbt),
+                    internal: Mutex::new(psbt),
                }),
                transaction_details: TransactionDetails::from(tx_details),
            })
@@ -488,7 +475,7 @@ impl TxBuilder {
 pub(crate) struct BumpFeeTxBuilder {
    pub(crate) txid: String,
    pub(crate) fee_rate: f32,
-    pub(crate) allow_shrinking: Option<Arc<Script>>,
+    pub(crate) allow_shrinking: Option<String>,
    pub(crate) rbf: Option<RbfValue>,
 }

@@ -507,9 +494,9 @@ impl BumpFeeTxBuilder {
    /// 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 script_pubkey
    /// can’t be found among the recipients of the transaction we are bumping.
-    pub(crate) fn allow_shrinking(&self, script_pubkey: Arc<Script>) -> Arc<Self> {
+    pub(crate) fn allow_shrinking(&self, address: String) -> Arc<Self> {
        Arc::new(Self {
-            allow_shrinking: Some(script_pubkey),
+            allow_shrinking: Some(address),
            ..self.clone()
        })
    }
@@ -542,7 +529,10 @@ impl BumpFeeTxBuilder {
        let mut tx_builder = wallet.build_fee_bump(txid)?;
        tx_builder.fee_rate(FeeRate::from_sat_per_vb(self.fee_rate));
        if let Some(allow_shrinking) = &self.allow_shrinking {
-            tx_builder.allow_shrinking(allow_shrinking.0.clone())?;
+            let address = BdkAddress::from_str(allow_shrinking)
+                .map_err(|e| BdkError::Generic(e.to_string()))?;
+            let script = address.script_pubkey();
+            tx_builder.allow_shrinking(script)?;
        }
        if let Some(rbf) = &self.rbf {
            match *rbf {
@@ -557,7 +547,7 @@ impl BumpFeeTxBuilder {
        tx_builder
            .finish()
            .map(|(psbt, _)| PartiallySignedTransaction {
-                inner: Mutex::new(psbt),
+                internal: Mutex::new(psbt),
            })
            .map(Arc::new)
    }
@@ -570,14 +560,9 @@ impl BumpFeeTxBuilder {
 mod test {
    use crate::database::DatabaseConfig;
    use crate::descriptor::Descriptor;
-    use crate::keys::{DescriptorSecretKey, Mnemonic};
    use crate::wallet::{AddressIndex, TxBuilder, Wallet};
-    use crate::Network;
-    use crate::Script;
-    use assert_matches::assert_matches;
-    use bdk::bitcoin::Address;
+    use bdk::bitcoin::{Address, Network};
    use bdk::wallet::get_funded_wallet;
-    use bdk::KeychainKind;
    use std::str::FromStr;
    use std::sync::{Arc, Mutex};

@@ -586,20 +571,20 @@ mod test {
        let test_wpkh = "wpkh(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
        let (funded_wallet, _, _) = get_funded_wallet(test_wpkh);
        let test_wallet = Wallet {
-            inner_mutex: Mutex::new(funded_wallet),
+            wallet_mutex: Mutex::new(funded_wallet),
        };
        let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
-        let drain_to_script = crate::Address::new(drain_to_address, Network::Testnet)
+        let drain_to_script = crate::Address::new(drain_to_address)
            .unwrap()
            .script_pubkey();
        let tx_builder = TxBuilder::new()
            .drain_wallet()
            .drain_to(drain_to_script.clone());
        assert!(tx_builder.drain_wallet);
-        assert_eq!(tx_builder.drain_to, Some(drain_to_script.0.clone()));
+        assert_eq!(tx_builder.drain_to, Some(drain_to_script.script.clone()));

        let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();
-        let psbt = tx_builder_result.psbt.inner.lock().unwrap().clone();
+        let psbt = tx_builder_result.psbt.internal.lock().unwrap().clone();
        let tx_details = tx_builder_result.transaction_details;

        // confirm one input with 50,000 sats
@@ -627,14 +612,12 @@ mod test {
                .cloned()
                .unwrap()
                .script_pubkey,
-            Network::Testnet.into(),
+            Network::Testnet,
        )
        .unwrap();
        assert_eq!(
            output_address,
-            Address::from_str("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt")
-                .unwrap()
-                .assume_checked()
+            Address::from_str("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt").unwrap()
        );
        let output_value = psbt.unsigned_tx.output.get(0).cloned().unwrap().value;
        assert_eq!(output_value, 49_890_u64); // input - fee
@@ -819,47 +802,4 @@ mod test {
            "bcrt1qaux734vuhykww9632v8cmdnk7z2mw5lsf74v6k"
        );
    }
-
-    #[test]
-    fn test_is_mine() {
-        // is_mine should return true for addresses generated by the wallet
-        let mnemonic: 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();
-        let secret_key: DescriptorSecretKey =
-            DescriptorSecretKey::new(Network::Testnet, Arc::new(mnemonic), None);
-        let descriptor: Descriptor = Descriptor::new_bip84(
-            Arc::new(secret_key),
-            KeychainKind::External,
-            Network::Testnet,
-        );
-        let wallet: Wallet = Wallet::new(
-            Arc::new(descriptor),
-            None,
-            Network::Testnet,
-            DatabaseConfig::Memory,
-        )
-        .unwrap();
-
-        let address = wallet.get_address(AddressIndex::New).unwrap();
-        let script: Arc<Script> = address.address.script_pubkey();
-
-        let is_mine_1: bool = wallet.is_mine(script).unwrap();
-        assert!(is_mine_1);
-
-        // is_mine returns false when provided a script that is not in the wallet
-        let other_wpkh = "wpkh(tprv8hwWMmPE4BVNxGdVt3HhEERZhondQvodUY7Ajyseyhudr4WabJqWKWLr4Wi2r26CDaNCQhhxEftEaNzz7dPGhWuKFU4VULesmhEfZYyBXdE/0/*)";
-        let other_descriptor = Descriptor::new(other_wpkh.to_string(), Network::Testnet).unwrap();
-
-        let other_wallet = Wallet::new(
-            Arc::new(other_descriptor),
-            None,
-            Network::Testnet,
-            DatabaseConfig::Memory,
-        )
-        .unwrap();
-
-        let other_address = other_wallet.get_address(AddressIndex::New).unwrap();
-        let other_script: Arc<Script> = other_address.address.script_pubkey();
-        let is_mine_2: bool = wallet.is_mine(other_script).unwrap();
-        assert_matches!(is_mine_2, false);
-    }
 }
--- a/bdk-jvm/README.md
+++ b/bdk-jvm/README.md
@@ -1,4 +1,4 @@
-# bdk-jvm
+# bdk-android
 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.

 ## How to Use
@@ -25,8 +25,8 @@ val internalDescriptor = Descriptor("wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8
 val databaseConfig = DatabaseConfig.Memory

 val blockchainConfig = BlockchainConfig.Electrum(
-    ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 10u, true)
-)
+        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)
 ```
@@ -38,39 +38,32 @@ 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>")
 }
 ```

+
 ## Example Projects
 * [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!:
-```shell
-curl -s "https://get.sdkman.io" | bash
-source "$HOME/.sdkman/bin/sdkman-init.sh"
-sdk install java 11.0.19-tem
-```
-2. Install Rust (note that we are currently building using Rust 1.67.0):
-```shell
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-rustup default 1.67.0
-```
-3. Clone this repository.
+
+1. Clone this repository.
 ```shell
 git clone https://github.com/bitcoindevkit/bdk-ffi
 ```
-4. If building on macOS install required intel and m1 jvm targets
+2. Follow the "General" bdk-ffi ["Getting Started (Developer)"] instructions.
+3. If building on macOS install required intel and m1 jvm targets
 ```sh
 rustup target add x86_64-apple-darwin aarch64-apple-darwin
 ```
-5. Build kotlin bindings
-```sh
-./gradlew buildJvmLib
-```
+4. Build kotlin bindings
+ ```sh
+ # build JVM library
+ ./gradlew buildJvmLib
+ ```

 ## How to publish to your local Maven repo
 ```shell
--- a/bdk-jvm/gradle.properties
+++ b/bdk-jvm/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 kotlin.code.style=official
-libraryVersion=0.31.1
+libraryVersion=0.28.0
--- a/bdk-jvm/lib/build.gradle.kts
+++ b/bdk-jvm/lib/build.gradle.kts
@@ -20,8 +20,8 @@ repositories {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
    withSourcesJar()
    withJavadocJar()
 }
@@ -107,8 +107,4 @@ signing {
 // binaries before running the tests
 tasks.withType<KotlinCompile> {
    dependsOn("buildJvmLib")
-
-    kotlinOptions {
-        jvmTarget = "11"
-    }
 }
--- a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt
+++ b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/Enums.kt
@@ -4,13 +4,11 @@ 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
-    System.getProperty("os.name").contains("windows", ignoreCase = true) -> OS.WINDOWS
    else -> OS.OTHER
 }

 enum class OS {
    MAC,
    LINUX,
-    WINDOWS,
    OTHER,
 }
--- a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt
+++ b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt
@@ -27,20 +27,13 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
                    val cargoArgs: List<String> = listOf("build", "--profile", "release-smaller", "--target", "aarch64-apple-darwin")
                    args(cargoArgs)
                }
-            } else if (operatingSystem == OS.LINUX) {
+            } else if(operatingSystem == OS.LINUX) {
                exec {
                    workingDir("${project.projectDir}/../../bdk-ffi")
                    executable("cargo")
                    val cargoArgs: List<String> = listOf("build", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu")
                    args(cargoArgs)
                }
-            } else if (operatingSystem == OS.WINDOWS) {
-                exec {
-                    workingDir("${project.projectDir}/../../bdk-ffi")
-                    executable("cargo")
-                    val cargoArgs: List<String> = listOf("build", "--profile", "release-smaller", "--target", "x86_64-pc-windows-msvc")
-                    args(cargoArgs)
-                }
            }
        }

@@ -77,25 +70,13 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
                        ext = "so"
                    )
                )
-            } else if (operatingSystem == OS.WINDOWS) {
-                libsToCopy.add(
-                    CopyMetadata(
-                        targetDir = "x86_64-pc-windows-msvc",
-                        resDir = "win32-x86-64",
-                        ext = "dll"
-                    )
-                )
-            }
-            val libName = when (operatingSystem) {
-                OS.WINDOWS -> "bdkffi"
-                else       -> "libbdkffi"
            }

            libsToCopy.forEach {
                doFirst {
                    copy {
                        with(it) {
-                            from("${project.projectDir}/../../target/${this.targetDir}/release-smaller/${libName}.${this.ext}")
+                            from("${project.projectDir}/../../target/${this.targetDir}/release-smaller/libbdkffi.${this.ext}")
                            into("${project.projectDir}/../../bdk-jvm/lib/src/main/resources/${this.resDir}/")
                        }
                    }
--- a/bdk-python/MANIFEST.in
+++ b/bdk-python/MANIFEST.in
@@ -1,3 +1,2 @@
 include ./src/bdkpython/libbdkffi.dylib
 include ./src/bdkpython/libbdkffi.so
-include ./src/bdkpython/bdkffi.dll
--- a/bdk-python/README.md
+++ b/bdk-python/README.md
@@ -12,9 +12,9 @@ pip install bdkpython
 ## Run the tests
 ```shell
 pip install --requirement requirements.txt
-bash ./scripts/generate-linux.sh # here you should run the script appropriate for your platform
+bash ./generate.sh
 python setup.py bdist_wheel --verbose
-pip install ./dist/bdkpython-<yourversion>.whl --force-reinstall
+pip install ./dist/bdkpython-<yourversion>-py3-none-any.whl --force-reinstall
 python -m unittest --verbose tests/test_bdk.py
 ```

@@ -23,14 +23,26 @@ python -m unittest --verbose tests/test_bdk.py
 # Install dependencies
 pip install --requirement requirements.txt

-# Generate the bindings (use the script appropriate for your platform)
-bash ./scripts/generate-linux.sh
+# Generate the bindings
+bash generate.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>.whl
+pip install ./dist/bdkpython-<yourversion>-py3-none-any.whl
 ```
--- a/bdk-python/generate.sh
+++ b/bdk-python/generate.sh
@@ -0,0 +1,24 @@
+#!/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!"
--- a/bdk-python/scripts/generate-linux.sh
+++ b/bdk-python/scripts/generate-linux.sh
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-${PYBIN}/python --version
-${PYBIN}/pip install -r requirements.txt
-
-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..."
-rustup default 1.67.0
-cargo build --profile release-smaller
-
-echo "Copying linux libbdkffi.so..."
-cp ../target/release-smaller/libbdkffi.so ../bdk-python/src/bdkpython/libbdkffi.so
-
-echo "All done!"
--- a/bdk-python/scripts/generate-macos-arm64.sh
+++ b/bdk-python/scripts/generate-macos-arm64.sh
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-python3 --version
-pip install --user -r requirements.txt
-
-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..."
-rustup default 1.67.0
-rustup target add aarch64-apple-darwin
-cargo build --profile release-smaller --target aarch64-apple-darwin
-
-echo "Copying libraries libbdkffi.dylib..."
-cp ../target/aarch64-apple-darwin/release-smaller/libbdkffi.dylib ../bdk-python/src/bdkpython/libbdkffi.dylib
-
-echo "All done!"
--- a/bdk-python/scripts/generate-macos-x86_64.sh
+++ b/bdk-python/scripts/generate-macos-x86_64.sh
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-python3 --version
-pip install --user -r requirements.txt
-
-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..."
-rustup target add x86_64-apple-darwin
-cargo build --profile release-smaller --target x86_64-apple-darwin
-
-echo "Copying libraries libbdkffi.dylib..."
-cp ../target/x86_64-apple-darwin/release-smaller/libbdkffi.dylib ../bdk-python/src/bdkpython/libbdkffi.dylib
-
-echo "All done!"
--- a/bdk-python/scripts/generate-windows.sh
+++ b/bdk-python/scripts/generate-windows.sh
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-python3 --version
-pip install --user -r requirements.txt
-
-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..."
-rustup default 1.67.0
-rustup target add x86_64-pc-windows-msvc
-cargo build --profile release-smaller --target x86_64-pc-windows-msvc
-
-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!"
--- a/bdk-python/setup.py
+++ b/bdk-python/setup.py
@@ -51,7 +51,7 @@ print(f"Wallet balance is: {balance.total}")

 setup(
    name="bdkpython",
-    version="0.31.0",
+    version="0.28.3",
    description="The Python language bindings for the Bitcoin Development Kit",
    long_description=LONG_DESCRIPTION,
    long_description_content_type="text/markdown",
@@ -62,6 +62,7 @@ setup(
    url="https://github.com/bitcoindevkit/bdk-ffi",
    author="Alekos Filini <alekos.filini@gmail.com>, Steve Myers <steve@notmandatory.org>",
    license="MIT or Apache 2.0",
+
    # This is required to ensure the library name includes the python version, abi, and platform tags
    # See issue #350 for more information
    has_ext_modules=lambda: True,
--- a/bdk-swift/Package.swift
+++ b/bdk-swift/Package.swift
@@ -29,9 +29,7 @@ let package = Package(
        .binaryTarget(name: "bdkFFI", path: "./bdkFFI.xcframework"),
        .target(
            name: "BitcoinDevKit",
-            dependencies: ["bdkFFI"],
-            swiftSettings: [.unsafeFlags(["-suppress-warnings"])]
-        ),
+            dependencies: ["bdkFFI"]),
        .testTarget(
            name: "BitcoinDevKitTests",
            dependencies: ["BitcoinDevKit"]),
--- a/bdk-swift/bdkFFI.xcframework/Info.plist
+++ b/bdk-swift/bdkFFI.xcframework/Info.plist
@@ -16,8 +16,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>macos</string>
-		    	<key>LSMinimumSystemVersion</key>
-   			<string>12.0</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -33,8 +31,6 @@
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
-		    	<key>MinimumOSVersion</key>
-   			<string>15.0</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -47,8 +43,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>MinimumOSVersion</key>
-   			<string>15.0</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
--- a/bdk-swift/bdkFFI.xcframework/ios-arm64/bdkFFI.framework/Info.plist
+++ b/bdk-swift/bdkFFI.xcframework/ios-arm64/bdkFFI.framework/Info.plist
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleIdentifier</key>
-    <string>com.bitcoindevkit.bdkFFI</string>
-    <key>CFBundleName</key>
-    <string>bdkFFI</string>
-    <key>CFBundleVersion</key>
-    <string>0.31.1</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.31.1</string>
-    <key>CFBundleExecutable</key>
-    <string>bdkFFI</string>
-    <key>MinimumOSVersion</key>
-    <string>100</string>
-</dict>
-</plist>
--- a/bdk-swift/bdkFFI.xcframework/ios-arm64_x86_64-simulator/bdkFFI.framework/Info.plist
+++ b/bdk-swift/bdkFFI.xcframework/ios-arm64_x86_64-simulator/bdkFFI.framework/Info.plist
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleIdentifier</key>
-    <string>com.bitcoindevkit.bdkFFI</string>
-    <key>CFBundleName</key>
-    <string>bdkFFI</string>
-    <key>CFBundleVersion</key>
-    <string>0.31.1</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.31.1</string>
-    <key>CFBundleExecutable</key>
-    <string>bdkFFI</string>
-    <key>MinimumOSVersion</key>
-    <string>15.0</string>
-</dict>
-</plist>
--- a/bdk-swift/bdkFFI.xcframework/macos-arm64_x86_64/bdkFFI.framework/Info.plist
+++ b/bdk-swift/bdkFFI.xcframework/macos-arm64_x86_64/bdkFFI.framework/Info.plist
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleIdentifier</key>
-    <string>com.bitcoindevkit.bdkFFI</string>
-    <key>CFBundleName</key>
-    <string>bdkFFI</string>
-    <key>CFBundleVersion</key>
-    <string>0.31.1</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.31.1</string>
-    <key>CFBundleExecutable</key>
-    <string>bdkFFI</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>12.0</string>
-</dict>
-</plist>
--- a/bdk-swift/build-local-swift.sh
+++ b/bdk-swift/build-local-swift.sh
@@ -5,10 +5,10 @@
 #
 # Run the script from the repo root directory, ie: ./bdk-swift/build-local-swift.sh

-rustup install nightly-2023-04-10
-rustup component add rust-src --toolchain nightly-2023-04-10
+rustup install nightly-x86_64-apple-darwin
+rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
 rustup target add aarch64-apple-ios x86_64-apple-ios
-rustup target add aarch64-apple-ios-sim --toolchain nightly-2023-04-10
+rustup target add aarch64-apple-ios-sim --toolchain nightly
 rustup target add aarch64-apple-darwin x86_64-apple-darwin

 pushd bdk-ffi
@@ -20,10 +20,10 @@ cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-da
 cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-darwin
 cargo build --package bdk-ffi --profile release-smaller --target x86_64-apple-ios
 cargo build --package bdk-ffi --profile release-smaller --target aarch64-apple-ios
-cargo +nightly-2023-04-10 build --package bdk-ffi --profile release-smaller --target aarch64-apple-ios-sim
+cargo +nightly build --package bdk-ffi --release -Z build-std --target aarch64-apple-ios-sim

 mkdir -p target/lipo-ios-sim/release-smaller
-lipo target/aarch64-apple-ios-sim/release-smaller/libbdkffi.a target/x86_64-apple-ios/release-smaller/libbdkffi.a -create -output target/lipo-ios-sim/release-smaller/libbdkffi.a
+lipo target/aarch64-apple-ios-sim/release/libbdkffi.a target/x86_64-apple-ios/release-smaller/libbdkffi.a -create -output target/lipo-ios-sim/release-smaller/libbdkffi.a
 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
Author	SHA1	Message	Date
thunderbiscuit	790d08c4c9	Fix library naming and bump Python version to 0.28.3	2023-04-25 10:22:09 -04:00
thunderbiscuit	ffd5a96ee0	Add library build task to Android test CI workflow	2023-04-24 16:09:45 -04:00
thunderbiscuit	fd02fc2a02	Remove support for Python 3.6 and 3.7	2023-04-24 16:09:15 -04:00
thunderbiscuit	5c560c6013	Use ubuntu-20.04 image for all Linux CI runs	2023-04-24 16:08:54 -04:00
thunderbiscuit	9d1b2de29b	Add workflow dispatch to all test workflows	2023-04-24 16:08:32 -04:00
thunderbiscuit	3e3c0bf22f	Pin Rust version in CI workflows to 1.67	2023-04-24 16:08:16 -04:00
thunderbiscuit	9b919e5ceb	Update libraries to official release versions	2023-04-18 12:31:15 -04:00