Merge pull request #1 from haveno-dex/master

Update to match Haveno repository.
boldsuck · May 15, 2024 · 1d573f6 · 1d573f6
2 parents 4ecfe15 + aee7a53
commit 1d573f6
Show file tree

Hide file tree

Showing 41 changed files with 266 additions and 146 deletions.
diff --git a/build.gradle b/build.gradle
@@ -360,6 +360,7 @@ configure(project(':p2p')) {
         testImplementation "ch.qos.logback:logback-core:$logbackVersion"
         testImplementation "org.apache.commons:commons-lang3:$langVersion"
         testImplementation("org.mockito:mockito-core:$mockitoVersion")
+        testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
 
         implementation "org.openjfx:javafx-base:$javafxVersion:$os"
         implementation "org.openjfx:javafx-graphics:$javafxVersion:$os"

diff --git a/core/src/main/java/haveno/core/account/sign/SignedWitnessService.java b/core/src/main/java/haveno/core/account/sign/SignedWitnessService.java
@@ -132,7 +132,7 @@ public void onAllServicesInitialized() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     onBootstrapComplete();
                 }
             });

diff --git a/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java
@@ -200,7 +200,7 @@ public void onAllServicesInitialized() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     onBootStrapped();
                 }
             });

diff --git a/core/src/main/java/haveno/core/app/AppStartupState.java b/core/src/main/java/haveno/core/app/AppStartupState.java
@@ -58,7 +58,7 @@ public AppStartupState(CoreNotificationService notificationService,
 
         p2PService.addP2PServiceListener(new BootstrapListener() {
             @Override
-            public void onUpdatedDataReceived() {
+            public void onDataReceived() {
                 updatedDataReceived.set(true);
             }
         });

diff --git a/core/src/main/java/haveno/core/offer/OfferBookService.java b/core/src/main/java/haveno/core/offer/OfferBookService.java
@@ -151,7 +151,7 @@ public void onRemoved(Collection<ProtectedStorageEntry> protectedStorageEntries)
         if (dumpStatistics) {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     addOfferBookChangedListener(new OfferBookChangedListener() {
                         @Override
                         public void onAdded(Offer offer) {

diff --git a/core/src/main/java/haveno/core/offer/OpenOfferManager.java b/core/src/main/java/haveno/core/offer/OpenOfferManager.java
@@ -295,7 +295,7 @@ public void onAllServicesInitialized() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     onBootstrapComplete();
                 }
             });

diff --git a/core/src/main/java/haveno/core/offer/TriggerPriceService.java b/core/src/main/java/haveno/core/offer/TriggerPriceService.java
@@ -62,7 +62,7 @@ public void onAllServicesInitialized() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     onBootstrapComplete();
                 }
             });

diff --git a/core/src/main/java/haveno/core/support/dispute/DisputeManager.java b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
@@ -264,7 +264,7 @@ public void onAllServicesInitialized() {
 
         p2PService.addP2PServiceListener(new BootstrapListener() {
             @Override
-            public void onUpdatedDataReceived() {
+            public void onDataReceived() {
                 tryApplyMessages();
             }
         });

diff --git a/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentManager.java b/core/src/main/java/haveno/core/support/dispute/agent/DisputeAgentManager.java
@@ -151,7 +151,7 @@ public void onRemoved(Collection<ProtectedStorageEntry> protectedStorageEntries)
             else
                 p2PService.addP2PServiceListener(new BootstrapListener() {
                     @Override
-                    public void onUpdatedDataReceived() {
+                    public void onDataReceived() {
                         startRepublishDisputeAgent();
                     }
                 });

diff --git a/core/src/main/java/haveno/core/trade/CleanupMailboxMessages.java b/core/src/main/java/haveno/core/trade/CleanupMailboxMessages.java
@@ -63,7 +63,7 @@ public void handleTrades(List<Trade> trades) {
             } else {
                 p2PService.addP2PServiceListener(new BootstrapListener() {
                     @Override
-                    public void onUpdatedDataReceived() {
+                    public void onDataReceived() {
                         cleanupMailboxMessages(trades);
                     }
                 });

diff --git a/core/src/main/java/haveno/core/trade/CleanupMailboxMessagesService.java b/core/src/main/java/haveno/core/trade/CleanupMailboxMessagesService.java
@@ -62,7 +62,7 @@ public void handleTrades(List<Trade> trades) {
             } else {
                 p2PService.addP2PServiceListener(new BootstrapListener() {
                     @Override
-                    public void onUpdatedDataReceived() {
+                    public void onDataReceived() {
                         cleanupMailboxMessages(trades);
                     }
                 });

diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -310,7 +310,7 @@ public void onAllServicesInitialized() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     initPersistedTrades();
                 }
             });

diff --git a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java
@@ -449,7 +449,7 @@ private void setupHandlers() {
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     setupInvalidOpenOffersHandler();
                 }
             });
@@ -527,7 +527,7 @@ private void setupDevDummyPaymentAccounts() {
             } else {
                 p2PService.addP2PServiceListener(new BootstrapListener() {
                     @Override
-                    public void onUpdatedDataReceived() {
+                    public void onDataReceived() {
                         accountAgeWitnessService.publishMyAccountAgeWitness(aliPayAccount.getPaymentAccountPayload());
                     }
                 });

diff --git a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
@@ -1021,7 +1021,8 @@ public void updateItem(final OfferBookListItem item, boolean empty) {
                                         setGraphic(null);
                                     } else {
                                         setText("");
-                                        setGraphic(new ColoredDecimalPlacesWithZerosText(model.formatDepositString(
+                                        String rangePrefix = item.getOffer().isRange() ? "<= " : "";
+                                        setGraphic(new ColoredDecimalPlacesWithZerosText(rangePrefix + model.formatDepositString(
                                                 deposit, item.getOffer().getAmount().longValueExact()),
                                                 GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
                                     }

diff --git a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
@@ -182,9 +182,7 @@ void initWithData(Offer offer) {
 
         this.amount.set(offer.getAmount().min(BigInteger.valueOf(getMaxTradeLimit())));
 
-        securityDeposit = offer.getDirection() == OfferDirection.SELL ?
-                getBuyerSecurityDeposit() :
-                getSellerSecurityDeposit();
+        updateSecurityDeposit();
 
         calculateVolume();
         calculateTotalToPay();
@@ -374,11 +372,12 @@ void calculateVolume() {
 
     void applyAmount(BigInteger amount) {
         this.amount.set(amount.min(BigInteger.valueOf(getMaxTradeLimit())));
-
         calculateTotalToPay();
     }
 
     void calculateTotalToPay() {
+        updateSecurityDeposit();
+
         // Taker pays 2 times the tx fee because the mining fee might be different when maker created the offer
         // and reserved his funds, so that would not work well with dynamic fees.
         // The mining fee for the takeOfferFee tx is deducted from the createOfferFee and not visible to the trader
@@ -468,11 +467,17 @@ public BigInteger getSecurityDeposit() {
         return securityDeposit;
     }
 
-    public BigInteger getBuyerSecurityDeposit() {
+    private void updateSecurityDeposit() {
+        securityDeposit = offer.getDirection() == OfferDirection.SELL ?
+                getBuyerSecurityDeposit() :
+                getSellerSecurityDeposit();
+    }
+
+    private BigInteger getBuyerSecurityDeposit() {
         return offer.getOfferPayload().getBuyerSecurityDepositForTradeAmount(amount.get());
     }
 
-    public BigInteger getSellerSecurityDeposit() {
+    private BigInteger getSellerSecurityDeposit() {
         return offer.getOfferPayload().getSellerSecurityDepositForTradeAmount(amount.get());
     }
 

diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -208,7 +208,7 @@ public void activate() {
         } else {
             bootstrapListener = new BootstrapListener() {
                 @Override
-                public void onUpdatedDataReceived() {
+                public void onDataReceived() {
                     registerSubscriptions();
                 }
             };

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1994,45 +1994,41 @@
             <sha256 value="836069ca9e8ee3c56e48376222da291263f137bd3fd16d84fdd47efcc3f286e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.7.0">
-         <artifact name="junit-jupiter-api-5.7.0.jar">
-            <sha256 value="b03f78e0daeed2d77a0af9bcd662b4cdb9693f7ee72e01a539b508b84c63d182" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-jupiter-api-5.7.0.pom">
-            <sha256 value="a0f823d513c8d4692935f24c2fe6e77cc4a7b6147a9e8a518f722e50bbf86138" origin="Generated by Gradle"/>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.10.1">
+         <artifact name="junit-jupiter-api-5.10.1.jar">
+            <sha256 value="60d5c398c32dc7039b99282514ad6064061d8417cf959a1f6bd2038cc907c913" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.9.2">
          <artifact name="junit-jupiter-api-5.9.2.jar">
             <sha256 value="f767a170f97127b0ad3582bf3358eabbbbe981d9f96411853e629d9276926fd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.7.0">
-         <artifact name="junit-jupiter-engine-5.7.0.jar">
-            <sha256 value="dfa26af94644ac2612dde6625852fcb550a0d21caa243257de54cba738ba87af" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-jupiter-engine-5.7.0.pom">
-            <sha256 value="b702e250875d331ee3c6b88f37299fbe951f43992f4b2e4a8f144e2e4cf2c7e8" origin="Generated by Gradle"/>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.10.1">
+         <artifact name="junit-jupiter-engine-5.10.1.jar">
+            <sha256 value="02930dfe495f93fe70b26550ace3a28f7e1b900c84426c2e4626ce020c7282d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.9.2">
          <artifact name="junit-jupiter-engine-5.9.2.jar">
             <sha256 value="74cfc49388f760413ff348ca2c9ab39527484b57deecd157f2275a5f8a5fe971" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.7.0">
-         <artifact name="junit-jupiter-params-5.7.0.jar">
-            <sha256 value="ca9f555c37b9bf79effd2e834af549e4feb52ad8ac9e348fe5b430d4d8a482b7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-jupiter-params-5.7.0.pom">
-            <sha256 value="23873e305a9751109839ad08b6b37dfadd1036f43b359b3b1b7bd2601fc73260" origin="Generated by Gradle"/>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.10.1">
+         <artifact name="junit-jupiter-params-5.10.1.jar">
+            <sha256 value="c8cf62debcbb354deefe1ffd0671eff785514907567d22a615ff8a8de4522b21" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.9.2">
          <artifact name="junit-jupiter-params-5.9.2.jar">
             <sha256 value="bde91900a5ce5d6663bb44bc708494b35daefcd73e1bb7afa61a4affe38ea97d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.10.1">
+         <artifact name="junit-platform-commons-1.10.1.jar">
+            <sha256 value="7d9855ee3f3f71f015eb1479559bf923783243c24fbfbd8b29bed8e8099b5672" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.7.0">
          <artifact name="junit-platform-commons-1.7.0.jar">
             <sha256 value="5330ee87cc7586e6e25175a34e9251624ff12ff525269d3415d0b4ca519b6fea" origin="Generated by Gradle"/>
@@ -2054,20 +2050,9 @@
             <sha256 value="624a3d745ef1d28e955a6a67af8edba0fdfc5c9bad680a73f67a70bb950a683d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-engine" version="1.7.0">
-         <artifact name="junit-platform-engine-1.7.0.jar">
-            <sha256 value="75f21a20dc594afdc875736725b408cec6d0344874d29f34b2dd3075500236f2" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-platform-engine-1.7.0.pom">
-            <sha256 value="225b99c5032fd1cb8cecda2e8b5a7526d6a5f81fb98a29a57557f7f5ccda9d12" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit.platform" name="junit-platform-engine" version="1.8.2">
-         <artifact name="junit-platform-engine-1.8.2.jar">
-            <sha256 value="0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-platform-engine-1.8.2.pom">
-            <sha256 value="0168643266060ed928ef5a81823003ecfae79a9a8c0bbfd76f4201c6c9d771c5" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.10.1">
+         <artifact name="junit-platform-engine-1.10.1.jar">
+            <sha256 value="baa48e470d6dee7369a0a8820c51da89c1463279eda6e13a304d11f45922c760" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.9.2">
@@ -2450,6 +2435,11 @@
             <sha256 value="0323f591b04d3a0d7ca9ebeebb9e9f34a07c0ec9169b7444ee3951b71d4cad56" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-junit-jupiter" version="5.10.0">
+         <artifact name="mockito-junit-jupiter-5.10.0.jar">
+            <sha256 value="24ae25cde73401edf029790534fe9f92c1304eb52e46a9e57cf2b6b937ae8c43" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.objenesis" name="objenesis" version="3.1">
          <artifact name="objenesis-3.1.jar">
             <sha256 value="cdb3d038c188de6f46ffd5cd930be2d5e5dba59c53b26437995d534e3db2fb80" origin="Generated by Gradle"/>
@@ -2564,8 +2554,10 @@
          <artifact name="opentest4j-1.2.0.jar">
             <sha256 value="58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="opentest4j-1.2.0.pom">
-            <sha256 value="a96e671816c1ff8803bdec74c9241f025bdfb277da5d2b4ee02266405936f994" origin="Generated by Gradle"/>
+      </component>
+      <component group="org.opentest4j" name="opentest4j" version="1.3.0">
+         <artifact name="opentest4j-1.3.0.jar">
+            <sha256 value="48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.ow2" name="ow2" version="1.5">

diff --git a/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java b/p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java
@@ -18,6 +18,7 @@
 package haveno.network;
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
+import haveno.common.util.SingleThreadExecutorUtils;
 import haveno.common.util.Utilities;
 import lombok.extern.slf4j.Slf4j;
 import org.bitcoinj.core.NetworkParameters;
@@ -32,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -83,9 +83,9 @@ protected ExecutorService createExecutor() {
         // Attempted workaround for reported bugs on Linux in which gethostbyname does not appear to be properly
         // thread safe and can cause segfaults on some libc versions.
         if (Utilities.isLinux())
-            return Executors.newSingleThreadExecutor(new ContextPropagatingThreadFactory("DNS seed lookups"));
+            return SingleThreadExecutorUtils.getSingleThreadExecutor(new ContextPropagatingThreadFactory("DNS seed lookups"));
         else
-            return Executors.newFixedThreadPool(seeds.size(), new DaemonThreadFactory("DNS seed lookups"));
+            return Utilities.getFixedThreadPoolExecutor(seeds.size(), new DaemonThreadFactory("DNS seed lookups"));
     }
 
     /**

diff --git a/p2p/src/main/java/haveno/network/p2p/BootstrapListener.java b/p2p/src/main/java/haveno/network/p2p/BootstrapListener.java
@@ -40,11 +40,11 @@ public void onSetupFailed(Throwable throwable) {
     }
 
     @Override
-    public void onDataReceived() {
+    public void onUpdatedDataReceived() {
     }
 
     @Override
-    public abstract void onUpdatedDataReceived();
+    public abstract void onDataReceived();
 
     @Override
     public void onRequestCustomBridges() {

diff --git a/p2p/src/main/java/haveno/network/p2p/P2PService.java b/p2p/src/main/java/haveno/network/p2p/P2PService.java
@@ -189,6 +189,7 @@ public void shutDown(Runnable shutDownCompleteHandler) {
     }
 
     private void doShutDown() {
+        log.info("P2PService doShutDown started");
 
         if (p2PDataStorage != null) {
             p2PDataStorage.shutDown();
@@ -298,7 +299,7 @@ public void onPreliminaryDataReceived() {
 
     @Override
     public void onUpdatedDataReceived() {
-        applyIsBootstrapped(P2PServiceListener::onUpdatedDataReceived);
+        p2pServiceListeners.forEach(P2PServiceListener::onUpdatedDataReceived);
     }
 
     @Override
@@ -313,7 +314,8 @@ public void onNoPeersAvailable() {
 
     @Override
     public void onDataReceived() {
-        p2pServiceListeners.forEach(P2PServiceListener::onDataReceived);
+        applyIsBootstrapped(P2PServiceListener::onDataReceived);
+
     }
 
     private void applyIsBootstrapped(Consumer<P2PServiceListener> listenerHandler) {

diff --git a/p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java b/p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java
@@ -44,7 +44,7 @@ public enum CloseConnectionReason {
 
     // illegal requests
     RULE_VIOLATION(true, false),
-    PEER_BANNED(true, false),
+    PEER_BANNED(false, false),
     INVALID_CLASS_RECEIVED(false, false),
     MANDATORY_CAPABILITIES_NOT_SUPPORTED(false, false);