Merge pull request #250 from zoedberg/fix_ci

fix CI

.github/workflows/build.yml

@@ -55,6 +55,7 @@ jobs:
       matrix:
         os: [ ubuntu-22.04, ubuntu-latest, macos-13, macos-latest, windows-2019, windows-latest ]
     steps:
+      - uses: ilammy/setup-nasm@v1
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Platform ${{matrix.os}}

.github/workflows/test.yml

@@ -23,6 +23,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
     steps:
+      - uses: ilammy/setup-nasm@v1
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Test ${{matrix.os}}
@@ -31,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@stable
       - uses: jetli/wasm-pack-action@v0.4.0
       - name: Add wasm32 target
         run: rustup target add wasm32-unknown-unknown

Cargo.toml

@@ -31,7 +31,7 @@ bp-core = "0.11.0-beta.8"
 bp-seals = "0.11.0-beta.8"
 bp-std = "0.11.0-beta.8"
 bp-electrum = "0.11.0-beta.8"
-bp-esplora = { version = "0.11.0-beta.8", default-features = false, features = ["blocking"] }
+bp-esplora = { version = "0.11.0-beta.8", default-features = false, git = "https://github.com/BP-WG/bp-esplora-client", branch = "master" }
 descriptors = "0.11.0-beta.8"
 psbt = { version = "0.11.0-beta.8", features = ["client-side-validation"] }
 bp-wallet = { version = "0.11.0-beta.8" }
@@ -91,11 +91,12 @@ getrandom = { version = "0.2", features = ["js"] }
 wasm-bindgen-test = "0.3"
 
 [features]
-default = ["esplora_blocking", "mempool_blocking"]
+default = []
 all = ["esplora_blocking", "electrum_blocking", "mempool_blocking", "serde", "log", "fs", "cli"]
 fs = ["serde", "bp-wallet/fs", "rgb-std/fs"]
 cli = ["fs", "bp-wallet/cli"]
-esplora_blocking = ["bp-esplora"]
+esplora_blocking = ["bp-esplora", "bp-esplora/blocking"]
+esplora_blocking-wasm = ["bp-esplora", "bp-esplora/blocking-wasm"]
 electrum_blocking = ["bp-electrum"]
 mempool_blocking = ["esplora_blocking"]
 serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb-psbt/serde"]

cli/Cargo.toml

@@ -27,7 +27,7 @@ bp-wallet = { workspace = true, features = ["cli"] }
 psbt = { workspace = true }
 rgb-std = { workspace = true, features = ["serde"] }
 rgb-interfaces = { workspace = true }
-rgb-runtime = { version = "0.11.0-beta.7", path = "..", features = ["electrum_blocking", "esplora_blocking", "log", "serde", "fs", "cli"] }
+rgb-runtime = { version = "0.11.0-beta.7", path = "..", features = ["electrum_blocking", "esplora_blocking", "mempool_blocking", "log", "serde", "fs", "cli"] }
 log = { workspace = true }
 env_logger = "0.11.5"
 clap = { version = "4.5.17", features = ["derive", "env"] }

src/wallet.rs

@@ -29,6 +29,7 @@ use bpstd::XpubDerivable;
 use bpwallet::fs::FsTextStore;
 #[cfg(feature = "fs")]
 use bpwallet::Wallet;
+#[cfg(not(target_arch = "wasm32"))]
 use nonasync::persistence::PersistenceProvider;
 use psrgbt::{Psbt, PsbtMeta};
 use rgbstd::containers::Transfer;