mirror of
https://github.com/bitcoin/bips.git
synced 2025-05-12 12:03:29 +00:00
Merge pull request #1078 from dr-orlovsky/patch-5
Fixing Simple Signer Algorithm
This commit is contained in:
commit
cd3885c0fb
@ -637,9 +637,9 @@ for input,i in enumerate(psbt.inputs):
|
|||||||
assert(sha256d(non_witness_utxo) == psbt.tx.input[i].prevout.hash)
|
assert(sha256d(non_witness_utxo) == psbt.tx.input[i].prevout.hash)
|
||||||
if redeemScript.exists:
|
if redeemScript.exists:
|
||||||
assert(non_witness_utxo.vout[psbt.tx.input[i].prevout.n].scriptPubKey == P2SH(redeemScript))
|
assert(non_witness_utxo.vout[psbt.tx.input[i].prevout.n].scriptPubKey == P2SH(redeemScript))
|
||||||
sign_non_witness(redeemScript)
|
sign_non_witness(redeemScript, i)
|
||||||
else:
|
else:
|
||||||
sign_non_witness(non_witness_utxo.vout[psbt.tx.input[i].prevout.n].scriptPubKey)
|
sign_non_witness(non_witness_utxo.vout[psbt.tx.input[i].prevout.n].scriptPubKey, i)
|
||||||
else if witness_utxo.exists:
|
else if witness_utxo.exists:
|
||||||
if redeemScript.exists:
|
if redeemScript.exists:
|
||||||
assert(witness_utxo.scriptPubKey == P2SH(redeemScript))
|
assert(witness_utxo.scriptPubKey == P2SH(redeemScript))
|
||||||
@ -647,10 +647,10 @@ for input,i in enumerate(psbt.inputs):
|
|||||||
else:
|
else:
|
||||||
script = witness_utxo.scriptPubKey
|
script = witness_utxo.scriptPubKey
|
||||||
if IsP2WPKH(script):
|
if IsP2WPKH(script):
|
||||||
sign_witness(P2PKH(script[2:22]))
|
sign_witness(P2PKH(script[2:22]), i)
|
||||||
else if IsP2WSH(script):
|
else if IsP2WSH(script):
|
||||||
assert(script == P2WSH(witnessScript))
|
assert(script == P2WSH(witnessScript))
|
||||||
sign_witness(witnessScript)
|
sign_witness(witnessScript, i)
|
||||||
else:
|
else:
|
||||||
assert False
|
assert False
|
||||||
</pre>
|
</pre>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user