Misc refactoring and tidying.

internal/rpc/jsonrpc/methods.go

@@ -1505,7 +1505,7 @@ func createTxRawResult(chainParams *chaincfg.Params, mtx *wire.MsgTx, blkIdx uin
 		LockTime:      mtx.LockTime,
 		Expiry:        mtx.Expiry,
 		Vin:           createVinList(mtx, isTreasuryEnabled),
-		Vout:          createVoutList(mtx, chainParams, nil, isTreasuryEnabled),
+		Vout:          createVoutList(mtx, chainParams, nil),
 		BlockHash:     blkHeader.BlockHash().String(),
 		BlockHeight:   int64(blkHeader.Height),
 		BlockIndex:    blkIdx,
@@ -1600,7 +1600,7 @@ func createVinList(mtx *wire.MsgTx, isTreasuryEnabled bool) []dcrdtypes.Vin {
 
 // createVoutList returns a slice of JSON objects for the outputs of the passed
 // transaction.
-func createVoutList(mtx *wire.MsgTx, chainParams *chaincfg.Params, filterAddrMap map[string]struct{}, isTreasuryEnabled bool) []dcrdtypes.Vout {
+func createVoutList(mtx *wire.MsgTx, chainParams *chaincfg.Params, filterAddrMap map[string]struct{}) []dcrdtypes.Vout {
 	txType := stake.DetermineTxType(mtx)
 	voutList := make([]dcrdtypes.Vout, 0, len(mtx.TxOut))
 	for i, v := range mtx.TxOut {

wallet/chainntfns.go

@@ -50,7 +50,7 @@ func (w *Wallet) extendMainChain(ctx context.Context, op errors.Op, dbtx walletd
 	}
 
 	// Notify interested clients of the connected block.
-	w.NtfnServer.notifyAttachedBlock(dbtx, n.Header, blockHash)
+	w.NtfnServer.notifyAttachedBlock(n.Header, blockHash)
 
 	blockMeta, err := w.txStore.GetBlockMetaForHash(txmgrNs, blockHash)
 	if err != nil {
@@ -288,7 +288,7 @@ func (w *Wallet) ChainSwitch(ctx context.Context, forest *SidechainForest, chain
 // evaluateStakePoolTicket evaluates a stake pool ticket to see if it's
 // acceptable to the stake pool. The ticket must pay out to the stake
 // pool cold wallet, and must have a sufficient fee.
-func (w *Wallet) evaluateStakePoolTicket(rec *udb.TxRecord, blockHeight int32, poolUser stdaddr.Address) bool {
+func (w *Wallet) evaluateStakePoolTicket(rec *udb.TxRecord, blockHeight int32) bool {
 	tx := rec.MsgTx
 
 	// Check the first commitment output (txOuts[1])
@@ -510,7 +510,7 @@ func (w *Wallet) processTransactionRecord(ctx context.Context, dbtx walletdb.Rea
 				break
 			}
 
-			if w.evaluateStakePoolTicket(rec, height, addr) {
+			if w.evaluateStakePoolTicket(rec, height) {
 				// Be sure to insert this into the user's stake
 				// pool entry into the stake manager.
 				poolTicket := &udb.PoolTicket{

wallet/notifications.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2015-2016 The btcsuite developers
-// Copyright (c) 2016-2021 The Decred developers
+// Copyright (c) 2016-2024 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -211,7 +211,7 @@ func flattenBalanceMap(m map[uint32]dcrutil.Amount) []AccountBalance {
 	return s
 }
 
-func relevantAccounts(w *Wallet, m map[uint32]dcrutil.Amount, txs []TransactionSummary) {
+func relevantAccounts(m map[uint32]dcrutil.Amount, txs []TransactionSummary) {
 	for _, tx := range txs {
 		for _, d := range tx.MyInputs {
 			m[d.PreviousAccount] = 0
@@ -244,7 +244,7 @@ func (s *NotificationServer) notifyUnminedTransaction(dbtx walletdb.ReadTx, deta
 		return
 	}
 	bals := make(map[uint32]dcrutil.Amount)
-	relevantAccounts(s.wallet, bals, unminedTxs)
+	relevantAccounts(bals, unminedTxs)
 	err = totalBalances(dbtx, s.wallet, bals)
 	if err != nil {
 		log.Errorf("Cannot determine balances for relevant accounts: %v", err)
@@ -285,7 +285,7 @@ func (s *NotificationServer) notifyMinedTransaction(dbtx walletdb.ReadTx, detail
 	*txs = append(*txs, makeTxSummary(dbtx, s.wallet, details))
 }
 
-func (s *NotificationServer) notifyAttachedBlock(dbtx walletdb.ReadTx, block *wire.BlockHeader, blockHash *chainhash.Hash) {
+func (s *NotificationServer) notifyAttachedBlock(block *wire.BlockHeader, blockHash *chainhash.Hash) {
 	defer s.mu.Unlock()
 	s.mu.Lock()
 
@@ -335,7 +335,7 @@ func (s *NotificationServer) sendAttachedBlockNotification(ctx context.Context)
 			return err
 		}
 		for _, b := range currentTxNtfn.AttachedBlocks {
-			relevantAccounts(w, bals, b.Transactions)
+			relevantAccounts(bals, b.Transactions)
 		}
 		return totalBalances(dbtx, w, bals)
 

wallet/udb/addressdb.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2014 The btcsuite developers
-// Copyright (c) 2015-2018 The Decred developers
+// Copyright (c) 2015-2024 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -515,7 +515,7 @@ func putWatchingOnly(ns walletdb.ReadWriteBucket, watchingOnly bool) error {
 // deserializeAccountRow deserializes the passed serialized account information.
 // This is used as a common base for the various account types to deserialize
 // the common parts.
-func deserializeAccountRow(accountID []byte, serializedAccount []byte) (*dbAccountRow, error) {
+func deserializeAccountRow(serializedAccount []byte) (*dbAccountRow, error) {
 	// The serialized account format is:
 	//   <acctType><rdlen><rawdata>
 	//
@@ -771,7 +771,7 @@ func fetchAccountByName(ns walletdb.ReadBucket, name string) (uint32, error) {
 
 // fetchAccountRow loads the row serializing details regarding an account.
 // This function does not perform any further parsing based on the account type.
-func fetchAccountRow(ns walletdb.ReadBucket, account uint32, dbVersion uint32) (*dbAccountRow, error) {
+func fetchAccountRow(ns walletdb.ReadBucket, account uint32) (*dbAccountRow, error) {
 	bucket := ns.NestedReadBucket(acctBucketName)
 
 	accountID := uint32ToBytes(account)
@@ -780,13 +780,13 @@ func fetchAccountRow(ns walletdb.ReadBucket, account uint32, dbVersion uint32) (
 		return nil, errors.E(errors.NotExist, errors.Errorf("no account %d", account))
 	}
 
-	return deserializeAccountRow(accountID, serializedRow)
+	return deserializeAccountRow(serializedRow)
 }
 
 // fetchAccountInfo loads information about the passed account from the
 // database.
 func fetchAccountInfo(ns walletdb.ReadBucket, account uint32, dbVersion uint32) (*dbBIP0044AccountRow, error) {
-	row, err := fetchAccountRow(ns, account, dbVersion)
+	row, err := fetchAccountRow(ns, account)
 	if err != nil {
 		return nil, err
 	}
@@ -801,7 +801,7 @@ func fetchAccountInfo(ns walletdb.ReadBucket, account uint32, dbVersion uint32)
 }
 
 func fetchDBAccount(ns walletdb.ReadBucket, account uint32, dbVersion uint32) (dbAccount, error) {
-	row, err := fetchAccountRow(ns, account, dbVersion)
+	row, err := fetchAccountRow(ns, account)
 	if err != nil {
 		return nil, err
 	}
@@ -1509,7 +1509,7 @@ func deletePrivateKeys(ns walletdb.ReadWriteBucket, dbVersion uint32) error {
 		}
 
 		// Deserialize the account row first to determine the type.
-		row, err := deserializeAccountRow(k, v)
+		row, err := deserializeAccountRow(v)
 		if err != nil {
 			c.Close()
 			return err

wallet/udb/addressmanager.go

@@ -785,7 +785,7 @@ func (m *Manager) UpgradeToSLIP0044CoinType(dbtx walletdb.ReadWriteTx) error {
 		return errors.E(errors.IO, "missing SLIP0044 coin type account row")
 	}
 	accountID := uint32ToBytes(0)
-	row, err := deserializeAccountRow(accountID, serializedRow)
+	row, err := deserializeAccountRow(serializedRow)
 	if err != nil {
 		return err
 	}

wallet/udb/txdb.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2015 The btcsuite developers
-// Copyright (c) 2015-2019 The Decred developers
+// Copyright (c) 2015-2024 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -546,7 +546,7 @@ func putRawTxRecord(ns walletdb.ReadWriteBucket, k, v []byte) error {
 	return nil
 }
 
-func readRawTxRecordMsgTx(txHash *chainhash.Hash, v []byte, msgTx *wire.MsgTx) error {
+func readRawTxRecordMsgTx(v []byte, msgTx *wire.MsgTx) error {
 	if len(v) < 8 {
 		return errors.E(errors.IO, errors.Errorf("tx record len %d", len(v)))
 	}

wallet/udb/txquery.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2015 The btcsuite developers
-// Copyright (c) 2015-2017 The Decred developers
+// Copyright (c) 2015-2024 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -662,7 +662,7 @@ func (s *Store) Spender(dbtx walletdb.ReadTx, out *wire.OutPoint) (*wire.MsgTx,
 			spenderIndex = extractRawDebitInputIndex(k)
 			k = extractRawDebitTxRecordKey(k)
 			v = existsRawTxRecord(ns, k)
-			err = readRawTxRecordMsgTx(&spenderHash, v, &spender)
+			err = readRawTxRecordMsgTx(v, &spender)
 			if err != nil {
 				return nil, 0, err
 			}

wallet/udb/vsp.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 The Decred developers
+// Copyright (c) 2020-2024 The Decred developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
@@ -135,7 +135,7 @@ func GetVSPTicketsByFeeStatus(dbtx walletdb.ReadTx, feeStatus int) (map[chainhas
 	return tickets, nil
 }
 
-// deserializeUserTicket deserializes the passed serialized user
+// deserializeVSPTicket deserializes the passed serialized user
 // ticket information.
 func deserializeVSPTicket(serializedTicket []byte) *VSPTicket {
 	// ticket stores hash size and an uint32 representing the fee processment
@@ -151,7 +151,7 @@ func deserializeVSPTicket(serializedTicket []byte) *VSPTicket {
 	return vspTicket
 }
 
-// serializeUserTicket returns the serialization of a single stake pool
+// serializeVSPTicket returns the serialization of a single stake pool
 // user ticket.
 func serializeVSPTicket(record *VSPTicket) []byte {
 	// ticket hash size + fee processment status + host ID

wallet/vspticket.go

@@ -65,7 +65,7 @@ func (w *Wallet) NewVSPTicket(ctx context.Context, hash *chainhash.Hash) (*VSPTi
 	case stdaddr.StakeAddress:
 		votingAddr = addr
 	default:
-		return nil, fmt.Errorf("address cannot be used for voting rights: %v", err)
+		return nil, fmt.Errorf("address cannot be used for voting rights: %v", addrs[0])
 	}
 
 	commitmentAddr, err := stake.AddrFromSStxPkScrCommitment(ticketTx.TxOut[1].PkScript, w.chainParams)