Remove unneeded accountName param from nextAddress

To ensure nextAddress is returning valid and helpful information,
retrieve the real account name from the database rather than just
blindly returning whatever account name was passed as a param (this
was often a fake/placeholder value anyway).

Author: jholdstock

wallet/addresses.go

@@ -504,7 +504,7 @@ func (s accountBranchChildUpdates) UpdateDB(ctx context.Context, w *Wallet, mayb
 // nextAddress returns the next address of an account branch.
 func (w *Wallet) nextAddress(ctx context.Context, op errors.Op,
 	updates *accountBranchChildUpdates, maybeDBTX walletdb.ReadWriteTx,
-	accountName string, account, branch uint32,
+	account, branch uint32,
 	callOpts ...NextAddressCallOption) (a stdaddr.Address, rerr error) {
 
 	if updates != nil && maybeDBTX != nil {
@@ -633,6 +633,12 @@ func (w *Wallet) nextAddress(ctx context.Context, op errors.Op,
 		} else {
 			return nil, errors.E(op, errors.Bug, "no method to update DB with addresses")
 		}
+
+		accountName, err := w.AccountName(ctx, account)
+		if err != nil {
+			return nil, errors.E(op, err)
+		}
+
 		alb.cursor++
 		addr := &xpubAddress{
 			AddressPubKeyHashEcdsaSecp256k1V0: apkh,
@@ -751,10 +757,8 @@ func (w *Wallet) NewExternalAddress(ctx context.Context, account uint32, callOpt
 	if err := w.notVotingAcct(ctx, op, account); err != nil {
 		return nil, err
 	}
-
-	accountName, _ := w.AccountName(ctx, account)
 	return w.nextAddress(ctx, op, nil, nil,
-		accountName, account, udb.ExternalBranch, callOpts...)
+		account, udb.ExternalBranch, callOpts...)
 }
 
 // NewInternalAddress returns an internal address.
@@ -765,10 +769,8 @@ func (w *Wallet) NewInternalAddress(ctx context.Context, account uint32, callOpt
 	if err := w.notVotingAcct(ctx, op, account); err != nil {
 		return nil, err
 	}
-
-	accountName, _ := w.AccountName(ctx, account)
 	return w.nextAddress(ctx, op, nil, nil,
-		accountName, account, udb.InternalBranch, callOpts...)
+		account, udb.InternalBranch, callOpts...)
 }
 
 // notVotingAcct errors if an account is a special voting type. This account
@@ -793,7 +795,7 @@ func (w *Wallet) notVotingAcct(ctx context.Context, op errors.Op, account uint32
 }
 
 func (w *Wallet) newChangeAddress(ctx context.Context, op errors.Op, updates *accountBranchChildUpdates,
-	maybeDBTX walletdb.ReadWriteTx, accountName string, account uint32, gap gapPolicy) (stdaddr.Address, error) {
+	maybeDBTX walletdb.ReadWriteTx, account uint32, gap gapPolicy) (stdaddr.Address, error) {
 
 	// Imported voting accounts must not be used for change.
 	if err := w.notVotingAcct(ctx, op, account); err != nil {
@@ -807,7 +809,7 @@ func (w *Wallet) newChangeAddress(ctx context.Context, op errors.Op, updates *ac
 	if account == udb.ImportedAddrAccount {
 		account = udb.DefaultAccountNum
 	}
-	return w.nextAddress(ctx, op, updates, maybeDBTX, accountName, account, udb.InternalBranch, withGapPolicy(gap))
+	return w.nextAddress(ctx, op, updates, maybeDBTX, account, udb.InternalBranch, withGapPolicy(gap))
 }
 
 // NewChangeAddress returns an internal address.  This is identical to
@@ -816,8 +818,7 @@ func (w *Wallet) newChangeAddress(ctx context.Context, op errors.Op, updates *ac
 // policy.
 func (w *Wallet) NewChangeAddress(ctx context.Context, account uint32) (stdaddr.Address, error) {
 	const op errors.Op = "wallet.NewChangeAddress"
-	accountName, _ := w.AccountName(ctx, account)
-	return w.newChangeAddress(ctx, op, nil, nil, accountName, account, gapPolicyWrap)
+	return w.newChangeAddress(ctx, op, nil, nil, account, gapPolicyWrap)
 }
 
 // BIP0044BranchNextIndexes returns the next external and internal branch child
@@ -949,9 +950,8 @@ type p2PKHChangeSource struct {
 }
 
 func (src *p2PKHChangeSource) Script() ([]byte, uint16, error) {
-	const accountName = "" // not returned, so can be faked.
 	changeAddress, err := src.wallet.newChangeAddress(src.ctx, "", nil, src.dbtx,
-		accountName, src.account, src.gapPolicy)
+		src.account, src.gapPolicy)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -977,9 +977,8 @@ type p2PKHTreasuryChangeSource struct {
 // Script returns the treasury change script and is required for change source
 // interface.
 func (src *p2PKHTreasuryChangeSource) Script() ([]byte, uint16, error) {
-	const accountName = "" // not returned, so can be faked.
 	changeAddress, err := src.wallet.newChangeAddress(src.ctx, "", nil, src.dbtx,
-		accountName, src.account, src.gapPolicy)
+		src.account, src.gapPolicy)
 	if err != nil {
 		return nil, 0, err
 	}

wallet/createtx.go

@@ -808,9 +808,8 @@ func (w *Wallet) compressWalletInternal(ctx context.Context, op errors.Op, dbtx
 
 	// Check if output address is default, and generate a new address if needed
 	if changeAddr == nil {
-		const accountName = "" // not used, so can be faked.
 		changeAddr, err = w.newChangeAddress(ctx, op, nil, dbtx,
-			accountName, account, gapPolicyIgnore)
+			account, gapPolicyIgnore)
 		if err != nil {
 			return nil, errors.E(op, err)
 		}
@@ -1168,8 +1167,7 @@ func (w *Wallet) purchaseTickets(ctx context.Context, op errors.Op,
 	}
 
 	stakeAddrFunc := func(op errors.Op, account, branch uint32) (stdaddr.StakeAddress, uint32, error) {
-		const accountName = "" // not used, so can be faked.
-		a, err := w.nextAddress(ctx, op, nil, nil, accountName,
+		a, err := w.nextAddress(ctx, op, nil, nil,
 			account, branch, WithGapPolicyIgnore())
 		if err != nil {
 			return nil, 0, err

wallet/mixing.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2024 The Decred developers
+// Copyright (c) 2019-2025 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -56,9 +56,8 @@ func (w *Wallet) makeGen(ctx context.Context, account, branch uint32) mixclient.
 		updates := make(accountBranchChildUpdates, 0, mcount)
 
 		for i := uint32(0); i < mcount; i++ {
-			const accountName = "" // not used, so can be faked.
 			mixAddr, err := w.nextAddress(ctx, op, &updates, nil,
-				accountName, account, branch, WithGapPolicyIgnore())
+				account, branch, WithGapPolicyIgnore())
 			if err != nil {
 				return nil, err
 			}
@@ -390,9 +389,8 @@ SplitPoints:
 	var change *wire.TxOut
 	if changeValue > 0 {
 		updates := make(accountBranchChildUpdates, 0, 1)
-		const accountName = "" // not used, so can be faked.
 		addr, err := w.nextAddress(ctx, op, &updates, nil,
-			accountName, changeAccount, udb.InternalBranch, WithGapPolicyIgnore())
+			changeAccount, udb.InternalBranch, WithGapPolicyIgnore())
 		if err != nil {
 			return errors.E(op, err)
 		}