Return txid from fund vault. Fix tests.

diba-io · Nov 11, 2023 · 3266dc2 · 3266dc2
1 parent 6f594e3
commit 3266dc2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/lib/web/bitcoin.ts b/lib/web/bitcoin.ts
@@ -204,4 +204,6 @@ export interface WalletData {
 export interface FundVaultDetails {
   assetsOutput?: string;
   udasOutput?: string;
+  isFunded: boolean;
+  fundTxid: string;
 }
diff --git a/src/bitcoin.rs b/src/bitcoin.rs
@@ -425,6 +425,7 @@ pub async fn fund_vault(
         assets_output,
         udas_output,
         is_funded: true,
+        fund_txid: Some(asset_txid.to_hex()),
     })
 }
 
@@ -459,6 +460,7 @@ pub async fn get_assets_vault(
         assets_output,
         udas_output,
         is_funded,
+        fund_txid: None,
     })
 }
 

diff --git a/src/structs.rs b/src/structs.rs
@@ -102,6 +102,7 @@ pub struct FundVaultDetails {
     pub assets_output: Option<String>,
     pub udas_output: Option<String>,
     pub is_funded: bool,
+    pub fund_txid: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

diff --git a/tests/rgb/integration/transfers.rs b/tests/rgb/integration/transfers.rs
@@ -1906,6 +1906,7 @@ async fn allow_consecutive_full_transfer_bidirectional() -> anyhow::Result<()> {
             consig,
             psbt,
             commit: _,
+            ..
         } = full_transfer_resp;
 
         let request = SignPsbtRequest {
@@ -1969,6 +1970,7 @@ async fn allow_consecutive_full_transfer_bidirectional() -> anyhow::Result<()> {
                 consig,
                 psbt,
                 commit: _,
+                ..
             } = full_transfer_resp;
 
             let request = SignPsbtRequest {
@@ -2082,6 +2084,7 @@ async fn allow_save_transfer_and_verify() -> anyhow::Result<()> {
         consig,
         psbt,
         commit: _,
+        ..
     } = resp;
 
     let request = SignPsbtRequest {