storage, BisqEnvironment bisqEnvironment,
FeeService feeService,
@Named(BtcOptionKeys.BTC_NODES) String btcNodesFromOptions,
@Named(BtcOptionKeys.USE_TOR_FOR_BTC) String useTorFlagFromOptions) {
INSTANCE = this;
this.storage = storage;
- this.bitsquareEnvironment = bitsquareEnvironment;
+ this.bisqEnvironment = bisqEnvironment;
directoryChooserPath = Utilities.getSystemHomeDirectory();
@@ -286,7 +286,7 @@ public final class Preferences implements Persistable {
storage.queueUpForSave();
}
- this.bitcoinNetwork = bitsquareEnvironment.getBitcoinNetwork();
+ this.bitcoinNetwork = bisqEnvironment.getBitcoinNetwork();
fiatCurrenciesAsObservable.addListener(this::updateTradeCurrencies);
cryptoCurrenciesAsObservable.addListener(this::updateTradeCurrencies);
@@ -333,7 +333,7 @@ public final class Preferences implements Persistable {
public void setBitcoinNetwork(BitcoinNetwork bitcoinNetwork) {
if (this.bitcoinNetwork != bitcoinNetwork)
- bitsquareEnvironment.saveBitcoinNetwork(bitcoinNetwork);
+ bisqEnvironment.saveBitcoinNetwork(bitcoinNetwork);
this.bitcoinNetwork = bitcoinNetwork;
diff --git a/network/src/main/java/io/bisq/network/DnsLookupTor.java b/network/src/main/java/io/bisq/network/DnsLookupTor.java
index ed0bccfc1e..ffce8a3967 100644
--- a/network/src/main/java/io/bisq/network/DnsLookupTor.java
+++ b/network/src/main/java/io/bisq/network/DnsLookupTor.java
@@ -57,7 +57,7 @@ public class DnsLookupTor {
public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLookupException {
try {
// note: This is creating a new connection to our proxy, without any authentication.
- // This works fine when connecting to bitsquare's internal Tor proxy, but
+ // This works fine when connecting to bisq's internal Tor proxy, but
// would fail if user has configured an external proxy that requires auth.
// It would be much better to use the already connected proxy socket, but when I
// tried that I get weird errors and the lookup fails.
diff --git a/network/src/main/java/io/bisq/network/Socks5ProxyProvider.java b/network/src/main/java/io/bisq/network/Socks5ProxyProvider.java
index c4d0081314..da845f28c6 100644
--- a/network/src/main/java/io/bisq/network/Socks5ProxyProvider.java
+++ b/network/src/main/java/io/bisq/network/Socks5ProxyProvider.java
@@ -66,8 +66,8 @@ public class Socks5ProxyProvider {
return socks5ProxyInternal;
}
- public void setSocks5ProxyInternal(@Nullable Socks5Proxy bitsquareSocks5Proxy) {
- this.socks5ProxyInternal = bitsquareSocks5Proxy;
+ public void setSocks5ProxyInternal(@Nullable Socks5Proxy bisqSocks5Proxy) {
+ this.socks5ProxyInternal = bisqSocks5Proxy;
}
@Nullable
diff --git a/network/src/main/java/io/bisq/p2p/NodeAddress.java b/network/src/main/java/io/bisq/p2p/NodeAddress.java
index a42094f101..c3c9a1a1e7 100644
--- a/network/src/main/java/io/bisq/p2p/NodeAddress.java
+++ b/network/src/main/java/io/bisq/p2p/NodeAddress.java
@@ -4,7 +4,7 @@ import io.bisq.app.Version;
import io.bisq.common.crypto.Hash;
import io.bisq.common.persistance.Persistable;
import io.bisq.common.wire.Payload;
-import io.bitsquare.common.wire.proto.Messages;
+import io.bisq.common.wire.proto.Messages;
import lombok.Getter;
import java.util.regex.Pattern;
diff --git a/network/src/main/java/io/bisq/p2p/messaging/PrefixedSealedAndSignedMessage.java b/network/src/main/java/io/bisq/p2p/messaging/PrefixedSealedAndSignedMessage.java
index b7f096fb3a..6a8372448f 100644
--- a/network/src/main/java/io/bisq/p2p/messaging/PrefixedSealedAndSignedMessage.java
+++ b/network/src/main/java/io/bisq/p2p/messaging/PrefixedSealedAndSignedMessage.java
@@ -3,9 +3,9 @@ package io.bisq.p2p.messaging;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.crypto.SealedAndSigned;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.network.messages.SendersNodeAddressMessage;
-import io.bitsquare.common.wire.proto.Messages;
import java.util.Arrays;
import java.util.UUID;
diff --git a/network/src/main/java/io/bisq/p2p/network/Connection.java b/network/src/main/java/io/bisq/p2p/network/Connection.java
index 49424b3d36..e9c6755e70 100644
--- a/network/src/main/java/io/bisq/p2p/network/Connection.java
+++ b/network/src/main/java/io/bisq/p2p/network/Connection.java
@@ -8,6 +8,7 @@ import io.bisq.app.Version;
import io.bisq.common.UserThread;
import io.bisq.common.util.Tuple2;
import io.bisq.common.util.Utilities;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.PrefixedSealedAndSignedMessage;
@@ -24,7 +25,6 @@ import io.bisq.p2p.storage.messages.AddDataMessage;
import io.bisq.p2p.storage.messages.RefreshTTLMessage;
import io.bisq.p2p.storage.payload.CapabilityRequiringPayload;
import io.bisq.p2p.storage.payload.StoragePayload;
-import io.bitsquare.common.wire.proto.Messages;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
diff --git a/network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java b/network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
index c2229738a2..f4cc56f34e 100644
--- a/network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
+++ b/network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
@@ -3,6 +3,7 @@ package io.bisq.p2p.network;
import com.google.protobuf.ByteString;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.crypto.SealedAndSigned;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.messages.alert.Alert;
import io.bisq.messages.alert.PrivateNotification;
@@ -41,7 +42,6 @@ import io.bisq.p2p.storage.payload.MailboxStoragePayload;
import io.bisq.p2p.storage.payload.StoragePayload;
import io.bisq.p2p.storage.storageentry.ProtectedMailboxStorageEntry;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.output.WriterOutputStream;
import org.bitcoinj.core.Coin;
@@ -55,7 +55,7 @@ import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collectors;
-import static io.bitsquare.common.wire.proto.Messages.Envelope.MessageCase.*;
+import static io.bisq.common.wire.proto.Messages.Envelope.MessageCase.*;
/**
* If the Messages class is giving errors in IntelliJ, you should change the IntelliJ IDEA Platform Properties file,
diff --git a/network/src/main/java/io/bisq/p2p/network/messages/CloseConnectionMessage.java b/network/src/main/java/io/bisq/p2p/network/messages/CloseConnectionMessage.java
index 4dd76ea0fb..7aeb0690bd 100644
--- a/network/src/main/java/io/bisq/p2p/network/messages/CloseConnectionMessage.java
+++ b/network/src/main/java/io/bisq/p2p/network/messages/CloseConnectionMessage.java
@@ -1,8 +1,8 @@
package io.bisq.p2p.network.messages;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
-import io.bitsquare.common.wire.proto.Messages;
public final class CloseConnectionMessage implements Message {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetDataResponse.java b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetDataResponse.java
index 5b774c7728..528510e6c2 100644
--- a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetDataResponse.java
+++ b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetDataResponse.java
@@ -2,10 +2,10 @@ package io.bisq.p2p.peers.getdata.messages;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bisq.p2p.storage.storageentry.ProtectedMailboxStorageEntry;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetUpdatedDataRequest.java b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
index 566e1880c4..29aa01c9b9 100644
--- a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
+++ b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
@@ -2,9 +2,9 @@ package io.bisq.p2p.peers.getdata.messages;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.network.messages.SendersNodeAddressMessage;
-import io.bitsquare.common.wire.proto.Messages;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
index bef61bbc57..30336837e0 100644
--- a/network/src/main/java/io/bisq/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
+++ b/network/src/main/java/io/bisq/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
@@ -3,10 +3,10 @@ package io.bisq.p2p.peers.getdata.messages;
import com.google.protobuf.ByteString;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.ToProtoBuffer;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bisq.p2p.network.messages.AnonymousMessage;
-import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Ping.java b/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Ping.java
index d2f0d1e6fd..5d788a9041 100644
--- a/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Ping.java
+++ b/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Ping.java
@@ -2,7 +2,7 @@ package io.bisq.p2p.peers.keepalive.messages;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
-import io.bitsquare.common.wire.proto.Messages;
+import io.bisq.common.wire.proto.Messages;
public final class Ping extends KeepAliveMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Pong.java b/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Pong.java
index 807f33755e..cf14a6a8b2 100644
--- a/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Pong.java
+++ b/network/src/main/java/io/bisq/p2p/peers/keepalive/messages/Pong.java
@@ -2,7 +2,7 @@ package io.bisq.p2p.peers.keepalive.messages;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
-import io.bitsquare.common.wire.proto.Messages;
+import io.bisq.common.wire.proto.Messages;
public final class Pong extends KeepAliveMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/peers/peerexchange/Peer.java b/network/src/main/java/io/bisq/p2p/peers/peerexchange/Peer.java
index dc31129b6a..f51fae942f 100644
--- a/network/src/main/java/io/bisq/p2p/peers/peerexchange/Peer.java
+++ b/network/src/main/java/io/bisq/p2p/peers/peerexchange/Peer.java
@@ -3,8 +3,8 @@ package io.bisq.p2p.peers.peerexchange;
import io.bisq.app.Version;
import io.bisq.common.persistance.Persistable;
import io.bisq.common.wire.Payload;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
-import io.bitsquare.common.wire.proto.Messages;
import java.util.Date;
diff --git a/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersRequest.java b/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersRequest.java
index d1f9cc23cf..ba89e308b2 100644
--- a/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersRequest.java
+++ b/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersRequest.java
@@ -2,12 +2,12 @@ package io.bisq.p2p.peers.peerexchange.messages;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.ToProtoBuffer;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bisq.p2p.network.messages.SendersNodeAddressMessage;
import io.bisq.p2p.peers.peerexchange.Peer;
-import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersResponse.java b/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersResponse.java
index fc61813253..a8904a2588 100644
--- a/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersResponse.java
+++ b/network/src/main/java/io/bisq/p2p/peers/peerexchange/messages/GetPeersResponse.java
@@ -2,9 +2,9 @@ package io.bisq.p2p.peers.peerexchange.messages;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bisq.p2p.peers.peerexchange.Peer;
-import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/network/src/main/java/io/bisq/p2p/seed/SeedNodesRepository.java b/network/src/main/java/io/bisq/p2p/seed/SeedNodesRepository.java
index d9c2d845fd..52fe886f3b 100644
--- a/network/src/main/java/io/bisq/p2p/seed/SeedNodesRepository.java
+++ b/network/src/main/java/io/bisq/p2p/seed/SeedNodesRepository.java
@@ -54,8 +54,8 @@ public class SeedNodesRepository {
// regtest
// For development you need to change that to your local onion addresses
- // 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --myAddress=rxdkppp3vicnbgqt:8002 --appName=Bitsquare_seed_node_rxdkppp3vicnbgqt.onion_8002
- // 2. Find your local onion address in Bitsquare_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname
+ // 1. Run a seed node with prog args: --bitcoinNetwork=regtest --nodePort=8002 --myAddress=rxdkppp3vicnbgqt:8002 --appName=bisq_seed_node_rxdkppp3vicnbgqt.onion_8002
+ // 2. Find your local onion address in bisq_seed_node_rxdkppp3vicnbgqt.onion_8002/regtest/tor/hiddenservice/hostname
// 3. Shut down the seed node
// 4. Rename the directory with your local onion address
// 5. Edit here your found onion address (new NodeAddress("YOUR_ONION.onion:8002")
diff --git a/network/src/main/java/io/bisq/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bisq/p2p/storage/P2PDataStorage.java
index 9cfbaaf648..64573966dc 100644
--- a/network/src/main/java/io/bisq/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bisq/p2p/storage/P2PDataStorage.java
@@ -11,6 +11,7 @@ import io.bisq.common.crypto.Sig;
import io.bisq.common.persistance.Persistable;
import io.bisq.common.util.Tuple2;
import io.bisq.common.util.Utilities;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.messages.ToProtoBuffer;
import io.bisq.p2p.NodeAddress;
@@ -24,7 +25,6 @@ import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
import io.bisq.storage.FileUtil;
import io.bisq.storage.ResourceNotFoundException;
import io.bisq.storage.Storage;
-import io.bitsquare.common.wire.proto.Messages;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/network/src/main/java/io/bisq/p2p/storage/messages/AddDataMessage.java b/network/src/main/java/io/bisq/p2p/storage/messages/AddDataMessage.java
index 2bebf76611..50a605d064 100644
--- a/network/src/main/java/io/bisq/p2p/storage/messages/AddDataMessage.java
+++ b/network/src/main/java/io/bisq/p2p/storage/messages/AddDataMessage.java
@@ -2,9 +2,9 @@ package io.bisq.p2p.storage.messages;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.storageentry.ProtectedMailboxStorageEntry;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
public final class AddDataMessage extends BroadcastMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/storage/messages/RefreshTTLMessage.java b/network/src/main/java/io/bisq/p2p/storage/messages/RefreshTTLMessage.java
index 5af7a07aba..f941203191 100644
--- a/network/src/main/java/io/bisq/p2p/storage/messages/RefreshTTLMessage.java
+++ b/network/src/main/java/io/bisq/p2p/storage/messages/RefreshTTLMessage.java
@@ -2,8 +2,8 @@ package io.bisq.p2p.storage.messages;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.ToProtoBuffer;
-import io.bitsquare.common.wire.proto.Messages;
import java.util.Arrays;
diff --git a/network/src/main/java/io/bisq/p2p/storage/messages/RemoveDataMessage.java b/network/src/main/java/io/bisq/p2p/storage/messages/RemoveDataMessage.java
index 6c36180381..ee6a1f9e04 100644
--- a/network/src/main/java/io/bisq/p2p/storage/messages/RemoveDataMessage.java
+++ b/network/src/main/java/io/bisq/p2p/storage/messages/RemoveDataMessage.java
@@ -2,8 +2,8 @@ package io.bisq.p2p.storage.messages;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
public final class RemoveDataMessage extends BroadcastMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/storage/messages/RemoveMailboxDataMessage.java b/network/src/main/java/io/bisq/p2p/storage/messages/RemoveMailboxDataMessage.java
index 7506c57b0a..67ae118920 100644
--- a/network/src/main/java/io/bisq/p2p/storage/messages/RemoveMailboxDataMessage.java
+++ b/network/src/main/java/io/bisq/p2p/storage/messages/RemoveMailboxDataMessage.java
@@ -2,8 +2,8 @@ package io.bisq.p2p.storage.messages;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.storageentry.ProtectedMailboxStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
public final class RemoveMailboxDataMessage extends BroadcastMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
diff --git a/network/src/main/java/io/bisq/p2p/storage/payload/MailboxStoragePayload.java b/network/src/main/java/io/bisq/p2p/storage/payload/MailboxStoragePayload.java
index 3f0267414c..f3c7090f15 100644
--- a/network/src/main/java/io/bisq/p2p/storage/payload/MailboxStoragePayload.java
+++ b/network/src/main/java/io/bisq/p2p/storage/payload/MailboxStoragePayload.java
@@ -3,12 +3,12 @@ package io.bisq.p2p.storage.payload;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.crypto.Sig;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.PrefixedSealedAndSignedMessage;
import io.bisq.p2p.peers.BroadcastHandler;
import io.bisq.p2p.storage.P2PDataStorage;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/network/src/main/java/io/bisq/p2p/storage/payload/StoragePayload.java b/network/src/main/java/io/bisq/p2p/storage/payload/StoragePayload.java
index 7690e5dbad..59a5d822b2 100644
--- a/network/src/main/java/io/bisq/p2p/storage/payload/StoragePayload.java
+++ b/network/src/main/java/io/bisq/p2p/storage/payload/StoragePayload.java
@@ -10,9 +10,9 @@ import java.security.PublicKey;
* Messages which support ownership protection (using signatures) and a time to live
*
* Implementations:
- * io.bitsquare.alert.Alert
- * io.bitsquare.arbitration.Arbitrator
- * io.bitsquare.trade.offer.Offer
+ * io.bisq.alert.Alert
+ * io.bisq.arbitration.Arbitrator
+ * io.bisq.trade.offer.Offer
*/
public interface StoragePayload extends ExpirablePayload {
/**
diff --git a/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedMailboxStorageEntry.java b/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedMailboxStorageEntry.java
index 5838567bbc..bfd5f627f6 100644
--- a/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedMailboxStorageEntry.java
+++ b/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedMailboxStorageEntry.java
@@ -3,9 +3,9 @@ package io.bisq.p2p.storage.storageentry;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.crypto.Sig;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.P2PDataStorage;
import io.bisq.p2p.storage.payload.MailboxStoragePayload;
-import io.bitsquare.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedStorageEntry.java b/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedStorageEntry.java
index cba3fbfaab..1935924c16 100644
--- a/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedStorageEntry.java
+++ b/network/src/main/java/io/bisq/p2p/storage/storageentry/ProtectedStorageEntry.java
@@ -6,8 +6,8 @@ import com.google.protobuf.Message;
import io.bisq.app.Version;
import io.bisq.common.crypto.Sig;
import io.bisq.common.wire.Payload;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.payload.StoragePayload;
-import io.bitsquare.common.wire.proto.Messages;
import lombok.EqualsAndHashCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/network/src/test/java/io/bisq/crypto/EncryptionServiceTests.java b/network/src/test/java/io/bisq/crypto/EncryptionServiceTests.java
index cf341ef89d..b64f93946a 100644
--- a/network/src/test/java/io/bisq/crypto/EncryptionServiceTests.java
+++ b/network/src/test/java/io/bisq/crypto/EncryptionServiceTests.java
@@ -20,13 +20,13 @@ package io.bisq.crypto;
import io.bisq.app.Version;
import io.bisq.common.crypto.*;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.MailboxMessage;
import io.bisq.p2p.messaging.PrefixedSealedAndSignedMessage;
import io.bisq.p2p.peers.keepalive.messages.Ping;
import io.bisq.storage.FileUtil;
-import io.bitsquare.common.wire.proto.Messages;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.After;
import org.junit.Before;
diff --git a/network/src/test/java/io/bisq/messages/payment/payload/OKPayAccountContractDataTest.java b/network/src/test/java/io/bisq/messages/payment/payload/OKPayAccountContractDataTest.java
index 5161676ef6..773064a38c 100644
--- a/network/src/test/java/io/bisq/messages/payment/payload/OKPayAccountContractDataTest.java
+++ b/network/src/test/java/io/bisq/messages/payment/payload/OKPayAccountContractDataTest.java
@@ -1,7 +1,7 @@
package io.bisq.messages.payment.payload;
import com.google.protobuf.util.JsonFormat;
-import io.bitsquare.common.wire.proto.Messages;
+import io.bisq.common.wire.proto.Messages;
import org.junit.Test;
import java.io.IOException;
diff --git a/network/src/test/java/io/bisq/p2p/DummySeedNode.java b/network/src/test/java/io/bisq/p2p/DummySeedNode.java
index 4987012aed..9e8bb68beb 100644
--- a/network/src/test/java/io/bisq/p2p/DummySeedNode.java
+++ b/network/src/test/java/io/bisq/p2p/DummySeedNode.java
@@ -160,7 +160,7 @@ public class DummySeedNode {
@Nullable Set progArgSeedNodes,
@Nullable P2PServiceListener listener) {
Path appPath = Paths.get(defaultUserDataDir,
- "Bitsquare_seed_node_" + String.valueOf(mySeedNodeAddress.getFullAddress().replace(":", "_")));
+ "bisq_seed_node_" + String.valueOf(mySeedNodeAddress.getFullAddress().replace(":", "_")));
String logPath = Paths.get(appPath.toString(), "logs").toString();
Log.setup(logPath);
diff --git a/network/src/test/java/io/bisq/p2p/mocks/MockMailboxPayload.java b/network/src/test/java/io/bisq/p2p/mocks/MockMailboxPayload.java
index aa668b9f0f..a86f9b40c6 100644
--- a/network/src/test/java/io/bisq/p2p/mocks/MockMailboxPayload.java
+++ b/network/src/test/java/io/bisq/p2p/mocks/MockMailboxPayload.java
@@ -1,10 +1,10 @@
package io.bisq.p2p.mocks;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.MailboxMessage;
import io.bisq.p2p.storage.payload.ExpirablePayload;
-import io.bitsquare.common.wire.proto.Messages;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.util.UUID;
diff --git a/network/src/test/java/io/bisq/p2p/mocks/MockPayload.java b/network/src/test/java/io/bisq/p2p/mocks/MockPayload.java
index db5d36165d..1f24b9dec1 100644
--- a/network/src/test/java/io/bisq/p2p/mocks/MockPayload.java
+++ b/network/src/test/java/io/bisq/p2p/mocks/MockPayload.java
@@ -1,9 +1,9 @@
package io.bisq.p2p.mocks;
import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.p2p.storage.payload.ExpirablePayload;
-import io.bitsquare.common.wire.proto.Messages;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
public final class MockPayload implements Message, ExpirablePayload {
diff --git a/network/src/test/java/io/bisq/p2p/network/NetworkStressTest.java b/network/src/test/java/io/bisq/p2p/network/NetworkStressTest.java
index 6973261b71..8b6ccab9bd 100644
--- a/network/src/test/java/io/bisq/p2p/network/NetworkStressTest.java
+++ b/network/src/test/java/io/bisq/p2p/network/NetworkStressTest.java
@@ -7,12 +7,12 @@ import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.util.Tuple3;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.crypto.DecryptedMsgWithPubKey;
import io.bisq.crypto.EncryptionService;
import io.bisq.p2p.*;
import io.bisq.p2p.messaging.*;
import io.bisq.p2p.seed.SeedNodesRepository;
-import io.bitsquare.common.wire.proto.Messages;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
diff --git a/network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java b/network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
index de3874531c..58fec4481f 100644
--- a/network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
+++ b/network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
@@ -5,6 +5,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.util.JsonFormat;
import io.bisq.common.crypto.*;
import io.bisq.common.util.Utilities;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.crypto.EncryptionService;
import io.bisq.messages.alert.Alert;
import io.bisq.messages.trade.offer.payload.Offer;
@@ -17,7 +18,6 @@ import io.bisq.p2p.storage.mocks.MockData;
import io.bisq.p2p.storage.payload.StoragePayload;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
import io.bisq.storage.FileUtil;
-import io.bitsquare.common.wire.proto.Messages;
import lombok.extern.slf4j.Slf4j;
import mockit.Mocked;
import mockit.integration.junit4.JMockit;
diff --git a/network/src/test/java/io/bisq/p2p/storage/messages/AddDataMessageTest.java b/network/src/test/java/io/bisq/p2p/storage/messages/AddDataMessageTest.java
index ff0d78549a..2a0b0ec468 100644
--- a/network/src/test/java/io/bisq/p2p/storage/messages/AddDataMessageTest.java
+++ b/network/src/test/java/io/bisq/p2p/storage/messages/AddDataMessageTest.java
@@ -4,13 +4,13 @@ import io.bisq.common.crypto.CryptoException;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.crypto.SealedAndSigned;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.PrefixedSealedAndSignedMessage;
import io.bisq.p2p.network.ProtoBufferUtilities;
import io.bisq.p2p.storage.payload.MailboxStoragePayload;
import io.bisq.p2p.storage.storageentry.ProtectedMailboxStorageEntry;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
-import io.bitsquare.common.wire.proto.Messages;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
diff --git a/network/src/test/java/io/bisq/p2p/storage/mocks/MockData.java b/network/src/test/java/io/bisq/p2p/storage/mocks/MockData.java
index c26a2f43c3..97e33294a2 100644
--- a/network/src/test/java/io/bisq/p2p/storage/mocks/MockData.java
+++ b/network/src/test/java/io/bisq/p2p/storage/mocks/MockData.java
@@ -1,7 +1,7 @@
package io.bisq.p2p.storage.mocks;
+import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.storage.payload.StoragePayload;
-import io.bitsquare.common.wire.proto.Messages;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.security.PublicKey;
diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh
index 1cdf019923..8cf0098bd4 100644
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@@ -16,7 +16,7 @@ $JAVA_HOME/bin/javapackager \
-Bruntime="$JAVA_HOME/jre" \
-BappVersion=$version \
-Bcategory=Network \
- -Bemail=team@bitsquare.io \
+ -Bemail=team@bisq.io \
-BlicenseType=GPLv3 \
-BlicenseFile=LICENSE \
-Bicon=package/linux/icon.png \
@@ -26,20 +26,20 @@ $JAVA_HOME/bin/javapackager \
-vendor bisq \
-outdir gui/deploy \
-srcfiles $jarFile:$jdkfixFile \
- -srcfiles "core/src/main/resources/bitsquare.policy" \
+ -srcfiles "core/src/main/resources/bisq.policy" \
-srcfiles package/linux/LICENSE \
- -appclass io.bitsquare.app.BitsquareAppMain \
+ -appclass io.bisq.app.BisqAppMain \
-outfile bisq \
-BjvmOptions=-Djava.security.manager \
-BjvmOptions=-Djava.security.debug=failure \
- -BjvmOptions=-Djava.security.policy=file:bitsquare.policy \
+ -BjvmOptions=-Djava.security.policy=file:bisq.policy \
-# sudo alien -r -c -k gui/deploy/bundles/bitsquare-$version.deb
+# sudo alien -r -c -k gui/deploy/bundles/bisq-$version.deb
-cp "gui/deploy/bundles/bitsquare-$version.deb" "/home/bitsquare/Desktop/bisq-32bit-$version.deb"
-mv "gui/deploy/bundles/bitsquare-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/bisq-32bit-$version.deb"
-# mv "bitsquare-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/bisq-32bit-$version.rpm"
+cp "gui/deploy/bundles/bisq-$version.deb" "/home/bisq/Desktop/bisq-32bit-$version.deb"
+mv "gui/deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/bisq-32bit-$version.deb"
+# mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/bisq-32bit-$version.rpm"
rm -r gui/deploy/
cd package/linux
diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh
index 9af485f47e..1c14cdf748 100644
--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@@ -16,7 +16,7 @@ $JAVA_HOME/bin/javapackager \
-Bruntime="$JAVA_HOME/jre" \
-BappVersion=$version \
-Bcategory=Network \
- -Bemail=team@bitsquare.io \
+ -Bemail=team@bisq.io \
-BlicenseType=GPLv3 \
-BlicenseFile=LICENSE \
-Bicon=package/linux/icon.png \
@@ -26,21 +26,21 @@ $JAVA_HOME/bin/javapackager \
-vendor bisq \
-outdir gui/deploy \
-srcfiles $jarFile:$jdkfixFile \
- -srcfiles "core/src/main/resources/bitsquare.policy" \
+ -srcfiles "core/src/main/resources/bisq.policy" \
-srcfiles package/linux/LICENSE \
- -appclass io.bitsquare.app.BitsquareAppMain \
+ -appclass io.bisq.app.BisqAppMain \
-outfile bisq \
-BjvmOptions=-Djava.security.manager \
-BjvmOptions=-Djava.security.debug=failure \
- -BjvmOptions=-Djava.security.policy=file:bitsquare.policy \
+ -BjvmOptions=-Djava.security.policy=file:bisq.policy \
# uncomment because the build VM does not support alien
-#sudo alien -r -c -k gui/deploy/bundles/bitsquare-$version.deb
+#sudo alien -r -c -k gui/deploy/bundles/bisq-$version.deb
-cp "gui/deploy/bundles/bitsquare-$version.deb" "/home/mk/Desktop/bisq-64bit-$version.deb"
-mv "gui/deploy/bundles/bitsquare-$version.deb" "/media/sf_vm_shared_ubuntu/bisq-64bit-$version.deb"
-#mv "bitsquare-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/bisq-64bit-$version.rpm"
+cp "gui/deploy/bundles/bisq-$version.deb" "/home/mk/Desktop/bisq-64bit-$version.deb"
+mv "gui/deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/bisq-64bit-$version.deb"
+#mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/bisq-64bit-$version.rpm"
rm -r gui/deploy/
cd package/linux
diff --git a/package/mac/Info.plist b/package/mac/Info.plist
index d37509e4ad..8837a1501e 100644
--- a/package/mac/Info.plist
+++ b/package/mac/Info.plist
@@ -14,9 +14,7 @@
package/mac/bisq.icns
CFBundleIdentifier
-
- io.bitsquare.Bitsquare
+ io.bisq.bisq
CFBundleInfoDictionaryVersion
6.0
@@ -44,13 +42,13 @@
JVMRuntime
..
JVMMainClassName
- io.bitsquare.app.core.BitsquareAppMain
+ io.bisq.app.core.BisqAppMain
JVMAppClasspath
JVMMainJarName
shaded.jar
JVMPreferencesID
- bitsquare
+ bisq
JVMOptions
diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh
index e5964db8c4..27e25fbdf8 100755
--- a/package/mac/create_app.sh
+++ b/package/mac/create_app.sh
@@ -20,7 +20,7 @@ echo "Using JAVA_HOME: $JAVA_HOME"
$JAVA_HOME/bin/javapackager \
-deploy \
-BappVersion=$version \
- -Bmac.CFBundleIdentifier=io.bitsquare \
+ -Bmac.CFBundleIdentifier=io.bisq \
-Bmac.CFBundleName=bisq \
-Bicon=package/mac/bisq.icns \
-Bruntime="$JAVA_HOME/jre" \
@@ -30,12 +30,12 @@ $JAVA_HOME/bin/javapackager \
-vendor bisq \
-outdir gui/deploy \
-srcfiles "gui/deploy/bisq-$version.jar" \
- -srcfiles "core/src/main/resources/bitsquare.policy" \
- -appclass io.bitsquare.app.BitsquareAppMain \
+ -srcfiles "core/src/main/resources/bisq.policy" \
+ -appclass io.bisq.app.BisqAppMain \
-outfile bisq \
-BjvmOptions=-Djava.security.manager \
-BjvmOptions=-Djava.security.debug=failure \
- -BjvmOptions=-Djava.security.policy=file:bitsquare.policy
+ -BjvmOptions=-Djava.security.policy=file:bisq.policy
rm "gui/deploy/bisq.html"
rm "gui/deploy/bisq.jnlp"
diff --git a/package/mac/finalize.sh b/package/mac/finalize.sh
index 63b551ba1d..e9fb7173d1 100644
--- a/package/mac/finalize.sh
+++ b/package/mac/finalize.sh
@@ -2,8 +2,8 @@
version="0.5.0.0"
-target_dir="/Users/dev/Documents/__bitsquare/_releases/$version"
-src_dir="/Users/dev/Documents/intellij/bitsquare"
+target_dir="/Users/dev/Documents/__bisq/_releases/$version"
+src_dir="/Users/dev/Documents/intellij/bisq"
rm -r $target_dir
@@ -44,11 +44,11 @@ cp "/Users/dev/vm_shared_windows/bundles/$exe" "/Users/dev/vm_shared_win10/$win6
cd "$target_dir"
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $mac.asc --detach-sig --armor $mac
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb64.asc --detach-sig --armor $deb64
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb32.asc --detach-sig --armor $deb32
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win64.asc --detach-sig --armor $win64
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win32.asc --detach-sig --armor $win32
+gpg --digest-algo SHA256 --local-user manfred@bisq.io --output $mac.asc --detach-sig --armor $mac
+gpg --digest-algo SHA256 --local-user manfred@bisq.io --output $deb64.asc --detach-sig --armor $deb64
+gpg --digest-algo SHA256 --local-user manfred@bisq.io --output $deb32.asc --detach-sig --armor $deb32
+gpg --digest-algo SHA256 --local-user manfred@bisq.io --output $win64.asc --detach-sig --armor $win64
+gpg --digest-algo SHA256 --local-user manfred@bisq.io --output $win32.asc --detach-sig --armor $win32
gpg --digest-algo SHA256 --verify $mac{.asc*,}
gpg --digest-algo SHA256 --verify $deb64{.asc*,}
diff --git a/package/stresstest/cleanup.sh b/package/stresstest/cleanup.sh
index 93b8dc94f2..808543c8ad 100755
--- a/package/stresstest/cleanup.sh
+++ b/package/stresstest/cleanup.sh
@@ -6,6 +6,6 @@ find . -name \*.DS_Store -type f -delete
find . -name \*._.DS_Store -type f -delete
find . -name \*SequenceNumberMap -type f -delete
find . -name \*PersistedPeers -type f -delete
-find . -name \*bitsquare.log -type f -delete
+find . -name \*bisq.log -type f -delete
find . -name \*__MACOSX -type d -delete
find . -name \*backup -type d -exec rm -R -f {} +
diff --git a/package/stresstest/init.sh b/package/stresstest/init.sh
index e57d98303b..611799b7be 100755
--- a/package/stresstest/init.sh
+++ b/package/stresstest/init.sh
@@ -2,12 +2,12 @@
cd ../../seednode/target
-logpath=/Users/dev/Documents/_intellij/bitsquare/logs
+logpath=/Users/dev/Documents/_intellij/bisq/logs
datapath="/Users/dev/Library/Application Support"
mkdir -p $logpath
-# rm "$datapath/Bitsquare_seed_node_hlitt7z4bec4kdh4.onion_8000/db/SequenceNumberMap"
-# rm "$datapath/Bitsquare_seed_node_hlitt7z4bec4kdh4.onion_8000/db/PersistedPeers"
+# rm "$datapath/bisq_seed_node_hlitt7z4bec4kdh4.onion_8000/db/SequenceNumberMap"
+# rm "$datapath/bisq_seed_node_hlitt7z4bec4kdh4.onion_8000/db/PersistedPeers"
# rm "$datapath/BS_arb/mainnet/db/SequenceNumberMap"
# rm "$datapath/BS_arb/mainnet/db/PersistedPeers"
diff --git a/package/stresstest/start.sh b/package/stresstest/start.sh
index c48ce81ed2..ace7e60290 100755
--- a/package/stresstest/start.sh
+++ b/package/stresstest/start.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-logpath=/home/bs/bitsquare/logs
+logpath=/home/bs/bisq/logs
datapath=/home/bs/.local/share
mkdir -p $logpath
diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat
index dfe118e982..25cc94f85c 100644
--- a/package/windows/32bitBuild.bat
+++ b/package/windows/32bitBuild.bat
@@ -1,4 +1,4 @@
-:: Invoke from bitsquare home directory
+:: Invoke from bisq home directory
:: edit iss file -> AppVersion
:: edit -> -BappVersion and -srcfiles
@@ -19,13 +19,13 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
-title bisq ^
-vendor bisq ^
-outdir %outdir% ^
--appclass io.bitsquare.app.BitsquareAppMain ^
+-appclass io.bisq.app.BisqAppMain ^
-srcfiles %outdir%\bisq.jar ^
--srcfiles "core/src/main/resources/bitsquare.policy" ^
+-srcfiles "core/src/main/resources/bisq.policy" ^
-outfile bisq ^
-Bruntime="%JAVA_HOME%\jre" ^
-BjvmOptions=-Djava.security.manager ^
-BjvmOptions=-Djava.security.debug=failure ^
--BjvmOptions=-Djava.security.policy=file:bitsquare.policy ^
+-BjvmOptions=-Djava.security.policy=file:bisq.policy ^
-Bicon=package\windows\bisq.ico
diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat
index 47d7f37de2..5497cfbf39 100644
--- a/package/windows/64bitBuild.bat
+++ b/package/windows/64bitBuild.bat
@@ -1,4 +1,4 @@
-:: Invoke from bitsquare home directory
+:: Invoke from bisq home directory
:: edit iss file -> AppVersion
:: edit -> -BappVersion and -srcfiles
@@ -19,12 +19,12 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
-title bisq ^
-vendor bisq ^
-outdir %outdir% ^
--appclass io.bitsquare.app.BitsquareAppMain ^
+-appclass io.bisq.app.BisqAppMain ^
-srcfiles %outdir%\bisq.jar ^
--srcfiles "core/src/main/resources/bitsquare.policy" ^
+-srcfiles "core/src/main/resources/bisq.policy" ^
-outfile bisq ^
-Bruntime="%JAVA_HOME%\jre" ^
-BjvmOptions=-Djava.security.manager ^
-BjvmOptions=-Djava.security.debug=failure ^
--BjvmOptions=-Djava.security.policy=file:bitsquare.policy ^
+-BjvmOptions=-Djava.security.policy=file:bisq.policy ^
-Bicon=package\windows\bisq.ico
diff --git a/package/windows/bisq.iss b/package/windows/bisq.iss
index e09b1aff05..54e39823a7 100755
--- a/package/windows/bisq.iss
+++ b/package/windows/bisq.iss
@@ -1,15 +1,15 @@
;This file will be executed next to the application bundle image
;I.e. current directory will contain folder bisq with application files
[Setup]
-AppId={{bitsquare}}
+AppId={{bisq}}
AppName=bisq
AppVersion=0.5.0.0
AppVerName=bisq
AppPublisher=bisq
AppComments=bisq
AppCopyright=Copyright (C) 2016
-AppPublisherURL=https://bitsquare.io
-AppSupportURL=https://bitsquare.io
+AppPublisherURL=https://bisq.io
+AppSupportURL=https://bisq.io
;AppUpdatesURL=http://java.com/
DefaultDirName={localappdata}\bisq
DisableStartupPrompt=Yes
diff --git a/pom.xml b/pom.xml
index db0cd4567b..fb7b02171a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- io.bitsquare
+ io.bisq
parent
pom
0.5.0.0
bisq - The decentralized bitcoin exchange
- https://bitsquare.io
+ https://bisq.io
- bitsquare.io
+ bisq.io
@@ -24,13 +24,13 @@
GitHub
- https://github.com/bitsquare/bitsquare/issues
+ https://github.com/bisq/bisq/issues
- scm:git:https://github.com/bitsquare/bitsquare
- scm:git:https://github.com/bitsquare/bitsquare
- scm:git:https://github.com/bitsquare/bitsquare
+ scm:git:https://github.com/bisq/bisq
+ scm:git:https://github.com/bisq/bisq
+ scm:git:https://github.com/bisq/bisq
diff --git a/provider/pom.xml b/provider/pom.xml
index c5ff6d59a1..68df19b288 100644
--- a/provider/pom.xml
+++ b/provider/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
parent
- io.bitsquare
+ io.bisq
0.5.0.0
4.0.0
@@ -77,7 +77,7 @@
- io.bitsquare
+ io.bisq
core
${project.parent.version}
diff --git a/seednode/pom.xml b/seednode/pom.xml
index 8bc8470b47..7f4b49df13 100644
--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
parent
- io.bitsquare
+ io.bisq
0.5.0.0
4.0.0
@@ -77,7 +77,7 @@
- io.bitsquare
+ io.bisq
core
${project.parent.version}
diff --git a/seednode/src/main/java/io/bisq/seednode/SeedNode.java b/seednode/src/main/java/io/bisq/seednode/SeedNode.java
index cdcfaf2b84..8d808238e6 100644
--- a/seednode/src/main/java/io/bisq/seednode/SeedNode.java
+++ b/seednode/src/main/java/io/bisq/seednode/SeedNode.java
@@ -4,7 +4,7 @@ import ch.qos.logback.classic.Level;
import com.google.inject.Guice;
import com.google.inject.Injector;
import io.bisq.app.AppOptionKeys;
-import io.bisq.app.BitsquareEnvironment;
+import io.bisq.app.BisqEnvironment;
import io.bisq.app.Log;
import io.bisq.app.Version;
import io.bisq.arbitration.ArbitratorManager;
@@ -45,7 +45,7 @@ public class SeedNode {
}
public SeedNode() {
- String logPath = Paths.get(env.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
+ String logPath = Paths.get(env.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bisq").toString();
Log.setup(logPath);
log.info("Log files under: " + logPath);
Version.printVersion();
@@ -80,7 +80,7 @@ public class SeedNode {
seedNodeModule = new SeedNodeModule(env);
injector = Guice.createInjector(seedNodeModule);
- Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
+ Version.setBtcNetworkId(injector.getInstance(BisqEnvironment.class).getBitcoinNetwork().ordinal());
p2pService = injector.getInstance(P2PService.class);
p2pService.start(new BootstrapListener() {
@Override
diff --git a/seednode/src/main/java/io/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/io/bisq/seednode/SeedNodeMain.java
index 3faf89803c..1ce41204e1 100644
--- a/seednode/src/main/java/io/bisq/seednode/SeedNodeMain.java
+++ b/seednode/src/main/java/io/bisq/seednode/SeedNodeMain.java
@@ -19,8 +19,8 @@ package io.bisq.seednode;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.bisq.app.AppOptionKeys;
-import io.bisq.app.BitsquareEnvironment;
-import io.bisq.app.BitsquareExecutable;
+import io.bisq.app.BisqEnvironment;
+import io.bisq.app.BisqExecutable;
import io.bisq.common.UserThread;
import io.bisq.common.util.Profiler;
import io.bisq.common.util.RestartUtil;
@@ -36,10 +36,10 @@ import java.io.IOException;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
-import static io.bisq.app.BitsquareEnvironment.DEFAULT_APP_NAME;
-import static io.bisq.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
+import static io.bisq.app.BisqEnvironment.DEFAULT_APP_NAME;
+import static io.bisq.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
-public class SeedNodeMain extends BitsquareExecutable {
+public class SeedNodeMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(SeedNodeMain.class);
private static long MAX_MEMORY_MB_DEFAULT = 500;
private static final long CHECK_MEMORY_PERIOD_SEC = 5 * 60;
@@ -56,7 +56,7 @@ public class SeedNodeMain extends BitsquareExecutable {
// We don't want to do the full argument parsing here as that might easily change in update versions
// So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
- BitsquareEnvironment.setDefaultAppName("Bitsquare_seednode");
+ BisqEnvironment.setDefaultAppName("bisq_seednode");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
@@ -74,10 +74,10 @@ public class SeedNodeMain extends BitsquareExecutable {
System.exit(EXIT_FAILURE);
return;
}
- BitsquareEnvironment bitsquareEnvironment = getBitsquareEnvironment(options);
+ BisqEnvironment bisqEnvironment = getBisqEnvironment(options);
- // need to call that before BitsquareAppMain().execute(args)
- BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY));
+ // need to call that before BisqAppMain().execute(args)
+ BisqExecutable.initAppDir(bisqEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY));
// For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
// In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:
@@ -88,7 +88,7 @@ public class SeedNodeMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
- final BitsquareEnvironment environment = getBitsquareEnvironment(options);
+ final BisqEnvironment environment = getBisqEnvironment(options);
SeedNode.setEnvironment(environment);
UserThread.execute(() -> seedNode = new SeedNode());
@@ -151,7 +151,7 @@ public class SeedNodeMain extends BitsquareExecutable {
}
}
- private void restart(BitsquareEnvironment environment) {
+ private void restart(BisqEnvironment environment) {
stopped = true;
seedNode.gracefulShutDown(() -> {
try {
diff --git a/seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java b/seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
index 24f6cfe03d..b2a7509382 100644
--- a/seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
+++ b/seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
@@ -20,7 +20,7 @@ package io.bisq.seednode;
import com.google.inject.Singleton;
import io.bisq.alert.AlertModule;
import io.bisq.app.AppModule;
-import io.bisq.app.BitsquareEnvironment;
+import io.bisq.app.BisqEnvironment;
import io.bisq.arbitration.ArbitratorModule;
import io.bisq.btc.BitcoinModule;
import io.bisq.common.Clock;
@@ -64,7 +64,7 @@ class SeedNodeModule extends AppModule {
File keyStorageDir = new File(env.getRequiredProperty(KeyStorage.DIR_KEY));
bind(File.class).annotatedWith(named(KeyStorage.DIR_KEY)).toInstance(keyStorageDir);
- bind(BitsquareEnvironment.class).toInstance((BitsquareEnvironment) env);
+ bind(BisqEnvironment.class).toInstance((BisqEnvironment) env);
// ordering is used for shut down sequence
install(tradeModule());
diff --git a/seednode/src/main/resources/logback.xml b/seednode/src/main/resources/logback.xml
index c6ad1b5f7e..cb9e126daa 100644
--- a/seednode/src/main/resources/logback.xml
+++ b/seednode/src/main/resources/logback.xml
@@ -30,21 +30,21 @@
-
+
+ -->
-
+
diff --git a/statistics/pom.xml b/statistics/pom.xml
index 35c9a37a39..4ece3c9b3a 100644
--- a/statistics/pom.xml
+++ b/statistics/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
parent
- io.bitsquare
+ io.bisq
0.5.0.0
4.0.0
@@ -77,7 +77,7 @@
- io.bitsquare
+ io.bisq
core
${project.parent.version}
diff --git a/statistics/src/main/java/io/bisq/statistics/Statistics.java b/statistics/src/main/java/io/bisq/statistics/Statistics.java
index 72a6c83319..ee6dfbca80 100644
--- a/statistics/src/main/java/io/bisq/statistics/Statistics.java
+++ b/statistics/src/main/java/io/bisq/statistics/Statistics.java
@@ -4,7 +4,7 @@ import ch.qos.logback.classic.Level;
import com.google.inject.Guice;
import com.google.inject.Injector;
import io.bisq.app.AppOptionKeys;
-import io.bisq.app.BitsquareEnvironment;
+import io.bisq.app.BisqEnvironment;
import io.bisq.app.Log;
import io.bisq.app.Version;
import io.bisq.arbitration.ArbitratorManager;
@@ -50,7 +50,7 @@ public class Statistics {
}
public Statistics() {
- String logPath = Paths.get(env.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bitsquare").toString();
+ String logPath = Paths.get(env.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bisq").toString();
Log.setup(logPath);
log.info("Log files under: " + logPath);
Version.printVersion();
@@ -85,7 +85,7 @@ public class Statistics {
statisticsModule = new StatisticsModule(env);
injector = Guice.createInjector(statisticsModule);
- Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
+ Version.setBtcNetworkId(injector.getInstance(BisqEnvironment.class).getBitcoinNetwork().ordinal());
p2pService = injector.getInstance(P2PService.class);
p2pService.start(new BootstrapListener() {
@Override
diff --git a/statistics/src/main/java/io/bisq/statistics/StatisticsMain.java b/statistics/src/main/java/io/bisq/statistics/StatisticsMain.java
index f05b9e190a..b885eb4bee 100644
--- a/statistics/src/main/java/io/bisq/statistics/StatisticsMain.java
+++ b/statistics/src/main/java/io/bisq/statistics/StatisticsMain.java
@@ -19,8 +19,8 @@ package io.bisq.statistics;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.bisq.app.AppOptionKeys;
-import io.bisq.app.BitsquareEnvironment;
-import io.bisq.app.BitsquareExecutable;
+import io.bisq.app.BisqEnvironment;
+import io.bisq.app.BisqExecutable;
import io.bisq.common.UserThread;
import io.bisq.common.util.Profiler;
import io.bisq.common.util.RestartUtil;
@@ -36,10 +36,10 @@ import java.io.IOException;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
-import static io.bisq.app.BitsquareEnvironment.DEFAULT_APP_NAME;
-import static io.bisq.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR;
+import static io.bisq.app.BisqEnvironment.DEFAULT_APP_NAME;
+import static io.bisq.app.BisqEnvironment.DEFAULT_USER_DATA_DIR;
-public class StatisticsMain extends BitsquareExecutable {
+public class StatisticsMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(StatisticsMain.class);
private static long MAX_MEMORY_MB_DEFAULT = 400;
private static final long CHECK_MEMORY_PERIOD_SEC = 3 * 60;
@@ -56,7 +56,7 @@ public class StatisticsMain extends BitsquareExecutable {
// We don't want to do the full argument parsing here as that might easily change in update versions
// So we only handle the absolute minimum which is APP_NAME, APP_DATA_DIR_KEY and USER_DATA_DIR
- BitsquareEnvironment.setDefaultAppName("Bitsquare_statistics");
+ BisqEnvironment.setDefaultAppName("bisq_statistics");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
@@ -74,10 +74,10 @@ public class StatisticsMain extends BitsquareExecutable {
System.exit(EXIT_FAILURE);
return;
}
- BitsquareEnvironment bitsquareEnvironment = getBitsquareEnvironment(options);
+ BisqEnvironment bisqEnvironment = getBisqEnvironment(options);
- // need to call that before BitsquareAppMain().execute(args)
- BitsquareExecutable.initAppDir(bitsquareEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY));
+ // need to call that before BisqAppMain().execute(args)
+ BisqExecutable.initAppDir(bisqEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY));
// For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
// In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:
@@ -88,7 +88,7 @@ public class StatisticsMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
- final BitsquareEnvironment environment = getBitsquareEnvironment(options);
+ final BisqEnvironment environment = getBisqEnvironment(options);
Statistics.setEnvironment(environment);
UserThread.execute(() -> statistics = new Statistics());
@@ -156,7 +156,7 @@ public class StatisticsMain extends BitsquareExecutable {
}
}
- private void restart(BitsquareEnvironment environment) {
+ private void restart(BisqEnvironment environment) {
stopped = true;
statistics.gracefulShutDown(() -> {
try {
diff --git a/statistics/src/main/java/io/bisq/statistics/StatisticsModule.java b/statistics/src/main/java/io/bisq/statistics/StatisticsModule.java
index 711c39dfc2..d8d61bf497 100644
--- a/statistics/src/main/java/io/bisq/statistics/StatisticsModule.java
+++ b/statistics/src/main/java/io/bisq/statistics/StatisticsModule.java
@@ -20,7 +20,7 @@ package io.bisq.statistics;
import com.google.inject.Singleton;
import io.bisq.alert.AlertModule;
import io.bisq.app.AppModule;
-import io.bisq.app.BitsquareEnvironment;
+import io.bisq.app.BisqEnvironment;
import io.bisq.arbitration.ArbitratorModule;
import io.bisq.btc.BitcoinModule;
import io.bisq.common.Clock;
@@ -64,7 +64,7 @@ class StatisticsModule extends AppModule {
File keyStorageDir = new File(env.getRequiredProperty(KeyStorage.DIR_KEY));
bind(File.class).annotatedWith(named(KeyStorage.DIR_KEY)).toInstance(keyStorageDir);
- bind(BitsquareEnvironment.class).toInstance((BitsquareEnvironment) env);
+ bind(BisqEnvironment.class).toInstance((BisqEnvironment) env);
// ordering is used for shut down sequence
install(tradeModule());
diff --git a/statistics/src/main/resources/logback.xml b/statistics/src/main/resources/logback.xml
index c6ad1b5f7e..cb9e126daa 100644
--- a/statistics/src/main/resources/logback.xml
+++ b/statistics/src/main/resources/logback.xml
@@ -30,21 +30,21 @@
-
+
+ -->
-
+
+
What is bisq?
@@ -12,19 +12,19 @@ There are no central points of control or failure in the bisq network. There are
Because the national currency portion of any trade must be transferred via traditional means such as a wire transfer, bisq incorporates first-class support for human arbitration to resolve any errors or disputes.
-You can read about all of this and more in the [whitepaper](https://bitsquare.io/bitsquare.pdf) and [arbitration](https://bitsquare.io/arbitration_system.pdf) documents. Several [videos](https://bitsquare.io/blog/category/video) are available as well.
+You can read about all of this and more in the [whitepaper](https://bisq.io/bisq.pdf) and [arbitration](https://bisq.io/arbitration_system.pdf) documents. Several [videos](https://bisq.io/blog/category/video) are available as well.
Status
------
bisq has released the beta version on the 27th of April 2016 after 3 months testing on mainnet.
-For the latest version checkout our [releases page](https://github.com/bitsquare/bitsquare/releases) at Github.
+For the latest version checkout our [releases page](https://github.com/bisq/bisq/releases) at Github.
Building from source
--------------------
See [doc/build.md](doc/build.md).
-[AUR for Arch Linux](https://aur.archlinux.org/packages/bitsquare-git)
+[AUR for Arch Linux](https://aur.archlinux.org/packages/bisq-git)
Staying in Touch
@@ -32,13 +32,13 @@ Staying in Touch
Contact the team and keep up to date using any of the following:
- - The [bisq Website](https://bitsquare.io)
- - GitHub [Issues](https://github.com/bitsquare/bitsquare/issues)
- - The [bisq Forum]( https://forum.bitsquare.io)
- - The [#bitsquare](https://webchat.freenode.net/?channels=bitsquare) IRC channel on Freenode ([logs](https://botbot.me/freenode/bitsquare))
- - Our [mailing list](https://groups.google.com/forum/#!forum/bitsquare)
- - [@bitsquare_](https://twitter.com/bitsquare_) on Twitter
- - Get in [contact](https://bitsquare.io/contact/) with us
+ - The [bisq Website](https://bisq.io)
+ - GitHub [Issues](https://github.com/bisq/bisq/issues)
+ - The [bisq Forum]( https://forum.bisq.io)
+ - The [#bisq](https://webchat.freenode.net/?channels=bisq) IRC channel on Freenode ([logs](https://botbot.me/freenode/bisq))
+ - Our [mailing list](https://groups.google.com/forum/#!forum/bisq)
+ - [@bisq_](https://twitter.com/bisq_) on Twitter
+ - Get in [contact](https://bisq.io/contact/) with us
License
diff --git a/_deactivated_.travis.yml b/_deactivated_.travis.yml
index 153a968f49..0d82b3d0e5 100644
--- a/_deactivated_.travis.yml
+++ b/_deactivated_.travis.yml
@@ -9,7 +9,7 @@ install:
notifications:
irc:
- channels: chat.freenode.net#bitsquare
+ channels: chat.freenode.net#bisq
template:
- '%{message} (%{repository}#%{build_number}, %{duration})'
- '%{repository}/%{branch} %{commit} %{author}: %{commit_message}'
diff --git a/common/pom.xml b/common/pom.xml
index 53d889fc3f..cce4bbca73 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">