Delay broadcasting of taker fee tx

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

@@ -589,6 +589,12 @@ public AddressEntry getFreshAddressEntry() {
         return getOrCreateAddressEntry(context, addressEntry);
     }
 
+    public AddressEntry getNewAddressEntry(String offerId, AddressEntry.Context context) {
+        AddressEntry entry = new AddressEntry(wallet.freshReceiveKey(), context, offerId);
+        addressEntryList.addAddressEntry(entry);
+        return entry;
+    }
+
     private AddressEntry getOrCreateAddressEntry(AddressEntry.Context context, Optional<AddressEntry> addressEntry) {
         if (addressEntry.isPresent()) {
             return addressEntry.get();

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

@@ -176,7 +176,8 @@ public Transaction createBtcTradingFeeTx(Address fundingAddress,
                                              Coin tradingFee,
                                              Coin txFee,
                                              String feeReceiverAddresses,
-                                             TxBroadcaster.Callback callback)
+                                             boolean doBroadcast,
+                                             @Nullable TxBroadcaster.Callback callback)
             throws InsufficientMoneyException, AddressFormatException {
         log.debug("fundingAddress " + fundingAddress.toString());
         log.debug("reservedForTradeAddress " + reservedForTradeAddress.toString());
@@ -216,7 +217,8 @@ public Transaction createBtcTradingFeeTx(Address fundingAddress,
             wallet.completeTx(sendRequest);
             WalletService.printTx("tradingFeeTx", tradingFeeTx);
 
-            broadcastTx(tradingFeeTx, callback);
+            if (doBroadcast && callback != null)
+                broadcastTx(tradingFeeTx, callback);
 
             return tradingFeeTx;
         } catch (Throwable t) {
@@ -327,15 +329,15 @@ public Transaction completeBsqTradingFeeTx(Transaction preparedBsqTx,
      * The taker creates a dummy transaction to get the input(s) and optional change output for the amount and the takersAddress for that trade.
      * That will be used to send to the maker for creating the deposit transaction.
      *
+     *
+     * @param takeOfferFeeTx The take offer fee tx
      * @param inputAmount   Amount of takers input
      * @param txFee         Mining fee
-     * @param takersAddress Address of taker
      * @return A data container holding the inputs, the output value and address
      * @throws TransactionVerificationException
-     * @throws WalletException
      */
-    public InputsAndChangeOutput takerCreatesDepositsTxInputs(Coin inputAmount, Coin txFee, Address takersAddress, Address takersChangeAddress) throws
-            TransactionVerificationException, WalletException {
+    public InputsAndChangeOutput takerCreatesDepositsTxInputs(Transaction takeOfferFeeTx, Coin inputAmount, Coin txFee, Address takersAddress) throws
+            TransactionVerificationException {
         log.debug("takerCreatesDepositsTxInputs called");
         log.debug("inputAmount " + inputAmount.toFriendlyString());
         log.debug("txFee " + txFee.toFriendlyString());
@@ -349,15 +351,13 @@ public InputsAndChangeOutput takerCreatesDepositsTxInputs(Coin inputAmount, Coin
         /*
          The tx we create has that structure:
 
-         IN[0]  any input > inputAmount (including tx fee) (unsigned)
-         IN[1...n] optional inputs supported, but normally there is just 1 input (unsigned)
+         IN[0]  input from taker fee tx > inputAmount (including tx fee) (unsigned)
          OUT[0] dummyOutputAmount (inputAmount - tx fee)
-         OUT[1] Optional Change = inputAmount - dummyOutputAmount - tx fee
 
-         We are only interested in the inputs and the optional change output.
+         We are only interested in the inputs.
+         We get the exact input value from the taker fee tx so we don't create a change output.
          */
 
-
         // inputAmount includes the tx fee. So we subtract the fee to get the dummyOutputAmount.
         Coin dummyOutputAmount = inputAmount.subtract(txFee);
 
@@ -370,11 +370,12 @@ OUT[0] dummyOutputAmount (inputAmount - tx fee)
         // Find the needed inputs to pay the output, optionally add 1 change output.
         // Normally only 1 input and no change output is used, but we support multiple inputs and 1 change output.
         // Our spending transaction output is from the create offer fee payment.
-        addAvailableInputsAndChangeOutputs(dummyTX, takersAddress, takersChangeAddress, txFee);
 
-        // The completeTx() call signs the input, but we don't want to pass over signed tx inputs so we remove the signature
-        WalletService.removeSignatures(dummyTX);
+        // We created the take offer fee tx in the structure that the second output is for the funds for the deposit tx.
+        TransactionOutput reservedForTradeOutput = takeOfferFeeTx.getOutputs().get(1);
+        dummyTX.addInput(reservedForTradeOutput);
 
+        WalletService.removeSignatures(dummyTX);
         WalletService.verifyTransaction(dummyTX);
 
         //WalletService.printTx("dummyTX", dummyTX);
@@ -388,20 +389,13 @@ OUT[0] dummyOutputAmount (inputAmount - tx fee)
                 })
                 .collect(Collectors.toList());
 
-        // We don't support more then 1 change outputs, so there are max. 2 outputs
-        checkArgument(dummyTX.getOutputs().size() < 3);
-        // Only interested in optional change output, the dummy output at index 0 is ignored (that's why we use index 1)
-        TransactionOutput changeOutput = dummyTX.getOutputs().size() == 2 ? dummyTX.getOutputs().get(1) : null;
-        long changeOutputValue = 0L;
-        String changeOutputAddress = null;
-        if (changeOutput != null) {
-            changeOutputValue = changeOutput.getValue().getValue();
-            Address addressFromP2PKHScript = changeOutput.getAddressFromP2PKHScript(params);
-            checkNotNull(addressFromP2PKHScript, "changeOutput.getAddressFromP2PKHScript(params) must not be null");
-            changeOutputAddress = addressFromP2PKHScript.toString();
-        }
 
-        return new InputsAndChangeOutput(new ArrayList<>(rawTransactionInputList), changeOutputValue, changeOutputAddress);
+        // TODO changeOutputValue and changeOutputAddress is not used as taker spends exact amount from fee tx.
+        // Change is handled already at the fee tx creation so the handling of a change output for the deposit tx
+        // can be removed here. We still keep it atm as we prefer to not introduce a larger
+        // refactoring. When new trade protocol gets implemented this can be cleaned.
+        // The maker though can have a change output if the taker takes less as the max. offer amount!
+        return new InputsAndChangeOutput(new ArrayList<>(rawTransactionInputList), 0, null);
     }
 
     /**

core/src/main/java/bisq/core/offer/OfferPayload.java

@@ -356,7 +356,7 @@ public static OfferPayload fromProto(PB.OfferPayload proto) {
 
     @Override
     public long getTTL() {
-        return TimeUnit.MINUTES.toMillis(7);
+        return TimeUnit.MINUTES.toMillis(8);
     }
 
     @Override

core/src/main/java/bisq/core/offer/OpenOffer.java

@@ -126,10 +126,9 @@ public void setStorage(Storage<TradableList<OpenOffer>> storage) {
     }
 
     public void setState(State state) {
-        log.trace("setState" + state);
         boolean changed = this.state != state;
         this.state = state;
-        if (changed)
+        if (changed && storage != null)
             storage.queueUpForSave();
 
         // We keep it reserved for a limited time, if trade preparation fails we revert to available state

core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java

@@ -80,6 +80,7 @@ protected void run() {
                         offer.getMakerFee(),
                         offer.getTxFee(),
                         arbitrator.getBtcAddress(),
+                        true,
                         new TxBroadcaster.Callback() {
                             @Override
                             public void onSuccess(Transaction transaction) {

core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java

@@ -34,6 +34,7 @@
 import bisq.core.trade.protocol.tasks.buyer_as_taker.BuyerAsTakerSignAndPublishDepositTx;
 import bisq.core.trade.protocol.tasks.taker.CreateTakerFeeTx;
 import bisq.core.trade.protocol.tasks.taker.TakerProcessPublishDepositTxRequest;
+import bisq.core.trade.protocol.tasks.taker.TakerPublishFeeTx;
 import bisq.core.trade.protocol.tasks.taker.TakerSelectMediator;
 import bisq.core.trade.protocol.tasks.taker.TakerSendDepositTxPublishedMessage;
 import bisq.core.trade.protocol.tasks.taker.TakerSendPayDepositRequest;
@@ -149,6 +150,7 @@ private void handle(PublishDepositTxRequest tradeMessage, NodeAddress sender) {
                 VerifyPeersAccountAgeWitness.class,
                 TakerVerifyMakerFeePayment.class,
                 TakerVerifyAndSignContract.class,
+                TakerPublishFeeTx.class,
                 BuyerAsTakerSignAndPublishDepositTx.class,
                 TakerSendDepositTxPublishedMessage.class,
                 PublishTradeStatistics.class

core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java

@@ -34,6 +34,7 @@
 import bisq.core.trade.protocol.tasks.seller_as_taker.SellerAsTakerSignAndPublishDepositTx;
 import bisq.core.trade.protocol.tasks.taker.CreateTakerFeeTx;
 import bisq.core.trade.protocol.tasks.taker.TakerProcessPublishDepositTxRequest;
+import bisq.core.trade.protocol.tasks.taker.TakerPublishFeeTx;
 import bisq.core.trade.protocol.tasks.taker.TakerSelectMediator;
 import bisq.core.trade.protocol.tasks.taker.TakerSendDepositTxPublishedMessage;
 import bisq.core.trade.protocol.tasks.taker.TakerSendPayDepositRequest;
@@ -141,6 +142,7 @@ private void handle(PublishDepositTxRequest tradeMessage, NodeAddress sender) {
                 VerifyPeersAccountAgeWitness.class,
                 TakerVerifyMakerFeePayment.class,
                 TakerVerifyAndSignContract.class,
+                TakerPublishFeeTx.class,
                 SellerAsTakerSignAndPublishDepositTx.class,
                 TakerSendDepositTxPublishedMessage.class,
                 PublishTradeStatistics.class

core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java

@@ -49,7 +49,7 @@
 
 @Slf4j
 public abstract class TradeProtocol {
-    private static final long TIMEOUT = 120;
+    private static final long TIMEOUT = 90;
 
     protected final ProcessModel processModel;
     private final DecryptedDirectMessageListener decryptedDirectMessageListener;

core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerCreatesDepositTxInputs.java

@@ -18,8 +18,8 @@
 package bisq.core.trade.protocol.tasks.buyer_as_taker;
 
 import bisq.core.btc.model.AddressEntry;
-import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.model.InputsAndChangeOutput;
+import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.trade.Trade;
 import bisq.core.trade.protocol.tasks.TradeTask;
 
@@ -51,12 +51,11 @@ protected void run() {
             BtcWalletService walletService = processModel.getBtcWalletService();
             Address takersAddress = walletService.getOrCreateAddressEntry(processModel.getOffer().getId(),
                     AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
-            Address takersChangeAddress = walletService.getFreshAddressEntry().getAddress();
             InputsAndChangeOutput result = processModel.getTradeWalletService().takerCreatesDepositsTxInputs(
+                    processModel.getTakeOfferFeeTx(),
                     takerInputAmount,
                     txFee.subtract(bsqTakerFee),
-                    takersAddress,
-                    takersChangeAddress);
+                    takersAddress);
             processModel.setRawTransactionInputs(result.rawTransactionInputs);
             processModel.setChangeOutputValue(result.changeOutputValue);
             processModel.setChangeOutputAddress(result.changeOutputAddress);

core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerCreatesDepositTxInputs.java

@@ -18,8 +18,8 @@
 package bisq.core.trade.protocol.tasks.seller_as_taker;
 
 import bisq.core.btc.model.AddressEntry;
-import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.model.InputsAndChangeOutput;
+import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.trade.Trade;
 import bisq.core.trade.protocol.tasks.TradeTask;
 
@@ -49,12 +49,11 @@ protected void run() {
                 BtcWalletService walletService = processModel.getBtcWalletService();
                 Address takersAddress = walletService.getOrCreateAddressEntry(processModel.getOffer().getId(),
                         AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
-                Address takersChangeAddress = walletService.getFreshAddressEntry().getAddress();
                 InputsAndChangeOutput result = processModel.getTradeWalletService().takerCreatesDepositsTxInputs(
+                        processModel.getTakeOfferFeeTx(),
                         takerInputAmount,
                         txFee,
-                        takersAddress,
-                        takersChangeAddress);
+                        takersAddress);
 
                 processModel.setRawTransactionInputs(result.rawTransactionInputs);
                 processModel.setChangeOutputValue(result.changeOutputValue);