From 5236b6c68ba1ffce07fbd815bc56765b68c47e69 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Mon, 16 Oct 2023 11:08:29 -0400 Subject: [PATCH] Temp 22: Fix Android cross-compilation issues --- .github/workflows/audit.yml | 11 +++++++---- bdk-ffi/Cargo.toml | 7 ++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index f8c869b0..648c55e2 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -16,7 +16,10 @@ jobs: run: working-directory: bdk-ffi steps: - - uses: actions/checkout@v3 - - uses: actions-rs/audit-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} + - name: "Check out PR branch" + uses: actions/checkout@v3 + + - name: "Run audit" + run: | + cargo install cargo-audit + cargo-audit audit diff --git a/bdk-ffi/Cargo.toml b/bdk-ffi/Cargo.toml index 73e4414a..4420f446 100644 --- a/bdk-ffi/Cargo.toml +++ b/bdk-ffi/Cargo.toml @@ -19,8 +19,13 @@ default = ["uniffi/cli"] [dependencies] bdk = { version = "1.0.0-alpha.2", features = ["all-keys", "keys-bip39"] } bdk_file_store = { version = "0.2.0" } -bdk_esplora = { version = "0.4.0" } +# TODO 22: the bdk_esplora crate uses esplora_client which uses reqwest for async. By default it uses the system +# openssl library, which is creating problems for cross-compilation. I'd rather use rustls, but it's hidden +# behind a feature flag. We need to look into whether openssl-sys is really required by bdk or if using rustls +# would work just as well. This here is a temporary workaround which removes the async feature on the bdk_esplora crate. +bdk_esplora = { version = "0.4.0", default-features = false, features = ["std", "blocking"] } uniffi = { version = "=0.23.0" } +# reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } [build-dependencies] uniffi = { version = "=0.23.0", features = ["build"] }