mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-24 15:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adding property to make sure timeout works in CSVEscrowTimeoutScriptPubKey

Browse source
This commit is contained in:
Chris Stewart 2017-04-02 10:13:42 -05:00
parent 948b0021fe
commit 365c0a698b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala
View file

@ -528,13 +528,14 @@ object CSVEscrowTimeoutScriptSignature extends Factory[CSVEscrowTimeoutScriptSig
def fromAsm(asm: Seq[ScriptToken]): CSVEscrowTimeoutScriptSignature = {
require(asm.nonEmpty)
val nestedScriptSig = if (BitcoinScriptUtil.castToBool(asm.head)) {
require(MultiSignatureScriptSignature.isMultiSignatureScriptSignature(asm.tail), "Need multisigScriptSig, got: " + asm.tail)
MultiSignatureScriptSignature.fromAsm(asm.tail)
val nested = asm.take(asm.length - 1)
val nestedScriptSig = if (BitcoinScriptUtil.castToBool(asm.last)) {
require(MultiSignatureScriptSignature.isMultiSignatureScriptSignature(nested), "Need multisigScriptSig, got: " + nested)
MultiSignatureScriptSignature.fromAsm(nested)
} else {
CSVScriptSignature(ScriptSignature.fromAsm(asm.tail))
CSVScriptSignature(ScriptSignature.fromAsm(nested))
}
val bytes = asm.head.bytes ++ nestedScriptSig.asmBytes
val bytes = nestedScriptSig.asmBytes ++ asm.last.bytes
val c = CompactSizeUInt.calculateCompactSizeUInt(bytes)
val fullBytes = c.bytes ++ bytes
fromBytes(fullBytes)
@ -542,11 +543,13 @@ object CSVEscrowTimeoutScriptSignature extends Factory[CSVEscrowTimeoutScriptSig
def isValidCSVEscrowTimeoutScriptSig(asm: Seq[ScriptToken],
scriptPubKey: CSVEscrowTimeoutScriptPubKey): Boolean = {
if (MultiSignatureScriptSignature.isMultiSignatureScriptSignature(asm.tail)) {
true
val nested = asm.take(asm.length - 1)
val isMultiSig = BitcoinScriptUtil.castToBool(asm.last)
if (isMultiSig) {
MultiSignatureScriptSignature.isMultiSignatureScriptSignature(nested)
} else {
val locktimeScript = scriptPubKey.timeout.scriptPubKeyAfterCSV
Try(ScriptSignature(asm,locktimeScript)).isSuccess
Try(ScriptSignature(nested,locktimeScript)).isSuccess
}
}

4
src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala
View file

@ -138,11 +138,11 @@ class TransactionSignatureCreatorSpec extends Properties("TransactionSignatureCr
if (result != ScriptOk) logger.warn("Result: " + result)
Seq(ScriptErrorPushSize, ScriptOk).contains(result)
}
property("generate a valid signature for a csv escrow timeout transaction") =
Prop.forAll(TransactionGenerators.spendableCSVMultiSigEscrowTimeoutTransaction) { txSigComponent: TransactionSignatureComponent =>
Prop.forAll(TransactionGenerators.spendableCSVEscrowTimeoutTransaction) { txSigComponent: TransactionSignatureComponent =>
val program = ScriptProgram(txSigComponent)
val result = ScriptInterpreter.run(program)
result == ScriptOk
}
}