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

bitcoinj 0.15: Replace deprecated Transaction.getHash() with Transaction.getTxId().

Browse source
This commit is contained in:
Oscar Guindzberg 2019-04-22 17:52:49 -03:00
parent 9a9b067d70
commit 76e6955aa4
No known key found for this signature in database
GPG key ID: 209796BF2E1D4F75
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
View file

@ -405,7 +405,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener
if (isConfirmed) {
// We lookup if we have a BSQ tx matching the parent tx
// We cannot make that findTx call outside of the loop as the parent tx can change at each iteration
Optional<Tx> txOptional = daoStateService.getTx(parentTransaction.getHash().toString());
Optional<Tx> txOptional = daoStateService.getTx(parentTransaction.getTxId().toString());
if (txOptional.isPresent()) {
TxOutput txOutput = txOptional.get().getTxOutputs().get(connectedOutput.getIndex());
if (daoStateService.isBsqTxOutputType(txOutput)) {

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

@ -761,7 +761,7 @@ public abstract class WalletService {
Wallet wallet,
TransactionConfidence.Source source) throws VerificationException {
Transaction tx = new Transaction(wallet.getParams(), serializedTransaction);
Transaction walletTransaction = wallet.getTransaction(tx.getHash());
Transaction walletTransaction = wallet.getTransaction(tx.getTxId());
if (walletTransaction == null) {
// We need to recreate the transaction otherwise we get a null pointer...

2
core/src/main/java/bisq/core/trade/Trade.java
View file

@ -695,7 +695,7 @@ public abstract class Trade implements Tradable, Model {
// The deserialized tx has not actual confidence data, so we need to get the fresh one from the wallet.
void updateDepositTxFromWallet() {
if (getDepositTx() != null)
applyDepositTx(processModel.getTradeWalletService().getWalletTx(getDepositTx().getHash()));
applyDepositTx(processModel.getTradeWalletService().getWalletTx(getDepositTx().getTxId()));
}
public void applyDepositTx(Transaction tx) {