support deposits and payout finalization and recovery

Author: woodser

core/src/main/java/haveno/core/api/CoreDisputesService.java

@@ -242,7 +242,7 @@ public void applyPayoutAmountsToDisputeResult(PayoutSuggestion payoutSuggestion,
             disputeResult.setBuyerPayoutAmountBeforeCost(tradeAmount.add(buyerSecurityDeposit).add(sellerSecurityDeposit)); // TODO (woodser): apply min payout to incentivize loser? (see post v1.1.7)
             disputeResult.setSellerPayoutAmountBeforeCost(BigInteger.ZERO);
             if (disputeResult.getBuyerPayoutAmountBeforeCost().compareTo(trade.getWallet().getBalance()) > 0) { // in case peer's deposit transaction is not confirmed
-                log.warn("Payout amount for buyer is more than wallet's balance. Decreasing payout amount from {} to {}",
+                log.warn("Payout amount for buyer is more than wallet's balance. This can happen if a deposit tx is dropped. Decreasing payout amount from {} to {}",
                         HavenoUtils.formatXmr(disputeResult.getBuyerPayoutAmountBeforeCost()),
                         HavenoUtils.formatXmr(trade.getWallet().getBalance()));
                 disputeResult.setBuyerPayoutAmountBeforeCost(trade.getWallet().getBalance());
@@ -254,7 +254,7 @@ public void applyPayoutAmountsToDisputeResult(PayoutSuggestion payoutSuggestion,
             disputeResult.setBuyerPayoutAmountBeforeCost(BigInteger.ZERO);
             disputeResult.setSellerPayoutAmountBeforeCost(tradeAmount.add(sellerSecurityDeposit).add(buyerSecurityDeposit));
             if (disputeResult.getSellerPayoutAmountBeforeCost().compareTo(trade.getWallet().getBalance()) > 0) { // in case peer's deposit transaction is not confirmed
-                log.warn("Payout amount for seller is more than wallet's balance. Decreasing payout amount from {} to {}",
+                log.warn("Payout amount for seller is more than wallet's balance. This can happen if a deposit tx is dropped. Decreasing payout amount from {} to {}",
                         HavenoUtils.formatXmr(disputeResult.getSellerPayoutAmountBeforeCost()),
                         HavenoUtils.formatXmr(trade.getWallet().getBalance()));
                 disputeResult.setSellerPayoutAmountBeforeCost(trade.getWallet().getBalance());

core/src/main/java/haveno/core/api/model/TradeInfo.java

@@ -91,11 +91,13 @@ public class TradeInfo implements Payload {
     private final boolean isDepositsPublished;
     private final boolean isDepositsConfirmed;
     private final boolean isDepositsUnlocked;
+    private final boolean isDepositsFinalized;
     private final boolean isPaymentSent;
     private final boolean isPaymentReceived;
     private final boolean isPayoutPublished;
     private final boolean isPayoutConfirmed;
     private final boolean isPayoutUnlocked;
+    private final boolean isPayoutFinalized;
     private final boolean isCompleted;
     private final String contractAsJson;
     private final ContractInfo contract;
@@ -135,11 +137,13 @@ public TradeInfo(TradeInfoV1Builder builder) {
         this.isDepositsPublished = builder.isDepositsPublished();
         this.isDepositsConfirmed = builder.isDepositsConfirmed();
         this.isDepositsUnlocked = builder.isDepositsUnlocked();
+        this.isDepositsFinalized = builder.isDepositsFinalized();
         this.isPaymentSent = builder.isPaymentSent();
         this.isPaymentReceived = builder.isPaymentReceived();
         this.isPayoutPublished = builder.isPayoutPublished();
         this.isPayoutConfirmed = builder.isPayoutConfirmed();
         this.isPayoutUnlocked = builder.isPayoutUnlocked();
+        this.isPayoutFinalized = builder.isPayoutFinalized();
         this.isCompleted = builder.isCompleted();
         this.contractAsJson = builder.getContractAsJson();
         this.contract = builder.getContract();
@@ -199,11 +203,13 @@ public static TradeInfo toTradeInfo(Trade trade) {
                 .withIsDepositsPublished(trade.isDepositsPublished())
                 .withIsDepositsConfirmed(trade.isDepositsConfirmed())
                 .withIsDepositsUnlocked(trade.isDepositsUnlocked())
+                .withIsDepositsFinalized(trade.isDepositsFinalized())
                 .withIsPaymentSent(trade.isPaymentSent())
                 .withIsPaymentReceived(trade.isPaymentReceived())
                 .withIsPayoutPublished(trade.isPayoutPublished())
                 .withIsPayoutConfirmed(trade.isPayoutConfirmed())
                 .withIsPayoutUnlocked(trade.isPayoutUnlocked())
+                .withIsPayoutFinalized(trade.isPayoutFinalized())
                 .withIsCompleted(trade.isCompleted())
                 .withContractAsJson(trade.getContractAsJson())
                 .withContract(contractInfo)
@@ -252,12 +258,14 @@ public haveno.proto.grpc.TradeInfo toProtoMessage() {
                 .setIsDepositsPublished(isDepositsPublished)
                 .setIsDepositsConfirmed(isDepositsConfirmed)
                 .setIsDepositsUnlocked(isDepositsUnlocked)
+                .setIsDepositsFinalized(isDepositsFinalized)
                 .setIsPaymentSent(isPaymentSent)
                 .setIsPaymentReceived(isPaymentReceived)
                 .setIsCompleted(isCompleted)
                 .setIsPayoutPublished(isPayoutPublished)
                 .setIsPayoutConfirmed(isPayoutConfirmed)
                 .setIsPayoutUnlocked(isPayoutUnlocked)
+                .setIsPayoutFinalized(isPayoutFinalized)
                 .setContractAsJson(contractAsJson == null ? "" : contractAsJson)
                 .setContract(contract.toProtoMessage())
                 .setStartTime(startTime)
@@ -299,12 +307,14 @@ public static TradeInfo fromProto(haveno.proto.grpc.TradeInfo proto) {
                 .withIsDepositsPublished(proto.getIsDepositsPublished())
                 .withIsDepositsConfirmed(proto.getIsDepositsConfirmed())
                 .withIsDepositsUnlocked(proto.getIsDepositsUnlocked())
+                .withIsDepositsFinalized(proto.getIsDepositsFinalized())
                 .withIsPaymentSent(proto.getIsPaymentSent())
                 .withIsPaymentReceived(proto.getIsPaymentReceived())
                 .withIsCompleted(proto.getIsCompleted())
                 .withIsPayoutPublished(proto.getIsPayoutPublished())
                 .withIsPayoutConfirmed(proto.getIsPayoutConfirmed())
                 .withIsPayoutUnlocked(proto.getIsPayoutUnlocked())
+                .withIsPayoutFinalized(proto.getIsPayoutFinalized())
                 .withContractAsJson(proto.getContractAsJson())
                 .withContract((ContractInfo.fromProto(proto.getContract())))
                 .withStartTime(proto.getStartTime())
@@ -345,11 +355,13 @@ public String toString() {
                 ", isDepositsPublished=" + isDepositsPublished + "\n" +
                 ", isDepositsConfirmed=" + isDepositsConfirmed + "\n" +
                 ", isDepositsUnlocked=" + isDepositsUnlocked + "\n" +
+                ", isDepositsFinalized=" + isDepositsFinalized + "\n" +
                 ", isPaymentSent=" + isPaymentSent + "\n" +
                 ", isPaymentReceived=" + isPaymentReceived + "\n" +
                 ", isPayoutPublished=" + isPayoutPublished + "\n" +
                 ", isPayoutConfirmed=" + isPayoutConfirmed + "\n" +
                 ", isPayoutUnlocked=" + isPayoutUnlocked + "\n" +
+                ", isPayoutFinalized=" + isPayoutFinalized + "\n" +
                 ", isCompleted=" + isCompleted + "\n" +
                 ", offer=" + offer + "\n" +
                 ", contractAsJson=" + contractAsJson + "\n" +

core/src/main/java/haveno/core/api/model/builder/TradeInfoV1Builder.java

@@ -64,11 +64,13 @@ public final class TradeInfoV1Builder {
     private boolean isDepositsPublished;
     private boolean isDepositsConfirmed;
     private boolean isDepositsUnlocked;
+    private boolean isDepositsFinalized;
     private boolean isPaymentSent;
     private boolean isPaymentReceived;
     private boolean isPayoutPublished;
     private boolean isPayoutConfirmed;
     private boolean isPayoutUnlocked;
+    private boolean isPayoutFinalized;
     private boolean isCompleted;
     private String contractAsJson;
     private ContractInfo contract;
@@ -242,6 +244,11 @@ public TradeInfoV1Builder withIsDepositsUnlocked(boolean isDepositsUnlocked) {
         return this;
     }
 
+    public TradeInfoV1Builder withIsDepositsFinalized(boolean isDepositsFinalized) {
+        this.isDepositsFinalized = isDepositsFinalized;
+        return this;
+    }
+
     public TradeInfoV1Builder withIsPaymentSent(boolean isPaymentSent) {
         this.isPaymentSent = isPaymentSent;
         return this;
@@ -267,6 +274,11 @@ public TradeInfoV1Builder withIsPayoutUnlocked(boolean isPayoutUnlocked) {
         return this;
     }
 
+    public TradeInfoV1Builder withIsPayoutFinalized(boolean isPayoutFinalized) {
+        this.isPayoutFinalized = isPayoutFinalized;
+        return this;
+    }
+
     public TradeInfoV1Builder withIsCompleted(boolean isCompleted) {
         this.isCompleted = isCompleted;
         return this;

core/src/main/java/haveno/core/notifications/alerts/TradeEvents.java

@@ -70,6 +70,7 @@ private void setTradePhaseListener(Trade trade) {
                     case DEPOSITS_PUBLISHED:
                         break;
                     case DEPOSITS_UNLOCKED:
+                    case DEPOSITS_FINALIZED: // TODO: use a separate message for deposits finalized?
                         if (trade.getContract() != null && pubKeyRingProvider.get().equals(trade.getContract().getBuyerPubKeyRing()))
                             msg = Res.get("account.notifications.trade.message.msg.conf", shortId);
                         break;

core/src/main/java/haveno/core/support/SupportManager.java

@@ -160,7 +160,7 @@ protected void handle(ChatMessage chatMessage) {
         log.info("Received {} from peer {}. tradeId={}, uid={}", chatMessage.getClass().getSimpleName(), chatMessage.getSenderNodeAddress(), tradeId, uid);
         boolean channelOpen = channelOpen(chatMessage);
         if (!channelOpen) {
-            log.debug("We got a chatMessage but we don't have a matching chat. TradeId = " + tradeId);
+            log.warn("We got a chatMessage but we don't have a matching chat. TradeId = " + tradeId);
             if (!delayMsgMap.containsKey(uid)) {
                 Timer timer = UserThread.runAfter(() -> handle(chatMessage), 1);
                 delayMsgMap.put(uid, timer);

core/src/main/java/haveno/core/support/dispute/DisputeManager.java

@@ -598,6 +598,12 @@ protected void handle(DisputeOpenedMessage message) {
                     TradePeer opener = sender == trade.getArbitrator() ? trade.getTradePeer() : sender;
                     if (message.getOpenerUpdatedMultisigHex() != null) opener.setUpdatedMultisigHex(message.getOpenerUpdatedMultisigHex());
 
+                    // arbitrator syncs and polls wallet
+                    if (trade.isArbitrator()) {
+                        trade.syncAndPollWallet();
+                        trade.recoverIfMissingWalletData();
+                    }
+
                     // add chat message with price info
                     if (trade instanceof ArbitratorTrade) addPriceInfoMessage(dispute, 0);