Transaction confirmation

crates/sage-api/src/records.rs

@@ -5,6 +5,7 @@ mod nft;
 mod peer;
 mod pending_transaction;
 mod sync_status;
+mod transaction_summary;
 
 pub use cat::*;
 pub use coin::*;
@@ -13,3 +14,4 @@ pub use nft::*;
 pub use peer::*;
 pub use pending_transaction::*;
 pub use sync_status::*;
+pub use transaction_summary::*;

crates/sage-api/src/records/pending_transaction.rs

@@ -8,5 +8,4 @@ pub struct PendingTransactionRecord {
     pub transaction_id: String,
     pub fee: Amount,
     pub submitted_at: Option<String>,
-    pub expiration_height: Option<u32>,
 }

crates/sage-api/src/records/transaction_summary.rs

@@ -0,0 +1,53 @@
+use serde::{Deserialize, Serialize};
+use specta::Type;
+
+use crate::Amount;
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct TransactionSummary {
+    pub fee: Amount,
+    pub inputs: Vec<Input>,
+    pub data: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct Input {
+    pub coin_id: String,
+    pub amount: Amount,
+    pub address: String,
+    #[serde(flatten)]
+    pub kind: InputKind,
+    pub outputs: Vec<Output>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct Output {
+    pub coin_id: String,
+    pub amount: Amount,
+    pub address: String,
+    pub receiving: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum InputKind {
+    Unknown,
+    Xch,
+    Launcher,
+    Cat {
+        asset_id: String,
+        name: Option<String>,
+        ticker: Option<String>,
+        icon_url: Option<String>,
+    },
+    Did {
+        launcher_id: String,
+        name: Option<String>,
+    },
+    Nft {
+        launcher_id: String,
+        image_data: Option<String>,
+        image_mime_type: Option<String>,
+        name: Option<String>,
+    },
+}

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

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
-use crate::Amount;
+use crate::{Amount, TransactionSummary};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 pub struct BulkMintNfts {
@@ -24,4 +24,5 @@ pub struct NftMint {
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 pub struct BulkMintNftsResponse {
     pub nft_ids: Vec<String>,
+    pub summary: TransactionSummary,
 }

crates/sage-database/src/coin_states.rs

@@ -88,16 +88,7 @@ async fn insert_coin_state(
             `synced`,
             `transaction_id`
         )
-        VALUES (
-            ?,
-            ?,
-            ?,
-            ?,
-            ?,
-            ?,
-            ?,
-            ?
-        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         ",
         coin_id_ref,
         parent_coin_id,

crates/sage-database/src/derivations.rs

@@ -15,6 +15,10 @@ impl Database {
     pub async fn synthetic_key_index(&self, synthetic_key: PublicKey) -> Result<Option<u32>> {
         synthetic_key_index(&self.pool, synthetic_key).await
     }
+
+    pub async fn is_p2_puzzle_hash(&self, p2_puzzle_hash: Bytes32) -> Result<bool> {
+        is_p2_puzzle_hash(&self.pool, p2_puzzle_hash).await
+    }
 }
 
 impl<'a> DatabaseTx<'a> {

crates/sage-database/src/primitives/dids.rs

@@ -42,6 +42,10 @@ impl Database {
     pub async fn did(&self, did_id: Bytes32) -> Result<Option<Did<Program>>> {
         did(&self.pool, did_id).await
     }
+
+    pub async fn did_name(&self, launcher_id: Bytes32) -> Result<Option<String>> {
+        did_name(&self.pool, launcher_id).await
+    }
 }
 
 impl<'a> DatabaseTx<'a> {
@@ -271,3 +275,23 @@ async fn did(conn: impl SqliteExecutor<'_>, did_id: Bytes32) -> Result<Option<Di
         },
     }))
 }
+
+async fn did_name(conn: impl SqliteExecutor<'_>, launcher_id: Bytes32) -> Result<Option<String>> {
+    let launcher_id = launcher_id.as_ref();
+
+    let Some(row) = sqlx::query!(
+        "
+        SELECT `name`
+        FROM `dids`
+        WHERE `launcher_id` = ?
+        ",
+        launcher_id
+    )
+    .fetch_optional(conn)
+    .await?
+    else {
+        return Ok(None);
+    };
+
+    Ok(row.name)
+}

crates/sage-database/src/primitives/nfts.rs

@@ -43,6 +43,10 @@ impl Database {
     pub async fn nft(&self, launcher_id: Bytes32) -> Result<Option<Nft<Program>>> {
         nft(&self.pool, launcher_id).await
     }
+
+    pub async fn fetch_nft_data(&self, hash: Bytes32) -> Result<Option<NftData>> {
+        fetch_nft_data(&self.pool, hash).await
+    }
 }
 
 impl<'a> DatabaseTx<'a> {

crates/sage-database/src/transactions.rs

@@ -11,7 +11,6 @@ pub struct TransactionRow {
     pub transaction_id: Bytes32,
     pub fee: u64,
     pub submitted_at: Option<i64>,
-    pub expiration_height: Option<u32>,
 }
 
 impl Database {
@@ -34,16 +33,8 @@ impl<'a> DatabaseTx<'a> {
         transaction_id: Bytes32,
         aggregated_signature: Signature,
         fee: u64,
-        expiration_height: Option<u32>,
     ) -> Result<()> {
-        insert_transaction(
-            &mut *self.tx,
-            transaction_id,
-            aggregated_signature,
-            fee,
-            expiration_height,
-        )
-        .await
+        insert_transaction(&mut *self.tx, transaction_id, aggregated_signature, fee).await
     }
 
     pub async fn insert_transaction_spend(
@@ -89,7 +80,6 @@ async fn insert_transaction(
     transaction_id: Bytes32,
     aggregated_signature: Signature,
     fee: u64,
-    expiration_height: Option<u32>,
 ) -> Result<()> {
     let transaction_id = transaction_id.as_ref();
     let aggregated_signature = aggregated_signature.to_bytes();
@@ -102,15 +92,13 @@ async fn insert_transaction(
         INSERT INTO `transactions` (
             `transaction_id`,
             `aggregated_signature`,
-            `fee`,
-            `expiration_height`
+            `fee`
         )
-        VALUES (?, ?, ?, ?)
+        VALUES (?, ?, ?)
         ",
         transaction_id,
         aggregated_signature,
-        fee,
-        expiration_height
+        fee
     )
     .execute(conn)
     .await?;
@@ -190,8 +178,7 @@ async fn transactions(conn: impl SqliteExecutor<'_>) -> Result<Vec<TransactionRo
         SELECT
             `transaction_id`,
             `fee`,
-            `submitted_at`,
-            `expiration_height`
+            `submitted_at`
         FROM `transactions`
         ORDER BY `submitted_at` DESC, `transaction_id` ASC
         "
@@ -205,7 +192,6 @@ async fn transactions(conn: impl SqliteExecutor<'_>) -> Result<Vec<TransactionRo
                 transaction_id: to_bytes32(&row.transaction_id)?,
                 fee: u64::from_be_bytes(to_bytes(&row.fee)?),
                 submitted_at: row.submitted_at,
-                expiration_height: row.expiration_height.map(TryInto::try_into).transpose()?,
             })
         })
         .collect()