Skip to content

Remove unneeded accountName param from nextAddress #2537

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

Remove unneeded accountName param from nextAddress #2537

Show file tree
Hide file tree
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
35 changes: 20 additions & 15 deletions wallet/addresses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -634,6 +634,18 @@ 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")
}

var accountName string
if maybeDBTX != nil {
addrmgrNs := maybeDBTX.ReadBucket(waddrmgrNamespaceKey)
accountName, err = w.manager.AccountName(addrmgrNs, account)
} else {
accountName, err = w.AccountName(ctx, account)
}
if err != nil {
return nil, errors.E(op, err)
}

alb.cursor++
addr := &xpubAddress{
AddressPubKeyHashEcdsaSecp256k1V0: apkh,
Expand Down Expand Up @@ -753,10 +765,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.
Expand All @@ -767,10 +777,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
Expand All @@ -795,7 +803,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 {
Expand All @@ -809,7 +817,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
Expand All @@ -818,8 +826,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
Expand Down Expand Up @@ -951,9 +958,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, "", src.updates,
src.dbtx, accountName, src.account, src.gapPolicy)
src.dbtx, src.account, src.gapPolicy)
if err != nil {
return nil, 0, err
}
Expand All @@ -979,9 +985,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, "", src.updates,
src.dbtx, accountName, src.account, src.gapPolicy)
src.dbtx, src.account, src.gapPolicy)
if err != nil {
return nil, 0, err
}
Expand Down
6 changes: 2 additions & 4 deletions wallet/createtx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,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)
}
Expand Down Expand Up @@ -1175,8 +1174,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
Expand Down
6 changes: 2 additions & 4 deletions wallet/mixing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ func (w *Wallet) makeGen(ctx context.Context, account, branch uint32) mixclient.
updates := make(accountBranchChildUpdates, 0, mcount)

for i := range mcount {
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
}
Expand Down Expand Up @@ -392,9 +391,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)
}
Expand Down
Loading