Skip to content

txauthor: Only get change address when needed. #2638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jholdstock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

txauthor: Only get change address when needed. #2638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions wallet/txauthor/author.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016 The btcsuite developers
// Copyright (c) 2016-2024 The Decred developers
// Copyright (c) 2016-2026 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -94,10 +94,6 @@ func NewUnsignedTransaction(outputs []*wire.TxOut, relayFeePerKb dcrutil.Amount,

targetAmount := sumOutputValues(outputs)
scriptSizes := []int{txsizes.RedeemP2PKHSigScriptSize}
changeScript, changeScriptVersion, err := fetchChange.Script()
if err != nil {
return nil, errors.E(op, err)
}
changeScriptSize := fetchChange.ScriptSize()
maxSignedSize := txsizes.EstimateSerializeSize(scriptSizes, outputs, changeScriptSize)
targetFee := txrules.FeeForSerializeSize(relayFeePerKb, maxSignedSize)
Expand Down Expand Up @@ -139,6 +135,10 @@ func NewUnsignedTransaction(outputs []*wire.TxOut, relayFeePerKb dcrutil.Amount,
changeAmount := inputDetail.Amount - targetAmount - maxRequiredFee
if changeAmount != 0 && !txrules.IsDustAmount(changeAmount,
changeScriptSize, relayFeePerKb) {
changeScript, changeScriptVersion, err := fetchChange.Script()
if err != nil {
return nil, errors.E(op, err)
}
if len(changeScript) > txscript.MaxScriptElementSize {
return nil, errors.E(errors.Invalid, "script size exceed maximum bytes "+
"pushable to the stack")
Expand Down
Loading