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

fix serialisation issue with address entry

Browse source
This commit is contained in:
Manfred Karrer 2015-11-07 03:39:37 +01:00
parent bce5460aa4
commit 6e1e3d4be3
10 changed files with 56 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -53,6 +53,7 @@ import javafx.scene.layout.StackPane;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import org.bitcoinj.crypto.DRMWorkaround;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.controlsfx.dialog.Dialogs;
import org.reactfx.EventStreams;
@ -114,6 +115,8 @@ public class BitsquareApp extends Application {
Thread.setDefaultUncaughtExceptionHandler(handler);
Thread.currentThread().setUncaughtExceptionHandler(handler);
DRMWorkaround.maybeDisableExportControls();
Security.addProvider(new BouncyCastleProvider());
try {

4
gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java
View file

@ -20,7 +20,6 @@ package io.bitsquare.app;
import io.bitsquare.BitsquareException;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.btc.RegTestHost;
import io.bitsquare.p2p.Utils;
import io.bitsquare.util.joptsimple.EnumValueConverter;
import joptsimple.OptionException;
import joptsimple.OptionParser;
@ -101,7 +100,8 @@ public class BitsquareAppMain extends BitsquareExecutable {
.ofType(boolean.class);
parser.accepts(ProgramArguments.NAME_KEY, description("Name of this node", null))
.withRequiredArg();
parser.accepts(ProgramArguments.PORT_KEY, description("Port to listen on", Utils.findFreeSystemPort()))
// use a fixed port as arbitrator use that for his ID
parser.accepts(ProgramArguments.PORT_KEY, description("Port to listen on", 9999))
.withRequiredArg()
.ofType(int.class);
parser.accepts(ProgramArguments.USE_LOCALHOST, description("Use localhost network for development", false))

24
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -206,30 +206,6 @@ class MainViewModel implements ViewModel {
///////////////////////////////////////////////////////////////////////////////////////////
private BooleanProperty initP2PNetwork() {
/* if (networkService.getNetworkInfo() instanceof TomP2PNetworkInfo) {
TomP2PNetworkInfo networkInfo = (TomP2PNetworkInfo) networkService.getNetworkInfo();
networkInfo.numPeersProperty().addListener((observable, oldValue, newValue) -> {
numDHTPeers.set(String.valueOf(newValue) + " peers");
if ((int) newValue == 0) {
if (lostP2PConnectionTimeoutTimer != null)
lostP2PConnectionTimeoutTimer.stop();
lostP2PConnectionTimeoutTimer = FxTimer.runLater(Duration.ofMillis(LOST_P2P_CONNECTION_TIMEOUT), () -> {
log.trace("Connection lost timeout reached");
bootstrapErrorMsg.set("We lost connection to the last peer.");
});
} else if ((int) oldValue == 0 && (int) newValue > 0) {
if (lostP2PConnectionTimeoutTimer != null) {
lostP2PConnectionTimeoutTimer.stop();
lostP2PConnectionTimeoutTimer = null;
}
bootstrapErrorMsg.set(null);
}
});
networkInfo.stateProperty().addListener((ov, oldValue, newValue) -> {
setBootstrapState(newValue);
});
}*/
final BooleanProperty p2pNetworkReady = new SimpleBooleanProperty();
p2PService.start(new P2PServiceListener() {
@Override

4
gui/src/main/resources/logback.xml
View file

@ -31,10 +31,10 @@
<logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
<logger name="org.bitcoinj.core.Peer" level="WARN"/>
<logger name="org.bitcoinj.core.HeadersMessage" level="WARN"/>
<logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
<!--
<logger name="com.vinumeris.updatefx" level="OFF"/>
<logger name="io.netty" level="OFF"/>
<logger name="org.bitcoinj.core.BitcoinSerializer" level="ERROR"/>
<logger name="org.bitcoinj.core.Peer" level="ERROR"/>-->