Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 11:46:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix withdrawal bug

Browse source
This commit is contained in:
Manfred Karrer 2014-10-25 20:17:57 +02:00
parent 7c8a8dffcd
commit 39509b91c8
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
View file

@ -133,6 +133,10 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isSentToP2SH if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isSentToP2SH
()) { ()) {
Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params); Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
log.trace("matchesRequiredAddress?");
log.trace(addressOutput.toString());
log.trace(addressEntry.getAddress().toString());
if (addressEntry != null && addressOutput.equals(addressEntry.getAddress())) { if (addressEntry != null && addressOutput.equals(addressEntry.getAddress())) {
return true; return true;
} }

5
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
View file

@ -123,8 +123,9 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
selectedItemChangeListener = (obsValue, oldValue, newValue) -> { selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
if (oldValue != null && newValue != null) if (oldValue != null && newValue != null)
presentationModel.selectTrade(newValue); presentationModel.selectTrade(newValue);
else if (newValue == null) // TODO only clearSelection when there are more at least one remaining trades
table.getSelectionModel().clearSelection(); /* else if (newValue == null)
table.getSelectionModel().clearSelection();*/
}; };
listChangeListener = change -> { listChangeListener = change -> {

4
src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java
View file

@ -282,6 +282,10 @@ public class BootstrappedPeerFactory {
private void bootstrapWithRelay(PeerDHT peerDHT) { private void bootstrapWithRelay(PeerDHT peerDHT) {
PeerAddress upa = peerDHT.peerBean().serverPeerAddress();
upa = upa.changeFirewalledTCP(true).changeFirewalledUDP(true);
peerDHT.peerBean().serverPeerAddress(upa);
PeerNAT peerNAT = new PeerBuilderNAT(peerDHT.peer()).start(); PeerNAT peerNAT = new PeerBuilderNAT(peerDHT.peer()).start();
FutureRelayNAT futureRelayNAT = peerNAT.startRelay(getBootstrapAddress()); FutureRelayNAT futureRelayNAT = peerNAT.startRelay(getBootstrapAddress());

4
src/main/java/io/bitsquare/msg/SeedNodeAddress.java
View file

@ -57,8 +57,8 @@ public class SeedNodeAddress {
public enum StaticSeedNodeAddresses { public enum StaticSeedNodeAddresses {
// Manfreds server: "188.226.179.109" // Manfreds server: "188.226.179.109"
// Steves server: "128.199.251.106" // Steves server: "128.199.251.106"
DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000), DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000);
DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000); // DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000);
//LOCALHOST("localhost", "127.0.0.1", 5000); //LOCALHOST("localhost", "127.0.0.1", 5000);
private final String id; private final String id;