Merge branch 'master' of https://github.com/dashpay/dashj into featur…

…e-coinjoin
dashpay · Dec 27, 2023 · bd7d61d · bd7d61d
2 parents 3ab8b1e + e7a22e1
commit bd7d61d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 apply plugin: 'signing'
 
-version = '20.0.1-CJ-SNAPSHOT'
+version = '20.0.2-CJ-SNAPSHOT'
 archivesBaseName = 'dashj-core'
 eclipse.project.name = 'dashj-core'
 

diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/bitcoinj/core/VersionMessage.java
@@ -44,7 +44,7 @@
 public class VersionMessage extends Message {
 
     /** The version of this library release, as a string. */
-    public static final String BITCOINJ_VERSION = "20.0.1-CJ-SNAPSHOT";
+    public static final String BITCOINJ_VERSION = "20.0.2-CJ-SNAPSHOT";
     /** The value that is prepended to the subVer field of this application. */
     public static final String LIBRARY_SUBVER = "/DashJ:" + BITCOINJ_VERSION + "/";
 

diff --git a/core/src/main/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtension.java b/core/src/main/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtension.java
@@ -75,6 +75,7 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -887,14 +888,18 @@ public boolean removeAuthenticationKeyUsageEventListener(AuthenticationKeyUsageE
 
     public void reset() {
         keyUsage.clear();
+    }
+
+    public void rescanWallet() {
         if (wallet != null) {
-           Set<Transaction> transactionSet = wallet.getTransactions(false);
-           List<Transaction> transactionList = Lists.newArrayList(transactionSet);
-           transactionList.sort((transaction1, transaction2) -> (int) (transaction1.getUpdateTime().getTime() - transaction2.getUpdateTime().getTime()));
+            keyUsage.clear();
+            Set<Transaction> transactionSet = wallet.getTransactions(false);
+            List<Transaction> transactionList = Lists.newArrayList(transactionSet);
+            transactionList.sort(Comparator.comparingLong(transaction -> transaction.getUpdateTime().getTime()));
 
-           for (Transaction tx : transactionList) {
+            for (Transaction tx : transactionList) {
                processTransaction(tx, null, AbstractBlockChain.NewBlockType.BEST_CHAIN);
-           }
+            }
         }
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtensionTest.java b/core/src/test/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtensionTest.java
@@ -228,9 +228,9 @@ public void loadWallet() throws IOException, UnreadableWalletException {
             // make sure this wallet has an authenticationGroupExtension
             assertTrue(wallet.getKeyChainExtensions().containsKey(AuthenticationGroupExtension.EXTENSION_ID));
 
-            // check that reset() preserves the usage count
+            // check that rescanWallet() preserves the usage count
             int usageBefore = authenticationGroupExtension.getKeyUsage().size();
-            authenticationGroupExtension.reset();
+            authenticationGroupExtension.rescanWallet();
             int usageAfter = authenticationGroupExtension.getKeyUsage().size();
             assertEquals(usageBefore, usageAfter);
         }