Delay broadcasting of taker fee tx

assets/src/main/java/bisq/asset/coins/Arqma.java

@@ -0,0 +1,30 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AltCoinAccountDisclaimer;
+import bisq.asset.Coin;
+import bisq.asset.CryptoNoteAddressValidator;
+
+@AltCoinAccountDisclaimer("account.altcoin.popup.arq.msg")
+public class Arqma extends Coin {
+
+     public Arqma() {
+         super("Arqma", "ARQ", new CryptoNoteAddressValidator(0x2cca, 0x6847));
+    }
+}

assets/src/main/resources/META-INF/services/bisq.asset.Asset

@@ -5,6 +5,7 @@
 bisq.asset.coins.Actinium
 bisq.asset.coins.Adeptio
 bisq.asset.coins.Aeon
+bisq.asset.coins.Arqma
 bisq.asset.coins.Askcoin
 bisq.asset.coins.Australiacash
 bisq.asset.coins.Beam

assets/src/test/java/bisq/asset/coins/ArqmaTest.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ package bisq.asset.coins;
+
+ import bisq.asset.AbstractAssetTest;
+ import org.junit.Test;
+
+ public class ArqmaTest extends AbstractAssetTest {
+
+     public ArqmaTest() {
+        super(new Arqma());
+    }
+
+     @Test
+    public void testValidAddresses() {
+        assertValidAddress("ar3ZLUTSac5DhxhyLJB11gcXWLYPKJchg7c8hoaKmqchC9TtHEdXzxGgt2vzCLUYwtSvkJQTXNCjzCR7KZiFUySV138PEopVC");
+        assertValidAddress("aRS3V2hXuVAGAb5XWcDvN7McsSyqrEZ3XWyfMdEDCqioWNmVUuoKyNxDo7rwPCg55Ugb6KHXLN7hLZEGcnZzbm8M7uJ9YdVpeN");
+        assertValidAddress("ar3mXR6SQeC3P9Dmq2LGsAeq5eDvjiNnYaywtqdNzixe6xLr38DiNVaaRKMkAQkR3NV3TuVAwAwEGH3QDgXJF3th1RwxABa9a");
+    }
+
+     @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("ar3ZLUTSac5DhxhyLJB11gcXWLYPKJchg7c8hoaKmqchC9TtHEdXzxGgt2vzCLUYwtSvkJQTXNCjzCR7KZiFUySV138PEopV");
+        assertInvalidAddress("aRS3V2hXuVAGAb5XWcDvN7McsSyqrEZ3XWyfMdEDCqioWNmVUuoKyNxDo7rwPCg55Ugb6KHXLN7hLZEGcnZzbm8M7uJ9YdVpeNZz");
+        assertInvalidAddress("aRV3V2hXuVAGAb5XWcDvN7McsSyqrEZ3XWyfMdEDCqioWNmVUuoKyNxDo7rwPCg55Ugb6KHXLN7hLZEGcnZzbm8M7uJ9YdVpeN");
+        assertInvalidAddress("ar3mXR6SQeC3P9Dmq2LGsAeq5eDvjiNnYaywtqdNzi#exLr38DiNVaaRKMkAQkR3NV3TuVAwAwEGH3QDgXJF3th1RwxABa9a");
+    }
+}

common/src/main/proto/pb.proto

@@ -725,6 +725,7 @@ message PaymentAccountPayload {
         HalCashAccountPayload hal_cash_account_payload = 24;
         PromptPayAccountPayload prompt_pay_account_payload = 25;
         AdvancedCashAccountPayload advanced_cash_account_payload = 26;
+        InstantCryptoCurrencyAccountPayload instant_crypto_currency_account_payload = 27;
     }
     map<string, string> exclude_from_json_data = 15;
 }
@@ -836,6 +837,10 @@ message CryptoCurrencyAccountPayload {
     string address = 1;
 }
 
+message InstantCryptoCurrencyAccountPayload {
+    string address = 1;
+}
+
 message FasterPaymentsAccountPayload {
     string sort_code = 1;
     string account_nr = 2;
@@ -954,6 +959,7 @@ message PersistableEnvelope {
         DaoStateStore dao_state_store = 24;
         MyReputationList my_reputation_list = 25;
         MyProofOfBurnList my_proof_of_burn_list = 26;
+        UnconfirmedBsqChangeOutputList unconfirmed_bsq_change_output_list = 27;
     }
 }
 
@@ -1405,6 +1411,12 @@ message BaseTxOutput {
     }
 }
 
+message UnconfirmedTxOutput {
+    int32 index = 1;
+    int64 value = 2;
+    string tx_id = 3;
+}
+
 message RawTxOutput {
 }
 
@@ -1571,6 +1583,10 @@ message MyProofOfBurnList {
     repeated MyProofOfBurn my_proof_of_burn = 1;
 }
 
+message UnconfirmedBsqChangeOutputList {
+    repeated UnconfirmedTxOutput unconfirmed_tx_output = 1;
+}
+
 message TempProposalPayload {
     Proposal proposal = 1;
     bytes owner_pub_key_encoded = 2;

core/src/main/java/bisq/core/btc/listeners/BsqBalanceListener.java

@@ -20,9 +20,10 @@
 import org.bitcoinj.core.Coin;
 
 public interface BsqBalanceListener {
-    void onUpdateBalances(Coin availableBalance,
+    void onUpdateBalances(Coin availableConfirmedBalance,
                           Coin availableNonBsqBalance,
                           Coin unverifiedBalance,
+                          Coin unconfirmedChangeBalance,
                           Coin lockedForVotingBalance,
                           Coin lockedInBondsBalance,
                           Coin unlockingBondsBalance);

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

@@ -103,7 +103,8 @@ public Coin getChange(Coin target, CoinSelection coinSelection) throws Insuffici
         return Coin.valueOf(change);
     }
 
-    // We allow spending own pending txs and if permitForeignPendingTx is set as well foreign unconfirmed txs.
+    // We allow spending from own unconfirmed txs and if permitForeignPendingTx is set as well from foreign
+    // unconfirmed txs.
     protected boolean isTxSpendable(Transaction tx) {
         TransactionConfidence confidence = tx.getConfidence();
         TransactionConfidence.ConfidenceType type = confidence.getConfidenceType();

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

@@ -19,7 +19,9 @@
 
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.blockchain.TxOutputKey;
+import bisq.core.dao.state.unconfirmed.UnconfirmedBsqChangeOutputListService;
 
+import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionOutput;
 
 import javax.inject.Inject;
@@ -32,18 +34,35 @@
  */
 @Slf4j
 public class BsqCoinSelector extends BisqDefaultCoinSelector {
-    private DaoStateService daoStateService;
+    private final DaoStateService daoStateService;
+    private final UnconfirmedBsqChangeOutputListService unconfirmedBsqChangeOutputListService;
 
     @Inject
-    public BsqCoinSelector(DaoStateService daoStateService) {
-        super(true);
+    public BsqCoinSelector(DaoStateService daoStateService, UnconfirmedBsqChangeOutputListService unconfirmedBsqChangeOutputListService) {
+        // permitForeignPendingTx is not relevant here as we do not support pending foreign utxos anyway.
+        super(false);
         this.daoStateService = daoStateService;
+        this.unconfirmedBsqChangeOutputListService = unconfirmedBsqChangeOutputListService;
     }
 
     @Override
     protected boolean isTxOutputSpendable(TransactionOutput output) {
         // output.getParentTransaction() cannot be null as it is checked in calling method
-        return output.getParentTransaction() != null &&
-                daoStateService.isTxOutputSpendable(new TxOutputKey(output.getParentTransaction().getHashAsString(), output.getIndex()));
+        Transaction parentTransaction = output.getParentTransaction();
+        if (parentTransaction == null)
+            return false;
+
+        // If it is a normal confirmed BSQ output we use the default lookup at the daoState
+        if (daoStateService.isTxOutputSpendable(new TxOutputKey(parentTransaction.getHashAsString(), output.getIndex())))
+            return true;
+
+        // It might be that it is an unconfirmed change output which we allow to be used for spending without requiring a confirmation.
+        // We check if we have the output in the dao state, if so we have a confirmed but unspendable output (e.g. confiscated).
+        if (daoStateService.getTxOutput(new TxOutputKey(parentTransaction.getHashAsString(), output.getIndex())).isPresent())
+            return false;
+
+        // Only if its not existing yet in the dao state (unconfirmed) we use our unconfirmedBsqChangeOutputList to
+        // check if it is an own change output.
+        return unconfirmedBsqChangeOutputListService.hasTransactionOutput(output);
     }
 }