mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make sure the actual wallet transaction is returned.

Browse source 
There was an issue with the transaction having a non-initialized
updateTime and/or blockTime because the wallet transaction was
not returned.
This commit is contained in:
jmacxx 2022-11-21 09:39:21 -06:00
parent 60522218a7
commit 24ae5f6220
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/bisq/core/btc/wallet/WalletService.java
View file

@ -837,17 +837,12 @@ public abstract class WalletService {
Wallet wallet,
TransactionConfidence.Source source) throws VerificationException {
Transaction tx = new Transaction(wallet.getParams(), serializedTransaction);
Transaction walletTransaction = wallet.getTransaction(tx.getTxId());
if (walletTransaction == null) {
if (wallet.getTransaction(tx.getTxId()) == null) {
// We need to recreate the transaction otherwise we get a null pointer...
tx.getConfidence(Context.get()).setSource(source);
//wallet.maybeCommitTx(tx);
wallet.receivePending(tx, null, true);
return tx;
} else {
return walletTransaction;
}
return wallet.getTransaction(tx.getTxId());
}
public static Transaction maybeAddNetworkTxToWallet(byte[] serializedTransaction,