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

Wallet now delegates currentAddress/freshAddress calls to KeychainGroup

Browse Source 
This way it's possible for KCG to yield P2H addresses in future
This commit is contained in:
troggy 2014-05-31 13:42:05 +03:00 committed by Mike Hearn
parent 927d8514f5
commit eae64a5357
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -305,7 +305,12 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
* Returns address for a {@link #currentKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)} * Returns address for a {@link #currentKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)}
*/ */
public Address currentAddress(KeyChain.KeyPurpose purpose) { public Address currentAddress(KeyChain.KeyPurpose purpose) {
return currentKey(purpose).toAddress(params); lock.lock();
try {
return keychain.currentAddress(purpose, params);
} finally {
lock.unlock();
}
} }
/** /**
@ -349,7 +354,14 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
* Returns address for a {@link #freshKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)} * Returns address for a {@link #freshKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)}
*/ */
public Address freshAddress(KeyChain.KeyPurpose purpose) { public Address freshAddress(KeyChain.KeyPurpose purpose) {
return freshKey(purpose).toAddress(params); lock.lock();
try {
Address key = keychain.freshAddress(purpose, params);
saveNow();
return key;
} finally {
lock.unlock();
}
} }
/** /**

14
core/src/main/java/com/google/bitcoin/wallet/KeyChainGroup.java
View File

@ -117,6 +117,13 @@ public class KeyChainGroup {
return current != null ? current : freshKey(purpose); return current != null ? current : freshKey(purpose);
} }
/**
* Returns address for a {@link #currentKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)}
*/
public Address currentAddress(KeyChain.KeyPurpose purpose, NetworkParameters params) {
return currentKey(purpose).toAddress(params);
}
/** /**
* Returns a key that has not been returned by this method before (fresh). You can think of this as being * Returns a key that has not been returned by this method before (fresh). You can think of this as being
* a newly created key, although the notion of "create" is not really valid for a * a newly created key, although the notion of "create" is not really valid for a
@ -132,6 +139,13 @@ public class KeyChainGroup {
return key; return key;
} }
/**
* Returns address for a {@link #freshKey(com.google.bitcoin.wallet.KeyChain.KeyPurpose)}
*/
public Address freshAddress(KeyChain.KeyPurpose purpose, NetworkParameters params) {
return freshKey(purpose).toAddress(params);
}
/** Returns the key chain that's used for generation of fresh/current keys. This is always the newest HD chain. */ /** Returns the key chain that's used for generation of fresh/current keys. This is always the newest HD chain. */
public DeterministicKeyChain getActiveKeyChain() { public DeterministicKeyChain getActiveKeyChain() {
if (chains.isEmpty()) if (chains.isEmpty())