Use Transaction.getIncludedInBestChainAt()

oscarguindzberg · Jan 24, 2019 · 2f324c4 · 2f324c4
1 parent 8b28f73
commit 2f324c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
@@ -592,6 +592,7 @@ public boolean isEncrypted() {
     }
 
     public List<Transaction> getRecentTransactions(int numTransactions, boolean includeDead) {
+        // Returns a list ordered by tx.getUpdateTime() desc
         return wallet.getRecentTransactions(numTransactions, includeDead);
     }
 

diff --git a/core/src/main/java/bisq/core/trade/Trade.java b/core/src/main/java/bisq/core/trade/Trade.java
@@ -752,7 +752,8 @@ private long getTradeStartTime() {
         if (depositTx != null && getTakeOfferDate() != null) {
             if (depositTx.getConfidence().getDepthInBlocks() > 0) {
                 final long tradeTime = getTakeOfferDate().getTime();
-                long blockTime = depositTx.getUpdateTime().getTime();
+                // Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()
+                long blockTime = depositTx.getIncludedInBestChainAt() != null ? depositTx.getIncludedInBestChainAt().getTime() : depositTx.getUpdateTime().getTime();
                 // If block date is in future (Date in Bitcoin blocks can be off by +/- 2 hours) we use our current date.
                 // If block date is earlier than our trade date we use our trade date.
                 if (blockTime > now)

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
@@ -270,7 +270,8 @@ private void updateList() {
                             bsqWalletService,
                             btcWalletService,
                             daoFacade,
-                            transaction.getUpdateTime(),
+                            // Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()
+                            transaction.getIncludedInBestChainAt() != null ? transaction.getIncludedInBestChainAt() : transaction.getUpdateTime(),
                             bsqFormatter);
                 })
                 .collect(Collectors.toList());

diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java
@@ -222,8 +222,8 @@ else if (!txFeeForBsqPayment)
             else if (details.isEmpty())
                 details = Res.get("funds.tx.txFeePaymentForBsqTx");
         }
-
-        date = transaction.getUpdateTime();
+        // Use tx.getIncludedInBestChainAt() when available, otherwise use tx.getUpdateTime()
+        date = transaction.getIncludedInBestChainAt() != null ? transaction.getIncludedInBestChainAt() : transaction.getUpdateTime();
         dateString = formatter.formatDateTime(date);
     }