multi: bump btcd to taproot aware version
This commit is contained in:
24 files changed
+228
-107
No files matched your search
@@ -612,7 +612,7 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
PubKey: aliceKeyPub,
|
||||
},
|
||||
SingleTweak: remoteCommitTweak,
|
||||
SigHashes: txscript.NewTxSigHashes(sweepTx),
|
||||
SigHashes: input.NewTxSigHashesV0Only(sweepTx),
|
||||
Output: &wire.TxOut{
|
||||
Value: int64(channelBalance),
|
||||
},
|
||||
@@ -626,9 +626,11 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
t.Fatalf("unable to generate delay commit spend witness: %v", err)
|
||||
}
|
||||
sweepTx.TxIn[0].Witness = aliceWitnessSpend
|
||||
vm, err := txscript.NewEngine(delayOutput.PkScript,
|
||||
sweepTx, 0, txscript.StandardVerifyFlags, nil,
|
||||
nil, int64(channelBalance))
|
||||
vm, err := txscript.NewEngine(
|
||||
delayOutput.PkScript, sweepTx, 0, txscript.StandardVerifyFlags,
|
||||
nil, nil, int64(channelBalance),
|
||||
txscript.NewCannedPrevOutputFetcher(nil, 0),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("unable to create engine: %v", err)
|
||||
}
|
||||
@@ -647,7 +649,7 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
},
|
||||
DoubleTweak: commitSecret,
|
||||
WitnessScript: delayScript,
|
||||
SigHashes: txscript.NewTxSigHashes(sweepTx),
|
||||
SigHashes: input.NewTxSigHashesV0Only(sweepTx),
|
||||
Output: &wire.TxOut{
|
||||
Value: int64(channelBalance),
|
||||
},
|
||||
@@ -660,9 +662,11 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
t.Fatalf("unable to generate revocation witness: %v", err)
|
||||
}
|
||||
sweepTx.TxIn[0].Witness = bobWitnessSpend
|
||||
vm, err = txscript.NewEngine(delayOutput.PkScript,
|
||||
sweepTx, 0, txscript.StandardVerifyFlags, nil,
|
||||
nil, int64(channelBalance))
|
||||
vm, err = txscript.NewEngine(
|
||||
delayOutput.PkScript, sweepTx, 0, txscript.StandardVerifyFlags,
|
||||
nil, nil, int64(channelBalance),
|
||||
txscript.NewCannedPrevOutputFetcher(nil, 0),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("unable to create engine: %v", err)
|
||||
}
|
||||
@@ -691,7 +695,7 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
PubKey: bobKeyPub,
|
||||
},
|
||||
WitnessScript: bobScriptP2WKH,
|
||||
SigHashes: txscript.NewTxSigHashes(sweepTx),
|
||||
SigHashes: input.NewTxSigHashesV0Only(sweepTx),
|
||||
Output: &wire.TxOut{
|
||||
Value: int64(channelBalance),
|
||||
PkScript: bobScriptP2WKH,
|
||||
@@ -713,6 +717,7 @@ func testSpendValidation(t *testing.T, tweakless bool) {
|
||||
regularOutput.PkScript,
|
||||
sweepTx, 0, txscript.StandardVerifyFlags, nil,
|
||||
nil, int64(channelBalance),
|
||||
txscript.NewCannedPrevOutputFetcher(bobScriptP2WKH, 0),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("unable to create engine: %v", err)
|
||||
|
||||
Reference in new issue
Block a user