From 09679b8d9fda3ed7b16597a2194ea022ad55a8ec Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Sat, 16 Aug 2014 19:13:20 -0700
Subject: [PATCH] Add a copy of the script to ScriptTrace

---
 src/blockdata/script.rs      | 2 +-
 src/blockdata/transaction.rs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/blockdata/script.rs b/src/blockdata/script.rs
index 501a45b..0fefd5f 100644
--- a/src/blockdata/script.rs
+++ b/src/blockdata/script.rs
@@ -47,7 +47,7 @@ use util::hash::Sha256dHash;
 use util::misc::script_find_and_remove;
 use util::thinvec::ThinVec;
 
-#[deriving(PartialEq, Show, Clone)]
+#[deriving(PartialEq, Eq, Show, Clone)]
 /// A Bitcoin script
 pub struct Script(ThinVec<u8>);
 
diff --git a/src/blockdata/transaction.rs b/src/blockdata/transaction.rs
index f4a2c1e..33149b9 100644
--- a/src/blockdata/transaction.rs
+++ b/src/blockdata/transaction.rs
@@ -110,6 +110,7 @@ impl json::ToJson for TransactionError {
 /// A trace of a script execution
 #[deriving(PartialEq, Eq, Show, Clone)]
 pub struct ScriptTrace {
+  script: Script,
   initial_stack: Vec<String>,
   iterations: Vec<TraceIteration>,
   error: Option<ScriptError>
@@ -124,7 +125,7 @@ pub struct InputTrace {
   error: Option<TransactionError>
 }
 
-impl_json!(ScriptTrace, initial_stack, iterations, error)
+impl_json!(ScriptTrace, script, initial_stack, iterations, error)
 impl_json!(InputTrace, sig_trace, pubkey_trace, p2sh_trace, error)
 
 /// A trace of a transaction's execution
@@ -202,6 +203,7 @@ impl Transaction {
       // Setup trace
       let mut trace = InputTrace {
         sig_trace: ScriptTrace {
+          script: Script::new(),
           initial_stack: vec![],
           iterations: vec![],
           error: None
@@ -218,6 +220,7 @@ impl Transaction {
           let mut p2sh_script = Script::new();
 
           let mut stack = Vec::with_capacity(6);
+          trace.sig_trace.script = input.script_sig.clone();
           match input.script_sig.evaluate(&mut stack,
                                           Some((self, n)),
                                           Some(&mut trace.sig_trace.iterations)) {
@@ -237,6 +240,7 @@ impl Transaction {
           }
           if trace.error.is_none() {
             let mut pk_trace = ScriptTrace {
+              script: txo.script_pubkey.clone(),
               initial_stack: stack.iter().map(|elem| elem.as_slice().to_hex()).collect(),
               iterations: vec![],
               error: None
@@ -261,6 +265,7 @@ impl Transaction {
             trace.pubkey_trace = Some(pk_trace);
             if trace.error.is_none() && txo.script_pubkey.is_p2sh() {
               let mut p2sh_trace = ScriptTrace {
+                script: p2sh_script.clone(),
                 initial_stack: p2sh_stack.iter().map(|elem| elem.as_slice().to_hex()).collect(),
                 iterations: vec![],
                 error: None