Merge pull request xch-dev#562 from xch-dev/use-sdk-fix

Use Wallet SDK fix

Author: Rigidity

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 = { version = "0.27.2", features = ["rustls", "offer-compression", "peer-simulator"] }
+chia-wallet-sdk = { git = "https://github.com/xch-dev/chia-wallet-sdk", rev = "c022b3d262ca13038958ccf3211925f87c3c1a83", features = ["rustls", "offer-compression", "peer-simulator"] }
 bip39 = "2.0.0"
 bech32 = "0.9.1"
 rand = "0.8.5"
@@ -103,7 +103,7 @@ tokio = "1.39.2"
 futures-util = "0.3.30"
 futures-lite = "2.3.0"
 sqlx = "0.8.0"
-reqwest = { version = "0.12.7", default-features = false }
+reqwest = { version = "0.12.22", default-features = false }
 
 # Utilities
 indexmap = "2.3.0"

Cargo.toml

@@ -71,6 +71,8 @@ pub struct RedownloadNftResponse {}
 pub struct IncreaseDerivationIndex {
     #[serde(default)]
     pub hardened: Option<bool>,
+    #[serde(default)]
+    pub unhardened: Option<bool>,
     pub index: u32,
 }
 

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

@@ -1,8 +1,10 @@
 mod maintenance;
+mod serialized_primitives;
 mod tables;
 mod utils;
 
 pub use maintenance::*;
+pub use serialized_primitives::*;
 pub use tables::*;
 
 pub(crate) use utils::*;

crates/sage-database/src/lib.rs

@@ -0,0 +1,155 @@
+use chia::{
+    clvm_traits::{FromClvm, ToClvm},
+    protocol::{Bytes32, Program},
+};
+use chia_wallet_sdk::{
+    driver::{Did, DidInfo, DriverError, HashedPtr, Nft, NftInfo, Singleton},
+    prelude::Allocator,
+};
+
+pub type SerializedNft = Singleton<SerializedNftInfo>;
+pub type SerializedDid = Singleton<SerializedDidInfo>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SerializedNftInfo {
+    pub launcher_id: Bytes32,
+    pub metadata: Program,
+    pub metadata_updater_puzzle_hash: Bytes32,
+    pub current_owner: Option<Bytes32>,
+    pub royalty_puzzle_hash: Bytes32,
+    pub royalty_basis_points: u16,
+    pub p2_puzzle_hash: Bytes32,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct SerializedDidInfo {
+    pub launcher_id: Bytes32,
+    pub recovery_list_hash: Option<Bytes32>,
+    pub num_verifications_required: u64,
+    pub metadata: Program,
+    pub p2_puzzle_hash: Bytes32,
+}
+
+pub trait DeserializePrimitive {
+    type Primitive;
+
+    fn deserialize(self, allocator: &mut Allocator) -> Result<Self::Primitive, DriverError>;
+}
+
+impl DeserializePrimitive for SerializedNft {
+    type Primitive = Nft;
+
+    fn deserialize(self, allocator: &mut Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(Nft::new(
+            self.coin,
+            self.proof,
+            self.info.deserialize(allocator)?,
+        ))
+    }
+}
+
+impl DeserializePrimitive for SerializedNftInfo {
+    type Primitive = NftInfo;
+
+    fn deserialize(self, allocator: &mut Allocator) -> Result<Self::Primitive, DriverError> {
+        let ptr = self.metadata.to_clvm(allocator)?;
+
+        Ok(NftInfo::new(
+            self.launcher_id,
+            HashedPtr::from_ptr(allocator, ptr),
+            self.metadata_updater_puzzle_hash,
+            self.current_owner,
+            self.royalty_puzzle_hash,
+            self.royalty_basis_points,
+            self.p2_puzzle_hash,
+        ))
+    }
+}
+
+impl DeserializePrimitive for SerializedDid {
+    type Primitive = Did;
+
+    fn deserialize(self, allocator: &mut Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(Did::new(
+            self.coin,
+            self.proof,
+            self.info.deserialize(allocator)?,
+        ))
+    }
+}
+
+impl DeserializePrimitive for SerializedDidInfo {
+    type Primitive = DidInfo;
+
+    fn deserialize(self, allocator: &mut Allocator) -> Result<Self::Primitive, DriverError> {
+        let ptr = self.metadata.to_clvm(allocator)?;
+
+        Ok(DidInfo::new(
+            self.launcher_id,
+            self.recovery_list_hash,
+            self.num_verifications_required,
+            HashedPtr::from_ptr(allocator, ptr),
+            self.p2_puzzle_hash,
+        ))
+    }
+}
+
+pub trait SerializePrimitive: Sized {
+    type Primitive;
+
+    fn serialize(&self, allocator: &Allocator) -> Result<Self::Primitive, DriverError>;
+}
+
+impl SerializePrimitive for Nft {
+    type Primitive = SerializedNft;
+
+    fn serialize(&self, allocator: &Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(SerializedNft {
+            coin: self.coin,
+            proof: self.proof,
+            info: self.info.serialize(allocator)?,
+        })
+    }
+}
+
+impl SerializePrimitive for NftInfo {
+    type Primitive = SerializedNftInfo;
+
+    fn serialize(&self, allocator: &Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(SerializedNftInfo {
+            launcher_id: self.launcher_id,
+            metadata: Program::from_clvm(allocator, self.metadata.ptr())?,
+            metadata_updater_puzzle_hash: self.metadata_updater_puzzle_hash,
+            current_owner: self.current_owner,
+            royalty_puzzle_hash: self.royalty_puzzle_hash,
+            royalty_basis_points: self.royalty_basis_points,
+            p2_puzzle_hash: self.p2_puzzle_hash,
+        })
+    }
+}
+
+impl SerializePrimitive for Did {
+    type Primitive = SerializedDid;
+
+    fn serialize(&self, allocator: &Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(SerializedDid {
+            coin: self.coin,
+            proof: self.proof,
+            info: self.info.serialize(allocator)?,
+        })
+    }
+}
+
+impl SerializePrimitive for DidInfo {
+    type Primitive = SerializedDidInfo;
+
+    fn serialize(&self, allocator: &Allocator) -> Result<Self::Primitive, DriverError> {
+        Ok(SerializedDidInfo {
+            launcher_id: self.launcher_id,
+            recovery_list_hash: self.recovery_list_hash,
+            num_verifications_required: self.num_verifications_required,
+            metadata: Program::from_clvm(allocator, self.metadata.ptr())?,
+            p2_puzzle_hash: self.p2_puzzle_hash,
+        })
+    }
+}