Merge branch 'haveno-dex:master' into restrictions

retoaccess1 · Feb 19, 2025 · 5f2b881 · 5f2b881
2 parents 38743f5 + b9381f7
commit 5f2b881
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -70,6 +70,7 @@ monerod1-local:
 		--log-level 0 \
 		--add-exclusive-node 127.0.0.1:48080 \
 		--add-exclusive-node 127.0.0.1:58080 \
+		--max-connections-per-ip 10 \
 		--rpc-access-control-origins http://localhost:8080 \
 		--fixed-difficulty 500 \
 		--disable-rpc-ban \
@@ -88,6 +89,7 @@ monerod2-local:
 		--confirm-external-bind \
 		--add-exclusive-node 127.0.0.1:28080 \
 		--add-exclusive-node 127.0.0.1:58080 \
+		--max-connections-per-ip 10 \
 		--rpc-access-control-origins http://localhost:8080 \
 		--fixed-difficulty 500 \
 		--disable-rpc-ban \
@@ -106,6 +108,7 @@ monerod3-local:
 		--confirm-external-bind \
 		--add-exclusive-node 127.0.0.1:28080 \
 		--add-exclusive-node 127.0.0.1:48080 \
+		--max-connections-per-ip 10 \
 		--rpc-access-control-origins http://localhost:8080 \
 		--fixed-difficulty 500 \
 		--disable-rpc-ban \

diff --git a/core/src/main/java/haveno/core/api/CoreTradesService.java b/core/src/main/java/haveno/core/api/CoreTradesService.java
@@ -47,7 +47,6 @@
 import haveno.core.support.traderchat.TradeChatSession;
 import haveno.core.support.traderchat.TraderChatManager;
 import haveno.core.trade.ClosedTradableManager;
-import haveno.core.trade.Tradable;
 import haveno.core.trade.Trade;
 import haveno.core.trade.TradeManager;
 import haveno.core.trade.TradeUtil;
@@ -223,8 +222,7 @@ private Optional<Trade> getOpenTrade(String tradeId) {
     }
 
     private Optional<Trade> getClosedTrade(String tradeId) {
-        Optional<Tradable> tradable = closedTradableManager.getTradeById(tradeId);
-        return tradable.filter((t) -> t instanceof Trade).map(value -> (Trade) value);
+        return closedTradableManager.getTradeById(tradeId);
     }
 
     List<Trade> getTrades() {

diff --git a/core/src/main/java/haveno/core/support/SupportManager.java b/core/src/main/java/haveno/core/support/SupportManager.java
@@ -232,10 +232,12 @@ private void onAckMessage(AckMessage ackMessage) {
             getAllChatMessages(ackMessage.getSourceId()).stream()
                     .filter(msg -> msg.getUid().equals(ackMessage.getSourceUid()))
                     .forEach(msg -> {
-                        if (ackMessage.isSuccess())
-                            msg.setAcknowledged(true);
-                        else
-                            msg.setAckError(ackMessage.getErrorMessage());
+                        UserThread.execute(() -> {
+                            if (ackMessage.isSuccess())
+                                msg.setAcknowledged(true);
+                            else
+                                msg.setAckError(ackMessage.getErrorMessage());
+                        });
                     });
             requestPersistence();
         }

diff --git a/core/src/main/java/haveno/core/trade/ClosedTradableManager.java b/core/src/main/java/haveno/core/trade/ClosedTradableManager.java
@@ -150,9 +150,9 @@ public Optional<Tradable> getTradableById(String id) {
         }
     }
 
-    public Optional<Tradable> getTradeById(String id) {
+    public Optional<Trade> getTradeById(String id) {
         synchronized (closedTradables) {
-            return closedTradables.stream().filter(e -> e instanceof Trade && e.getId().equals(id)).findFirst();
+            return getClosedTrades().stream().filter(e -> e.getId().equals(id)).findFirst();
         }
     }
 

diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -1315,7 +1315,7 @@ public List<Trade> getClosedTrades() {
     }
 
     public Optional<Trade> getClosedTrade(String tradeId) {
-        return closedTradableManager.getClosedTrades().stream().filter(e -> e.getId().equals(tradeId)).findFirst();
+        return closedTradableManager.getTradeById(tradeId);
     }
 
     public Optional<Trade> getFailedTrade(String tradeId) {

diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/BuyerSendPaymentSentMessage.java
@@ -66,7 +66,7 @@
 public abstract class BuyerSendPaymentSentMessage extends SendMailboxMessageTask {
     private ChangeListener<MessageState> listener;
     private Timer timer;
-    private static final int MAX_RESEND_ATTEMPTS = 10;
+    private static final int MAX_RESEND_ATTEMPTS = 20;
     private int delayInMin = 10;
     private int resendCounter = 0;
 
@@ -198,7 +198,16 @@ private void tryToSendAgainLater() {
             onMessageStateChange(processModel.getPaymentSentMessageStateProperty().get());
         }
 
-        delayInMin = delayInMin * 2;
+        // first re-send is after 2 minutes, then increase the delay exponentially
+        if (resendCounter == 0) {
+            int shortDelay = 2;
+            log.info("We will send the message again to the peer after a delay of {} min.", shortDelay);
+            timer = UserThread.runAfter(this::run, shortDelay, TimeUnit.MINUTES);
+        } else {
+            log.info("We will send the message again to the peer after a delay of {} min.", delayInMin);
+            timer = UserThread.runAfter(this::run, delayInMin, TimeUnit.MINUTES);
+            delayInMin = (int) ((double) delayInMin * 1.5);
+        }
         resendCounter++;
     }
 

diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendDepositsConfirmedMessage.java
@@ -37,7 +37,7 @@
 @Slf4j
 public abstract class SendDepositsConfirmedMessage extends SendMailboxMessageTask {
     private Timer timer;
-    private static final int MAX_RESEND_ATTEMPTS = 10;
+    private static final int MAX_RESEND_ATTEMPTS = 20;
     private int delayInMin = 10;
     private int resendCounter = 0;
 
@@ -137,15 +137,15 @@ private void tryToSendAgainLater() {
             timer.stop();
         }
 
-        // first re-send is after 2 minutes, then double the delay each iteration
+        // first re-send is after 2 minutes, then increase the delay exponentially
         if (resendCounter == 0) {
             int shortDelay = 2;
             log.info("We will send the message again to the peer after a delay of {} min.", shortDelay);
             timer = UserThread.runAfter(this::run, shortDelay, TimeUnit.MINUTES);
         } else {
             log.info("We will send the message again to the peer after a delay of {} min.", delayInMin);
             timer = UserThread.runAfter(this::run, delayInMin, TimeUnit.MINUTES);
-            delayInMin = delayInMin * 2;
+            delayInMin = (int) ((double) delayInMin * 1.5);
         }
         resendCounter++;
     }