Merge pull request xch-dev#574 from dkackman/options-ui

Options UI

Author: Rigidity

crates/sage-api/endpoints.json

@@ -84,6 +84,7 @@
   "resync_cat": true,
   "update_cat": true,
   "update_did": true,
+  "update_option": true,
   "update_nft": true,
   "update_nft_collection": true,
   "redownload_nft": true,

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

@@ -25,6 +25,7 @@ pub struct NftRecord {
     pub edition_number: Option<u32>,
     pub edition_total: Option<u32>,
     pub icon_url: Option<String>,
+    pub created_timestamp: Option<u64>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

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

@@ -13,8 +13,10 @@ pub struct OptionRecord {
     pub amount: Amount,
     pub underlying_asset: Asset,
     pub underlying_amount: Amount,
+    pub underlying_coin_id: String,
     pub strike_asset: Asset,
     pub strike_amount: Amount,
     pub expiration_seconds: u64,
     pub created_height: Option<u32>,
+    pub created_timestamp: Option<u64>,
 }

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

@@ -22,6 +22,17 @@ pub struct UpdateCat {
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct UpdateCatResponse {}
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "tauri", derive(specta::Type))]
+pub struct UpdateOption {
+    pub option_id: String,
+    pub visible: bool,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[cfg_attr(feature = "tauri", derive(specta::Type))]
+pub struct UpdateOptionResponse {}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct UpdateDid {

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

@@ -234,14 +234,35 @@ pub struct GetMinterDidIdsResponse {
     pub total: u32,
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize)]
+#[cfg_attr(feature = "tauri", derive(specta::Type))]
+#[serde(rename_all = "snake_case")]
+pub enum OptionSortMode {
+    #[default]
+    Name,
+    CreatedHeight,
+    ExpirationSeconds,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
-pub struct GetOptions {}
+pub struct GetOptions {
+    pub offset: u32,
+    pub limit: u32,
+    #[serde(default)]
+    pub sort_mode: OptionSortMode,
+    #[serde(default)]
+    pub ascending: bool,
+    pub find_value: Option<String>,
+    #[serde(default)]
+    pub include_hidden: bool,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "tauri", derive(specta::Type))]
 pub struct GetOptionsResponse {
     pub options: Vec<OptionRecord>,
+    pub total: u32,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

crates/sage-database/src/tables/assets/option.rs

@@ -194,7 +194,6 @@ async fn candidates_for_download(
         WHERE data IS NULL
         AND (last_checked_timestamp IS NULL OR unixepoch() - last_checked_timestamp >= ?)
         AND failed_attempts < ?
-        ORDER BY last_checked_timestamp ASC
         LIMIT ?
         ",
         check_every_seconds,

crates/sage-database/src/tables/files.rs

@@ -8,13 +8,17 @@ use clvmr::Allocator;
 use sage_api::{
     IncreaseDerivationIndex, IncreaseDerivationIndexResponse, RedownloadNft, RedownloadNftResponse,
     ResyncCat, ResyncCatResponse, UpdateCat, UpdateCatResponse, UpdateDid, UpdateDidResponse,
-    UpdateNft, UpdateNftCollection, UpdateNftCollectionResponse, UpdateNftResponse,
+    UpdateNft, UpdateNftCollection, UpdateNftCollectionResponse, UpdateNftResponse, UpdateOption,
+    UpdateOptionResponse,
 };
 use sage_assets::DexieCat;
 use sage_database::{Asset, AssetKind, Derivation};
 use sage_wallet::SyncCommand;
 
-use crate::{parse_asset_id, parse_collection_id, parse_did_id, parse_nft_id, Error, Result, Sage};
+use crate::{
+    parse_asset_id, parse_collection_id, parse_did_id, parse_nft_id, parse_option_id, Error,
+    Result, Sage,
+};
 
 impl Sage {
     pub async fn resync_cat(&self, req: ResyncCat) -> Result<ResyncCatResponse> {
@@ -69,6 +73,22 @@ impl Sage {
         Ok(UpdateCatResponse {})
     }
 
+    pub async fn update_option(&self, req: UpdateOption) -> Result<UpdateOptionResponse> {
+        let wallet = self.wallet()?;
+
+        let option_id = parse_option_id(req.option_id)?;
+
+        let Some(mut asset) = wallet.db.asset(option_id).await? else {
+            return Err(Error::MissingDid(option_id));
+        };
+
+        asset.is_visible = req.visible;
+
+        wallet.db.update_asset(asset).await?;
+
+        Ok(UpdateOptionResponse {})
+    }
+
     pub async fn update_did(&self, req: UpdateDid) -> Result<UpdateDidResponse> {
         let wallet = self.wallet()?;
 

crates/sage/src/endpoints/actions.rs

@@ -24,13 +24,13 @@ use sage_api::{
     GetSpendableCoinCountResponse, GetSyncStatus, GetSyncStatusResponse, GetToken,
     GetTokenResponse, GetTransaction, GetTransactionResponse, GetTransactions,
     GetTransactionsResponse, GetVersion, GetVersionResponse, NftCollectionRecord, NftData,
-    NftRecord, NftSortMode as ApiNftSortMode, OptionRecord, PendingTransactionRecord,
-    PerformDatabaseMaintenance, PerformDatabaseMaintenanceResponse, TokenRecord,
-    TransactionCoinRecord, TransactionRecord,
+    NftRecord, NftSortMode as ApiNftSortMode, OptionRecord, OptionSortMode as ApiOptionSortMode,
+    PendingTransactionRecord, PerformDatabaseMaintenance, PerformDatabaseMaintenanceResponse,
+    TokenRecord, TransactionCoinRecord, TransactionRecord,
 };
 use sage_database::{
-    AssetFilter, CoinFilterMode, CoinSortMode, NftGroupSearch, NftRow, NftSortMode, Transaction,
-    TransactionCoin,
+    AssetFilter, CoinFilterMode, CoinSortMode, NftGroupSearch, NftRow, NftSortMode, OptionSortMode,
+    Transaction, TransactionCoin,
 };
 use sage_wallet::WalletError;
 
@@ -400,12 +400,30 @@ impl Sage {
         Ok(GetMinterDidIdsResponse { did_ids, total })
     }
 
-    pub async fn get_options(&self, _req: GetOptions) -> Result<GetOptionsResponse> {
+    pub async fn get_options(&self, req: GetOptions) -> Result<GetOptionsResponse> {
         let wallet = self.wallet()?;
 
+        let sort_mode = match req.sort_mode {
+            ApiOptionSortMode::Name => OptionSortMode::Name,
+            ApiOptionSortMode::CreatedHeight => OptionSortMode::CreatedHeight,
+            ApiOptionSortMode::ExpirationSeconds => OptionSortMode::ExpirationSeconds,
+        };
+
         let mut options = Vec::new();
 
-        for row in wallet.db.owned_options().await? {
+        let (rows, total) = wallet
+            .db
+            .owned_options(
+                req.limit,
+                req.offset,
+                sort_mode,
+                req.ascending,
+                req.find_value,
+                req.include_hidden,
+            )
+            .await?;
+
+        for row in rows {
             options.push(OptionRecord {
                 launcher_id: Address::new(row.asset.hash, "option".to_string()).encode()?,
                 name: row.asset.name,
@@ -416,14 +434,16 @@ impl Sage {
                 amount: Amount::u64(row.coin_row.coin.amount),
                 underlying_asset: self.encode_asset(row.underlying_asset)?,
                 underlying_amount: Amount::u64(row.underlying_amount),
+                underlying_coin_id: hex::encode(row.underlying_coin_id),
                 strike_asset: self.encode_asset(row.strike_asset)?,
                 strike_amount: Amount::u64(row.strike_amount),
                 expiration_seconds: row.expiration_seconds,
                 created_height: row.coin_row.created_height,
+                created_timestamp: row.coin_row.created_timestamp,
             });
         }
 
-        Ok(GetOptionsResponse { options })
+        Ok(GetOptionsResponse { options, total })
     }
 
     pub async fn get_option(&self, req: GetOption) -> Result<GetOptionResponse> {
@@ -446,10 +466,12 @@ impl Sage {
             amount: Amount::u64(row.coin_row.coin.amount),
             underlying_asset: self.encode_asset(row.underlying_asset)?,
             underlying_amount: Amount::u64(row.underlying_amount),
+            underlying_coin_id: hex::encode(row.underlying_coin_id),
             strike_asset: self.encode_asset(row.strike_asset)?,
             strike_amount: Amount::u64(row.strike_amount),
             expiration_seconds: row.expiration_seconds,
             created_height: row.coin_row.created_height,
+            created_timestamp: row.coin_row.created_timestamp,
         };
 
         Ok(GetOptionResponse {
@@ -820,6 +842,7 @@ impl Sage {
             edition_number: metadata.as_ref().map(|m| m.edition_number as u32),
             edition_total: metadata.as_ref().map(|m| m.edition_total as u32),
             created_height: row.coin_row.created_height,
+            created_timestamp: row.coin_row.created_timestamp,
             icon_url: row.asset.icon_url,
         })
     }

crates/sage/src/endpoints/data.rs

@@ -162,3 +162,5 @@ WHERE 1=1
     option_expiration_seconds IS NULL
     OR (option_creator_p2_puzzle_id IS NOT NULL AND unixepoch() >= option_expiration_seconds)
   );
+
+CREATE INDEX idx_file_uris_timestamp_failed ON file_uris(last_checked_timestamp, failed_attempts);