bisq-network · alejandrogarcia83 · Mar 27, 2024 · Feb 26, 2024
diff --git a/cli/src/main/java/bisq/cli/CliMain.java b/cli/src/main/java/bisq/cli/CliMain.java
@@ -586,6 +586,19 @@ public static void run(String[] args) {
                     out.printf("trade %s payment started message sent%n", tradeId);
                     return;
                 }
+                case confirmpaymentstartedxmr: {
+                    var opts = new GetTradeOptionParser(args).parse();
+                    if (opts.isForHelp()) {
+                        out.println(client.getMethodHelp(method));
+                        return;
+                    }
+                    var tradeId = opts.getTradeId();
+                    var txId = opts.getTxId();
+                    var txKey = opts.getTxKey();
+                    client.confirmPaymentStartedXmr(tradeId, txId, txKey);
+                    out.printf("trade %s payment started message sent%n", tradeId);
+                    return;
+                }
                 case confirmpaymentreceived: {
                     var opts = new GetTradeOptionParser(args).parse();
                     if (opts.isForHelp()) {

diff --git a/cli/src/main/java/bisq/cli/GrpcClient.java b/cli/src/main/java/bisq/cli/GrpcClient.java
@@ -362,6 +362,9 @@ public List<TradeInfo> getTradeHistory(GetTradesRequest.Category category) {
     public void confirmPaymentStarted(String tradeId) {
         tradesServiceRequest.confirmPaymentStarted(tradeId);
     }
+    public void confirmPaymentStartedXmr(String tradeId, String txId, String txKey) {
+        tradesServiceRequest.confirmPaymentStartedXmr(tradeId, txId, txKey);
+    }
 
     public void confirmPaymentReceived(String tradeId) {
         tradesServiceRequest.confirmPaymentReceived(tradeId);

diff --git a/cli/src/main/java/bisq/cli/Method.java b/cli/src/main/java/bisq/cli/Method.java
@@ -65,5 +65,6 @@ public enum Method {
     unsettxfeerate,
     withdrawfunds,
     stop,
-    getdaostatus
+    getdaostatus,
+    confirmpaymentstartedxmr
 }
diff --git a/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java b/cli/src/main/java/bisq/cli/opts/GetTradeOptionParser.java
@@ -22,6 +22,8 @@
 
 import static bisq.cli.opts.OptLabel.OPT_SHOW_CONTRACT;
 import static bisq.cli.opts.OptLabel.OPT_TRADE_ID;
+import static bisq.cli.opts.OptLabel.OPT_TX_ID;
+import static bisq.cli.opts.OptLabel.OPT_TX_KEY;
 
 public class GetTradeOptionParser extends AbstractMethodOptionParser implements MethodOpts {
 
@@ -33,6 +35,16 @@ public class GetTradeOptionParser extends AbstractMethodOptionParser implements
             .ofType(boolean.class)
             .defaultsTo(Boolean.FALSE);
 
+    final OptionSpec<String> txIdOpt = parser.accepts(OPT_TX_ID, "optional tx id")
+            .withOptionalArg()
+            .ofType(String.class)
+            .defaultsTo("");
+
+    final OptionSpec<String> txKeyOpt = parser.accepts(OPT_TX_KEY, "optional tx key")
+            .withOptionalArg()
+            .ofType(String.class)
+            .defaultsTo("");
+
     public GetTradeOptionParser(String[] args) {
         super(args);
     }
@@ -57,4 +69,10 @@ public String getTradeId() {
     public boolean getShowContract() {
         return options.has(showContractOpt) ? options.valueOf(showContractOpt) : false;
     }
+    public String getTxId() {
+        return options.has(txIdOpt) ? options.valueOf(txIdOpt) : "";
+    }
+    public String getTxKey() {
+        return options.has(txKeyOpt) ? options.valueOf(txKeyOpt) : "";
+    }
 }
diff --git a/cli/src/main/java/bisq/cli/opts/OptLabel.java b/cli/src/main/java/bisq/cli/opts/OptLabel.java
@@ -56,4 +56,6 @@ public class OptLabel {
     public final static String OPT_TX_FEE_RATE = "tx-fee-rate";
     public final static String OPT_WALLET_PASSWORD = "wallet-password";
     public final static String OPT_NEW_WALLET_PASSWORD = "new-wallet-password";
+    public final static String OPT_TX_ID = "tx-id";
+    public final static String OPT_TX_KEY = "tx-key";
 }
diff --git a/cli/src/main/java/bisq/cli/request/TradesServiceRequest.java b/cli/src/main/java/bisq/cli/request/TradesServiceRequest.java
@@ -20,6 +20,7 @@
 import bisq.proto.grpc.CloseTradeRequest;
 import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
 import bisq.proto.grpc.ConfirmPaymentStartedRequest;
+import bisq.proto.grpc.ConfirmPaymentStartedXmrRequest;
 import bisq.proto.grpc.FailTradeRequest;
 import bisq.proto.grpc.GetTradeRequest;
 import bisq.proto.grpc.GetTradesRequest;
@@ -115,6 +116,16 @@ public void confirmPaymentStarted(String tradeId) {
         grpcStubs.tradesService.confirmPaymentStarted(request);
     }
 
+    public void confirmPaymentStartedXmr(String tradeId, String txId, String txKey) {
+        var request = ConfirmPaymentStartedXmrRequest.newBuilder()
+                .setTradeId(tradeId)
+                .setTxId(txId)
+                .setTxKey(txKey)
+                .build();
+        //noinspection ResultOfMethodCallIgnored
+        grpcStubs.tradesService.confirmPaymentStartedXmr(request);
+    }
+
     public void confirmPaymentReceived(String tradeId) {
         var request = ConfirmPaymentReceivedRequest.newBuilder()
                 .setTradeId(tradeId)

diff --git a/core/src/main/java/bisq/core/api/CoreApi.java b/core/src/main/java/bisq/core/api/CoreApi.java
@@ -56,6 +56,8 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Nullable;
+
 import static bisq.proto.grpc.EditOfferRequest.EditType;
 
 /**
@@ -318,8 +320,8 @@ public void takeOffer(String offerId,
                 errorMessageHandler);
     }
 
-    public void confirmPaymentStarted(String tradeId) {
-        coreTradesService.confirmPaymentStarted(tradeId);
+    public void confirmPaymentStarted(String tradeId, @Nullable String txId, @Nullable String txKey) {
+        coreTradesService.confirmPaymentStarted(tradeId, txId, txKey);
     }
 
     public void confirmPaymentReceived(String tradeId) {

diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/bisq/core/api/CoreTradesService.java
@@ -60,6 +60,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Nullable;
+
 import static bisq.core.btc.model.AddressEntry.Context.TRADE_PAYOUT;
 import static bisq.proto.grpc.GetTradesRequest.Category.CLOSED;
 import static java.lang.String.format;
@@ -186,7 +188,7 @@ void takeOffer(Offer offer,
         );
     }
 
-    void confirmPaymentStarted(String tradeId) {
+    void confirmPaymentStarted(String tradeId, @Nullable String txId, @Nullable String txKey) {
         var trade = getTrade(tradeId);
         if (isFollowingBuyerProtocol(trade)) {
             if (!trade.isDepositConfirmed()) {
@@ -196,6 +198,11 @@ void confirmPaymentStarted(String tradeId) {
                                 trade.getId(),
                                 trade.getDepositTxId()));
             }
+            // pass along counter currency tx proof info if provided
+            if (txId != null && txKey != null && !txId.isEmpty() && !txKey.isEmpty()) {
+                trade.setCounterCurrencyTxId(txId);
+                trade.setCounterCurrencyExtraData(txKey);
+            }
             var tradeProtocol = tradeManager.getTradeProtocol(trade);
             ((BuyerProtocol) tradeProtocol).onPaymentStarted(
                     () -> {

diff --git a/core/src/main/java/bisq/core/api/model/TradeInfo.java b/core/src/main/java/bisq/core/api/model/TradeInfo.java
@@ -93,6 +93,8 @@ public class TradeInfo implements Payload {
     private final boolean isCompleted;
     private final String contractAsJson;
     private final ContractInfo contract;
+    private final String autoConfTxId;
+    private final String autoConfTxKey;
     private final boolean hasFailed;
     private final String errorMessage;
     // Optional BSQ swap trade protocol details (post v1).
@@ -126,6 +128,8 @@ public TradeInfo(TradeInfoV1Builder builder) {
         this.isCompleted = builder.isCompleted();
         this.contractAsJson = builder.getContractAsJson();
         this.contract = builder.getContract();
+        this.autoConfTxId = builder.getAutoConfTxId();
+        this.autoConfTxKey = builder.getAutoConfTxKey();
         this.bsqSwapTradeInfo = null;
         this.closingStatus = builder.getClosingStatus();
         this.hasFailed = builder.isHasFailed();
@@ -188,7 +192,7 @@ public static TradeInfo toTradeInfo(BsqSwapTrade bsqSwapTrade,
                 .withPhase(bsqSwapTrade.getTradePhase().name())
                 // N/A for bsq-swaps: tradePeriodState, isDepositPublished, isDepositConfirmed
                 // N/A for bsq-swaps: isPaymentStartedMessageSent, isPaymentReceivedMessageSent, isPayoutPublished
-                // N/A for bsq-swaps: isCompleted, contractAsJson, contract
+                // N/A for bsq-swaps: isCompleted, contractAsJson, contract, autoConfTxId, autoConfTxKey
                 .withClosingStatus(closingStatus)
                 .build();
         tradeInfo.bsqSwapTradeInfo = toBsqSwapTradeInfo(bsqSwapTrade, isMyOffer, numConfirmations);
@@ -247,6 +251,8 @@ private static TradeInfo toTradeInfo(Trade trade,
                 .withContractAsJson(trade.getContractAsJson())
                 .withContract(contractInfo)
                 .withClosingStatus(closingStatus)
+                .withAutoConfTxId(trade.getCounterCurrencyTxId() == null ? "" : trade.getCounterCurrencyTxId())
+                .withAutoConfTxKey(trade.getCounterCurrencyExtraData() == null ? "" : trade.getCounterCurrencyExtraData())
                 .withHasFailed(trade.hasFailed())
                 .withErrorMessage(trade.hasErrorMessage() ? trade.getErrorMessage() : "")
                 .build();
@@ -286,6 +292,8 @@ public bisq.proto.grpc.TradeInfo toProtoMessage() {
                         .setIsCompleted(isCompleted)
                         .setHasFailed(hasFailed)
                         .setErrorMessage(errorMessage == null ? "" : errorMessage)
+                        .setAutoConfTxId(autoConfTxId == null ? "" : autoConfTxId)
+                        .setAutoConfTxKey(autoConfTxKey == null ? "" : autoConfTxKey)
                         .setClosingStatus(closingStatus);
         if (offer.isBsqSwapOffer()) {
             protoBuilder.setBsqSwapTradeInfo(bsqSwapTradeInfo.toProtoMessage());
@@ -328,6 +336,8 @@ public static TradeInfo fromProto(bisq.proto.grpc.TradeInfo proto) {
                 .withClosingStatus(proto.getClosingStatus())
                 .withHasFailed(proto.getHasFailed())
                 .withErrorMessage(proto.getErrorMessage())
+                .withAutoConfTxId(proto.getAutoConfTxId())
+                .withAutoConfTxKey(proto.getAutoConfTxKey())
                 .build();
 
         if (proto.getOffer().getIsBsqSwapOffer())
@@ -369,6 +379,8 @@ public String toString() {
                 ", closingStatus=" + closingStatus + "\n" +
                 ", hasFailed=" + hasFailed + "\n" +
                 ", errorMessage=" + errorMessage + "\n" +
+                ", autoConfTxId=" + autoConfTxId + "\n" +
+                ", autoConfTxKey=" + autoConfTxKey + "\n" +
                 '}';
     }
 }
diff --git a/core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java b/core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java
@@ -61,6 +61,8 @@ public final class TradeInfoV1Builder {
     private ContractInfo contract;
     private String closingStatus;
     private String errorMessage;
+    private String autoConfTxId;
+    private String autoConfTxKey;
 
     public TradeInfoV1Builder withOffer(OfferInfo offer) {
         this.offer = offer;
@@ -207,6 +209,16 @@ public TradeInfoV1Builder withClosingStatus(String closingStatus) {
         return this;
     }
 
+    public TradeInfoV1Builder withAutoConfTxId(String autoConfTxId) {
+        this.autoConfTxId = autoConfTxId;
+        return this;
+    }
+
+    public TradeInfoV1Builder withAutoConfTxKey(String autoConfTxKey) {
+        this.autoConfTxKey = autoConfTxKey;
+        return this;
+    }
+
     public TradeInfo build() {
         return new TradeInfo(this);
     }

diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java
@@ -32,6 +32,7 @@
 import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
 import bisq.proto.grpc.ConfirmPaymentStartedReply;
 import bisq.proto.grpc.ConfirmPaymentStartedRequest;
+import bisq.proto.grpc.ConfirmPaymentStartedXmrRequest;
 import bisq.proto.grpc.FailTradeReply;
 import bisq.proto.grpc.FailTradeRequest;
 import bisq.proto.grpc.GetTradeReply;
@@ -174,7 +175,20 @@ public void getTrades(GetTradesRequest req,
     public void confirmPaymentStarted(ConfirmPaymentStartedRequest req,
                                       StreamObserver<ConfirmPaymentStartedReply> responseObserver) {
         try {
-            coreApi.confirmPaymentStarted(req.getTradeId());
+            coreApi.confirmPaymentStarted(req.getTradeId(), null, null);
+            var reply = ConfirmPaymentStartedReply.newBuilder().build();
+            responseObserver.onNext(reply);
+            responseObserver.onCompleted();
+        } catch (Throwable cause) {
+            exceptionHandler.handleException(log, cause, responseObserver);
+        }
+    }
+
+    @Override
+    public void confirmPaymentStartedXmr(ConfirmPaymentStartedXmrRequest req,
+                                         StreamObserver<ConfirmPaymentStartedReply> responseObserver) {
+        try {
+            coreApi.confirmPaymentStarted(req.getTradeId(), req.getTxId(), req.getTxKey());
             var reply = ConfirmPaymentStartedReply.newBuilder().build();
             responseObserver.onNext(reply);
             responseObserver.onCompleted();

diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
@@ -496,6 +496,9 @@ service Trades {
     // Send a 'payment started' message to a trading peer (the BTC seller).
     rpc ConfirmPaymentStarted (ConfirmPaymentStartedRequest) returns (ConfirmPaymentStartedReply) {
     }
+    // Send a 'payment started' message with optional XMR specific parameters to a trading peer (the BTC seller).
+    rpc ConfirmPaymentStartedXmr (ConfirmPaymentStartedXmrRequest) returns (ConfirmPaymentStartedReply) {
+    }
     // Send a 'payment received' message to a trading peer (the BTC buyer).
     rpc ConfirmPaymentReceived (ConfirmPaymentReceivedRequest) returns (ConfirmPaymentReceivedReply) {
     }
@@ -538,6 +541,12 @@ message ConfirmPaymentStartedRequest {
     string trade_id = 1;    // The unique identifier of the open trade.
 }
 
+message ConfirmPaymentStartedXmrRequest {
+    string trade_id = 1;    // The unique identifier of the open trade.
+    string tx_id = 2;       // XMR txId for payment proof
+    string tx_key = 3;      // XMR txKey for payment proof
+}
+
 message ConfirmPaymentStartedReply {
 }
 
@@ -664,6 +673,10 @@ message TradeInfo {
     bool has_failed = 30;
     // Error message applicable when trade is failed.
     string error_message = 31;
+    // txId used for XMR auto conf.
+    string auto_conf_tx_id = 32;
+    // tx key used for XMR auto conf.
+    string auto_conf_tx_key = 33;
 }
 
 message ContractInfo {