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

User getAddressEntry instead of getOrCreateAddressEntry in readOnly access for addressEntries (iteration for lists).

Browse source 
Remove addressEntry after trade process entered new state.
This commit is contained in:
Manfred Karrer 2017-06-25 00:57:12 +02:00
parent 5a16864eaa
commit 7c1c9a34a4
19 changed files with 126 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
View file

@ -52,19 +52,21 @@ public class CreateMakerFeeTx extends Task<PlaceOfferModel> {
@Override
protected void run() {
Offer offer = model.getOffer();
try {
runInterceptHook();
String id = offer.getId();
BtcWalletService walletService = model.getWalletService();
NodeAddress selectedArbitratorNodeAddress = ArbitratorSelectionRule.select(model.getUser().getAcceptedArbitratorAddresses(),
model.getOffer());
log.debug("selectedArbitratorAddress " + selectedArbitratorNodeAddress);
Arbitrator selectedArbitrator = model.getUser().getAcceptedArbitratorByAddress(selectedArbitratorNodeAddress);
checkNotNull(selectedArbitrator, "selectedArbitrator must not be null at CreateOfferFeeTx");
BtcWalletService walletService = model.getWalletService();
String id = offer.getId();
Address fundingAddress = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.OFFER_FUNDING).getAddress();
Address reservedForTradeAddress = walletService.getOrCreateAddressEntry(id,
AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
Address reservedForTradeAddress = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
Address changeAddress = walletService.getOrCreateAddressEntry(AddressEntry.Context.AVAILABLE).getAddress();
final TradeWalletService tradeWalletService = model.getTradeWalletService();
@ -84,6 +86,7 @@ public class CreateMakerFeeTx extends Task<PlaceOfferModel> {
// tx malleability
offer.setOfferFeePaymentTxId(btcTransaction.getHashAsString());
model.setTransaction(btcTransaction);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING);
complete();
} else {
@ -110,7 +113,8 @@ public class CreateMakerFeeTx extends Task<PlaceOfferModel> {
checkArgument(transaction.equals(signedTx));
offer.setOfferFeePaymentTxId(transaction.getHashAsString());
model.setTransaction(transaction);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING);
complete();
log.debug("Successfully sent tx with id " + transaction.getHashAsString());
}

3
core/src/main/java/io/bisq/core/trade/TradeManager.java
View file

@ -533,8 +533,7 @@ public class TradeManager implements PersistedDataHost {
Stream<AddressEntry> available = Stream.concat(availableOrPayout,
btcWalletService.getAddressEntries(AddressEntry.Context.ARBITRATOR).stream());
available = Stream.concat(available, btcWalletService.getAddressEntries(AddressEntry.Context.OFFER_FUNDING).stream());
return available
.filter(addressEntry -> btcWalletService.getBalanceForAddress(addressEntry.getAddress()).isPositive());
return available.filter(addressEntry -> btcWalletService.getBalanceForAddress(addressEntry.getAddress()).isPositive());
}
public Stream<Trade> getLockedTradeStream() {

2
core/src/main/java/io/bisq/core/trade/protocol/TradeProtocol.java
View file

@ -136,7 +136,7 @@ public abstract class TradeProtocol {
private void cleanupTradableOnFault() {
final Trade.State state = trade.getState();
log.debug("cleanupTradable tradeState=" + state);
log.warn("cleanupTradableOnFault tradeState=" + state);
TradeManager tradeManager = processModel.getTradeManager();
if (trade.isInPreparation()) {
// no funds left. we just clean up the trade list

2
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
View file

@ -18,6 +18,7 @@
package io.bisq.core.trade.protocol.tasks.buyer;
import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.messages.PayoutTxPublishedMessage;
@ -55,6 +56,7 @@ public class BuyerProcessPayoutTxPublishedMessage extends TradeTask {
processModel.removeMailboxMessageAfterProcessing(trade);
trade.setState(Trade.State.BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG);
processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
complete();
} catch (Throwable t) {

16
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerSetupPayoutTxListener.java
View file

@ -43,21 +43,24 @@ public class BuyerSetupPayoutTxListener extends TradeTask {
@Override
protected void run() {
try {
runInterceptHook();
if (!trade.isPayoutPublished()) {
BtcWalletService walletService = processModel.getBtcWalletService();
Address address = walletService.getOrCreateAddressEntry(processModel.getOffer().getId(),
AddressEntry.Context.TRADE_PAYOUT).getAddress();
final String id = processModel.getOffer().getId();
Address address = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.TRADE_PAYOUT).getAddress();
if (isInNetwork(walletService.getConfidenceForAddress(address))) {
trade.setState(Trade.State.BUYER_SAW_PAYOUT_TX_IN_NETWORK);
swapMultiSigEntry();
} else {
listener = new AddressConfidenceListener(address) {
@Override
public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
if (isInNetwork(confidence))
if (isInNetwork(confidence)) {
trade.setState(Trade.State.BUYER_SAW_PAYOUT_TX_IN_NETWORK);
swapMultiSigEntry();
}
}
};
walletService.addAddressConfidenceListener(listener);
@ -66,6 +69,7 @@ public class BuyerSetupPayoutTxListener extends TradeTask {
log.debug("BuyerSetupListenerForPayoutTx tradeStateSubscription tradeState=" + newValue);
if (trade.isPayoutPublished()) {
walletService.removeAddressConfidenceListener(listener);
swapMultiSigEntry();
// hack to remove tradeStateSubscription at callback
UserThread.execute(this::unSubscribe);
}
@ -80,6 +84,10 @@ public class BuyerSetupPayoutTxListener extends TradeTask {
}
}
private void swapMultiSigEntry() {
processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
}
private boolean isInNetwork(TransactionConfidence confidence) {
log.debug("onTransactionConfidenceChanged " + confidence);
return confidence != null &&

8
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerSignPayoutTx.java
View file

@ -74,14 +74,6 @@ public class BuyerAsMakerSignPayoutTx extends TradeTask {
buyerMultiSigPubKey,
sellerMultiSigPubKey,
trade.getArbitratorBtcPubKey());
/*
DeterministicKey multiSigKeyPair,
byte[] buyerPubKey,
byte[] sellerPubKey,
byte[] arbitratorPubKey
*/
processModel.setPayoutTxSignature(payoutTxSignature);
complete();

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java
View file

@ -82,6 +82,8 @@ public class BuyerAsTakerSignAndPublishDepositTx extends TradeTask {
Timer timeoutTimer = UserThread.runAfter(() -> {
log.warn("Broadcast not completed after 5 sec. We go on with the trade protocol.");
trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE);
complete();
}, 5);
@ -102,6 +104,8 @@ public class BuyerAsTakerSignAndPublishDepositTx extends TradeTask {
log.trace("takerSignAndPublishTx succeeded " + transaction);
trade.setDepositTx(transaction);
trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE);
complete();
} else {
log.warn("We got the callback called after the timeout has been triggered a complete().");

2
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java
View file

@ -18,6 +18,7 @@
package io.bisq.core.trade.protocol.tasks.maker;
import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.btc.AddressEntry;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.messages.DepositTxPublishedMessage;
@ -59,6 +60,7 @@ public class MakerProcessDepositTxPublishedMessage extends TradeTask {
processModel.removeMailboxMessageAfterProcessing(trade);
trade.setState(Trade.State.MAKER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG);
processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
complete();
} catch (Throwable t) {

15
core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java
View file

@ -48,18 +48,20 @@ public class MakerSetupDepositTxListener extends TradeTask {
runInterceptHook();
if (trade.getState().getPhase() == Trade.Phase.TAKER_FEE_PUBLISHED) {
BtcWalletService walletService = processModel.getBtcWalletService();
Address address = walletService.getOrCreateAddressEntry(trade.getId(),
AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
final String id = trade.getId();
Address address = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
if (walletService.getBalanceForAddress(address).isZero()) {
trade.setState(Trade.State.MAKER_SAW_DEPOSIT_TX_IN_NETWORK);
swapReservedForTradeEntry();
} else {
listener = new BalanceListener(address) {
@Override
public void onBalanceChanged(Coin balance, Transaction tx) {
// dont store trade.getState().getPhase() as variable as we need it volatile!
if (balance.isZero() && trade.getState().getPhase() == Trade.Phase.TAKER_FEE_PUBLISHED)
if (balance.isZero() && trade.getState().getPhase() == Trade.Phase.TAKER_FEE_PUBLISHED) {
trade.setState(Trade.State.MAKER_SAW_DEPOSIT_TX_IN_NETWORK);
swapReservedForTradeEntry();
}
}
};
walletService.addBalanceListener(listener);
@ -68,6 +70,7 @@ public class MakerSetupDepositTxListener extends TradeTask {
log.error("MakerSetupDepositTxListener tradeStateSubscription tradeState=" + newValue);
if (newValue.getPhase() != Trade.Phase.TAKER_FEE_PUBLISHED) {
walletService.removeBalanceListener(listener);
swapReservedForTradeEntry();
// hack to remove tradeStateSubscription at callback
UserThread.execute(this::unSubscribe);
}
@ -83,6 +86,10 @@ public class MakerSetupDepositTxListener extends TradeTask {
}
}
private void swapReservedForTradeEntry() {
processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
}
private void unSubscribe() {
if (tradeStateSubscription != null)
tradeStateSubscription.unsubscribe();

7
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java
View file

@ -30,6 +30,7 @@ import org.bitcoinj.core.Transaction;
import org.bitcoinj.crypto.DeterministicKey;
import java.util.Arrays;
import java.util.Optional;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@ -66,8 +67,9 @@ public class SellerSignAndFinalizePayoutTx extends TradeTask {
final byte[] buyerMultiSigPubKey = tradingPeer.getMultiSigPubKey();
byte[] sellerMultiSigPubKey = processModel.getMyMultiSigPubKey();
checkArgument(Arrays.equals(sellerMultiSigPubKey,
walletService.getOrCreateAddressEntry(id, AddressEntry.Context.MULTI_SIG).getPubKey()),
Optional<AddressEntry> MultiSigAddressEntryOptional = walletService.getAddressEntry(id, AddressEntry.Context.MULTI_SIG);
checkArgument(MultiSigAddressEntryOptional.isPresent() && Arrays.equals(sellerMultiSigPubKey,
MultiSigAddressEntryOptional.get().getPubKey()),
"sellerMultiSigPubKey from AddressEntry must match the one from the trade data. trade id =" + id);
DeterministicKey multiSigKeyPair = walletService.getMultiSigKeyPair(id, sellerMultiSigPubKey);
@ -86,6 +88,7 @@ public class SellerSignAndFinalizePayoutTx extends TradeTask {
);
trade.setPayoutTx(transaction);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.MULTI_SIG);
complete();
} catch (Throwable t) {

9
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java
View file

@ -79,18 +79,11 @@ public class SellerAsMakerCreatesAndSignsDepositTx extends TradeTask {
.add(offer.getBuyerSecurityDeposit());
final List<RawTransactionInput> takerRawTransactionInputs = tradingPeer.getRawTransactionInputs();
final long takerChangeOutputValue = tradingPeer.getChangeOutputValue();
final String takerChangeAddressString = tradingPeer.getChangeOutputAddress();
final Address makerAddress = walletService.getOrCreateAddressEntry(id,
AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
final Address makerAddress = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
final Address makerChangeAddress = walletService.getOrCreateAddressEntry(AddressEntry.Context.AVAILABLE).getAddress();
final byte[] buyerPubKey = tradingPeer.getMultiSigPubKey();
final byte[] sellerPubKey = processModel.getMyMultiSigPubKey();
checkArgument(Arrays.equals(sellerPubKey,
makerMultiSigAddressEntry.getPubKey()),

5
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java
View file

@ -81,6 +81,8 @@ public class SellerAsTakerSignAndPublishDepositTx extends TradeTask {
Timer timeoutTimer = UserThread.runAfter(() -> {
log.warn("Broadcast not completed after 5 sec. We go on with the trade protocol.");
trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE);
complete();
}, 5);
@ -101,7 +103,8 @@ public class SellerAsTakerSignAndPublishDepositTx extends TradeTask {
log.trace("takerSignAndPublishTx succeeded " + transaction);
trade.setDepositTx(transaction);
trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE);
complete();
} else {
log.warn("We got the callback called after the timeout has been triggered a complete().");

10
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/CreateTakerFeeTx.java
View file

@ -60,11 +60,11 @@ public class CreateTakerFeeTx extends TradeTask {
log.debug("selectedArbitratorAddress " + selectedArbitratorNodeAddress);
Arbitrator selectedArbitrator = user.getAcceptedArbitratorByAddress(selectedArbitratorNodeAddress);
checkNotNull(selectedArbitrator, "selectedArbitrator must not be null at CreateTakeOfferFeeTx");
BtcWalletService walletService = processModel.getBtcWalletService();
String id = processModel.getOffer().getId();
AddressEntry addressEntry = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.OFFER_FUNDING);
AddressEntry reservedForTradeAddressEntry = walletService.getOrCreateAddressEntry(id,
AddressEntry.Context.RESERVED_FOR_TRADE);
AddressEntry reservedForTradeAddressEntry = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE);
AddressEntry changeAddressEntry = walletService.getOrCreateAddressEntry(AddressEntry.Context.AVAILABLE);
Address fundingAddress = addressEntry.getAddress();
Address reservedForTradeAddress = reservedForTradeAddressEntry.getAddress();
@ -84,6 +84,7 @@ public class CreateTakerFeeTx extends TradeTask {
//TODO use handler for broadcastTx success
processModel.setTakeOfferFeeTx(createTakeOfferFeeTx);
trade.setTakerFeeTxId(createTakeOfferFeeTx.getHashAsString());
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING);
complete();
} else {
@ -109,6 +110,8 @@ public class CreateTakerFeeTx extends TradeTask {
log.warn("Broadcast not completed after 5 sec. We go on with the trade protocol.");
trade.setTakerFeeTxId(signedTx.getHashAsString());
processModel.setTakeOfferFeeTx(signedTx);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING);
complete();
}, 5);
@ -118,12 +121,13 @@ public class CreateTakerFeeTx extends TradeTask {
if (!completed) {
timeoutTimer.stop();
if (transaction != null) {
log.debug("Successfully sent tx with id " + transaction.getHashAsString());
checkArgument(transaction.equals(signedTx));
trade.setTakerFeeTxId(transaction.getHashAsString());
processModel.setTakeOfferFeeTx(transaction);
walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING);
complete();
log.debug("Successfully sent tx with id " + transaction.getHashAsString());
}
} else {
log.warn("We got the callback called after the timeout has been triggered a complete().");

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerVerifyAndSignContract.java
View file

@ -110,11 +110,11 @@ public class TakerVerifyAndSignContract extends TradeTask {
Sig.verify(maker.getPubKeyRing().getSignaturePubKey(),
contractAsJson,
maker.getContractSignature());
complete();
} catch (Throwable t) {
failed("Signature verification failed. " + t.getMessage());
}
complete();
} catch (Throwable t) {
failed(t);
}

17
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
View file

@ -1044,9 +1044,15 @@ public class MainViewModel implements ViewModel {
private void updateReservedBalance() {
Coin sum = Coin.valueOf(openOfferManager.getObservableList().stream()
.map(openOffer -> {
Address address = btcWalletService.getOrCreateAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
return btcWalletService.getBalanceForAddress(address);
final Optional<AddressEntry> addressEntryOptional = btcWalletService.getAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
if (addressEntryOptional.isPresent()) {
Address address = addressEntryOptional.get().getAddress();
return btcWalletService.getBalanceForAddress(address);
} else {
return null;
}
})
.filter(e -> e != null)
.mapToLong(Coin::getValue)
.sum());
@ -1056,8 +1062,11 @@ public class MainViewModel implements ViewModel {
private void updateLockedBalance() {
Coin sum = Coin.valueOf(tradeManager.getLockedTradeStream()
.mapToLong(trade -> {
Coin lockedTradeAmount = btcWalletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG).getCoinLockedInMultiSig();
return lockedTradeAmount.getValue();
final Optional<AddressEntry> addressEntryOptional = btcWalletService.getAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
if (addressEntryOptional.isPresent())
return addressEntryOptional.get().getCoinLockedInMultiSig().getValue();
else
return 0;
})
.sum());
lockedBalance.set(formatter.formatCoinWithCode(sum));

26
gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java
View file

@ -58,7 +58,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<LockedListItem, LockedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn;
private final BtcWalletService walletService;
private final BtcWalletService btcWalletService;
private final TradeManager tradeManager;
private final OpenOfferManager openOfferManager;
private final Preferences preferences;
@ -77,9 +77,9 @@ public class LockedView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private LockedView(BtcWalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
private LockedView(BtcWalletService btcWalletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
BSFormatter formatter, OfferDetailsWindow offerDetailsWindow, TradeDetailsWindow tradeDetailsWindow) {
this.walletService = walletService;
this.btcWalletService = btcWalletService;
this.tradeManager = tradeManager;
this.openOfferManager = openOfferManager;
this.preferences = preferences;
@ -133,7 +133,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
tableView.setItems(sortedList);
updateList();
walletService.addBalanceListener(balanceListener);
btcWalletService.addBalanceListener(balanceListener);
}
@Override
@ -142,7 +142,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
tradeManager.getTradableList().removeListener(tradeListChangeListener);
sortedList.comparatorProperty().unbind();
observableList.forEach(LockedListItem::cleanup);
walletService.removeBalanceListener(balanceListener);
btcWalletService.removeBalanceListener(balanceListener);
}
@ -153,10 +153,18 @@ public class LockedView extends ActivatableView<VBox, Void> {
private void updateList() {
observableList.forEach(LockedListItem::cleanup);
observableList.setAll(tradeManager.getLockedTradeStream()
.map(trade -> new LockedListItem(trade,
walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG),
walletService,
formatter))
.map(trade -> {
final Optional<AddressEntry> addressEntryOptional = btcWalletService.getAddressEntry(trade.getId(), AddressEntry.Context.MULTI_SIG);
if (addressEntryOptional.isPresent()) {
return new LockedListItem(trade,
addressEntryOptional.get(),
btcWalletService,
formatter);
} else {
return null;
}
})
.filter(e -> e != null)
.collect(Collectors.toList()));
}

22
gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java
View file

@ -28,20 +28,22 @@ import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Transaction;
import java.util.Optional;
class ReservedListItem {
private final BalanceListener balanceListener;
private final Label balanceLabel;
private final OpenOffer openOffer;
private final AddressEntry addressEntry;
private final BtcWalletService walletService;
private final BtcWalletService btcWalletService;
private final BSFormatter formatter;
private final String addressString;
private Coin balance;
public ReservedListItem(OpenOffer openOffer, AddressEntry addressEntry, BtcWalletService walletService, BSFormatter formatter) {
public ReservedListItem(OpenOffer openOffer, AddressEntry addressEntry, BtcWalletService btcWalletService, BSFormatter formatter) {
this.openOffer = openOffer;
this.addressEntry = addressEntry;
this.walletService = walletService;
this.btcWalletService = btcWalletService;
this.formatter = formatter;
addressString = addressEntry.getAddressString();
@ -53,19 +55,21 @@ class ReservedListItem {
updateBalance();
}
};
walletService.addBalanceListener(balanceListener);
btcWalletService.addBalanceListener(balanceListener);
updateBalance();
}
public void cleanup() {
walletService.removeBalanceListener(balanceListener);
btcWalletService.removeBalanceListener(balanceListener);
}
private void updateBalance() {
Address address = walletService.getOrCreateAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
balance = walletService.getBalanceForAddress(address);
if (balance != null)
balanceLabel.setText(formatter.formatCoin(this.balance));
final Optional<AddressEntry> addressEntryOptional = btcWalletService.getAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
addressEntryOptional.ifPresent(addressEntry -> {
balance = btcWalletService.getBalanceForAddress(addressEntry.getAddress());
if (balance != null)
balanceLabel.setText(formatter.formatCoin(balance));
});
}
private Address getAddress() {

26
gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java
View file

@ -58,7 +58,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<ReservedListItem, ReservedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn;
private final BtcWalletService walletService;
private final BtcWalletService btcWalletService;
private final TradeManager tradeManager;
private final OpenOfferManager openOfferManager;
private final Preferences preferences;
@ -77,9 +77,9 @@ public class ReservedView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private ReservedView(BtcWalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
private ReservedView(BtcWalletService btcWalletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
BSFormatter formatter, OfferDetailsWindow offerDetailsWindow, TradeDetailsWindow tradeDetailsWindow) {
this.walletService = walletService;
this.btcWalletService = btcWalletService;
this.tradeManager = tradeManager;
this.openOfferManager = openOfferManager;
this.preferences = preferences;
@ -133,7 +133,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
tableView.setItems(sortedList);
updateList();
walletService.addBalanceListener(balanceListener);
btcWalletService.addBalanceListener(balanceListener);
}
@Override
@ -142,7 +142,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
tradeManager.getTradableList().removeListener(tradeListChangeListener);
sortedList.comparatorProperty().unbind();
observableList.forEach(ReservedListItem::cleanup);
walletService.removeBalanceListener(balanceListener);
btcWalletService.removeBalanceListener(balanceListener);
}
@ -153,10 +153,18 @@ public class ReservedView extends ActivatableView<VBox, Void> {
private void updateList() {
observableList.forEach(ReservedListItem::cleanup);
observableList.setAll(openOfferManager.getObservableList().stream()
.map(openOffer -> new ReservedListItem(openOffer,
walletService.getOrCreateAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE),
walletService,
formatter))
.map(openOffer -> {
Optional<AddressEntry> addressEntryOptional = btcWalletService.getAddressEntry(openOffer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
if (addressEntryOptional.isPresent()) {
return new ReservedListItem(openOffer,
addressEntryOptional.get(),
btcWalletService,
formatter);
} else {
return null;
}
})
.filter(e -> e != null)
.collect(Collectors.toList()));
}

7
gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java
View file

@ -212,8 +212,11 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
trades.stream()
.filter(Trade::isPayoutPublished)
.forEach(trade -> {
if (walletService.getBalanceForAddress(walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.TRADE_PAYOUT).getAddress()).isZero())
tradeManager.addTradeToClosedTrades(trade);
walletService.getAddressEntry(trade.getId(), AddressEntry.Context.TRADE_PAYOUT)
.ifPresent(addressEntry -> {
if (walletService.getBalanceForAddress(addressEntry.getAddress()).isZero())
tradeManager.addTradeToClosedTrades(trade);
});
});
}