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

…e-coinjoin
dashpay · Aug 9, 2024 · dc0f2c7 · dc0f2c7
2 parents f6e18c3 + 69d405e
commit dc0f2c7
Show file tree

Hide file tree

Showing 116 changed files with 2,394 additions and 1,454 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'jacoco'
 apply plugin: 'signing'
 // apply plugin:  'com.github.spotbugs'
 
-version = '20.0.5-CJ-SNAPSHOT'
+version = '21.0.0-CJ-SNAPSHOT'
 archivesBaseName = 'dashj-core'
 eclipse.project.name = 'dashj-core'
 
@@ -58,6 +58,7 @@ test {
     exclude 'org/bitcoinj/core/PeerTest*'
     exclude 'org/bitcoinj/core/TransactionBroadcastTest*'
     exclude 'org/bitcoinj/net/NetworkAbstractionTests*'
+    exclude 'org/bitcoinj/net/discovery/DnsDiscoveryTest*'
     exclude 'org/bitcoinj/protocols/channels/ChannelConnectionTest*'
     exclude 'org/bitcoinj/core/LevelDBFullPrunedBlockChainTest*'
     exclude 'org/bitcoinj/store/LevelDBBlockStoreTest*'

diff --git a/core/src/main/java/org/bitcoinj/core/Address.java b/core/src/main/java/org/bitcoinj/core/Address.java
@@ -30,7 +30,7 @@
 import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.script.ScriptPattern;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 
 /**
  * <p>A Bitcoin address looks like 1MsScoe2fTJoq4ZPdQgqyhgWeoNamYPevy and is derived from an elliptic curve public key
@@ -284,7 +284,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(super.hashCode(), p2sh);
+        return Objects.hash(super.hashCode(), p2sh);
     }
 
     @Override

diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/bitcoinj/core/Block.java
@@ -368,11 +368,9 @@ private void writeTransactions(OutputStream stream) throws IOException {
             return;
         }
 
-        if (transactions != null) {
-            stream.write(new VarInt(transactions.size()).encode());
-            for (Transaction tx : transactions) {
-                tx.bitcoinSerialize(stream);
-            }
+        stream.write(new VarInt(transactions.size()).encode());
+        for (Transaction tx : transactions) {
+            tx.bitcoinSerialize(stream);
         }
         //writeMasterNodeVotes(stream);
     }

diff --git a/core/src/main/java/org/bitcoinj/core/BloomFilter.java b/core/src/main/java/org/bitcoinj/core/BloomFilter.java
@@ -23,14 +23,14 @@
 import org.bitcoinj.script.ScriptPattern;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.lang.Math.*;
@@ -373,7 +373,7 @@ public synchronized boolean equals(Object o) {
 
     @Override
     public synchronized int hashCode() {
-        return Objects.hashCode(hashFuncs, nTweak, Arrays.hashCode(data));
+        return Objects.hash(hashFuncs, nTweak, Arrays.hashCode(data));
     }
 
     public final byte[] getData() {

diff --git a/core/src/main/java/org/bitcoinj/core/Coin.java b/core/src/main/java/org/bitcoinj/core/Coin.java
@@ -18,7 +18,6 @@
 
 import org.bitcoinj.utils.MonetaryFormat;
 import com.google.common.math.LongMath;
-import com.google.common.primitives.Longs;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -343,6 +342,6 @@ public int hashCode() {
 
     @Override
     public int compareTo(final Coin other) {
-        return Longs.compare(this.value, other.value);
+        return Long.compare(this.value, other.value);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/ECKey.java b/core/src/main/java/org/bitcoinj/core/ECKey.java
@@ -25,7 +25,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedBytes;
 import org.bitcoin.NativeSecp256k1;
@@ -62,6 +61,7 @@
 import java.security.SignatureException;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Objects;
 
 import static com.google.common.base.Preconditions.*;
 
@@ -611,7 +611,7 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(r, s);
+            return Objects.hash(r, s);
         }
     }
 
@@ -1340,11 +1340,11 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || !(o instanceof ECKey)) return false;
         ECKey other = (ECKey) o;
-        return Objects.equal(this.priv, other.priv)
-                && Objects.equal(this.pub, other.pub)
-                && Objects.equal(this.creationTimeSeconds, other.creationTimeSeconds)
-                && Objects.equal(this.keyCrypter, other.keyCrypter)
-                && Objects.equal(this.encryptedPrivateKey, other.encryptedPrivateKey);
+        return Objects.equals(this.priv, other.priv)
+                && Objects.equals(this.pub, other.pub)
+                && Objects.equals(this.creationTimeSeconds, other.creationTimeSeconds)
+                && Objects.equals(this.keyCrypter, other.keyCrypter)
+                && Objects.equals(this.encryptedPrivateKey, other.encryptedPrivateKey);
     }
 
     @Override

diff --git a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java b/core/src/main/java/org/bitcoinj/core/FilteredBlock.java
@@ -17,7 +17,6 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Objects;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
@@ -136,7 +135,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(associatedTransactions, header, merkleTree);
+        return Objects.hash(associatedTransactions, header, merkleTree);
     }
 
     @Override

diff --git a/core/src/main/java/org/bitcoinj/core/GetUTXOsMessage.java b/core/src/main/java/org/bitcoinj/core/GetUTXOsMessage.java
@@ -16,12 +16,12 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>This command is supported only by <a href="http://github.com/bitcoinxt/bitcoinxt">Bitcoin XT</a> nodes, which
@@ -100,6 +100,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(includeMempool, outPoints);
+        return Objects.hash(includeMempool, outPoints);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/InventoryItem.java b/core/src/main/java/org/bitcoinj/core/InventoryItem.java
@@ -16,7 +16,7 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 
 public class InventoryItem {
 
@@ -86,6 +86,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(type, hash);
+        return Objects.hash(type, hash);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java
@@ -17,8 +17,10 @@
 
 package org.bitcoinj.core;
 
+import org.bitcoinj.core.Block;
+import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.VerificationException;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
 import org.bitcoinj.net.discovery.*;
 import org.bitcoinj.params.*;
 import org.bitcoinj.script.*;
@@ -298,7 +300,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(getId());
+        return Objects.hash(getId());
     }
 
     /** Returns the network parameters for the given string ID or NULL if not recognized. */
@@ -686,7 +688,9 @@ public static enum ProtocolVersion {
         SMNLE_VERSIONED(70228),
         MNLISTDIFF_VERSION_ORDER(70229),
         MNLISTDIFF_CHAINLOCKS(70230),
-        CURRENT(70230); //testnet is still 70228
+        CORE_20_1(70231),
+        CORE_21(70232),
+        CURRENT(70232); //testnet is still 70228
 
         private final int bitcoinProtocol;
 

diff --git a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
@@ -23,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import static org.bitcoinj.core.Utils.*;
-import com.google.common.base.Objects;
 
 /**
  * <p>A data structure that contains proofs of block inclusion for one or more transactions, in an efficient manner.</p>
@@ -275,7 +275,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(transactionCount, hashes, Arrays.hashCode(matchedChildBits));
+        return Objects.hash(transactionCount, hashes, Arrays.hashCode(matchedChildBits));
     }
 
     @Override

diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java
@@ -21,6 +21,7 @@
 
 import org.bitcoinj.coinjoin.CoinJoin;
 import org.bitcoinj.coinjoin.utils.CoinJoinManager;
+import org.bitcoinj.coinjoin.CoinJoinQueue;
 import org.bitcoinj.core.listeners.*;
 import org.bitcoinj.evolution.SimplifiedMasternodeListDiff;
 import org.bitcoinj.evolution.listeners.MasternodeListDownloadedListener;
@@ -43,10 +44,12 @@
 import org.bitcoinj.wallet.Wallet;
 
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -1490,7 +1493,7 @@ protected void processInv(InventoryMessage inv) {
         }
 
         // The New InstantSendLock (ISLOCK)
-        if(context.instantSendManager != null && context.instantSendManager.isNewInstantSendEnabled() &&
+        if(context.instantSendManager != null && context.instantSendManager.isInstantSendEnabled() &&
                 context.masternodeSync != null && context.masternodeSync.hasSyncFlag(MasternodeSync.SYNC_FLAGS.SYNC_INSTANTSENDLOCKS)) {
             it = instantSendLocks.iterator();
             while (it.hasNext()) {
@@ -1752,7 +1755,7 @@ private void blockChainDownloadLocked(Sha256Hash toHash) {
         StoredBlock chainHead = blockChain.getChainHead();
         Sha256Hash chainHeadHash = chainHead.getHeader().getHash();
         // Did we already make this request? If so, don't do it again.
-        if (Objects.equal(lastGetBlocksBegin, chainHeadHash) && Objects.equal(lastGetBlocksEnd, toHash)) {
+        if (Objects.equals(lastGetBlocksBegin, chainHeadHash) && Objects.equals(lastGetBlocksEnd, toHash)) {
             log.info("blockChainDownloadLocked({}): ignoring duplicated request: {}", toHash, chainHeadHash);
             for (Sha256Hash hash : pendingBlockDownloads)
                 log.info("Pending block download: {}", hash);
@@ -1829,7 +1832,7 @@ private void blockChainHeaderDownloadLocked(Sha256Hash toHash) {
         StoredBlock chainHead = headerChain.getChainHead();
         Sha256Hash chainHeadHash = chainHead.getHeader().getHash();
         // Did we already make this request? If so, don't do it again.
-        if (Objects.equal(lastGetHeadersBegin, chainHeadHash) && Objects.equal(lastGetHeadersEnd, toHash)) {
+        if (Objects.equals(lastGetHeadersBegin, chainHeadHash) && Objects.equals(lastGetHeadersEnd, toHash)) {
             log.info("blockChainDownloadLocked({}): ignoring duplicated request: {}", toHash, chainHeadHash);
             for (Sha256Hash hash : pendingBlockDownloads)
                 log.info("Pending block download: {}", hash);

diff --git a/core/src/main/java/org/bitcoinj/core/PeerAddress.java b/core/src/main/java/org/bitcoinj/core/PeerAddress.java
@@ -17,14 +17,14 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Objects;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -209,7 +209,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(addr, port, time, services);
+        return Objects.hash(addr, port, time, services);
     }
 
     public InetSocketAddress toSocketAddress() {

diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -20,7 +20,6 @@
 import com.google.common.annotations.*;
 import com.google.common.base.*;
 import com.google.common.collect.*;
-import com.google.common.primitives.*;
 import com.google.common.util.concurrent.*;
 import net.jcip.annotations.*;
 import org.bitcoinj.coinjoin.SendCoinJoinQueue;
@@ -421,13 +420,9 @@ private PeerGroup(Context context, @Nullable AbstractBlockChain chain, @Nullable
             public int compare(PeerAddress a, PeerAddress b) {
                 checkState(lock.isHeldByCurrentThread());
                 int result = backoffMap.get(a).compareTo(backoffMap.get(b));
-                if (result != 0)
-                    return result;
-                result = Ints.compare(getPriority(a), getPriority(b));
-                if (result != 0)
-                    return result;
                 // Sort by port if otherwise equals - for testing
-                result = Ints.compare(a.getPort(), b.getPort());
+                if (result == 0)
+                    result = Integer.compare(a.getPort(), b.getPort());
                 return result;
             }
         });
@@ -569,8 +564,6 @@ public void go() {
                 discoverySuccess = discoverPeers() > 0;
             }
 
-            long retryTime;
-            PeerAddress addrToTry;
             lock.lock();
             try {
                 if (doDiscovery) {
@@ -594,12 +587,12 @@ public void go() {
                         // were given a fixed set of addresses in some test scenario.
                     }
                     return;
-                } else {
-                    do {
-                        addrToTry = inactives.poll();
-                    } while (ipv6Unreachable && addrToTry.getAddr() instanceof Inet6Address);
-                    retryTime = backoffMap.get(addrToTry).getRetryTime();
                 }
+                PeerAddress addrToTry;
+                do {
+                    addrToTry = inactives.poll();
+                } while (ipv6Unreachable && addrToTry.getAddr() instanceof Inet6Address);
+                long retryTime = backoffMap.get(addrToTry).getRetryTime();
                 retryTime = Math.max(retryTime, groupBackoff.getRetryTime());
                 if (retryTime > now) {
                     long delay = retryTime - now;

diff --git a/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java b/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java
@@ -23,8 +23,8 @@
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Objects;
 
-import com.google.common.base.Objects;
 import com.google.common.primitives.UnsignedBytes;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -59,7 +59,7 @@ public final NetworkParameters getParameters() {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(params, Arrays.hashCode(bytes));
+        return Objects.hash(params, Arrays.hashCode(bytes));
     }
 
     @Override