Clear signing updates (#349)

* reserved fee, p2 puzzle hash, message hashes

* Requested payments, and NFTs

* Update declarations

Author: Rigidity

bindings/clear_signing.json

@@ -5,7 +5,8 @@
     "fields": {
       "launcher_id": "Bytes32",
       "custody_hash": "TreeHash",
-      "delegated_spend": "Spend"
+      "delegated_spend": "Spend",
+      "coin_id": "Option<Bytes32>"
     }
   },
   "VaultTransaction": {
@@ -18,7 +19,11 @@
       "nfts": "Vec<ParsedNftTransfer>",
       "drop_coins": "Vec<DropCoin>",
       "fee_paid": "u64",
-      "total_fee": "u64"
+      "total_fee": "u64",
+      "reserved_fee": "u64",
+      "p2_puzzle_hash": "Bytes32",
+      "coin_message_hash": "Option<Bytes32>",
+      "puzzle_message_hash": "Bytes32"
     }
   },
   "ParsedPayment": {
@@ -46,11 +51,23 @@
       "coin": "Coin",
       "clawback": "Option<ClawbackV2>",
       "memos": "Vec<String>",
-      "new_uris": "Vec<MetadataUpdate>",
-      "latest_owner": "Option<Bytes32>",
+      "old_state": "NftState",
+      "new_state": "NftState",
+      "royalty_puzzle_hash": "Bytes32",
+      "royalty_basis_points": "u16",
       "includes_unverifiable_updates": "bool"
     }
   },
+  "NftState": {
+    "type": "class",
+    "new": true,
+    "remote": true,
+    "fields": {
+      "parsed_metadata": "Option<NftMetadata>",
+      "metadata_updater_puzzle_hash": "Bytes32",
+      "owner": "Option<Bytes32>"
+    }
+  },
   "TransferType": {
     "type": "enum",
     "values": ["Sent", "Burned", "Offered", "Received", "Updated"]

crates/chia-sdk-bindings/src/clear_signing.rs

@@ -9,6 +9,7 @@ pub struct VaultSpendReveal {
     pub launcher_id: Bytes32,
     pub custody_hash: TreeHash,
     pub delegated_spend: Spend,
+    pub coin_id: Option<Bytes32>,
 }
 
 impl From<VaultSpendReveal> for sdk::VaultSpendReveal {
@@ -17,6 +18,7 @@ impl From<VaultSpendReveal> for sdk::VaultSpendReveal {
             launcher_id: value.launcher_id,
             custody_hash: value.custody_hash,
             delegated_spend: value.delegated_spend.into(),
+            coin_id: value.coin_id,
         }
     }
 }

crates/chia-sdk-bindings/src/lib.rs

@@ -76,10 +76,11 @@ pub use chia_sdk_coinset::{
 };
 pub use chia_sdk_driver::{
     Bulletin, BulletinMessage, Cat, CatInfo, Clawback, ClawbackV2, Delta, DropCoin,
-    MedievalVaultHint, MedievalVaultInfo, MetadataUpdate, OptionInfo, OptionMetadata, OptionType,
-    OptionUnderlying, P2ParentCoin, ParsedNftTransfer, ParsedPayment, RewardDistributorConstants,
-    RewardDistributorState, RewardDistributorType, RoundRewardInfo, RoundTimeInfo, StreamedAsset,
-    StreamingPuzzleInfo, TransferType, UriKind, VaultInfo, VaultTransaction,
+    MedievalVaultHint, MedievalVaultInfo, MetadataUpdate, NftState, OptionInfo, OptionMetadata,
+    OptionType, OptionUnderlying, P2ParentCoin, ParsedNftTransfer, ParsedPayment,
+    RewardDistributorConstants, RewardDistributorState, RewardDistributorType, RoundRewardInfo,
+    RoundTimeInfo, StreamedAsset, StreamingPuzzleInfo, TransferType, UriKind, VaultInfo,
+    VaultTransaction,
 };
 pub use chia_sdk_types::{
     conditions::TradePrice,

crates/chia-sdk-driver/src/action_system/spends.rs

@@ -43,6 +43,7 @@ pub struct Outputs {
     pub nfts: IndexMap<Id, Nft>,
     pub options: IndexMap<Id, OptionContract>,
     pub fee: u64,
+    pub reserved_fee: u64,
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
@@ -240,8 +241,8 @@ impl Spends<Unfinished> {
 
         conditions = conditions.extend(self.conditions.optional.clone());
 
-        if self.outputs.fee > 0 {
-            conditions = conditions.reserve_fee(self.outputs.fee);
+        if self.outputs.reserved_fee > 0 {
+            conditions = conditions.reserve_fee(self.outputs.reserved_fee);
         }
 
         for (_, spend) in self.iter_conditions_spends() {

crates/chia-sdk-driver/src/actions/fee.rs

@@ -3,11 +3,15 @@ use crate::{Deltas, DriverError, Id, SpendAction, SpendContext, Spends};
 #[derive(Debug, Clone, Copy)]
 pub struct FeeAction {
     pub amount: u64,
+    pub reserved: bool,
 }
 
 impl FeeAction {
     pub fn new(amount: u64) -> Self {
-        Self { amount }
+        Self {
+            amount,
+            reserved: true,
+        }
     }
 }
 
@@ -24,6 +28,10 @@ impl SpendAction for FeeAction {
     ) -> Result<(), DriverError> {
         spends.outputs.fee += self.amount;
 
+        if self.reserved {
+            spends.outputs.reserved_fee += self.amount;
+        }
+
         Ok(())
     }
 }