Fix API with new db schema

crates/sage-api/src/requests/transactions.rs

@@ -9,7 +9,7 @@ pub struct SendXch {
     pub amount: Amount,
     pub fee: Amount,
     #[serde(default)]
-    pub memos: Option<Vec<String>>,
+    pub memos: Vec<String>,
     #[serde(default)]
     pub auto_submit: bool,
 }
@@ -21,7 +21,7 @@ pub struct BulkSendXch {
     pub amount: Amount,
     pub fee: Amount,
     #[serde(default)]
-    pub memos: Option<Vec<String>>,
+    pub memos: Vec<String>,
     #[serde(default)]
     pub auto_submit: bool,
 }
@@ -122,7 +122,7 @@ pub struct SendCat {
     #[serde(default = "yes")]
     pub include_hint: bool,
     #[serde(default)]
-    pub memos: Option<Vec<String>>,
+    pub memos: Vec<String>,
     #[serde(default)]
     pub auto_submit: bool,
 }
@@ -137,7 +137,7 @@ pub struct BulkSendCat {
     #[serde(default = "yes")]
     pub include_hint: bool,
     #[serde(default)]
-    pub memos: Option<Vec<String>>,
+    pub memos: Vec<String>,
     #[serde(default)]
     pub auto_submit: bool,
 }
@@ -163,7 +163,7 @@ pub struct Payment {
     pub address: String,
     pub amount: Amount,
     #[serde(default)]
-    pub memos: Option<Vec<String>>,
+    pub memos: Vec<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

crates/sage/src/endpoints/transactions.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use chia::{
-    protocol::{Bytes, Coin, CoinSpend},
+    protocol::{Coin, CoinSpend},
     puzzles::nft::NftMetadata,
 };
 use chia_wallet_sdk::{driver::MetadataUpdate, utils::Address};
@@ -33,7 +33,7 @@ impl Sage {
         let memos = parse_memos(req.memos)?;
 
         let coin_spends = wallet
-            .send_xch(vec![(puzzle_hash, amount)], fee, memos)
+            .send_xch(vec![(puzzle_hash, amount)], fee, memos, None)
             .await?;
         self.transact(coin_spends, req.auto_submit).await
     }
@@ -52,7 +52,7 @@ impl Sage {
         let fee = parse_amount(req.fee)?;
         let memos = parse_memos(req.memos)?;
 
-        let coin_spends = wallet.send_xch(amounts, fee, memos).await?;
+        let coin_spends = wallet.send_xch(amounts, fee, memos, None).await?;
         self.transact(coin_spends, req.auto_submit).await
     }
 
@@ -212,6 +212,7 @@ impl Sage {
                 fee,
                 req.include_hint,
                 memos,
+                None,
             )
             .await?;
         self.transact(coin_spends, req.auto_submit).await
@@ -233,7 +234,7 @@ impl Sage {
         let memos = parse_memos(req.memos)?;
 
         let coin_spends = wallet
-            .send_cat(asset_id, amounts, fee, req.include_hint, memos)
+            .send_cat(asset_id, amounts, fee, req.include_hint, memos, None)
             .await?;
         self.transact(coin_spends, req.auto_submit).await
     }
@@ -251,15 +252,7 @@ impl Sage {
             };
             let amount = parse_amount(payment.amount)?;
             let puzzle_hash = self.parse_address(payment.address)?;
-            let memos = if let Some(list) = payment.memos {
-                let mut memos = Vec::new();
-                for memo in list {
-                    memos.push(Bytes::from(hex::decode(memo)?));
-                }
-                Some(memos)
-            } else {
-                None
-            };
+            let memos = parse_memos(payment.memos)?;
 
             payments.push(MultiSendPayment {
                 asset_id,
@@ -405,7 +398,9 @@ impl Sage {
         let puzzle_hash = self.parse_address(req.address)?;
         let fee = parse_amount(req.fee)?;
 
-        let coin_spends = wallet.transfer_nfts(nft_ids, puzzle_hash, fee).await?;
+        let coin_spends = wallet
+            .transfer_nfts(nft_ids, puzzle_hash, fee, None)
+            .await?;
         self.transact(coin_spends, req.auto_submit).await
     }
 
@@ -448,7 +443,9 @@ impl Sage {
         let puzzle_hash = self.parse_address(req.address)?;
         let fee = parse_amount(req.fee)?;
 
-        let coin_spends = wallet.transfer_dids(did_ids, puzzle_hash, fee).await?;
+        let coin_spends = wallet
+            .transfer_dids(did_ids, puzzle_hash, fee, None)
+            .await?;
         self.transact(coin_spends, req.auto_submit).await
     }
 

crates/sage/src/utils/confirmation.rs

@@ -12,7 +12,7 @@ use sage_api::{
 };
 use sage_assets::Data;
 use sage_database::Database;
-use sage_wallet::{compute_nft_info, ChildKind, CoinKind, Transaction};
+use sage_wallet::{compute_nft_info, CoinKind, Transaction};
 
 use crate::{Error, Result, Sage};
 
@@ -93,13 +93,10 @@ impl Sage {
             let mut outputs = Vec::new();
 
             for output in input.outputs {
-                let p2_puzzle_hash = match output.kind {
-                    ChildKind::Unknown { hint } => hint.unwrap_or(output.coin.puzzle_hash),
-                    ChildKind::Launcher => output.coin.puzzle_hash,
-                    ChildKind::Cat { p2_puzzle_hash, .. } => p2_puzzle_hash,
-                    ChildKind::Did { info, .. } => info.p2_puzzle_hash,
-                    ChildKind::Nft { info, .. } => info.p2_puzzle_hash,
-                };
+                let p2_puzzle_hash = output
+                    .kind
+                    .custody_p2_puzzle_hash()
+                    .unwrap_or(output.coin.puzzle_hash);
 
                 let address = Address::new(p2_puzzle_hash, self.network().prefix()).encode()?;
 
@@ -161,11 +158,11 @@ pub async fn extract_nft_data(
 
     if let Some(metadata_hash) = onchain_metadata.metadata_hash {
         if let Some(metadata) = cache.nft_data.get(&metadata_hash) {
-            let info = compute_nft_info(None, Some(&metadata.blob));
+            let info = compute_nft_info(None, &metadata.blob);
             result.name = info.name;
         } else if let Some(db) = &db {
             if let Some(metadata) = db.full_file_data(metadata_hash).await? {
-                let info = compute_nft_info(None, Some(&metadata.blob));
+                let info = compute_nft_info(None, &metadata.data);
                 result.name = info.name;
             }
         }

crates/sage/src/utils/parse.rs

@@ -147,16 +147,12 @@ pub fn parse_program(input: String) -> Result<Program> {
     Ok(hex::decode(stripped)?.into())
 }
 
-pub fn parse_memos(input: Option<Vec<String>>) -> Result<Option<Vec<Bytes>>> {
-    if let Some(list) = input {
-        let mut memos = Vec::new();
-        for memo in list {
-            memos.push(Bytes::from(hex::decode(memo)?));
-        }
-        Ok(Some(memos))
-    } else {
-        Ok(None)
+pub fn parse_memos(input: Vec<String>) -> Result<Vec<Bytes>> {
+    let mut memos = Vec::new();
+    for memo in input {
+        memos.push(Bytes::from(hex::decode(memo)?));
     }
+    Ok(memos)
 }
 
 #[cfg(test)]