Merge pull request #290 from xch-dev/prep-update

Add NFT refresh and prep update

crates/sage-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-api"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "API definitions for the Sage wallet."

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

@@ -38,6 +38,14 @@ pub struct UpdateNft {
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
 pub struct UpdateNftResponse {}
 
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct RedownloadNft {
+    pub nft_id: String,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
+pub struct RedownloadNftResponse {}
+
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
 pub struct IncreaseDerivationIndex {
     pub hardened: bool,

crates/sage-assets/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-assets"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Fetches non-critical data from various APIs for use in Sage wallet."

crates/sage-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-cli"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "A CLI and RPC for Sage wallet."

crates/sage-cli/src/router.rs

@@ -131,6 +131,7 @@ routes!(
     update_cat await: UpdateCat = "/update_cat",
     update_did await: UpdateDid = "/update_did",
     update_nft await: UpdateNft = "/update_nft",
+    redownload_nft await: RedownloadNft = "/redownload_nft",
     increase_derivation_index await: IncreaseDerivationIndex = "/increase_derivation_index",
 );
 

crates/sage-config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-config"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Configuration for the Sage wallet."

crates/sage-database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-database"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "The SQLite database for Sage."

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

@@ -180,6 +180,14 @@ impl<'a> DatabaseTx<'a> {
         set_nft_uri_checked(&mut *self.tx, uri, hash, hash_matches).await
     }
 
+    pub async fn set_nft_uri_unchecked(&mut self, uri: String) -> Result<()> {
+        set_nft_uri_unchecked(&mut *self.tx, uri).await
+    }
+
+    pub async fn delete_nft_data(&mut self, hash: Bytes32) -> Result<()> {
+        delete_nft_data(&mut *self.tx, hash).await
+    }
+
     pub async fn insert_nft_data(&mut self, hash: Bytes32, nft_data: NftData) -> Result<()> {
         insert_nft_data(&mut *self.tx, hash, nft_data).await
     }
@@ -420,6 +428,14 @@ async fn set_nft_uri_checked(
     Ok(())
 }
 
+async fn set_nft_uri_unchecked(conn: impl SqliteExecutor<'_>, uri: String) -> Result<()> {
+    sqlx::query!("UPDATE `nft_uris` SET `checked` = 0 WHERE `uri` = ?", uri)
+        .execute(conn)
+        .await?;
+
+    Ok(())
+}
+
 async fn insert_nft_data(
     conn: impl SqliteExecutor<'_>,
     hash: Bytes32,
@@ -442,6 +458,16 @@ async fn insert_nft_data(
     Ok(())
 }
 
+async fn delete_nft_data(conn: impl SqliteExecutor<'_>, hash: Bytes32) -> Result<()> {
+    let hash = hash.as_ref();
+
+    sqlx::query!("DELETE FROM `nft_data` WHERE `hash` = ?", hash)
+        .execute(conn)
+        .await?;
+
+    Ok(())
+}
+
 async fn distinct_minter_dids(conn: impl SqliteExecutor<'_>) -> Result<Vec<Option<Bytes32>>> {
     let rows = sqlx::query!("SELECT DISTINCT minter_did FROM nfts WHERE minter_did IS NOT NULL")
         .fetch_all(conn)

crates/sage-keychain/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-keychain"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "A simple password based keychain implementation for Sage."

crates/sage-wallet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-wallet"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "The driver code and sync logic for Sage wallet."

crates/sage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "A high level abstraction for running Sage wallet."

crates/sage/src/endpoints/actions.rs

@@ -1,10 +1,13 @@
 use chia::{
     bls::master_to_wallet_hardened_intermediate,
-    puzzles::{standard::StandardArgs, DeriveSynthetic},
+    clvm_traits::{FromClvm, ToClvm},
+    puzzles::{nft::NftMetadata, standard::StandardArgs, DeriveSynthetic},
 };
+use clvmr::Allocator;
 use sage_api::{
-    IncreaseDerivationIndex, IncreaseDerivationIndexResponse, RemoveCat, RemoveCatResponse,
-    UpdateCat, UpdateCatResponse, UpdateDid, UpdateDidResponse, UpdateNft, UpdateNftResponse,
+    IncreaseDerivationIndex, IncreaseDerivationIndexResponse, RedownloadNft, RedownloadNftResponse,
+    RemoveCat, RemoveCatResponse, UpdateCat, UpdateCatResponse, UpdateDid, UpdateDidResponse,
+    UpdateNft, UpdateNftResponse,
 };
 use sage_database::{CatRow, DidRow};
 use sage_wallet::SyncCommand;
@@ -75,6 +78,54 @@ impl Sage {
         Ok(UpdateNftResponse {})
     }
 
+    pub async fn redownload_nft(&self, req: RedownloadNft) -> Result<RedownloadNftResponse> {
+        let wallet = self.wallet()?;
+
+        let nft_id = parse_nft_id(req.nft_id)?;
+
+        let Some(nft) = wallet.db.nft(nft_id).await? else {
+            return Err(Error::MissingNft(nft_id));
+        };
+
+        let mut allocator = Allocator::new();
+        let metadata = nft
+            .info
+            .metadata
+            .to_clvm(&mut allocator)
+            .ok()
+            .and_then(|ptr| NftMetadata::from_clvm(&allocator, ptr).ok());
+
+        if let Some(metadata) = metadata {
+            let mut tx = wallet.db.tx().await?;
+
+            for uri in [
+                metadata.data_uris,
+                metadata.metadata_uris,
+                metadata.license_uris,
+            ]
+            .concat()
+            {
+                tx.set_nft_uri_unchecked(uri).await?;
+            }
+
+            if let Some(hash) = metadata.data_hash {
+                tx.delete_nft_data(hash).await?;
+            }
+
+            if let Some(hash) = metadata.metadata_hash {
+                tx.delete_nft_data(hash).await?;
+            }
+
+            if let Some(hash) = metadata.license_hash {
+                tx.delete_nft_data(hash).await?;
+            }
+
+            tx.commit().await?;
+        }
+
+        Ok(RedownloadNftResponse {})
+    }
+
     pub async fn increase_derivation_index(
         &self,
         req: IncreaseDerivationIndex,

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-tauri"
-version = "0.9.1"
+version = "0.9.2"
 description = "A next generation Chia wallet."
 authors = ["Rigidity <[email protected]>"]
 license = "Apache-2.0"

src-tauri/gen/apple/sage-tauri_iOS/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.1</string>
+	<string>0.9.2</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.1</string>
+	<string>0.9.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -45,4 +45,4 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Read QR codes</string>
 </dict>
-</plist>
+</plist>

src-tauri/src/commands.rs

@@ -475,6 +475,15 @@ pub async fn update_nft(state: State<'_, AppState>, req: UpdateNft) -> Result<Up
     Ok(state.lock().await.update_nft(req).await?)
 }
 
+#[command]
+#[specta]
+pub async fn redownload_nft(
+    state: State<'_, AppState>,
+    req: RedownloadNft,
+) -> Result<RedownloadNftResponse> {
+    Ok(state.lock().await.redownload_nft(req).await?)
+}
+
 #[command]
 #[specta]
 pub async fn increase_derivation_index(

src-tauri/src/lib.rs

@@ -84,6 +84,7 @@ pub fn run() {
             commands::remove_cat,
             commands::update_did,
             commands::update_nft,
+            commands::redownload_nft,
             commands::increase_derivation_index,
             commands::get_peers,
             commands::add_peer,

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "Sage",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "identifier": "com.rigidnetwork.sage",
   "build": {
     "frontendDist": "../dist",

src/bindings.ts

@@ -206,6 +206,9 @@ async updateDid(req: UpdateDid) : Promise<UpdateDidResponse> {
 async updateNft(req: UpdateNft) : Promise<UpdateNftResponse> {
     return await TAURI_INVOKE("update_nft", { req });
 },
+async redownloadNft(req: RedownloadNft) : Promise<RedownloadNftResponse> {
+    return await TAURI_INVOKE("redownload_nft", { req });
+},
 async increaseDerivationIndex(req: IncreaseDerivationIndex) : Promise<IncreaseDerivationIndexResponse> {
     return await TAURI_INVOKE("increase_derivation_index", { req });
 },
@@ -362,6 +365,8 @@ export type OfferSummary = { fee: Amount; maker: OfferAssets; taker: OfferAssets
 export type OfferXch = { amount: Amount; royalty: Amount }
 export type PeerRecord = { ip_addr: string; port: number; peak_height: number }
 export type PendingTransactionRecord = { transaction_id: string; fee: Amount; submitted_at: string | null }
+export type RedownloadNft = { nft_id: string }
+export type RedownloadNftResponse = Record<string, never>
 export type RemoveCat = { asset_id: string }
 export type RemoveCatResponse = Record<string, never>
 export type RemovePeer = { ip: string; ban: boolean }