dashpay · HashEngineering · Jun 21, 2023 · Jun 11, 2023 · Jun 11, 2023 · Jun 20, 2023
diff --git a/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainGroupExtension.java b/core/src/main/java/org/bitcoinj/wallet/AbstractKeyChainGroupExtension.java
@@ -48,7 +48,7 @@ protected AbstractKeyChainGroupExtension(Wallet wallet) {
         this.wallet = wallet;
     }
 
-    abstract protected AnyKeyChainGroup getKeyChainGroup();
+    abstract public AnyKeyChainGroup getKeyChainGroup();
 
     boolean isInitialized() {
            return getKeyChainGroup() != null;

diff --git a/core/src/main/java/org/bitcoinj/wallet/AuthenticationKeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/AuthenticationKeyChainGroup.java
@@ -340,7 +340,7 @@ protected void maybeMarkCurrentKeyAsUsed(IDeterministicKey key) {
         }
     }
 
-    protected AuthenticationKeyChain.KeyChainType getKeyChainType(byte [] pubkeyHash) {
+    public AuthenticationKeyChain.KeyChainType getKeyChainType(byte [] pubkeyHash) {
         for (AnyDeterministicKeyChain chain: chains) {
             if (chain.findKeyFromPubHash(pubkeyHash) != null) {
                 return ((AuthenticationKeyChain)chain).getType();

diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinJoinExtension.java b/core/src/main/java/org/bitcoinj/wallet/CoinJoinExtension.java
@@ -161,7 +161,7 @@ public void addEncryptedKeyChain(DeterministicSeed seed, ImmutableList<ChildNumb
     }
 
     @Override
-    protected AnyKeyChainGroup getKeyChainGroup() {
+    public AnyKeyChainGroup getKeyChainGroup() {
         return coinJoinKeyChainGroup;
     }
 

diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -5347,7 +5347,26 @@ public Map<String, KeyChainGroupExtension> getKeyChainExtensions() {
             lock.unlock();
         }
     }
+
+    /** checks for the existance of an extension */
+    public boolean hasExtension(String id) {
+        lock.lock();
+        try {
+            return extensions.containsKey(id) || keyChainExtensions.containsKey(id);
+        } finally {
+            lock.unlock();
+        }
+    }
 
+    public KeyChainGroupExtension getKeyChainExtension(String id) {
+        lock.lock();
+        try {
+            return keyChainExtensions.get(id);
+        } finally {
+            lock.unlock();
+        }
+    }
+
     /**
      * Deserialize the wallet extension with the supplied data and then install it, replacing any existing extension
      * that may have existed with the same ID. If an exception is thrown then the extension is removed from the wallet,

diff --git a/core/src/main/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtension.java b/core/src/main/java/org/bitcoinj/wallet/authentication/AuthenticationGroupExtension.java
@@ -107,7 +107,7 @@ public AuthenticationGroupExtension(NetworkParameters params) {
     }
 
     @Override
-    protected AnyKeyChainGroup getKeyChainGroup() {
+    public AnyKeyChainGroup getKeyChainGroup() {
         return keyChainGroup;
     }
 

diff --git a/core/src/test/java/org/bitcoinj/evolution/QuorumStateValidateQuorumsTest.java b/core/src/test/java/org/bitcoinj/evolution/QuorumStateValidateQuorumsTest.java
@@ -130,6 +130,7 @@ public void processDiffMessage() throws BlockStoreException, IOException {
             stream.close();
         } finally {
             context.setDebugMode(false);
+            context.close();
             blockChain.getBlockStore().close();
         }
     }

diff --git a/core/src/test/java/org/bitcoinj/quorums/QuorumRotationSt 8000 ateValidateQuorumsTest.java b/core/src/test/java/org/bitcoinj/quorums/QuorumRotationSt 8000 ateValidateQuorumsTest.java
@@ -40,6 +40,8 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import static org.junit.Assert.assertEquals;
 
@@ -109,7 +111,7 @@ private void initContext() throws BlockStoreException {
     }
 
     @Test
-    public void processDiffMessage() throws BlockStoreException, IOException, ExecutionException, InterruptedException {
+    public void processDiffMessage() throws BlockStoreException, IOException, ExecutionException, InterruptedException, TimeoutException {
         try {
             // this is for mainnet
             URL datafile = Objects.requireNonNull(getClass().getResource(qrInfoFilename));
@@ -130,13 +132,14 @@ public void processDiffMessage() throws BlockStoreException, IOException, Execut
 
             SettableFuture<Boolean> qrinfoComplete = SettableFuture.create();
             manager.processDiffMessage(null, qrinfo, false, qrinfoComplete);
-            qrinfoComplete.get();
+            qrinfoComplete.get(120, TimeUnit.SECONDS);
 
             assertEquals(height, manager.getQuorumListAtTip(context.getParams().getLlmqDIP0024InstantSend()).getHeight());
 
             stream.close();
         } finally {
             context.setDebugMode(false);
+            context.close();
             blockChain.getBlockStore().close();
         }
     }