solution

xch-dev · Dec 4, 2024 · b4bb358 · b4bb358
1 parent ee33a33
commit b4bb358
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/crates/chia-sdk-types/src/puzzle_mod.rs b/crates/chia-sdk-types/src/puzzle_mod.rs
@@ -1,27 +1,34 @@
 use chia_puzzles::{
     cat::{
-        CatArgs, EverythingWithSignatureTailArgs, GenesisByCoinIdTailArgs, CAT_PUZZLE,
+        CatArgs, CatSolution, EverythingWithSignatureTailArgs, GenesisByCoinIdTailArgs, CAT_PUZZLE,
         CAT_PUZZLE_HASH, EVERYTHING_WITH_SIGNATURE_TAIL_PUZZLE,
         EVERYTHING_WITH_SIGNATURE_TAIL_PUZZLE_HASH, GENESIS_BY_COIN_ID_TAIL_PUZZLE,
         GENESIS_BY_COIN_ID_TAIL_PUZZLE_HASH,
     },
-    did::{DidArgs, DID_INNER_PUZZLE, DID_INNER_PUZZLE_HASH},
+    did::{DidArgs, DidSolution, DID_INNER_PUZZLE, DID_INNER_PUZZLE_HASH},
     nft::{
-        NftIntermediateLauncherArgs, NftOwnershipLayerArgs, NftRoyaltyTransferPuzzleArgs,
-        NftStateLayerArgs, NFT_INTERMEDIATE_LAUNCHER_PUZZLE, NFT_INTERMEDIATE_LAUNCHER_PUZZLE_HASH,
+        NftIntermediateLauncherArgs, NftOwnershipLayerArgs, NftOwnershipLayerSolution,
+        NftRoyaltyTransferPuzzleArgs, NftStateLayerArgs, NftStateLayerSolution,
+        NFT_INTERMEDIATE_LAUNCHER_PUZZLE, NFT_INTERMEDIATE_LAUNCHER_PUZZLE_HASH,
         NFT_OWNERSHIP_LAYER_PUZZLE, NFT_OWNERSHIP_LAYER_PUZZLE_HASH, NFT_ROYALTY_TRANSFER_PUZZLE,
         NFT_ROYALTY_TRANSFER_PUZZLE_HASH, NFT_STATE_LAYER_PUZZLE, NFT_STATE_LAYER_PUZZLE_HASH,
     },
-    singleton::{SingletonArgs, SINGLETON_TOP_LAYER_PUZZLE, SINGLETON_TOP_LAYER_PUZZLE_HASH},
-    standard::{StandardArgs, STANDARD_PUZZLE, STANDARD_PUZZLE_HASH},
+    singleton::{
+        SingletonArgs, SingletonSolution, SINGLETON_TOP_LAYER_PUZZLE,
+        SINGLETON_TOP_LAYER_PUZZLE_HASH,
+    },
+    standard::{StandardArgs, StandardSolution, STANDARD_PUZZLE, STANDARD_PUZZLE_HASH},
 };
 use clvm_traits::ToClvm;
 use clvm_utils::{CurriedProgram, TreeHash, TreeHasher};
+use clvmr::NodePtr;
 
 pub trait Mod {
     const MOD_REVEAL: &[u8];
     const MOD_HASH: TreeHash;
 
+    type Solution;
+
     fn curry_tree_hash(&self) -> TreeHash
     where
         Self: Sized + ToClvm<TreeHasher>,
@@ -38,49 +45,59 @@ pub trait Mod {
 impl Mod for StandardArgs {
     const MOD_REVEAL: &[u8] = &STANDARD_PUZZLE;
     const MOD_HASH: TreeHash = STANDARD_PUZZLE_HASH;
+    type Solution = StandardSolution<NodePtr, NodePtr>;
 }
 
 impl<I> Mod for CatArgs<I> {
     const MOD_REVEAL: &[u8] = &CAT_PUZZLE;
     const MOD_HASH: TreeHash = CAT_PUZZLE_HASH;
+    type Solution = CatSolution<NodePtr>;
 }
 
 impl<I, M> Mod for DidArgs<I, M> {
     const MOD_REVEAL: &[u8] = &DID_INNER_PUZZLE;
     const MOD_HASH: TreeHash = DID_INNER_PUZZLE_HASH;
+    type Solution = DidSolution<NodePtr>;
 }
 
 impl Mod for NftIntermediateLauncherArgs {
     const MOD_REVEAL: &[u8] = &NFT_INTERMEDIATE_LAUNCHER_PUZZLE;
     const MOD_HASH: TreeHash = NFT_INTERMEDIATE_LAUNCHER_PUZZLE_HASH;
+    type Solution = ();
 }
 
 impl Mod for NftRoyaltyTransferPuzzleArgs {
     const MOD_REVEAL: &[u8] = &NFT_ROYALTY_TRANSFER_PUZZLE;
     const MOD_HASH: TreeHash = NFT_ROYALTY_TRANSFER_PUZZLE_HASH;
+    type Solution = NodePtr;
 }
 
 impl<I, P> Mod for NftOwnershipLayerArgs<I, P> {
     const MOD_REVEAL: &[u8] = &NFT_OWNERSHIP_LAYER_PUZZLE;
     const MOD_HASH: TreeHash = NFT_OWNERSHIP_LAYER_PUZZLE_HASH;
+    type Solution = NftOwnershipLayerSolution<NodePtr>;
 }
 
 impl<I, M> Mod for NftStateLayerArgs<I, M> {
     const MOD_REVEAL: &[u8] = &NFT_STATE_LAYER_PUZZLE;
     const MOD_HASH: TreeHash = NFT_STATE_LAYER_PUZZLE_HASH;
+    type Solution = NftStateLayerSolution<NodePtr>;
 }
 
 impl<I> Mod for SingletonArgs<I> {
     const MOD_REVEAL: &[u8] = &SINGLETON_TOP_LAYER_PUZZLE;
     const MOD_HASH: TreeHash = SINGLETON_TOP_LAYER_PUZZLE_HASH;
+    type Solution = SingletonSolution<NodePtr>;
 }
 
 impl Mod for EverythingWithSignatureTailArgs {
     const MOD_REVEAL: &[u8] = &EVERYTHING_WITH_SIGNATURE_TAIL_PUZZLE;
     const MOD_HASH: TreeHash = EVERYTHING_WITH_SIGNATURE_TAIL_PUZZLE_HASH;
+    type Solution = NodePtr;
 }
 
 impl Mod for GenesisByCoinIdTailArgs {
     const MOD_REVEAL: &[u8] = &GENESIS_BY_COIN_ID_TAIL_PUZZLE;
     const MOD_HASH: TreeHash = GENESIS_BY_COIN_ID_TAIL_PUZZLE_HASH;
+    type Solution = NodePtr;
 }