Merge branch 'master' into add-policy-api

bitcoindevkit · Nov 8, 2024 · 269b301 · 269b301
2 parents 2b8592e + 20eebc8
commit 269b301
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     name: "Build and test"
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3

diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
@@ -660,6 +660,9 @@ interface EsploraClient {
 
   [Throws=EsploraError]
   Transaction? get_tx(string txid);
+
+  [Throws=EsploraError]
+  u32 get_height();
 };
 
 // ------------------------------------------------------------------------

diff --git a/bdk-ffi/src/esplora.rs b/bdk-ffi/src/esplora.rs
@@ -89,4 +89,8 @@ impl EsploraClient {
         let tx_opt = self.0.get_tx(&txid)?;
         Ok(tx_opt.map(|inner| Arc::new(Transaction::from(inner))))
     }
+
+    pub fn get_height(&self) -> Result<u32, EsploraError> {
+        self.0.get_height().map_err(EsploraError::from)
+    }
 }