Skip to content

Commit

Permalink
Merge pull request #925 from guggero/addr-master-fingerprint
Browse files Browse the repository at this point in the history
waddrmgr: add MasterKeyFingerprint to new addresses
  • Loading branch information
Roasbeef authored Apr 8, 2024
2 parents b2f31f9 + 423bb21 commit 7fa5f9b
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions waddrmgr/scoped_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,8 @@ func (s *ScopedKeyManager) accountAddrType(acctInfo *accountInfo,
//
// This function MUST be called with the manager lock held for writes.
func (s *ScopedKeyManager) nextAddresses(ns walletdb.ReadWriteBucket,
account uint32, numAddresses uint32, internal bool) ([]ManagedAddress, error) {
account uint32, numAddresses uint32, internal bool) ([]ManagedAddress,
error) {

// The next address can only be generated for accounts that have
// already been created.
Expand Down Expand Up @@ -1089,10 +1090,11 @@ func (s *ScopedKeyManager) nextAddresses(ns walletdb.ReadWriteBucket,
// proper derivation path so this information can be available
// to callers.
derivationPath := DerivationPath{
InternalAccount: account,
Account: acctKey.ChildIndex(),
Branch: branchNum,
Index: nextIndex - 1,
InternalAccount: account,
Account: acctKey.ChildIndex(),
Branch: branchNum,
Index: nextIndex - 1,
MasterKeyFingerprint: acctInfo.masterKeyFingerprint,
}

// Create a new managed address based on the public or private
Expand Down

0 comments on commit 7fa5f9b

Please sign in to comment.