Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 10:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Wallet: Fix getIssuedReceiveKeys() and getIssuedReceiveAddresses() to return keys/addresses of all active chains.

Browse Source
This commit is contained in:
Andreas Schildbach 2019-02-18 00:21:00 +01:00
parent f94f8cd692
commit d7b2beac97
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View File

@ -709,7 +709,11 @@ public class Wallet extends BaseTaggableObject
public List<ECKey> getIssuedReceiveKeys() { public List<ECKey> getIssuedReceiveKeys() {
keyChainGroupLock.lock(); keyChainGroupLock.lock();
try { try {
return keyChainGroup.getActiveKeyChain().getIssuedReceiveKeys(); List<ECKey> keys = new LinkedList<>();
long keyRotationTimeSecs = vKeyRotationTimestamp;
for (final DeterministicKeyChain chain : keyChainGroup.getActiveKeyChains(keyRotationTimeSecs))
keys.addAll(chain.getIssuedReceiveKeys());
return keys;
} finally { } finally {
keyChainGroupLock.unlock(); keyChainGroupLock.unlock();
} }
@ -722,12 +726,13 @@ public class Wallet extends BaseTaggableObject
public List<Address> getIssuedReceiveAddresses() { public List<Address> getIssuedReceiveAddresses() {
keyChainGroupLock.lock(); keyChainGroupLock.lock();
try { try {
final DeterministicKeyChain activeKeyChain = keyChainGroup.getActiveKeyChain(); List<Address> addresses = new ArrayList<>();
final List<ECKey> keys = activeKeyChain.getIssuedReceiveKeys(); long keyRotationTimeSecs = vKeyRotationTimestamp;
final Script.ScriptType outputScriptType = activeKeyChain.getOutputScriptType(); for (final DeterministicKeyChain chain : keyChainGroup.getActiveKeyChains(keyRotationTimeSecs)) {
List<Address> addresses = new ArrayList<>(keys.size()); Script.ScriptType outputScriptType = chain.getOutputScriptType();
for (ECKey key : keys) for (ECKey key : chain.getIssuedReceiveKeys())
addresses.add(Address.fromKey(getParams(), key, outputScriptType)); addresses.add(Address.fromKey(getParams(), key, outputScriptType));
}
return addresses; return addresses;
} finally { } finally {
keyChainGroupLock.unlock(); keyChainGroupLock.unlock();