[WIP] Add cancel trade feature

core/src/main/java/bisq/core/account/sign/SignedWitnessService.java

@@ -272,16 +272,16 @@ private String signAccountAgeWitness(Coin tradeAmount,
         return "";
     }
 
-    public void selfSignAccountAgeWitness(AccountAgeWitness accountAgeWitness) throws CryptoException {
+    public void signAndPublishAccountAgeWitness(AccountAgeWitness accountAgeWitness) throws CryptoException {
         log.info("Sign own accountAgeWitness {}", accountAgeWitness);
-        signAccountAgeWitness(MINIMUM_TRADE_AMOUNT_FOR_SIGNING, accountAgeWitness,
+        signAndPublishAccountAgeWitness(MINIMUM_TRADE_AMOUNT_FOR_SIGNING, accountAgeWitness,
                 keyRing.getSignatureKeyPair().getPublic());
     }
 
     // Any peer can sign with DSA key
-    public Optional<SignedWitness> signAccountAgeWitness(Coin tradeAmount,
-                                                         AccountAgeWitness accountAgeWitness,
-                                                         PublicKey peersPubKey) throws CryptoException {
+    public Optional<SignedWitness> signAndPublishAccountAgeWitness(Coin tradeAmount,
+                                                                   AccountAgeWitness accountAgeWitness,
+                                                                   PublicKey peersPubKey) throws CryptoException {
         if (isSignedAccountAgeWitness(accountAgeWitness)) {
             log.warn("Trader trying to sign already signed accountagewitness {}", accountAgeWitness.toString());
             return Optional.empty();
@@ -494,7 +494,8 @@ void addToMap(SignedWitness signedWitness) {
     private void publishSignedWitness(SignedWitness signedWitness) {
         if (!signedWitnessMap.containsKey(signedWitness.getHashAsByteArray())) {
             log.info("broadcast signed witness {}", signedWitness.toString());
-            p2PService.addPersistableNetworkPayload(signedWitness, false);
+            // We set reBroadcast to true to achieve better resilience.
+            p2PService.addPersistableNetworkPayload(signedWitness, true);
             addToMap(signedWitness);
         }
     }

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java

@@ -35,14 +35,11 @@
 import bisq.core.support.dispute.arbitration.TraderDataItem;
 import bisq.core.trade.Contract;
 import bisq.core.trade.Trade;
-import bisq.core.trade.messages.TraderSignedWitnessMessage;
 import bisq.core.trade.protocol.TradingPeer;
 import bisq.core.user.User;
 
 import bisq.network.p2p.BootstrapListener;
-import bisq.network.p2p.NodeAddress;
 import bisq.network.p2p.P2PService;
-import bisq.network.p2p.SendMailboxMessageListener;
 import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
 
@@ -76,7 +73,6 @@
 import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -202,7 +198,7 @@ public void onUpdatedDataReceived() {
 
     private void onBootStrapped() {
         republishAllFiatAccounts();
-        signSameNameAccounts();
+        signAndPublishSameNameAccounts();
     }
 
 
@@ -672,7 +668,7 @@ public void arbitratorSignAccountAgeWitness(AccountAgeWitness accountAgeWitness,
         signedWitnessService.signAccountAgeWitness(accountAgeWitness, key, tradersPubKey, time);
     }
 
-    public Optional<SignedWitness> traderSignPeersAccountAgeWitness(Trade trade) {
+    public Optional<SignedWitness> traderSignAndPublishPeersAccountAgeWitness(Trade trade) {
         AccountAgeWitness peersWitness = findTradePeerWitness(trade).orElse(null);
         Coin tradeAmount = trade.getTradeAmount();
         checkNotNull(trade.getProcessModel().getTradingPeer().getPubKeyRing(), "Peer must have a keyring");
@@ -682,7 +678,7 @@ public Optional<SignedWitness> traderSignPeersAccountAgeWitness(Trade trade) {
         checkNotNull(peersPubKey, "Peers pub key must not be null");
 
         try {
-            return signedWitnessService.signAccountAgeWitness(tradeAmount, peersWitness, peersPubKey);
+            return signedWitnessService.signAndPublishAccountAgeWitness(tradeAmount, peersWitness, peersPubKey);
         } catch (CryptoException e) {
             log.warn("Trader failed to sign witness, exception {}", e.toString());
         }
@@ -827,7 +823,7 @@ public Set<AccountAgeWitness> getOrphanSignedWitnesses() {
                 .collect(Collectors.toSet());
     }
 
-    public void signSameNameAccounts() {
+    public void signAndPublishSameNameAccounts() {
         // Collect accounts that have ownerId to sign unsigned accounts with the same ownderId
         var signerAccounts = Objects.requireNonNull(user.getPaymentAccounts()).stream()
                 .filter(account -> account.getOwnerId() != null &&
@@ -842,7 +838,7 @@ public void signSameNameAccounts() {
         signerAccounts.forEach(signer -> unsignedAccounts.forEach(unsigned -> {
             if (signer.getOwnerId().equals(unsigned.getOwnerId())) {
                 try {
-                    signedWitnessService.selfSignAccountAgeWitness(
+                    signedWitnessService.signAndPublishAccountAgeWitness(
                             getMyWitness(unsigned.getPaymentAccountPayload()));
                 } catch (CryptoException e) {
                     log.warn("Self signing failed, exception {}", e.toString());
@@ -868,44 +864,4 @@ public boolean isSignWitnessTrade(Trade trade) {
                 !peerHasSignedWitness(trade) &&
                 tradeAmountIsSufficient(trade.getTradeAmount());
     }
-
-    public void maybeSignWitness(Trade trade) {
-        if (isSignWitnessTrade(trade)) {
-            var signedWitnessOptional = traderSignPeersAccountAgeWitness(trade);
-            signedWitnessOptional.ifPresent(signedWitness -> sendSignedWitnessToPeer(signedWitness, trade));
-        }
-    }
-
-    private void sendSignedWitnessToPeer(SignedWitness signedWitness, Trade trade) {
-        if (trade == null) return;
-
-        NodeAddress tradingPeerNodeAddress = trade.getTradingPeerNodeAddress();
-        var traderSignedWitnessMessage = new TraderSignedWitnessMessage(UUID.randomUUID().toString(), trade.getId(),
-                tradingPeerNodeAddress, signedWitness);
-
-        p2PService.sendEncryptedMailboxMessage(
-                tradingPeerNodeAddress,
-                trade.getProcessModel().getTradingPeer().getPubKeyRing(),
-                traderSignedWitnessMessage,
-                new SendMailboxMessageListener() {
-                    @Override
-                    public void onArrived() {
-                        log.info("SendMailboxMessageListener onArrived tradeId={} at peer {} SignedWitness {}",
-                                trade.getId(), tradingPeerNodeAddress, signedWitness);
-                    }
-
-                    @Override
-                    public void onStoredInMailbox() {
-                        log.info("SendMailboxMessageListener onStoredInMailbox tradeId={} at peer {} SignedWitness {}",
-                                trade.getId(), tradingPeerNodeAddress, signedWitness);
-                    }
-
-                    @Override
-                    public void onFault(String errorMessage) {
-                        log.error("SendMailboxMessageListener onFault tradeId={} at peer {} SignedWitness {}",
-                                trade.getId(), tradingPeerNodeAddress, signedWitness);
-                    }
-                }
-        );
-    }
 }

core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java

@@ -58,7 +58,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -833,6 +832,70 @@ public Transaction sellerSignsAndFinalizesPayoutTx(Transaction depositTx,
         return payoutTx;
     }
 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Canceled trade payoutTx
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    //TODO avoid code duplication
+    public byte[] signCanceledTradePayoutTx(Transaction depositTx,
+                                            Coin buyerPayoutAmount,
+                                            Coin sellerPayoutAmount,
+                                            String buyerPayoutAddressString,
+                                            String sellerPayoutAddressString,
+                                            DeterministicKey myMultiSigKeyPair,
+                                            byte[] buyerPubKey,
+                                            byte[] sellerPubKey)
+            throws AddressFormatException, TransactionVerificationException {
+        Transaction preparedPayoutTx = createPayoutTx(depositTx, buyerPayoutAmount, sellerPayoutAmount,
+                buyerPayoutAddressString, sellerPayoutAddressString);
+        // MS redeemScript
+        Script redeemScript = get2of2MultiSigRedeemScript(buyerPubKey, sellerPubKey);
+        // MS output from prev. tx is index 0
+        Sha256Hash sigHash = preparedPayoutTx.hashForSignature(0, redeemScript, Transaction.SigHash.ALL, false);
+        checkNotNull(myMultiSigKeyPair, "myMultiSigKeyPair must not be null");
+        if (myMultiSigKeyPair.isEncrypted()) {
+            checkNotNull(aesKey);
+        }
+        ECKey.ECDSASignature mySignature = myMultiSigKeyPair.sign(sigHash, aesKey).toCanonicalised();
+        WalletService.printTx("prepared canceled trade payoutTx for sig creation", preparedPayoutTx);
+        WalletService.verifyTransaction(preparedPayoutTx);
+        return mySignature.encodeToDER();
+    }
+
+    //TODO avoid code duplication
+    public Transaction finalizeCanceledTradePayoutTx(Transaction depositTx,
+                                                     byte[] buyerSignature,
+                                                     byte[] sellerSignature,
+                                                     Coin buyerPayoutAmount,
+                                                     Coin sellerPayoutAmount,
+                                                     String buyerPayoutAddressString,
+                                                     String sellerPayoutAddressString,
+                                                     DeterministicKey multiSigKeyPair,
+                                                     byte[] buyerPubKey,
+                                                     byte[] sellerPubKey)
+            throws AddressFormatException, TransactionVerificationException, WalletException {
+        Transaction payoutTx = createPayoutTx(depositTx, buyerPayoutAmount, sellerPayoutAmount, buyerPayoutAddressString, sellerPayoutAddressString);
+        // MS redeemScript
+        Script redeemScript = get2of2MultiSigRedeemScript(buyerPubKey, sellerPubKey);
+        // MS output from prev. tx is index 0
+        checkNotNull(multiSigKeyPair, "multiSigKeyPair must not be null");
+        TransactionSignature buyerTxSig = new TransactionSignature(ECKey.ECDSASignature.decodeFromDER(buyerSignature),
+                Transaction.SigHash.ALL, false);
+        TransactionSignature sellerTxSig = new TransactionSignature(ECKey.ECDSASignature.decodeFromDER(sellerSignature),
+                Transaction.SigHash.ALL, false);
+        // Take care of order of signatures. Need to be reversed here. See comment below at getMultiSigRedeemScript (seller, buyer)
+        Script inputScript = ScriptBuilder.createP2SHMultiSigInputScript(ImmutableList.of(sellerTxSig, buyerTxSig), redeemScript);
+        TransactionInput input = payoutTx.getInput(0);
+        input.setScriptSig(inputScript);
+        WalletService.printTx("canceled trade payoutTx", payoutTx);
+        WalletService.verifyTransaction(payoutTx);
+        WalletService.checkWalletConsistency(wallet);
+        WalletService.checkScriptSig(payoutTx, input, 0);
+        checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
+        input.verify(input.getConnectedOutput());
+        return payoutTx;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Mediated payoutTx

core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java

@@ -53,12 +53,15 @@
 import bisq.core.trade.messages.DepositTxMessage;
 import bisq.core.trade.messages.InputsForDepositTxRequest;
 import bisq.core.trade.messages.InputsForDepositTxResponse;
-import bisq.core.trade.messages.MediatedPayoutTxPublishedMessage;
-import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
 import bisq.core.trade.messages.PayoutTxPublishedMessage;
 import bisq.core.trade.messages.PeerPublishedDelayedPayoutTxMessage;
 import bisq.core.trade.messages.RefreshTradeStateRequest;
 import bisq.core.trade.messages.TraderSignedWitnessMessage;
+import bisq.core.trade.messages.cancel.CancelTradeRequestAcceptedMessage;
+import bisq.core.trade.messages.cancel.CancelTradeRequestRejectedMessage;
+import bisq.core.trade.messages.cancel.RequestCancelTradeMessage;
+import bisq.core.trade.messages.mediation.MediatedPayoutTxPublishedMessage;
+import bisq.core.trade.messages.mediation.MediatedPayoutTxSignatureMessage;
 import bisq.core.trade.statistics.TradeStatistics;
 
 import bisq.network.p2p.AckMessage;
@@ -174,6 +177,13 @@ public NetworkEnvelope fromProto(protobuf.NetworkEnvelope proto) throws Protobuf
                 case MEDIATED_PAYOUT_TX_PUBLISHED_MESSAGE:
                     return MediatedPayoutTxPublishedMessage.fromProto(proto.getMediatedPayoutTxPublishedMessage(), messageVersion);
 
+                case REQUEST_CANCEL_TRADE_MESSAGE:
+                    return RequestCancelTradeMessage.fromProto(proto.getRequestCancelTradeMessage(), messageVersion);
+                case CANCEL_TRADE_ACCEPTED_MESSAGE:
+                    return CancelTradeRequestAcceptedMessage.fromProto(proto.getCancelTradeAcceptedMessage(), messageVersion);
+                case CANCEL_TRADE_REJECTED_MESSAGE:
+                    return CancelTradeRequestRejectedMessage.fromProto(proto.getCancelTradeRejectedMessage(), messageVersion);
+
                 case OPEN_NEW_DISPUTE_MESSAGE:
                     return OpenNewDisputeMessage.fromProto(proto.getOpenNewDisputeMessage(), this, messageVersion);
                 case PEER_OPENED_DISPUTE_MESSAGE:

core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java

@@ -94,7 +94,7 @@ public static Tradable fromProto(protobuf.BuyerAsMakerTrade buyerAsMakerTradePro
         trade.setTradePrice(proto.getTradePrice());
         trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
 
-        return fromProto(trade,
+        return BuyerTrade.fromProto(trade,
                 proto,
                 coreProtoResolver);
     }
@@ -115,4 +115,10 @@ public void handleTakeOfferRequest(InputsForDepositTxRequest message,
                                        ErrorMessageHandler errorMessageHandler) {
         ((MakerProtocol) tradeProtocol).handleTakeOfferRequest(message, taker, errorMessageHandler);
     }
+
+
+    @Override
+    public String toString() {
+        return "BuyerAsMakerTrade{} " + super.toString();
+    }
 }

core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java

@@ -86,7 +86,7 @@ public static Tradable fromProto(protobuf.BuyerAsTakerTrade buyerAsTakerTradePro
                                      BtcWalletService btcWalletService,
                                      CoreProtoResolver coreProtoResolver) {
         protobuf.Trade proto = buyerAsTakerTradeProto.getTrade();
-        return fromProto(new BuyerAsTakerTrade(
+        return BuyerTrade.fromProto(new BuyerAsTakerTrade(
                         Offer.fromProto(proto.getOffer()),
                         Coin.valueOf(proto.getTradeAmountAsLong()),
                         Coin.valueOf(proto.getTxFeeAsLong()),
@@ -118,4 +118,10 @@ public void takeAvailableOffer() {
         checkArgument(tradeProtocol instanceof TakerProtocol, "tradeProtocol NOT instanceof TakerProtocol");
         ((TakerProtocol) tradeProtocol).takeAvailableOffer();
     }
+
+
+    @Override
+    public String toString() {
+        return "BuyerAsTakerTrade{} " + super.toString();
+    }
 }