Merge remote-tracking branch 'upstream/new-database' into migrate-schema

Author: dkackman

Cargo.lock

@@ -90,7 +90,7 @@ chia-traits = "0.26.0"
 chia-sha2 = "0.26.0"
 chia-puzzles = "0.20.1"
 clvmr = "0.14.0"
-chia-wallet-sdk = { git = "https://github.com/xch-dev/chia-wallet-sdk", rev = "1202fe93b62a60fba4009071ae60b960b27e72e6", features = ["rustls", "offer-compression", "peer-simulator"] }
+chia-wallet-sdk = { git = "https://github.com/xch-dev/chia-wallet-sdk", rev = "c9a35dacaf5387483c99208591d8831692bcc1ab", features = ["rustls", "offer-compression", "peer-simulator"] }
 bip39 = "2.0.0"
 bech32 = "0.9.1"
 rand = "0.8.5"

Cargo.toml

@@ -47,8 +47,6 @@ pub struct TakeOffer {
     pub fee: Amount,
     #[serde(default)]
     pub auto_submit: bool,
-    #[serde(default = "yes")]
-    pub auto_import: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

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

@@ -118,6 +118,14 @@ pub struct NftMetadataInfo {
     pub collection_id: Option<Bytes32>,
 }
 
+#[derive(Debug, Clone)]
+pub struct RequestedNft {
+    pub metadata: Program,
+    pub metadata_updater_puzzle_hash: Bytes32,
+    pub royalty_puzzle_hash: Bytes32,
+    pub royalty_basis_points: u16,
+}
+
 impl Database {
     pub async fn asset_kind(&self, asset_id: Bytes32) -> Result<Option<AssetKind>> {
         asset_kind(&self.pool, asset_id).await
@@ -180,6 +188,10 @@ impl Database {
     pub async fn did_assets(&self) -> Result<Vec<DidAsset>> {
         did_assets(&self.pool).await
     }
+
+    pub async fn requested_nft(&self, launcher_id: Bytes32) -> Result<Option<RequestedNft>> {
+        requested_nft(&self.pool, launcher_id).await
+    }
 }
 
 impl DatabaseTx<'_> {
@@ -928,3 +940,32 @@ async fn did_assets(conn: impl SqliteExecutor<'_>) -> Result<Vec<DidAsset>> {
     })
     .collect()
 }
+
+async fn requested_nft(
+    conn: impl SqliteExecutor<'_>,
+    launcher_id: Bytes32,
+) -> Result<Option<RequestedNft>> {
+    let launcher_id = launcher_id.as_ref();
+
+    query!(
+        "
+        SELECT
+            metadata, metadata_updater_puzzle_hash, royalty_puzzle_hash, royalty_basis_points
+        FROM nfts
+        INNER JOIN assets ON assets.id = nfts.asset_id
+        WHERE hash = ?
+        ",
+        launcher_id
+    )
+    .fetch_optional(conn)
+    .await?
+    .map(|row| {
+        Ok(RequestedNft {
+            metadata: Program::from(row.metadata),
+            metadata_updater_puzzle_hash: row.metadata_updater_puzzle_hash.convert()?,
+            royalty_puzzle_hash: row.royalty_puzzle_hash.convert()?,
+            royalty_basis_points: row.royalty_basis_points.convert()?,
+        })
+    })
+    .transpose()
+}

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

@@ -206,10 +206,6 @@ impl DatabaseTx<'_> {
         is_known_coin(&mut *self.tx, coin_id).await
     }
 
-    pub async fn is_latest_singleton_coin(&mut self, hash: Bytes32) -> Result<bool> {
-        is_latest_singleton_coin(&mut *self.tx, hash).await
-    }
-
     pub async fn sync_coin(
         &mut self,
         coin_id: Bytes32,
@@ -347,22 +343,6 @@ async fn delete_coin(conn: impl SqliteExecutor<'_>, coin_id: Bytes32) -> Result<
     Ok(())
 }
 
-async fn is_latest_singleton_coin(conn: impl SqliteExecutor<'_>, hash: Bytes32) -> Result<bool> {
-    let hash_ref = hash.as_ref();
-
-    let rows = query!(
-        "SELECT amount FROM internal_coins WHERE parent_coin_hash = ?",
-        hash_ref
-    )
-    .fetch_all(conn)
-    .await?
-    .into_iter()
-    .map(|row| row.amount.convert())
-    .collect::<Result<Vec<u64>>>()?;
-
-    Ok(rows.into_iter().all(|amount| amount % 2 == 0))
-}
-
 async fn sync_coin(
     conn: impl SqliteExecutor<'_>,
     coin_id: Bytes32,