From 9d81bdbc52cf2a5f93bc345a4f433c474fd02fc5 Mon Sep 17 00:00:00 2001 From: Jonathan Roelofs Date: Sun, 27 Aug 2017 15:10:01 -0600 Subject: [PATCH 1/2] Fix Issue #28. NFC --- Mycelium Wallet/Models/MYCWallet.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mycelium Wallet/Models/MYCWallet.m b/Mycelium Wallet/Models/MYCWallet.m index 7cfd2bc..42e572c 100644 --- a/Mycelium Wallet/Models/MYCWallet.m +++ b/Mycelium Wallet/Models/MYCWallet.m @@ -1385,13 +1385,15 @@ - (void) discoverAccounts:(BTCKeychain*)rootKeychain accountIndex:(NSInteger)acc } BTCKeychain* accKeychain = [[rootKeychain keychainForAccount:(uint32_t)accountIndex] publicKeychain]; - - // Scan 20 external address and 2 internal ones. NSMutableArray* addrs = [NSMutableArray array]; + + // Scan external addresses... for (uint32_t j = 0; j < 2; j++) { BTCAddress* addr = [self addressForAddress:[BTCPublicKeyAddress addressWithData:BTCHash160([accKeychain externalKeyAtIndex:j].publicKey)]]; [addrs addObject:addr]; } + + // ... and internal addresses. for (uint32_t j = 0; j < 2; j++) { BTCAddress* addr = [self addressForAddress:[BTCPublicKeyAddress addressWithData:BTCHash160([accKeychain changeKeyAtIndex:j].publicKey)]]; [addrs addObject:addr]; From 365c2f7085223d621bb425be4a682935088e9863 Mon Sep 17 00:00:00 2001 From: Jon Roelofs Date: Sun, 8 Mar 2020 14:09:07 -0600 Subject: [PATCH 2/2] Scan GAP20 external addresses, not GAP2 --- Mycelium Wallet/Models/MYCWallet.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mycelium Wallet/Models/MYCWallet.m b/Mycelium Wallet/Models/MYCWallet.m index 42e572c..ebb5bc0 100644 --- a/Mycelium Wallet/Models/MYCWallet.m +++ b/Mycelium Wallet/Models/MYCWallet.m @@ -1388,7 +1388,7 @@ - (void) discoverAccounts:(BTCKeychain*)rootKeychain accountIndex:(NSInteger)acc NSMutableArray* addrs = [NSMutableArray array]; // Scan external addresses... - for (uint32_t j = 0; j < 2; j++) { + for (uint32_t j = 0; j < 20; j++) { BTCAddress* addr = [self addressForAddress:[BTCPublicKeyAddress addressWithData:BTCHash160([accKeychain externalKeyAtIndex:j].publicKey)]]; [addrs addObject:addr]; }