Add a function for C++/Rust comparison interpreter

Author: sellout

src/interpreter.rs

@@ -146,7 +146,7 @@ impl SignatureChecker for BaseSignatureChecker {}
 #[derive(Copy, Clone)]
 pub struct CallbackTransactionSignatureChecker<'a> {
     pub sighash: SighashCalculator<'a>,
-    pub lock_time: &'a ScriptNum,
+    pub lock_time: ScriptNum,
     pub is_final: bool,
 }
 
@@ -1304,11 +1304,11 @@ impl SignatureChecker for CallbackTransactionSignatureChecker<'_> {
         // We want to compare apples to apples, so fail the script
         // unless the type of nLockTime being tested is the same as
         // the nLockTime in the transaction.
-        if *self.lock_time < LOCKTIME_THRESHOLD && *lock_time >= LOCKTIME_THRESHOLD
-            || *self.lock_time >= LOCKTIME_THRESHOLD && *lock_time < LOCKTIME_THRESHOLD
+        if self.lock_time < LOCKTIME_THRESHOLD && *lock_time >= LOCKTIME_THRESHOLD
+            || self.lock_time >= LOCKTIME_THRESHOLD && *lock_time < LOCKTIME_THRESHOLD
             // Now that we know we're comparing apples-to-apples, the
             // comparison is a simple numeric one.
-            || lock_time > self.lock_time
+            || *lock_time > self.lock_time
         {
             false
             // Finally the nLockTime feature can be disabled and thus

src/lib.rs

@@ -20,8 +20,8 @@ use tracing::warn;
 
 pub use cxx::*;
 pub use interpreter::{
-    CallbackTransactionSignatureChecker, HashType, SighashCalculator, SignedOutputs,
-    VerificationFlags,
+    CallbackTransactionSignatureChecker, DefaultStepEvaluator, HashType, SighashCalculator,
+    SignedOutputs, VerificationFlags,
 };
 pub use zcash_script::*;
 
@@ -250,6 +250,32 @@ pub struct ComparisonInterpreter<T, U> {
     second: U,
 }
 
+pub fn cxx_rust_comparison_interpreter<'a>(
+    sighash: &'a SighashCalculator<'a>,
+    lock_time: u32,
+    is_final: bool,
+    flags: VerificationFlags,
+) -> ComparisonInterpreter<
+    CxxInterpreter<'a>,
+    StepwiseInterpreter<DefaultStepEvaluator<CallbackTransactionSignatureChecker<'a>>>,
+> {
+    ComparisonInterpreter {
+        first: CxxInterpreter {
+            sighash: sighash,
+            lock_time,
+            is_final,
+        },
+        second: rust_interpreter(
+            flags,
+            CallbackTransactionSignatureChecker {
+                sighash: sighash,
+                lock_time: lock_time.into(),
+                is_final,
+            },
+        ),
+    }
+}
+
 /// This implementation is functionally equivalent to the `T` impl, but it also runs a second (`U`)
 /// impl and logs a warning if they disagree.
 impl<T: ZcashScript, U: ZcashScript> ZcashScript for ComparisonInterpreter<T, U> {
@@ -354,7 +380,7 @@ mod tests {
                 flags,
                 CallbackTransactionSignatureChecker {
                     sighash: &sighash,
-                    lock_time: &lock_time.into(),
+                    lock_time: lock_time.into(),
                     is_final,
                 },
             ),
@@ -384,7 +410,7 @@ mod tests {
                 flags,
                 CallbackTransactionSignatureChecker {
                     sighash: &invalid_sighash,
-                    lock_time: &lock_time.into(),
+                    lock_time: lock_time.into(),
                     is_final,
                 },
             ),
@@ -415,7 +441,7 @@ mod tests {
                 flags,
                 CallbackTransactionSignatureChecker {
                     sighash: &missing_sighash,
-                    lock_time: &lock_time.into(),
+                    lock_time: lock_time.into(),
                     is_final,
                 },
             ),
@@ -452,7 +478,7 @@ mod tests {
                 flags,
                 CallbackTransactionSignatureChecker {
                     sighash: &sighash,
-                    lock_time: &lock_time.into(),
+                    lock_time: lock_time.into(),
                     is_final,
                 },
             ),
@@ -487,7 +513,7 @@ mod tests {
                 flags,
                 CallbackTransactionSignatureChecker {
                     sighash: &sighash,
-                    lock_time: &lock_time.into(),
+                    lock_time: lock_time.into(),
                     is_final,
                 },
             ),

src/zcash_script.rs

@@ -289,7 +289,7 @@ mod tests {
 
         let checker = CallbackTransactionSignatureChecker {
             sighash: &sighash,
-            lock_time: &n_lock_time.into(),
+            lock_time: n_lock_time.into(),
             is_final,
         };
         let rust_stepper = DefaultStepEvaluator { flags, checker };
@@ -316,7 +316,7 @@ mod tests {
 
         let checker = CallbackTransactionSignatureChecker {
             sighash: &sighash,
-            lock_time: &n_lock_time.into(),
+            lock_time: n_lock_time.into(),
             is_final,
         };
         let rust_stepper = DefaultStepEvaluator { flags, checker };
@@ -381,7 +381,7 @@ mod tests {
 
         let checker = CallbackTransactionSignatureChecker {
             sighash: &invalid_sighash,
-            lock_time: &n_lock_time.into(),
+            lock_time: n_lock_time.into(),
             is_final,
         };
         let rust_stepper = DefaultStepEvaluator { flags, checker };
@@ -408,7 +408,7 @@ mod tests {
 
         let checker = CallbackTransactionSignatureChecker {
             sighash: &missing_sighash,
-            lock_time: &n_lock_time.into(),
+            lock_time: n_lock_time.into(),
             is_final,
         };
         let rust_stepper = DefaultStepEvaluator { flags, checker };
@@ -442,7 +442,7 @@ mod tests {
         ) {
             let checker = CallbackTransactionSignatureChecker {
                 sighash: &missing_sighash,
-                lock_time: &lock_time.into(),
+                lock_time: lock_time.into(),
                 is_final,
             };
             let flags = repair_flags(VerificationFlags::from_bits_truncate(flags));
@@ -470,10 +470,9 @@ mod tests {
                 // Don’t waste test cases on whether or not `SigPushOnly` is set.
                 (VerificationFlags::all() - VerificationFlags::SigPushOnly).bits()),
         ) {
-            let lt = lock_time.into();
             let checker = CallbackTransactionSignatureChecker {
                 sighash: &missing_sighash,
-                lock_time: &lt,
+                lock_time: lock_time.into(),
                 is_final,
             };
             let flags = repair_flags(VerificationFlags::from_bits_truncate(flags)) | VerificationFlags::SigPushOnly;