milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Add a copy of the script to ScriptTrace

This commit is contained in:
Andrew Poelstra 2014-08-16 19:13:20 -07:00
parent 62dd2e7cee
commit 09679b8d9f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockdata/script.rs
View File

@ -47,7 +47,7 @@ use util::hash::Sha256dHash;
use util::misc::script_find_and_remove; use util::misc::script_find_and_remove;
use util::thinvec::ThinVec; use util::thinvec::ThinVec;
#[deriving(PartialEq, Show, Clone)] #[deriving(PartialEq, Eq, Show, Clone)]
/// A Bitcoin script /// A Bitcoin script
pub struct Script(ThinVec<u8>); pub struct Script(ThinVec<u8>);

7
src/blockdata/transaction.rs
View File

@ -110,6 +110,7 @@ impl json::ToJson for TransactionError {
/// A trace of a script execution /// A trace of a script execution
#[deriving(PartialEq, Eq, Show, Clone)] #[deriving(PartialEq, Eq, Show, Clone)]
pub struct ScriptTrace { pub struct ScriptTrace {
script: Script,
initial_stack: Vec<String>, initial_stack: Vec<String>,
iterations: Vec<TraceIteration>, iterations: Vec<TraceIteration>,
error: Option<ScriptError> error: Option<ScriptError>
@ -124,7 +125,7 @@ pub struct InputTrace {
error: Option<TransactionError> 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) impl_json!(InputTrace, sig_trace, pubkey_trace, p2sh_trace, error)
/// A trace of a transaction's execution /// A trace of a transaction's execution
@ -202,6 +203,7 @@ impl Transaction {
// Setup trace // Setup trace
let mut trace = InputTrace { let mut trace = InputTrace {
sig_trace: ScriptTrace { sig_trace: ScriptTrace {
script: Script::new(),
initial_stack: vec![], initial_stack: vec![],
iterations: vec![], iterations: vec![],
error: None error: None
@ -218,6 +220,7 @@ impl Transaction {
let mut p2sh_script = Script::new(); let mut p2sh_script = Script::new();
let mut stack = Vec::with_capacity(6); let mut stack = Vec::with_capacity(6);
trace.sig_trace.script = input.script_sig.clone();
match input.script_sig.evaluate(&mut stack, match input.script_sig.evaluate(&mut stack,
Some((self, n)), Some((self, n)),
Some(&mut trace.sig_trace.iterations)) { Some(&mut trace.sig_trace.iterations)) {
@ -237,6 +240,7 @@ impl Transaction {
} }
if trace.error.is_none() { if trace.error.is_none() {
let mut pk_trace = ScriptTrace { let mut pk_trace = ScriptTrace {
script: txo.script_pubkey.clone(),
initial_stack: stack.iter().map(|elem| elem.as_slice().to_hex()).collect(), initial_stack: stack.iter().map(|elem| elem.as_slice().to_hex()).collect(),
iterations: vec![], iterations: vec![],
error: None error: None
@ -261,6 +265,7 @@ impl Transaction {
trace.pubkey_trace = Some(pk_trace); trace.pubkey_trace = Some(pk_trace);
if trace.error.is_none() && txo.script_pubkey.is_p2sh() { if trace.error.is_none() && txo.script_pubkey.is_p2sh() {
let mut p2sh_trace = ScriptTrace { let mut p2sh_trace = ScriptTrace {
script: p2sh_script.clone(),
initial_stack: p2sh_stack.iter().map(|elem| elem.as_slice().to_hex()).collect(), initial_stack: p2sh_stack.iter().map(|elem| elem.as_slice().to_hex()).collect(),
iterations: vec![], iterations: vec![],
error: None error: None