Merge pull request #693 from dkackman/bug-692

Rigidity · web-flow · commit 5a6408e550e7 · 2025-10-15T13:09:55.000-04:00
no SVG thumbnails on testnet
diff --git a/crates/sage-assets/src/nfts/fetch_nft_uri.rs b/crates/sage-assets/src/nfts/fetch_nft_uri.rs
@@ -21,7 +21,7 @@ pub struct Data {
     pub thumbnail: Option<Thumbnail>,
 }
 
-pub async fn fetch_uri(uri: String) -> Result<Data, UriError> {
+pub async fn fetch_uri(uri: String, testnet: bool) -> Result<Data, UriError> {
     let response = reqwest::get(&uri).await?;
 
     let mime_type = match response.headers().get(CONTENT_TYPE) {
@@ -49,7 +49,7 @@ pub async fn fetch_uri(uri: String) -> Result<Data, UriError> {
     hasher.update(&blob);
     let hash = Bytes32::new(hasher.finalize());
 
-    let mut thumbnail = match mintgarden_thumbnail(hash).await {
+    let mut thumbnail = match mintgarden_thumbnail(hash, testnet).await {
         Ok(thumbnail) => thumbnail,
         Err(error) => {
             debug!("Failed to fetch MintGarden thumbnail for {uri}: {error}");
@@ -91,11 +91,11 @@ pub async fn fetch_uri(uri: String) -> Result<Data, UriError> {
     })
 }
 
-pub async fn fetch_uris_without_hash(uris: Vec<String>) -> Result<Data, UriError> {
+pub async fn fetch_uris_without_hash(uris: Vec<String>, testnet: bool) -> Result<Data, UriError> {
     let mut futures = FuturesUnordered::new();
 
     for uri in uris {
-        futures.push(fetch_uri(uri));
+        futures.push(fetch_uri(uri, testnet));
     }
 
     let mut data = None;
@@ -128,11 +128,11 @@ pub async fn fetch_uris_without_hash(uris: Vec<String>) -> Result<Data, UriError
     data.ok_or(UriError::NoUris)
 }
 
-pub async fn fetch_uris_with_hash(uris: Vec<String>, hash: Bytes32) -> Option<Data> {
+pub async fn fetch_uris_with_hash(uris: Vec<String>, hash: Bytes32, testnet: bool) -> Option<Data> {
     let mut futures = FuturesUnordered::new();
 
     for uri in uris {
-        futures.push(async move { (uri.clone(), fetch_uri(uri).await) });
+        futures.push(async move { (uri.clone(), fetch_uri(uri, testnet).await) });
     }
 
     while let Some((uri, result)) = futures.next().await {
@@ -151,8 +151,14 @@ pub async fn fetch_uris_with_hash(uris: Vec<String>, hash: Bytes32) -> Option<Da
     None
 }
 
-pub async fn mintgarden_thumbnail(data_hash: Bytes32) -> Result<Option<Thumbnail>, UriError> {
-    let url = format!("https://assets.mainnet.mintgarden.io/thumbnails/{data_hash}_512.webp");
+pub async fn mintgarden_thumbnail(
+    data_hash: Bytes32,
+    testnet: bool,
+) -> Result<Option<Thumbnail>, UriError> {
+    let url = format!(
+        "https://assets.{}.mintgarden.io/thumbnails/{data_hash}_512.webp",
+        if testnet { "testnet" } else { "mainnet" }
+    );
 
     let response = reqwest::get(&url).await?;
 
diff --git a/crates/sage-wallet/src/queues/nft_uri_queue.rs b/crates/sage-wallet/src/queues/nft_uri_queue.rs
@@ -11,16 +11,22 @@ use tokio::{
 use tracing::{debug, info, warn};
 
 use crate::{compute_nft_info, SyncEvent, WalletError};
-
+use chia_wallet_sdk::types::TESTNET11_CONSTANTS;
+use sage_config::Network;
 #[derive(Debug)]
 pub struct NftUriQueue {
     db: Database,
     sync_sender: mpsc::Sender<SyncEvent>,
+    network: Network,
 }
 
 impl NftUriQueue {
-    pub fn new(db: Database, sync_sender: mpsc::Sender<SyncEvent>) -> Self {
-        Self { db, sync_sender }
+    pub fn new(db: Database, sync_sender: mpsc::Sender<SyncEvent>, network: Network) -> Self {
+        Self {
+            db,
+            sync_sender,
+            network,
+        }
     }
 
     pub async fn start(self, delay: Duration) -> Result<(), WalletError> {
@@ -40,10 +46,14 @@ impl NftUriQueue {
         info!("Processing batch of {} NFT URIs", batch.len());
 
         let mut futures = FuturesUnordered::new();
-
+        let testnet = self.network.genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;
         for item in batch {
             futures.push(async move {
-                let result = timeout(Duration::from_secs(15), fetch_uri(item.uri.clone())).await;
+                let result = timeout(
+                    Duration::from_secs(15),
+                    fetch_uri(item.uri.clone(), testnet),
+                )
+                .await;
                 (item, result)
             });
         }
diff --git a/crates/sage-wallet/src/sync_manager.rs b/crates/sage-wallet/src/sync_manager.rs
@@ -433,8 +433,12 @@ impl SyncManager {
 
             if self.nft_uri_queue_task.is_none() && !self.options.testing {
                 let task = tokio::spawn(
-                    NftUriQueue::new(wallet.db.clone(), self.event_sender.clone())
-                        .start(self.options.timeouts.nft_uri_delay),
+                    NftUriQueue::new(
+                        wallet.db.clone(),
+                        self.event_sender.clone(),
+                        self.network.clone(),
+                    )
+                    .start(self.options.timeouts.nft_uri_delay),
                 );
                 self.nft_uri_queue_task = Some(task);
             }
diff --git a/crates/sage/src/endpoints/offers.rs b/crates/sage/src/endpoints/offers.rs
@@ -3,6 +3,7 @@ use chia::puzzles::nft::NftMetadata;
 use chia_wallet_sdk::{
     driver::{decode_offer, encode_offer, DriverError, Offer, SpendContext},
     signer::AggSigConstants,
+    types::TESTNET11_CONSTANTS,
     utils::Address,
 };
 use itertools::Itertools;
@@ -304,14 +305,16 @@ impl Sage {
             });
         }
 
+        let testnet = self.network().genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;
+
         for nft in offer.offered_coins().nfts.values() {
             let _info = if let Ok(metadata) = ctx.extract::<NftMetadata>(nft.info.metadata.ptr()) {
                 let mut confirmation_info = ConfirmationInfo::default();
 
                 if let Some(hash) = metadata.data_hash {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.data_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),
                     )
                     .await
                     {
@@ -322,7 +325,7 @@ impl Sage {
                 if let Some(hash) = metadata.metadata_hash {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),
                     )
                     .await
                     {
@@ -395,7 +398,7 @@ impl Sage {
                 if let Some(hash) = metadata.data_hash {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.data_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),
                     )
                     .await
                     {
@@ -406,7 +409,7 @@ impl Sage {
                 if let Some(hash) = metadata.metadata_hash {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),
                     )
                     .await
                     {
diff --git a/crates/sage/src/endpoints/transactions.rs b/crates/sage/src/endpoints/transactions.rs
@@ -6,6 +6,7 @@ use chia::{
 };
 use chia_wallet_sdk::{
     driver::{MetadataUpdate, OptionType},
+    types::TESTNET11_CONSTANTS,
     utils::Address,
 };
 use itertools::Itertools;
@@ -285,6 +286,7 @@ impl Sage {
 
         let mut mints = Vec::with_capacity(req.mints.len());
         let mut info = ConfirmationInfo::default();
+        let testnet = self.network().genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;
 
         for item in req.mints {
             let royalty_puzzle_hash = item
@@ -301,7 +303,7 @@ impl Sage {
             } else {
                 let data = timeout(
                     Duration::from_secs(10),
-                    fetch_uris_without_hash(item.data_uris.clone()),
+                    fetch_uris_without_hash(item.data_uris.clone(), testnet),
                 )
                 .await??;
 
@@ -318,7 +320,7 @@ impl Sage {
             } else {
                 let metadata = timeout(
                     Duration::from_secs(10),
-                    fetch_uris_without_hash(item.metadata_uris.clone()),
+                    fetch_uris_without_hash(item.metadata_uris.clone(), testnet),
                 )
                 .await??;
 
@@ -335,7 +337,7 @@ impl Sage {
             } else {
                 let data = timeout(
                     Duration::from_secs(10),
-                    fetch_uris_without_hash(item.license_uris.clone()),
+                    fetch_uris_without_hash(item.license_uris.clone(), testnet),
                 )
                 .await??;
 
diff --git a/crates/sage/src/utils/cache.rs b/crates/sage/src/utils/cache.rs
@@ -81,11 +81,13 @@ impl Sage {
         }
 
         let info = if let Ok(metadata) = NftMetadata::from_clvm(allocator, nft_metadata) {
+            let testnet = self.network().genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;
+
             if let Some(hash) = metadata.data_hash {
                 if let Entry::Vacant(entry) = confirmation_info.nft_data.entry(hash) {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.data_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),
                     )
                     .await
                     {
@@ -98,7 +100,7 @@ impl Sage {
                 if let Entry::Vacant(entry) = confirmation_info.nft_data.entry(hash) {
                     if let Ok(Some(data)) = timeout(
                         Duration::from_secs(10),
-                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),
+                        fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),
                     )
                     .await
                     {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ use chia::puzzles::nft::NftMetadata;`
`3`	`3`	`use chia_wallet_sdk::{`
`4`	`4`	`driver::{decode_offer, encode_offer, DriverError, Offer, SpendContext},`
`5`	`5`	`signer::AggSigConstants,`
	`6`	`+ types::TESTNET11_CONSTANTS,`
`6`	`7`	`utils::Address,`
`7`	`8`	`};`
`8`	`9`	`use itertools::Itertools;`
`@@ -304,14 +305,16 @@ impl Sage {`
`304`	`305`	`});`
`305`	`306`	`}`
`306`	`307`
	`308`	`+ let testnet = self.network().genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;`
	`309`	`+`
`307`	`310`	`for nft in offer.offered_coins().nfts.values() {`
`308`	`311`	`let _info = if let Ok(metadata) = ctx.extract::<NftMetadata>(nft.info.metadata.ptr()) {`
`309`	`312`	`let mut confirmation_info = ConfirmationInfo::default();`
`310`	`313`
`311`	`314`	`if let Some(hash) = metadata.data_hash {`
`312`	`315`	`if let Ok(Some(data)) = timeout(`
`313`	`316`	`Duration::from_secs(10),`
`314`		`- fetch_uris_with_hash(metadata.data_uris.clone(), hash),`
	`317`	`+ fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),`
`315`	`318`	`)`
`316`	`319`	`.await`
`317`	`320`	`{`
`@@ -322,7 +325,7 @@ impl Sage {`
`322`	`325`	`if let Some(hash) = metadata.metadata_hash {`
`323`	`326`	`if let Ok(Some(data)) = timeout(`
`324`	`327`	`Duration::from_secs(10),`
`325`		`- fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),`
	`328`	`+ fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),`
`326`	`329`	`)`
`327`	`330`	`.await`
`328`	`331`	`{`
`@@ -395,7 +398,7 @@ impl Sage {`
`395`	`398`	`if let Some(hash) = metadata.data_hash {`
`396`	`399`	`if let Ok(Some(data)) = timeout(`
`397`	`400`	`Duration::from_secs(10),`
`398`		`- fetch_uris_with_hash(metadata.data_uris.clone(), hash),`
	`401`	`+ fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),`
`399`	`402`	`)`
`400`	`403`	`.await`
`401`	`404`	`{`
`@@ -406,7 +409,7 @@ impl Sage {`
`406`	`409`	`if let Some(hash) = metadata.metadata_hash {`
`407`	`410`	`if let Ok(Some(data)) = timeout(`
`408`	`411`	`Duration::from_secs(10),`
`409`		`- fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),`
	`412`	`+ fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),`
`410`	`413`	`)`
`411`	`414`	`.await`
`412`	`415`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,13 @@ impl Sage {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`let info = if let Ok(metadata) = NftMetadata::from_clvm(allocator, nft_metadata) {`
	`84`	`+ let testnet = self.network().genesis_challenge == TESTNET11_CONSTANTS.genesis_challenge;`
	`85`	`+`
`84`	`86`	`if let Some(hash) = metadata.data_hash {`
`85`	`87`	`if let Entry::Vacant(entry) = confirmation_info.nft_data.entry(hash) {`
`86`	`88`	`if let Ok(Some(data)) = timeout(`
`87`	`89`	`Duration::from_secs(10),`
`88`		`- fetch_uris_with_hash(metadata.data_uris.clone(), hash),`
	`90`	`+ fetch_uris_with_hash(metadata.data_uris.clone(), hash, testnet),`
`89`	`91`	`)`
`90`	`92`	`.await`
`91`	`93`	`{`
`@@ -98,7 +100,7 @@ impl Sage {`
`98`	`100`	`if let Entry::Vacant(entry) = confirmation_info.nft_data.entry(hash) {`
`99`	`101`	`if let Ok(Some(data)) = timeout(`
`100`	`102`	`Duration::from_secs(10),`
`101`		`- fetch_uris_with_hash(metadata.metadata_uris.clone(), hash),`
	`103`	`+ fetch_uris_with_hash(metadata.metadata_uris.clone(), hash, testnet),`
`102`	`104`	`)`
`103`	`105`	`.await`
`104`	`106`	`{`