From 7219c346a6c0973cad5ee05ded131ec98e6ac0f9 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 8 Apr 2024 15:47:22 -0700 Subject: [PATCH] Merge pull request #925 from guggero/addr-master-fingerprint waddrmgr: add MasterKeyFingerprint to new addresses --- waddrmgr/scoped_manager.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/waddrmgr/scoped_manager.go b/waddrmgr/scoped_manager.go index 380347954d..12bb1fe60b 100644 --- a/waddrmgr/scoped_manager.go +++ b/waddrmgr/scoped_manager.go @@ -1047,7 +1047,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. @@ -1129,10 +1130,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