completed txscript tests and fixed some opcodes (#242)

* completed txscript tests and fixed some opcodes * implemented bitcoind tests and fixed errors discovered in testing process * changed to go-kaspad * fixed clippy issue * fixed from PR
kaspanet · Oct 2, 2023 · 222ae83 · 222ae83
1 parent 41d14dd
commit 222ae83
Show file tree

Hide file tree

Showing 10 changed files with 6,963 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/txscript/Cargo.toml b/crypto/txscript/Cargo.toml
@@ -30,6 +30,7 @@ serde.workspace = true
 criterion.workspace = true
 smallvec.workspace = true
 hex = "0.4"
+serde_json = "1.0"
 
 [[bench]]
 name = "bench"

diff --git a/crypto/txscript/errors/src/lib.rs b/crypto/txscript/errors/src/lib.rs
@@ -6,9 +6,6 @@ pub enum TxScriptError {
     MalformedPushSize(Vec<u8>),
     #[error("opcode requires {0} bytes, but script only has {1} remaining")]
     MalformedPush(usize, usize),
-    // We return error if stack entry is false
-    #[error("false stack entry at end of script execution")]
-    FalseStackEntry,
     #[error("transaction input index {0} >= {1}")]
     InvalidIndex(usize, usize),
     #[error("combined stack size {0} > max allowed {1}")]
@@ -23,6 +20,7 @@ pub enum TxScriptError {
     EmptyStack,
     #[error("stack contains {0} unexpected items")]
     CleanStack(usize),
+    // We return error if stack entry is false
     #[error("false stack entry at end of script execution")]
     EvalFalse,
     #[error("script returned early")]
@@ -67,4 +65,8 @@ pub enum TxScriptError {
     SignatureScriptNotPushOnly,
     #[error("end of script reached in conditional execution")]
     ErrUnbalancedConditional,
+    #[error("opcode requires at least {0} but stack has only {1}")]
+    InvalidStackOperation(usize, usize),
+    #[error("script of size {0} exceeded maximum allowed size of {1}")]
+    ScriptSize(usize, usize),
 }
diff --git a/crypto/txscript/src/data_stack.rs b/crypto/txscript/src/data_stack.rs
@@ -181,7 +181,7 @@ impl DataStack for Stack {
         Vec<u8>: OpcodeData<T>,
     {
         if self.len() < SIZE {
-            return Err(TxScriptError::EmptyStack);
+            return Err(TxScriptError::InvalidStackOperation(SIZE, self.len()));
         }
         Ok(<[T; SIZE]>::try_from(self.split_off(self.len() - SIZE).iter().map(|v| v.deserialize()).collect::<Result<Vec<T>, _>>()?)
             .expect("Already exact item"))
@@ -193,7 +193,7 @@ impl DataStack for Stack {
         Vec<u8>: OpcodeData<T>,
     {
         if self.len() < SIZE {
-            return Err(TxScriptError::EmptyStack);
+            return Err(TxScriptError::InvalidStackOperation(SIZE, self.len()));
         }
         Ok(<[T; SIZE]>::try_from(self[self.len() - SIZE..].iter().map(|v| v.deserialize()).collect::<Result<Vec<T>, _>>()?)
             .expect("Already exact item"))
@@ -202,15 +202,15 @@ impl DataStack for Stack {
     #[inline]
     fn pop_raw<const SIZE: usize>(&mut self) -> Result<[Vec<u8>; SIZE], TxScriptError> {
         if self.len() < SIZE {
-            return Err(TxScriptError::EmptyStack);
+            return Err(TxScriptError::InvalidStackOperation(SIZE, self.len()));
         }
         Ok(<[Vec<u8>; SIZE]>::try_from(self.split_off(self.len() - SIZE)).expect("Already exact item"))
     }
 
     #[inline]
     fn peek_raw<const SIZE: usize>(&self) -> Result<[Vec<u8>; SIZE], TxScriptError> {
         if self.len() < SIZE {
-            return Err(TxScriptError::EmptyStack);
+            return Err(TxScriptError::InvalidStackOperation(SIZE, self.len()));
         }
         Ok(<[Vec<u8>; SIZE]>::try_from(self[self.len() - SIZE..].to_vec()).expect("Already exact item"))
     }
@@ -230,7 +230,7 @@ impl DataStack for Stack {
                 self.truncate(self.len() - SIZE);
                 Ok(())
             }
-            false => Err(TxScriptError::EmptyStack),
+            false => Err(TxScriptError::InvalidStackOperation(SIZE, self.len())),
         }
     }
 
@@ -241,7 +241,7 @@ impl DataStack for Stack {
                 self.extend_from_within(self.len() - SIZE..);
                 Ok(())
             }
-            false => Err(TxScriptError::EmptyStack),
+            false => Err(TxScriptError::InvalidStackOperation(SIZE, self.len())),
         }
     }
 
@@ -252,7 +252,7 @@ impl DataStack for Stack {
                 self.extend_from_within(self.len() - 2 * SIZE..self.len() - SIZE);
                 Ok(())
             }
-            false => Err(TxScriptError::EmptyStack),
+            false => Err(TxScriptError::InvalidStackOperation(2 * SIZE, self.len())),
         }
     }
 
@@ -264,7 +264,7 @@ impl DataStack for Stack {
                 self.extend(drained);
                 Ok(())
             }
-            false => Err(TxScriptError::EmptyStack),
+            false => Err(TxScriptError::InvalidStackOperation(3 * SIZE, self.len())),
         }
     }
 
@@ -276,7 +276,7 @@ impl DataStack for Stack {
                 self.extend(drained);
                 Ok(())
             }
-            false => Err(TxScriptError::EmptyStack),
+            false => Err(TxScriptError::InvalidStackOperation(2 * SIZE, self.len())),
         }
     }
 }