Creates a deterministic key chain with the given watch key. If isFollowing flag is set then this keychain follows
* some other keychain. In a married wallet following keychain represents "spouse's" keychain.
Watch key has to be an account key.
*/ protected DeterministicKeyChain(DeterministicKey watchKey, boolean isFollowing) { - this(watchKey, Utils.currentTimeSeconds()); + this(watchKey); this.isFollowing = isFollowing; } @@ -352,20 +345,10 @@ public class DeterministicKeyChain implements EncryptableKeyChain { } /** - * Creates a key chain that watches the given account key. The creation time is taken to be the time that BIP 32 - * was standardised: most likely, you can optimise by selecting a more accurate creation time for your key and - * using the other watch method. + * Creates a key chain that watches the given account key. */ public static DeterministicKeyChain watch(DeterministicKey accountKey) { - return watch(accountKey, DeterministicHierarchy.BIP32_STANDARDISATION_TIME_SECS); - } - - /** - * Creates a key chain that watches the given account key, and assumes there are no transactions involving it until - * the given time (this is an optimisation for chain scanning purposes). - */ - public static DeterministicKeyChain watch(DeterministicKey accountKey, long seedCreationTimeSecs) { - return new DeterministicKeyChain(accountKey, seedCreationTimeSecs); + return new DeterministicKeyChain(accountKey); } /** @@ -682,7 +665,10 @@ public class DeterministicKeyChain implements EncryptableKeyChain { @Override public long getEarliestKeyCreationTime() { - return seed != null ? seed.getCreationTimeSeconds() : creationTimeSeconds; + if (seed != null) + return seed.getCreationTimeSeconds(); + else + return getWatchingKey().getCreationTimeSeconds(); } @Override @@ -868,6 +854,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain { boolean isMarried = !isFollowingKey && !chains.isEmpty() && chains.get(chains.size() - 1).isFollowing(); if (seed == null) { DeterministicKey accountKey = new DeterministicKey(immutablePath, chainCode, pubkey, null, null); + accountKey.setCreationTimeSeconds(key.getCreationTimestamp() / 1000); chain = factory.makeWatchingKeyChain(key, iter.peek(), accountKey, isFollowingKey, isMarried); isWatchingAccountKey = true; } else { diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index 0c1be6ce..ea7d0e97 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -93,15 +93,6 @@ public class KeyChainGroup implements KeyBag { this(params, null, ImmutableList.of(DeterministicKeyChain.watch(watchKey)), null, null); } - /** - * Creates a keychain group with no basic chain, and an HD chain that is watching the given watching key which - * was assumed to be first used at the given UNIX time. - * This HAS to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}. - */ - public KeyChainGroup(NetworkParameters params, DeterministicKey watchKey, long creationTimeSecondsSecs) { - this(params, null, ImmutableList.of(DeterministicKeyChain.watch(watchKey, creationTimeSecondsSecs)), null, null); - } - // Used for deserialization. private KeyChainGroup(NetworkParameters params, @Nullable BasicKeyChain basicKeyChain, Listoptional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
boolean hasCreationTimestamp();
@@ -2414,8 +2414,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
long getCreationTimestamp();
@@ -2958,8 +2958,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public boolean hasCreationTimestamp() {
@@ -2969,8 +2969,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public long getCreationTimestamp() {
@@ -3905,8 +3905,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public boolean hasCreationTimestamp() {
@@ -3916,8 +3916,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public long getCreationTimestamp() {
@@ -3927,8 +3927,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public Builder setCreationTimestamp(long value) {
@@ -3941,8 +3941,8 @@ public final class Protos {
* optional int64 creation_timestamp = 5;
*
*
- * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- * optional is that some very old wallets don't have this data.
+ * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ * optional is that keys derived from a parent don't have this data.
*
*/
public Builder clearCreationTimestamp() {
diff --git a/core/src/test/java/org/bitcoinj/core/WalletTest.java b/core/src/test/java/org/bitcoinj/core/WalletTest.java
index 12eac8b0..d78f7b1b 100644
--- a/core/src/test/java/org/bitcoinj/core/WalletTest.java
+++ b/core/src/test/java/org/bitcoinj/core/WalletTest.java
@@ -1640,8 +1640,7 @@ public class WalletTest extends TestWithWallet {
public void watchingWalletWithCreationTime() throws Exception {
DeterministicKey watchKey = wallet.getWatchingKey();
String serialized = watchKey.serializePubB58(PARAMS);
- watchKey = DeterministicKey.deserializeB58(null, serialized, PARAMS);
- Wallet watchingWallet = Wallet.fromWatchingKey(PARAMS, watchKey, 1415282801);
+ Wallet watchingWallet = Wallet.fromWatchingKeyB58(PARAMS, serialized, 1415282801);
DeterministicKey key2 = watchingWallet.freshReceiveKey();
assertEquals(myKey, key2);
@@ -3499,8 +3498,7 @@ public class WalletTest extends TestWithWallet {
public void watchingMarriedWallet() throws Exception {
DeterministicKey watchKey = wallet.getWatchingKey();
String serialized = watchKey.serializePubB58(PARAMS);
- watchKey = DeterministicKey.deserializeB58(null, serialized, PARAMS);
- Wallet wallet = Wallet.fromWatchingKey(PARAMS, watchKey);
+ Wallet wallet = Wallet.fromWatchingKeyB58(PARAMS, serialized, 0);
blockStore = new MemoryBlockStore(PARAMS);
chain = new BlockChain(PARAMS, wallet, blockStore);
diff --git a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
index 870503d5..6df927e6 100644
--- a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
+++ b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
@@ -289,7 +289,7 @@ public class WalletProtobufSerializerTest {
@Test
public void testRoundTripNormalWallet() throws Exception {
- Wallet wallet1 = roundTrip(myWallet);
+ Wallet wallet1 = roundTrip(myWallet);
assertEquals(0, wallet1.getTransactions(true).size());
assertEquals(Coin.ZERO, wallet1.getBalance());
assertArrayEquals(myKey.getPubKey(),
@@ -300,6 +300,22 @@ public class WalletProtobufSerializerTest {
wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getCreationTimeSeconds());
}
+ @Test
+ public void testRoundTripWatchingWallet() throws Exception {
+ final String xpub = "tpubD9LrDvFDrB6wYNhbR2XcRRaT4yCa37TjBR3YthBQvrtEwEq6CKeEXUs3TppQd38rfxmxD1qLkC99iP3vKcKwLESSSYdFAftbrpuhSnsw6XM";
+ final long creationTimeSeconds = 1457019819;
+ Wallet wallet = Wallet.fromWatchingKeyB58(PARAMS, xpub, creationTimeSeconds);
+ Wallet wallet2 = roundTrip(wallet);
+ Wallet wallet3 = roundTrip(wallet2);
+ assertEquals(xpub, wallet.getWatchingKey().serializePubB58(PARAMS));
+ assertEquals(creationTimeSeconds, wallet.getWatchingKey().getCreationTimeSeconds());
+ assertEquals(creationTimeSeconds, wallet2.getWatchingKey().getCreationTimeSeconds());
+ assertEquals(creationTimeSeconds, wallet3.getWatchingKey().getCreationTimeSeconds());
+ assertEquals(creationTimeSeconds, wallet.getEarliestKeyCreationTime());
+ assertEquals(creationTimeSeconds, wallet2.getEarliestKeyCreationTime());
+ assertEquals(creationTimeSeconds, wallet3.getEarliestKeyCreationTime());
+ }
+
@Test
public void testRoundTripMarriedWallet() throws Exception {
// create 2-of-2 married wallet
diff --git a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
index a97b9cd1..5277dbc9 100644
--- a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
@@ -323,7 +323,7 @@ public class DeterministicKeyChainTest {
watchingKey = DeterministicKey.deserializeB58(null, pub58, params);
watchingKey.setCreationTimeSeconds(100000);
chain = DeterministicKeyChain.watch(watchingKey);
- assertEquals(DeterministicHierarchy.BIP32_STANDARDISATION_TIME_SECS, chain.getEarliestKeyCreationTime());
+ assertEquals(100000, chain.getEarliestKeyCreationTime());
chain.setLookaheadSize(10);
chain.maybeLookAhead();
diff --git a/core/src/wallet.proto b/core/src/wallet.proto
index fb38a121..19007027 100644
--- a/core/src/wallet.proto
+++ b/core/src/wallet.proto
@@ -120,8 +120,8 @@ message Key {
// User-provided label associated with the key.
optional string label = 4;
- // Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. Only reason it's
- // optional is that some very old wallets don't have this data.
+ // Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
+ // optional is that keys derived from a parent don't have this data.
optional int64 creation_timestamp = 5;
optional DeterministicKey deterministic_key = 7;