add and process finalized states for deposit txs and payout tx

Author: woodser

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

@@ -96,6 +96,7 @@ public class TradeInfo implements Payload {
     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;
@@ -140,6 +141,7 @@ public TradeInfo(TradeInfoV1Builder builder) {
         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();
@@ -204,6 +206,7 @@ public static TradeInfo toTradeInfo(Trade trade) {
                 .withIsPayoutPublished(trade.isPayoutPublished())
                 .withIsPayoutConfirmed(trade.isPayoutConfirmed())
                 .withIsPayoutUnlocked(trade.isPayoutUnlocked())
+                .withIsPayoutFinalized(trade.isPayoutFinalized())
                 .withIsCompleted(trade.isCompleted())
                 .withContractAsJson(trade.getContractAsJson())
                 .withContract(contractInfo)
@@ -258,6 +261,7 @@ public haveno.proto.grpc.TradeInfo toProtoMessage() {
                 .setIsPayoutPublished(isPayoutPublished)
                 .setIsPayoutConfirmed(isPayoutConfirmed)
                 .setIsPayoutUnlocked(isPayoutUnlocked)
+                .setIsPayoutFinalized(isPayoutFinalized)
                 .setContractAsJson(contractAsJson == null ? "" : contractAsJson)
                 .setContract(contract.toProtoMessage())
                 .setStartTime(startTime)
@@ -305,6 +309,7 @@ public static TradeInfo fromProto(haveno.proto.grpc.TradeInfo proto) {
                 .withIsPayoutPublished(proto.getIsPayoutPublished())
                 .withIsPayoutConfirmed(proto.getIsPayoutConfirmed())
                 .withIsPayoutUnlocked(proto.getIsPayoutUnlocked())
+                .withIsPayoutFinalized(proto.getIsPayoutFinalized())
                 .withContractAsJson(proto.getContractAsJson())
                 .withContract((ContractInfo.fromProto(proto.getContract())))
                 .withStartTime(proto.getStartTime())
@@ -350,6 +355,7 @@ public String toString() {
                 ", 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

@@ -69,6 +69,7 @@ public final class TradeInfoV1Builder {
     private boolean isPayoutPublished;
     private boolean isPayoutConfirmed;
     private boolean isPayoutUnlocked;
+    private boolean isPayoutFinalized;
     private boolean isCompleted;
     private String contractAsJson;
     private ContractInfo contract;
@@ -267,6 +268,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:
                         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/trade/Trade.java

@@ -126,7 +126,7 @@ public void onPaymentSent(ResultHandler resultHandler, ErrorMessageHandler error
                 this.errorMessageHandler = errorMessageHandler;
                 BuyerEvent event = BuyerEvent.PAYMENT_SENT;
                 try {
-                    expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED, Trade.Phase.PAYMENT_SENT)
+                    expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED, Trade.Phase.DEPOSITS_FINALIZED, Trade.Phase.PAYMENT_SENT)
                             .with(event)
                             .preCondition(trade.confirmPermitted()))
                             .setup(tasks(ApplyFilter.class,

core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java

@@ -80,7 +80,9 @@ protected void onMailboxMessage(TradeMessage message, NodeAddress peer) {
     // Trader has not yet received the peer's signature but has clicked the accept button.
     public void onAcceptMediationResult(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
         DisputeEvent event = DisputeEvent.MEDIATION_RESULT_ACCEPTED;
-        expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED,
+        expect(anyPhase(
+                Trade.Phase.DEPOSITS_UNLOCKED,
+                Trade.Phase.DEPOSITS_FINALIZED,
                 Trade.Phase.PAYMENT_SENT,
                 Trade.Phase.PAYMENT_RECEIVED)
                 .with(event)
@@ -107,7 +109,9 @@ public void onAcceptMediationResult(ResultHandler resultHandler, ErrorMessageHan
     // Trader has already received the peer's signature and has clicked the accept button as well.
     public void onFinalizeMediationResultPayout(ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
         DisputeEvent event = DisputeEvent.MEDIATION_RESULT_ACCEPTED;
-        expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED,
+        expect(anyPhase(
+                Trade.Phase.DEPOSITS_UNLOCKED,
+                Trade.Phase.DEPOSITS_FINALIZED,
                 Trade.Phase.PAYMENT_SENT,
                 Trade.Phase.PAYMENT_RECEIVED)
                 .with(event)
@@ -135,7 +139,9 @@ public void onFinalizeMediationResultPayout(ResultHandler resultHandler, ErrorMe
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     protected void handle(MediatedPayoutTxSignatureMessage message, NodeAddress peer) {
-        expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED,
+        expect(anyPhase(
+                Trade.Phase.DEPOSITS_UNLOCKED,
+                Trade.Phase.DEPOSITS_FINALIZED,
                 Trade.Phase.PAYMENT_SENT,
                 Trade.Phase.PAYMENT_RECEIVED)
                 .with(message)
@@ -145,7 +151,9 @@ protected void handle(MediatedPayoutTxSignatureMessage message, NodeAddress peer
     }
 
     protected void handle(MediatedPayoutTxPublishedMessage message, NodeAddress peer) {
-        expect(anyPhase(Trade.Phase.DEPOSITS_UNLOCKED,
+        expect(anyPhase(
+                Trade.Phase.DEPOSITS_UNLOCKED,
+                Trade.Phase.DEPOSITS_FINALIZED,
                 Trade.Phase.PAYMENT_SENT,
                 Trade.Phase.PAYMENT_RECEIVED)
                 .with(message)

core/src/main/java/haveno/core/trade/protocol/DisputeProtocol.java

@@ -1077,7 +1077,7 @@ public synchronized void resetAddressEntriesForOpenOffer(String offerId) {
         // swap trade payout to available if applicable
         if (tradeManager == null) return;
         Trade trade = tradeManager.getTrade(offerId);
-        if (trade == null || trade.isPayoutUnlocked()) swapAddressEntryToAvailable(offerId, XmrAddressEntry.Context.TRADE_PAYOUT);
+        if (trade == null || trade.isPayoutFinalized()) swapAddressEntryToAvailable(offerId, XmrAddressEntry.Context.TRADE_PAYOUT);
     }
 
     public synchronized void swapPayoutAddressEntryToAvailable(String offerId) {
@@ -1221,7 +1221,7 @@ public Stream<XmrAddressEntry> getAddressEntriesForAvailableBalanceStream() {
         Stream<XmrAddressEntry> available = getFundedAvailableAddressEntries().stream();
         available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.ARBITRATOR).stream());
         available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.OFFER_FUNDING).stream().filter(entry -> !tradeManager.getOpenOfferManager().getOpenOffer(entry.getOfferId()).isPresent()));
-        available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.TRADE_PAYOUT).stream().filter(entry -> tradeManager.getTrade(entry.getOfferId()) == null || tradeManager.getTrade(entry.getOfferId()).isPayoutUnlocked()));
+        available = Stream.concat(available, getAddressEntries(XmrAddressEntry.Context.TRADE_PAYOUT).stream().filter(entry -> tradeManager.getTrade(entry.getOfferId()) == null || tradeManager.getTrade(entry.getOfferId()).isPayoutFinalized()));
         return available.filter(addressEntry -> getBalanceForSubaddress(addressEntry.getSubaddressIndex()).compareTo(BigInteger.ZERO) > 0);
     }
 

core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java

@@ -660,6 +660,7 @@ portfolio.pending.unconfirmedTooLong=Deposit transactions on trade {0} are still
   If the problem persists, contact Haveno support [HYPERLINK:https://matrix.to/#/#haveno:monero.social].
 
 portfolio.pending.step1.waitForConf=Wait for blockchain confirmations
+portfolio.pending.step2_buyer.additionalConf=Deposits have reached 10 confirmations.\nFor extra security, we recommend waiting {0} confirmations before sending payment.\nProceed early at your own risk.
 portfolio.pending.step2_buyer.startPayment=Start payment
 portfolio.pending.step2_seller.waitPaymentSent=Wait until payment has been sent
 portfolio.pending.step3_buyer.waitPaymentArrived=Wait until payment arrived
@@ -2337,6 +2338,7 @@ notification.ticket.headline=Support ticket for trade with ID {0}
 notification.trade.completed=The trade is now completed, and you can withdraw your funds.
 notification.trade.accepted=Your offer has been accepted by a XMR {0}.
 notification.trade.unlocked=Your trade has been confirmed.\nYou can start the payment now.
+notification.trade.finalized=The trade has {0} confirmations.\nYou can start the payment now.
 notification.trade.paymentSent=The XMR buyer has sent the payment.
 notification.trade.selectTrade=Select trade
 notification.trade.peerOpenedDispute=Your trading peer has opened a {0}.

core/src/main/resources/i18n/displayStrings.properties

@@ -625,6 +625,7 @@ portfolio.pending.unconfirmedTooLong=Vkladové transakce obchodu {0} jsou stále
   Pokud problém přetrvává, kontaktujte podporu Haveno [HYPERLINK:https://matrix.to/#/#haveno:monero.social].
 
 portfolio.pending.step1.waitForConf=Počkejte na potvrzení na blockchainu
+portfolio.pending.step2_buyer.additionalConf=Vklady dosáhly 10 potvrzení.\nPro vyšší bezpečnost doporučujeme počkat na {0} potvrzení před odesláním platby.\nPokračujte dříve na vlastní riziko.
 portfolio.pending.step2_buyer.startPayment=Zahajte platbu
 portfolio.pending.step2_seller.waitPaymentSent=Počkejte, než začne platba
 portfolio.pending.step3_buyer.waitPaymentArrived=Počkejte, než dorazí platba

core/src/main/resources/i18n/displayStrings_cs.properties

@@ -577,6 +577,7 @@ portfolio.closedTrades.deviation.help=Prozentuale Preisabweichung vom Markt
 portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the traditional or crypto payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0}
 
 portfolio.pending.step1.waitForConf=Auf Blockchain-Bestätigung warten
+portfolio.pending.step2_buyer.additionalConf=Einzahlungen haben 10 Bestätigungen erreicht.\nFür zusätzliche Sicherheit empfehlen wir, {0} Bestätigungen abzuwarten, bevor Sie die Zahlung senden.\nEin früheres Vorgehen erfolgt auf eigenes Risiko.
 portfolio.pending.step2_buyer.startPayment=Zahlung beginnen
 portfolio.pending.step2_seller.waitPaymentSent=Auf Zahlungsbeginn warten
 portfolio.pending.step3_buyer.waitPaymentArrived=Auf Zahlungseingang warten