Merge pull request #135 from xch-dev/revert-132-clawbacks

Revert "Implement clawbacks"

crates/chia-sdk-driver/src/driver_error.rs

@@ -47,7 +47,4 @@ pub enum DriverError {
 
     #[error("custom driver error: {0}")]
     Custom(String),
-
-    #[error("invalid merkle proof")]
-    InvalidMerkleProof,
 }

crates/chia-sdk-driver/src/layers.rs

@@ -1,28 +1,24 @@
-mod augmented_condition_layer;
 mod cat_layer;
 mod did_layer;
 mod nft_ownership_layer;
 mod nft_state_layer;
-mod p2_curried_layer;
 mod p2_delegated_conditions_layer;
 mod p2_delegated_singleton_layer;
-mod p2_one_of_many_layer;
-mod p2_singleton_layer;
+mod p2_one_of_many;
+mod p2_singleton;
 mod royalty_transfer_layer;
 mod settlement_layer;
 mod singleton_layer;
 mod standard_layer;
 
-pub use augmented_condition_layer::*;
 pub use cat_layer::*;
 pub use did_layer::*;
 pub use nft_ownership_layer::*;
 pub use nft_state_layer::*;
-pub use p2_curried_layer::*;
 pub use p2_delegated_conditions_layer::*;
 pub use p2_delegated_singleton_layer::*;
-pub use p2_one_of_many_layer::*;
-pub use p2_singleton_layer::*;
+pub use p2_one_of_many::*;
+pub use p2_singleton::*;
 pub use royalty_transfer_layer::*;
 pub use settlement_layer::*;
 pub use singleton_layer::*;

crates/chia-sdk-driver/src/layers/datalayer/delegation_layer.rs

@@ -4,7 +4,7 @@ use clvm_utils::{CurriedProgram, ToTreeHash, TreeHash};
 use clvmr::{Allocator, NodePtr};
 use hex_literal::hex;
 
-use crate::{DriverError, Layer, MerkleProof, Puzzle, SpendContext};
+use crate::{DriverError, Layer, Puzzle, SpendContext};
 
 #[allow(clippy::doc_markdown)]
 /// The Delegation [`Layer`] is used to enable DataLayer delegation capabilities
@@ -159,7 +159,7 @@ impl DelegationLayerArgs {
 #[derive(ToClvm, FromClvm, Debug, Clone, PartialEq, Eq)]
 #[clvm(list)]
 pub struct DelegationLayerSolution<P, S> {
-    pub merkle_proof: Option<MerkleProof>,
+    pub merkle_proof: Option<(u32, Vec<Bytes32>)>,
     pub puzzle_reveal: P,
     pub puzzle_solution: S,
 }

crates/chia-sdk-driver/src/layers/p2_one_of_many_layer.rs → crates/chia-sdk-driver/src/layers/p2_one_of_many.rs

@@ -1,25 +1,19 @@
 use chia_protocol::Bytes32;
 use clvm_traits::{FromClvm, ToClvm};
-use clvm_utils::{CurriedProgram, ToTreeHash, TreeHash};
+use clvm_utils::{CurriedProgram, TreeHash};
 use clvmr::{Allocator, NodePtr};
 use hex_literal::hex;
 
-use crate::{DriverError, Layer, MerkleProof, Puzzle, SpendContext};
+use crate::{DriverError, Layer, Puzzle, SpendContext};
 
 /// The p2 1 of n [`Layer`] allows for picking from several delegated puzzles at runtime without revealing up front.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct P2OneOfManyLayer {
+pub struct P2OneOfMany {
     /// The merkle root used to lookup the delegated puzzle as part of the solution.
     pub merkle_root: Bytes32,
 }
 
-impl P2OneOfManyLayer {
-    pub fn new(merkle_root: Bytes32) -> Self {
-        Self { merkle_root }
-    }
-}
-
-impl Layer for P2OneOfManyLayer {
+impl Layer for P2OneOfMany {
     type Solution = P2OneOfManySolution<NodePtr, NodePtr>;
 
     fn parse_puzzle(allocator: &Allocator, puzzle: Puzzle) -> Result<Option<Self>, DriverError> {
@@ -66,46 +60,20 @@ impl Layer for P2OneOfManyLayer {
     }
 }
 
-impl ToTreeHash for P2OneOfManyLayer {
-    fn tree_hash(&self) -> TreeHash {
-        CurriedProgram {
-            program: P2_ONE_OF_MANY_PUZZLE_HASH,
-            args: P2OneOfManyArgs::new(self.merkle_root),
-        }
-        .tree_hash()
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ToClvm, FromClvm)]
 #[clvm(curry)]
 pub struct P2OneOfManyArgs {
     pub merkle_root: Bytes32,
 }
 
-impl P2OneOfManyArgs {
-    pub fn new(merkle_root: Bytes32) -> Self {
-        Self { merkle_root }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, ToClvm, FromClvm)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ToClvm, FromClvm)]
 #[clvm(list)]
 pub struct P2OneOfManySolution<P, S> {
-    pub merkle_proof: MerkleProof,
+    pub merkle_proof: Bytes32,
     pub puzzle: P,
     pub solution: S,
 }
 
-impl<P, S> P2OneOfManySolution<P, S> {
-    pub fn new(merkle_proof: MerkleProof, puzzle: P, solution: S) -> Self {
-        Self {
-            merkle_proof,
-            puzzle,
-            solution,
-        }
-    }
-}
-
 pub const P2_ONE_OF_MANY_PUZZLE: [u8; 280] = hex!(
     "
     ff02ffff01ff02ffff03ffff09ff05ffff02ff06ffff04ff02ffff04ffff0bff