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

Using 'Try' return type when using ScriptSignature.fromScriptPubKey

Browse source
This commit is contained in:
Chris Stewart 2017-05-17 18:16:22 -05:00
parent e5f9887db7
commit 25e5b108c6
3 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,15 +129,15 @@ sealed trait P2SHScriptSignature extends ScriptSignature {
/** Returns the script signature of this p2shScriptSig with no serialized redeemScript */
def scriptSignatureNoRedeemScript: ScriptSignature = {
def scriptSignatureNoRedeemScript: Try[ScriptSignature] = {
//witness scriptPubKeys always have EmptyScriptSigs
if (WitnessScriptPubKey.isWitnessScriptPubKey(asm)) EmptyScriptSignature
if (WitnessScriptPubKey.isWitnessScriptPubKey(asm)) Success(EmptyScriptSignature)
else {
val asmWithoutRedeemScriptAndPushOp = asm(asm.size - 2) match {
case b : BytesToPushOntoStack => asm.dropRight(2)
case _ => asm.dropRight(3)
}
ScriptSignature.fromAsm(asmWithoutRedeemScriptAndPushOp)
ScriptSignature.fromScriptPubKey(asmWithoutRedeemScriptAndPushOp,redeemScript)
}
}
@ -151,10 +151,11 @@ sealed trait P2SHScriptSignature extends ScriptSignature {
/** The digital signatures inside of the scriptSig */
def signatures : Seq[ECDigitalSignature] = {
val nonRedeemScript = splitAtRedeemScript(asm)._1
val sigs = nonRedeemScript.filter(_.isInstanceOf[ScriptConstant]).filterNot(_.isInstanceOf[ScriptNumberOperation]).filterNot(_.hex.length < 100)
sigs.map(s => ECDigitalSignature(s.hex))
def signatures : Seq[ECDigitalSignature] = scriptSignatureNoRedeemScript match {
case Failure(_) => Nil
case Success(nonRedeemScript) =>
val sigs = nonRedeemScript.asm.filter(_.isInstanceOf[ScriptConstant]).filterNot(_.isInstanceOf[ScriptNumberOperation]).filterNot(_.hex.length < 100)
sigs.map(s => ECDigitalSignature(s.hex))
}
@ -162,8 +163,10 @@ sealed trait P2SHScriptSignature extends ScriptSignature {
* Splits the given asm into two parts
* the first part is the digital signatures
* the second part is the redeem script */
def splitAtRedeemScript(asm : Seq[ScriptToken]) : (Seq[ScriptToken],Seq[ScriptToken]) = {
(scriptSignatureNoRedeemScript.asm, redeemScript.asm)
def splitAtRedeemScript(asm : Seq[ScriptToken]) : Try[(Seq[ScriptToken],Seq[ScriptToken])] = {
scriptSignatureNoRedeemScript.map { scriptSig =>
(scriptSig.asm, redeemScript.asm)
}
}
}
@ -468,19 +471,22 @@ object ScriptSignature extends Factory[ScriptSignature] with BitcoinSLogger {
* @param scriptPubKey the scriptPubKey which the script signature is trying to spend
* @return
*/
def fromScriptPubKey(tokens : Seq[ScriptToken], scriptPubKey : ScriptPubKey) : ScriptSignature = scriptPubKey match {
case s : P2SHScriptPubKey => P2SHScriptSignature.fromAsm(tokens)
case s : P2PKHScriptPubKey => P2PKHScriptSignature.fromAsm(tokens)
case s : P2PKScriptPubKey => P2PKScriptSignature.fromAsm(tokens)
case s : MultiSignatureScriptPubKey => MultiSignatureScriptSignature.fromAsm(tokens)
case s : NonStandardScriptPubKey => NonStandardScriptSignature.fromAsm(tokens)
def fromScriptPubKey(tokens : Seq[ScriptToken], scriptPubKey : ScriptPubKey): Try[ScriptSignature] = scriptPubKey match {
case _: P2SHScriptPubKey => Try(P2SHScriptSignature.fromAsm(tokens))
case _: P2PKHScriptPubKey => Try(P2PKHScriptSignature.fromAsm(tokens))
case _: P2PKScriptPubKey => Try(P2PKScriptSignature.fromAsm(tokens))
case _: MultiSignatureScriptPubKey => Try(MultiSignatureScriptSignature.fromAsm(tokens))
case _: NonStandardScriptPubKey => Try(NonStandardScriptSignature.fromAsm(tokens))
case s : CLTVScriptPubKey => fromScriptPubKey(tokens, s.scriptPubKeyAfterCLTV)
case s : CSVScriptPubKey => fromScriptPubKey(tokens, s.scriptPubKeyAfterCSV)
case _: WitnessScriptPubKeyV0 | _: UnassignedWitnessScriptPubKey => EmptyScriptSignature
case EmptyScriptPubKey => if (tokens.isEmpty) EmptyScriptSignature else NonStandardScriptSignature.fromAsm(tokens)
case _ : WitnessCommitment => throw new IllegalArgumentException("Cannot spend witness commitment scriptPubKey")
case _: WitnessScriptPubKeyV0 | _: UnassignedWitnessScriptPubKey => Success(EmptyScriptSignature)
case EmptyScriptPubKey =>
if (tokens.isEmpty) Success(EmptyScriptSignature) else Try(NonStandardScriptSignature.fromAsm(tokens))
case _ : WitnessCommitment => Failure(new IllegalArgumentException("Cannot spend witness commitment scriptPubKey"))
}
def apply(tokens : Seq[ScriptToken], scriptPubKey : ScriptPubKey) : ScriptSignature = fromScriptPubKey(tokens, scriptPubKey)
def apply(tokens : Seq[ScriptToken], scriptPubKey : ScriptPubKey): Try[ScriptSignature] = {
fromScriptPubKey(tokens, scriptPubKey)
}
}

3
src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala
View file

@ -12,7 +12,6 @@ class P2SHScriptSignatureSpec extends Properties("P2SHScriptSignatureSpec") with
property("Symmetrical serialization") =
Prop.forAll(ScriptGenerators.p2shScriptSignature) { p2shScriptSig =>
logger.info("P2shScriptSig: " + p2shScriptSig)
P2SHScriptSignature(p2shScriptSig.hex) == p2shScriptSig
}
@ -21,7 +20,7 @@ class P2SHScriptSignatureSpec extends Properties("P2SHScriptSignatureSpec") with
Prop.forAll(ScriptGenerators.witnessScriptPubKeyV0) { case (witScriptPubKey,privKeys) =>
val p2shScriptSig = P2SHScriptSignature(witScriptPubKey)
p2shScriptSig.redeemScript == witScriptPubKey
p2shScriptSig.scriptSignatureNoRedeemScript == EmptyScriptSignature
p2shScriptSig.scriptSignatureNoRedeemScript.get == EmptyScriptSignature
}
}

2
src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala
View file

@ -31,7 +31,7 @@ class P2SHScriptSignatureTest extends FlatSpec with MustMatchers with BitcoinSLo
case _ => throw new RuntimeException("Should be p2sh scriptSig")
}
p2shScriptSig.scriptSignatureNoRedeemScript.asm must be (Seq(
p2shScriptSig.scriptSignatureNoRedeemScript.get.asm must be (Seq(
OP_0, BytesToPushOntoStack(71), ScriptConstant("304402207d764cb90c9fd84b74d33a47cf3a0ffead9ded98333776becd6acd32c4426dac02203905a0d064e7f53d07793e86136571b6e4f700c1cfb888174e84d78638335b8101"),
BytesToPushOntoStack(72),
ScriptConstant("3045022100906aaca39f022acd8b7a38fd2f92aca9e9f35cfeaee69a6f13e1d083ae18222602204c9ed96fc6c4de56fd85c679fc59c16ee1ccc80c42563b86174e1a506fc007c801")