Revert "mining: return witness_script instead of raw witness_c…" #82

Closed
roylee17 wants to merge 1 commit from roylee/fix-segwit-block-gbt-issue into master

View file

@ -868,7 +868,7 @@ mempoolLoop:
} }
// AddWitnessCommitment adds the witness commitment as an OP_RETURN outpout // AddWitnessCommitment adds the witness commitment as an OP_RETURN outpout
// within the coinbase tx. The witness script is returned. // within the coinbase tx. The raw commitment is returned.
func AddWitnessCommitment(coinbaseTx *btcutil.Tx, func AddWitnessCommitment(coinbaseTx *btcutil.Tx,
blockTxns []*btcutil.Tx) []byte { blockTxns []*btcutil.Tx) []byte {
@ -907,7 +907,7 @@ func AddWitnessCommitment(coinbaseTx *btcutil.Tx,
coinbaseTx.MsgTx().TxOut = append(coinbaseTx.MsgTx().TxOut, coinbaseTx.MsgTx().TxOut = append(coinbaseTx.MsgTx().TxOut,
commitmentOutput) commitmentOutput)
return witnessScript return witnessCommitment
} }
// UpdateBlockTime updates the timestamp in the header of the passed block to // UpdateBlockTime updates the timestamp in the header of the passed block to