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

tx trace: add `executed` boolean, add a trace even for ops that fail

This commit is contained in:
Andrew Poelstra 2014-08-17 13:35:57 -07:00
parent 09679b8d9f
commit 7059c21ef4
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/blockdata/script.rs
View File

@ -109,11 +109,12 @@ impl json::ToJson for ScriptError {
pub struct TraceIteration { pub struct TraceIteration {
index: uint, index: uint,
opcode: allops::Opcode, opcode: allops::Opcode,
executed: bool,
effect: opcodes::OpcodeClass, effect: opcodes::OpcodeClass,
stack: Vec<String> stack: Vec<String>
} }
impl_json!(TraceIteration, index, opcode, effect, stack) impl_json!(TraceIteration, index, opcode, executed, effect, stack)
/// Hashtype of a transaction, encoded in the last byte of a signature, /// Hashtype of a transaction, encoded in the last byte of a signature,
/// specifically in the last 5 bits `byte & 31` /// specifically in the last 5 bits `byte & 31`
@ -595,6 +596,20 @@ impl Script {
while index < raw.len() { while index < raw.len() {
let executing = exec_stack.iter().all(|e| *e); let executing = exec_stack.iter().all(|e| *e);
let byte = unsafe { *raw.get(index) }; let byte = unsafe { *raw.get(index) };
// Write out the trace, except the stack which we don't know yet
match trace {
Some(ref mut t) => {
let opcode = allops::Opcode::from_u8(byte);
t.push(TraceIteration {
index: index,
opcode: opcode,
executed: executing,
effect: opcode.classify(),
stack: vec![]
});
}
None => {}
}
index += 1; index += 1;
// The definitions of all these categories are in opcodes.rs // The definitions of all these categories are in opcodes.rs
//println!("read {} as {} as {} ... stack before op is {}", byte, allops::Opcode::from_u8(byte), allops::Opcode::from_u8(byte).classify(), stack); //println!("read {} as {} as {} ... stack before op is {}", byte, allops::Opcode::from_u8(byte), allops::Opcode::from_u8(byte).classify(), stack);
@ -890,18 +905,12 @@ impl Script {
} // end opcode match } // end opcode match
} // end classification match } // end classification match
} // end loop } // end loop
match trace { // Store the stack in the trace
Some(ref mut t) => { trace.as_mut().map(|t|
let opcode = allops::Opcode::from_u8(byte); t.mut_last().map(|t|
t.push(TraceIteration { t.stack = stack.iter().map(|elem| elem.as_slice().to_hex()).collect()
index: index - 1, )
opcode: opcode, );
effect: opcode.classify(),
stack: stack.iter().map(|elem| elem.as_slice().to_hex()).collect()
});
}
None => {}
}
} }
Ok(()) Ok(())
} }