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

Rebranding: replace bitsquare with bisq

Browse source
This commit is contained in:
Manfred Karrer 2017-03-12 16:00:40 -05:00
parent 0435c88717
commit 3b557463da
182 changed files with 616 additions and 618 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -4,7 +4,7 @@
/out
**/target
.idea
!.idea/copyright/Bitsquare_Affero_GPLv3.xml
!.idea/copyright/bisq_Affero_GPLv3.xml
!.idea/copyright/profiles_settings.xml
!.idea/codeStyleSettings.xml
*.iml

22
README.md
View file

@ -1,4 +1,4 @@
<img src="https://bitsquare.io/images/logo.png" width="240"/>
<img src="https://bisq.io/images/logo.png" width="240"/>
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

2
_deactivated_.travis.yml
View file

@ -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}'

2
common/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bisq/common/crypto/PubKeyRing.java
View file

@ -20,7 +20,7 @@ package io.bisq.common.crypto;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
common/src/main/java/io/bisq/common/crypto/SealedAndSigned.java
View file

@ -20,7 +20,7 @@ package io.bisq.common.crypto;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
common/src/main/java/io/bisq/common/util/ProtoBufferUtils.java
View file

@ -1,7 +1,7 @@
package io.bisq.common.util;
import io.bisq.app.Version;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
/**
* Created by mike on 07/02/2017.

3
common/src/main/java/io/bisq/io/LookAheadObjectInputStream.java
View file

@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import java.io.*;
import java.util.regex.Pattern;
//TODO remove once protobuffer is applied everywhere
/**
* Based on https://github.com/ikkisoft/SerialKiller but we removed the support for a config file as
* that introduced many dependencies (like the vulnerable commons collections).
@ -34,7 +35,7 @@ public class LookAheadObjectInputStream extends ObjectInputStream {
// based filter gives us sufficient security.
// This white list is not sufficient for the objects used for local persistence! We don't use any white list for those.
private static final Pattern[] whiteListP2PNetwork = {
Pattern.compile("io\\.bitsquare\\..*$"),
Pattern.compile("io\\.bisq\\..*$"),
Pattern.compile("org\\.bitcoinj\\..*$"),
Pattern.compile("java\\.lang\\.Boolean$"),

2
common/src/main/java/io/bisq/messages/Message.java
View file

@ -1,6 +1,6 @@
package io.bisq.messages;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import java.io.Serializable;

4
common/src/main/proto/bsmessage.proto
View file

@ -1,11 +1,11 @@
syntax = "proto3";
package io.bitsquare.proto;
package io.bisq.proto;
//
// A simple protocol for describing signed sets of IP addresses. Intended to be distributed via HTTP[S] or in files.
//
option java_package = "io.bitsquare.common.wire.proto";
option java_package = "io.bisq.common.wire.proto";
option java_outer_classname = "Messages";
message Envelope {

24
common/src/main/resources/logback.xml
View file

@ -12,27 +12,27 @@
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
<logger name="io.bisq.locale.BSResources" level="ERROR"/>
<!-- <logger name="io.bitsquare.p2p.peers.PeerGroup" level="TRACE"/>
<!-- <logger name="io.bisq.p2p.peers.PeerGroup" level="TRACE"/>
<logger name="io.bitsquare.p2p.P2PService" level="TRACE"/>
<logger name="io.bitsquare.p2p.storage.ProtectedExpirableDataStorage" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.LocalhostNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.NetworkNode" level="TRACE"/>-->
<logger name="io.bisq.p2p.P2PService" level="TRACE"/>
<logger name="io.bisq.p2p.storage.ProtectedExpirableDataStorage" level="TRACE"/>
<logger name="io.bisq.p2p.network.LocalhostNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.NetworkNode" level="TRACE"/>-->
<!-- <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="WARN"/>
<logger name="io.bitsquare.btc.AddressBasedCoinSelector" level="WARN"/>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bisq.btc.AddressBasedCoinSelector" level="WARN"/>
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
<logger name="io.bitsquare.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bisq.gui.util.Profiler" level="ERROR"/>
<logger name="io.bisq.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="org.bitcoinj" level="WARN"/>

1
common/src/test/java/io/bisq/common/wire/proto/ProtoBufferTest.java
View file

@ -1,6 +1,5 @@
package io.bisq.common.wire.proto;
import io.bitsquare.common.wire.proto.Messages;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;

6
core/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
@ -13,12 +13,12 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>network</artifactId>
<version>${project.parent.version}</version>
</dependency>

20
core/src/main/java/io/bisq/app/BitsquareExecutable.java → core/src/main/java/io/bisq/app/BisqExecutable.java
View file

@ -17,7 +17,7 @@
package io.bisq.app;
import io.bisq.BitsquareException;
import io.bisq.BisqException;
import io.bisq.btc.RegTestHost;
import io.bisq.common.CommonOptionKeys;
import io.bisq.messages.btc.BitcoinNetwork;
@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
import static java.lang.String.join;
public abstract class BitsquareExecutable {
public abstract class BisqExecutable {
private static final int EXIT_SUCCESS = 0;
public static final int EXIT_FAILURE = 1;
private static final String HELP_KEY = "help";
@ -73,7 +73,7 @@ public abstract class BitsquareExecutable {
protected void customizeOptionParsing(OptionParser parser) {
parser.accepts(CommonOptionKeys.LOG_LEVEL_KEY,
description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", BitsquareEnvironment.LOG_LEVEL_DEFAULT))
description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", BisqEnvironment.LOG_LEVEL_DEFAULT))
.withRequiredArg();
parser.accepts(NetworkOptionKeys.SEED_NODES_KEY,
@ -110,16 +110,16 @@ public abstract class BitsquareExecutable {
.withRequiredArg();
parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY,
description("User data directory", BitsquareEnvironment.DEFAULT_USER_DATA_DIR))
description("User data directory", BisqEnvironment.DEFAULT_USER_DATA_DIR))
.withRequiredArg();
parser.accepts(AppOptionKeys.APP_NAME_KEY,
description("Application name", BitsquareEnvironment.DEFAULT_APP_NAME))
description("Application name", BisqEnvironment.DEFAULT_APP_NAME))
.withRequiredArg();
parser.accepts(AppOptionKeys.MAX_MEMORY,
description("Max. permitted memory (used only at headless versions)", 600))
.withRequiredArg();
parser.accepts(AppOptionKeys.APP_DATA_DIR_KEY,
description("Application data directory", BitsquareEnvironment.DEFAULT_APP_DATA_DIR))
description("Application data directory", BisqEnvironment.DEFAULT_APP_DATA_DIR))
.withRequiredArg();
parser.accepts(AppOptionKeys.IGNORE_DEV_MSG_KEY,
description("If set to true all signed messages from bisq developers are ignored " +
@ -168,8 +168,8 @@ public abstract class BitsquareExecutable {
.withRequiredArg();
}
public static BitsquareEnvironment getBitsquareEnvironment(OptionSet options) {
return new BitsquareEnvironment(new JOptCommandLinePropertySource(BitsquareEnvironment.BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(options)));
public static BisqEnvironment getBisqEnvironment(OptionSet options) {
return new BisqEnvironment(new JOptCommandLinePropertySource(BisqEnvironment.BISQ_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(options)));
}
protected static String description(String descText, Object defaultValue) {
@ -188,14 +188,14 @@ public abstract class BitsquareExecutable {
Path dir = Paths.get(appDir);
if (Files.exists(dir)) {
if (!Files.isWritable(dir))
throw new BitsquareException("Application data directory '%s' is not writeable", dir);
throw new BisqException("Application data directory '%s' is not writeable", dir);
else
return;
}
try {
Files.createDirectories(dir);
} catch (IOException ex) {
throw new BitsquareException(ex, "Application data directory '%s' could not be created", dir);
throw new BisqException(ex, "Application data directory '%s' could not be created", dir);
}
}
}

2
core/src/main/java/io/bisq/btc/wallet/BitsquareDefaultCoinSelector.java → core/src/main/java/io/bisq/btc/wallet/BisqDefaultCoinSelector.java
View file

@ -36,7 +36,7 @@ import java.util.List;
* possible. This means that the transaction is the most likely to get confirmed. Note that this means we may end up
* "spending" more priority than would be required to get the transaction we are creating confirmed.
*/
public abstract class BitsquareDefaultCoinSelector implements CoinSelector {
public abstract class BisqDefaultCoinSelector implements CoinSelector {
@Override
public CoinSelection select(Coin target, List<TransactionOutput> candidates) {
ArrayList<TransactionOutput> selected = new ArrayList<>();

4
core/src/main/java/io/bisq/btc/wallet/BitsquareKeyChainFactory.java → core/src/main/java/io/bisq/btc/wallet/BisqKeyChainFactory.java
View file

@ -28,10 +28,10 @@ import org.bitcoinj.wallet.DeterministicSeed;
import org.bitcoinj.wallet.KeyChainFactory;
import org.bitcoinj.wallet.Protos;
class BitsquareKeyChainFactory implements KeyChainFactory {
class BisqKeyChainFactory implements KeyChainFactory {
private final boolean useBitcoinDeterministicKeyChain;
public BitsquareKeyChainFactory(boolean useBitcoinDeterministicKeyChain) {
public BisqKeyChainFactory(boolean useBitcoinDeterministicKeyChain) {
this.useBitcoinDeterministicKeyChain = useBitcoinDeterministicKeyChain;
}

6
core/src/main/java/io/bisq/btc/wallet/BitsquareKeyChainGroup.java → core/src/main/java/io/bisq/btc/wallet/BisqKeyChainGroup.java
View file

@ -23,7 +23,7 @@ import org.bitcoinj.wallet.KeyChainGroup;
import java.security.SecureRandom;
class BitsquareKeyChainGroup extends KeyChainGroup {
class BisqKeyChainGroup extends KeyChainGroup {
private final boolean useBitcoinDeterministicKeyChain;
private int lookaheadSize;
@ -31,13 +31,13 @@ class BitsquareKeyChainGroup extends KeyChainGroup {
return useBitcoinDeterministicKeyChain;
}
public BitsquareKeyChainGroup(NetworkParameters params, boolean useBitcoinDeterministicKeyChain, int lookaheadSize) {
public BisqKeyChainGroup(NetworkParameters params, boolean useBitcoinDeterministicKeyChain, int lookaheadSize) {
super(params);
this.useBitcoinDeterministicKeyChain = useBitcoinDeterministicKeyChain;
this.lookaheadSize = lookaheadSize;
}
public BitsquareKeyChainGroup(NetworkParameters params, DeterministicKeyChain chain, boolean useBitcoinDeterministicKeyChain, int lookaheadSize) {
public BisqKeyChainGroup(NetworkParameters params, DeterministicKeyChain chain, boolean useBitcoinDeterministicKeyChain, int lookaheadSize) {
super(params, chain);
this.useBitcoinDeterministicKeyChain = useBitcoinDeterministicKeyChain;

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

@ -35,7 +35,7 @@ import java.util.Set;
* We use a specialized version of the CoinSelector based on the DefaultCoinSelector implementation.
* We lookup for spendable outputs which matches our address of our address.
*/
class BsqCoinSelector extends BitsquareDefaultCoinSelector {
class BsqCoinSelector extends BisqDefaultCoinSelector {
private static final Logger log = LoggerFactory.getLogger(BsqCoinSelector.class);
private final boolean permitForeignPendingTx;

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

@ -29,7 +29,7 @@ import java.util.Set;
* We use a specialized version of the CoinSelector based on the DefaultCoinSelector implementation.
* We lookup for spendable outputs which matches any of our addresses.
*/
class BtcCoinSelector extends BitsquareDefaultCoinSelector {
class BtcCoinSelector extends BisqDefaultCoinSelector {
private static final Logger log = LoggerFactory.getLogger(BtcCoinSelector.class);
private NetworkParameters params;

22
core/src/main/java/io/bisq/btc/wallet/WalletConfig.java
View file

@ -65,7 +65,7 @@ public class WalletConfig extends AbstractIdleService {
// WalletFactory
///////////////////////////////////////////////////////////////////////////////////////////
public interface BitsquareWalletFactory extends WalletProtobufSerializer.WalletFactory {
public interface BisqWalletFactory extends WalletProtobufSerializer.WalletFactory {
Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup);
Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup, boolean isBsqWallet);
@ -82,7 +82,7 @@ public class WalletConfig extends AbstractIdleService {
private final String btcWalletFilePrefix;
private final String bsqWalletFilePrefix;
private final Socks5Proxy socks5Proxy;
private final BitsquareWalletFactory walletFactory;
private final BisqWalletFactory walletFactory;
private volatile Wallet vBtcWallet;
private volatile Wallet vBsqWallet;
@ -125,7 +125,7 @@ public class WalletConfig extends AbstractIdleService {
this.bsqWalletFilePrefix = bsqWalletFilePrefix;
this.socks5Proxy = socks5Proxy;
walletFactory = new BitsquareWalletFactory() {
walletFactory = new BisqWalletFactory() {
@Override
public Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup) {
// This is called when we load an existing wallet
@ -387,19 +387,19 @@ public class WalletConfig extends AbstractIdleService {
// BTC wallet
vBtcWalletFile = new File(directory, btcWalletFilePrefix + ".wallet");
boolean shouldReplayWallet = (vBtcWalletFile.exists() && !chainFileExists) || seed != null;
BitsquareKeyChainGroup keyChainGroup;
BisqKeyChainGroup keyChainGroup;
if (seed != null)
keyChainGroup = new BitsquareKeyChainGroup(params, new BtcDeterministicKeyChain(seed), true, btcWalletLookaheadSize);
keyChainGroup = new BisqKeyChainGroup(params, new BtcDeterministicKeyChain(seed), true, btcWalletLookaheadSize);
else
keyChainGroup = new BitsquareKeyChainGroup(params, true, btcWalletLookaheadSize);
keyChainGroup = new BisqKeyChainGroup(params, true, btcWalletLookaheadSize);
vBtcWallet = createOrLoadWallet(vBtcWalletFile, shouldReplayWallet, seed, keyChainGroup, false);
// BSQ walelt
vBsqWalletFile = new File(directory, bsqWalletFilePrefix + ".wallet");
if (seed != null)
keyChainGroup = new BitsquareKeyChainGroup(params, new BsqDeterministicKeyChain(seed), false, bsqWalletLookaheadSize);
keyChainGroup = new BisqKeyChainGroup(params, new BsqDeterministicKeyChain(seed), false, bsqWalletLookaheadSize);
else
keyChainGroup = new BitsquareKeyChainGroup(params, new BsqDeterministicKeyChain(vBtcWallet.getKeyChainSeed()), false, bsqWalletLookaheadSize);
keyChainGroup = new BisqKeyChainGroup(params, new BsqDeterministicKeyChain(vBtcWallet.getKeyChainSeed()), false, bsqWalletLookaheadSize);
vBsqWallet = createOrLoadWallet(vBsqWalletFile, shouldReplayWallet, seed, keyChainGroup, true);
// Initiate Bitcoin network objects (block store, blockchain and peer group)
@ -493,7 +493,7 @@ public class WalletConfig extends AbstractIdleService {
}
private Wallet createOrLoadWallet(File walletFile, boolean shouldReplayWallet, @Nullable DeterministicSeed seed,
BitsquareKeyChainGroup keyChainGroup, boolean isBsqWallet)
BisqKeyChainGroup keyChainGroup, boolean isBsqWallet)
throws Exception {
Wallet wallet;
@ -526,7 +526,7 @@ public class WalletConfig extends AbstractIdleService {
else
serializer = new WalletProtobufSerializer();
serializer.setKeyChainFactory(new BitsquareKeyChainFactory(useBitcoinDeterministicKeyChain));
serializer.setKeyChainFactory(new BisqKeyChainFactory(useBitcoinDeterministicKeyChain));
wallet = serializer.readWallet(params, extArray, proto);
if (shouldReplayWallet)
wallet.reset();
@ -536,7 +536,7 @@ public class WalletConfig extends AbstractIdleService {
return wallet;
}
private Wallet createWallet(BitsquareKeyChainGroup keyChainGroup, boolean isBsqWallet) {
private Wallet createWallet(BisqKeyChainGroup keyChainGroup, boolean isBsqWallet) {
checkNotNull(walletFactory, "walletFactory must not be null");
return walletFactory.create(params, keyChainGroup, isBsqWallet);
}

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

@ -64,7 +64,7 @@ public abstract class WalletService {
protected final Preferences preferences;
protected final FeeService feeService;
protected final NetworkParameters params;
protected final WalletEventListener walletEventListener = new BitsquareWalletEventListener();
protected final WalletEventListener walletEventListener = new BisqWalletEventListener();
protected final CopyOnWriteArraySet<AddressConfidenceListener> addressConfidenceListeners = new CopyOnWriteArraySet<>();
protected final CopyOnWriteArraySet<TxConfidenceListener> txConfidenceListeners = new CopyOnWriteArraySet<>();
protected final CopyOnWriteArraySet<BalanceListener> balanceListeners = new CopyOnWriteArraySet<>();
@ -565,10 +565,10 @@ public abstract class WalletService {
///////////////////////////////////////////////////////////////////////////////////////////
// BitsquareWalletEventListener
// bisqWalletEventListener
///////////////////////////////////////////////////////////////////////////////////////////
public class BitsquareWalletEventListener extends AbstractWalletEventListener {
public class BisqWalletEventListener extends AbstractWalletEventListener {
@Override
public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
notifyBalanceListeners(tx);

4
core/src/main/java/io/bisq/btc/wallet/WalletsSetup.java
View file

@ -80,8 +80,8 @@ public class WalletsSetup {
private final NetworkParameters params;
private final File walletDir;
private final int socks5DiscoverMode;
private final String walletFileName = "Bitsquare_BTC";
private final String bsqWalletFileName = "Bitsquare_BSQ";
private final String walletFileName = "bisq_BTC";
private final String bsqWalletFileName = "bisq_BSQ";
private final Long bloomFilterTweak;
private final Storage<Long> storage;
private final IntegerProperty numPeers = new SimpleIntegerProperty(0);

2
core/src/main/java/io/bisq/filter/FilterManager.java
View file

@ -22,13 +22,13 @@ import com.google.inject.name.Named;
import io.bisq.app.AppOptionKeys;
import io.bisq.app.DevEnv;
import io.bisq.common.crypto.KeyRing;
import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.filter.payload.Filter;
import io.bisq.messages.filter.payload.PaymentAccountFilter;
import io.bisq.p2p.P2PService;
import io.bisq.p2p.storage.HashMapChangedListener;
import io.bisq.p2p.storage.storageentry.ProtectedStorageEntry;
import io.bisq.user.User;
import io.bitsquare.common.wire.proto.Messages;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.SimpleObjectProperty;

4
core/src/main/resources/bitsquare.policy → core/src/main/resources/bisq.policy
View file

@ -45,7 +45,7 @@ grant {
permission "java.util.PropertyPermission" "priceFeedProviders", "read";
permission "java.util.PropertyPermission" "maxMemory", "read";
/* Why ??? no permission exceptions, no dependency in bitsquare nor in bitcoinj. Local problem? */
/* Why ??? no permission exceptions, no dependency in bisq nor in bitcoinj. Local problem? */
permission "java.util.PropertyPermission" "com.google.appengine.runtime.environment", "read";
permission "java.lang.RuntimePermission" "accessDeclaredMembers";
@ -103,7 +103,7 @@ grant {
/* only for dev
permission "java.io.FilePermission" "${user.home}${/}.m2${/}-", "read";
permission "java.io.FilePermission" "/Users/me/dev/bitcoin_projects/bitsquare/-", "read";
permission "java.io.FilePermission" "/Users/me/dev/bitcoin_projects/bisq/-", "read";
permission "java.lang.reflect.ReflectPermission" "suppressAccessChecks";
*/

0
core/src/main/resources/bitsquare.properties → core/src/main/resources/bisq.properties
View file

10
core/src/main/resources/logback.xml
View file

@ -10,14 +10,14 @@
<appender-ref ref="CONSOLE_APPENDER"/>
</root>
<logger name="io.bitsquare" level="TRACE"/>
<logger name="io.bisq" level="TRACE"/>
<logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="WARN"/>
<logger name="io.bitsquare.btc.AddressBasedCoinSelector" level="OFF"/>
<logger name="io.bisq.btc.AddressBasedCoinSelector" level="OFF"/>
<logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
<logger name="io.bisq.gui.util.Profiler" level="ERROR"/>
<logger name="io.bisq.locale.Res" level="ERROR"/>
<logger name="io.bitsquare.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bisq.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="org.bitcoinj" level="WARN"/>
@ -35,7 +35,7 @@
<!-- <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
<logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
<logger name="org.bitcoinj.wallet.DeterministicKeyChain" level="WARN"/>-->
<!-- <logger name="io.bitsquare.btc.WalletService" level="WARN"/>-->
<!-- <logger name="io.bisq.btc.WalletService" level="WARN"/>-->
<!--
<logger name="org.bitcoinj.core.Wallet" level="OFF"/>

2
doc/bitsquare-sn.cron.sh → doc/bisq-sn.cron.sh
View file

@ -10,7 +10,7 @@
# Author: Ivan Vilata-i-Balaguer <ivan@selidor.net>
MAX_RSS_MiB=400
PIDDIR=/var/run/bitsquare-sn
PIDDIR=/var/run/bisq-sn
INITDIR=/etc/init.d
# Restart de daemon with the given address.

6
doc/bitsquare-sn.init.sh → doc/bisq-sn.init.sh
View file

@ -4,7 +4,7 @@ if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
fi
### BEGIN INIT INFO
# Provides: bitsquare-sn
# Provides: bisq-sn
# Required-Start: $local_fs $remote_fs $named $network $time
# Required-Stop: $local_fs $remote_fs $named $network $time
# Default-Start: 2 3 4 5
@ -36,10 +36,10 @@ SN_USER=bsqsn
# Using a name different than the daemon's base name
# causes problems when stopping the process.
#NAME="bitsquare-sn"
#NAME="bisq-sn"
DESC="bisq seed node $SN_ADDRESS"
START_ARGS="--chuid $SN_USER --background --make-pidfile"
PIDFILE="/var/run/bitsquare-sn/$SN_ADDRESS.pid"
PIDFILE="/var/run/bisq-sn/$SN_ADDRESS.pid"
DAEMON=/usr/bin/java
DAEMON_ARGS="-jar $SN_JAR $SN_ADDRESS $SN_NETWORK_ID $SN_MAX_CONNECTIONS"

0
doc/bitsquare.conf → doc/bisq.conf
View file

30
doc/build.md
View file

@ -3,7 +3,7 @@
This guide will walk you through the process of building bisq from source.
> _**NOTE:** For most users, building from source is not necessary. See the [releases page](https://github.com/bitsquare/bitsquare/releases), where you'll find installers for Windows, Linux and Mac OS X._
> _**NOTE:** For most users, building from source is not necessary. See the [releases page](https://github.com/bisq/bisq/releases), where you'll find installers for Windows, Linux and Mac OS X._
There is an install script (2 parts) for setup (JDK, git, maven, Bitcoinj, bisq) on Linux in that directory (install_on_unix.sh, install_on_unix_fin.sh).
@ -92,20 +92,20 @@ Build bitcoinj and btcd-cli4j fork
> _**NOTE:**
Bitcoinj versions later than 0.13.1 has removed support for Java serialisation.
Version 0.13.1 is also missing support for Java serialisation in MainNetParams (HttpDiscovery.Details).
We removed usage of Cartographer/HttpDiscovery in our [fork of version 0.13.1.7](https://github.com/bitsquare/bitcoinj/tree/FixBloomFilters).
We removed usage of Cartographer/HttpDiscovery in our [fork of version 0.13.1.7](https://github.com/bisq/bitcoinj/tree/FixBloomFilters).
Beside the Java serialisation issues there are [privacy concerns](http://bitcoin-development.narkive.com/hczWIAby/bitcoin-development-cartographer#post3) regarding Cartographer.
Here is a Github issue with background and open tasks regarding [Bloom Filters](https://github.com/bitsquare/bitsquare/issues/414)._ Note: use a fresh directory, this should not be done inside the bitsquare folder.
Here is a Github issue with background and open tasks regarding [Bloom Filters](https://github.com/bisq/bisq/issues/414)._ Note: use a fresh directory, this should not be done inside the bisq folder.
Btcd-cli4j is used for RPC communication to a local Bitcoin Core node.
TODO: remove if not used in production
$ cd ..
$ git clone -b FixBloomFilters https://github.com/bitsquare/bitcoinj.git
$ git clone -b FixBloomFilters https://github.com/bisq/bitcoinj.git
$ cd bitcoinj
$ mvn clean install -DskipTests -Dmaven.javadoc.skip=true
$ cd ..
$ git clone https://github.com/bitsquare/btcd-cli4j.git
$ git clone https://github.com/bisq/btcd-cli4j.git
$ cd btcd-cli4j
$ mvn clean install -DskipTests -Dmaven.javadoc.skip=true
@ -117,8 +117,8 @@ Prepare bisq build
You need to get the bisq dependencies first as we need to copy the BouncyCastle jar to the JRE directory.
$ git clone https://github.com/bitsquare/bitsquare.git
$ cd bitsquare
$ git clone https://github.com/bisq/bisq.git
$ cd bisq
$ mvn clean package -DskipTests -Dmaven.javadoc.skip=true
### 5. Copy the BouncyCastle provider jar file
@ -166,12 +166,12 @@ If you want to build the binaries check out the build scripts under the package
Development mode
-----------------
Please check out our wiki for more information about [testing](https://github.com/bitsquare/bitsquare/wiki/Testing-bisq-with-Mainnet)
and how to use [regtest](https://github.com/bitsquare/bitsquare/wiki/How-to-use-bisq-with-regtest-%28advanced%29)
Please check out our wiki for more information about [testing](https://github.com/bisq/bisq/wiki/Testing-bisq-with-Mainnet)
and how to use [regtest](https://github.com/bisq/bisq/wiki/How-to-use-bisq-with-regtest-%28advanced%29)
Here are example program arguments for using regtest with localhost environment (not using Tor):
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --useLocalhost=true --myAddress=localhost:2002 --nodePort=2002 --appName=Bitsquare_seed_node_localhost_2002
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --useLocalhost=true --myAddress=localhost:2002 --nodePort=2002 --appName=bisq_seed_node_localhost_2002
$ java -jar gui/target/shaded.jar --bitcoinNetwork=REGTEST --useLocalhost=true --myAddress=localhost:2222 --nodePort=2222 --appName=bisq-Local-Regtest-Arbitrator
@ -186,11 +186,11 @@ Running local seed node with Tor and RegTest
If you want to run locally a seed node via Tor you need to add your seed node's hidden service address to the SeedNodesRepository.java class.
You can find the hidden service address after you started once a seed node. Start it with a placeholder address like:
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --nodePort=8002 --myAddress=xxxxxxxx.onion:8002 --appName=Bitsquare_seed_node_xxxxxxxx.onion_8000
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --nodePort=8002 --myAddress=xxxxxxxx.onion:8002 --appName=bisq_seed_node_xxxxxxxx.onion_8000
Once the hidden service is published (check console output) quit the seed node and copy the hidden service address from the console output.
Alternatively you can navigate to the application directory and open Bitsquare_seed_node_xxxxxxx.onion_8002/tor/hiddenservice/hostname.
use that hidden service address also to rename the xxxxxxx placeholder of your Bitsquare_seed_node_xxxxxxx.onion_8002 directory.
Alternatively you can navigate to the application directory and open bisq_seed_node_xxxxxxx.onion_8002/tor/hiddenservice/hostname.
use that hidden service address also to rename the xxxxxxx placeholder of your bisq_seed_node_xxxxxxx.onion_8002 directory.
Start again the SeedNode.jar now with the correct hidden service address.
Instructions are also at the SeedNodesRepository class.
@ -198,7 +198,7 @@ Here are example program arguments for using regtest and using the Tor network (
$ java -jar seednode/target/SeedNode.jar ewdkppp3vicnbgqt.onion:8002 2 50
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --nodePort=8002 --myAddress=ewdkppp3vicnbgqt.onion:8002 --appName=Bitsquare_seed_node_ewdkppp3vicnbgqt.oinion_8002
$ java -jar seednode/target/SeedNode.jar --bitcoinNetwork=REGTEST --nodePort=8002 --myAddress=ewdkppp3vicnbgqt.onion:8002 --appName=bisq_seed_node_ewdkppp3vicnbgqt.oinion_8002
$ java -jar gui/target/shaded.jar --bitcoinNetwork=REGTEST --myAddress=localhost:2222 --nodePort=2222 --appName=bisq-Local-Regtest-Arbitrator
@ -210,4 +210,4 @@ Here are example program arguments for using regtest and using the Tor network (
Problems?
---------
If the instructions above don't work for you, please [raise an issue](https://github.com/bitsquare/bitsquare/issues/new?labels=%5Bbuild%5D). Thanks!
If the instructions above don't work for you, please [raise an issue](https://github.com/bisq/bisq/issues/new?labels=%5Bbuild%5D). Thanks!

8
doc/install_on_unix.sh
View file

@ -35,14 +35,14 @@ rm -r UnlimitedJCEPolicyJDK8 jce_policy-8.zip
echo "Install bitcoinj"
cd ~
git clone -b FixBloomFilters https://github.com/bitsquare/bitcoinj.git
git clone -b FixBloomFilters https://github.com/bisq/bitcoinj.git
cd bitcoinj
mvn clean install -DskipTests -Dmaven.javadoc.skip=true
echo "Install and resolve dependencies for bitsquare"
echo "Install and resolve dependencies for bisq"
cd ~
git clone https://github.com/bitsquare/bitsquare.git
cd bitsquare
git clone https://github.com/bisq/bisq.git
cd bisq
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
echo "Add BountyCastle.jar"

8
doc/install_on_unix_fin.sh
View file

@ -10,14 +10,14 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
# and add JAVA_HOME to .bashrc
# export JAVA_HOME=/usr/lib/jvm/java-8-oracle
echo "Install bitsquare"
cd ~/bitsquare
echo "Install bisq"
cd ~/bisq
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
cd ..
mkdir .local
mkdir .local/share
echo "Start bitsquare"
java -jar ~/bitsquare/gui/target/shaded.jar
echo "Start bisq"
java -jar ~/bisq/gui/target/shaded.jar

0
doc/monitor-bitsquare-sn.cron.sh → doc/monitor-bisq-sn.cron.sh
View file

2
doc/policy-file-setup.md
View file

@ -1,2 +1,2 @@
In the IDE you need to add that VM option:
-Djava.security.manager -Djava.security.debug=failure -Djava.security.policy=./core/src/main/resources/bitsquare.policy
-Djava.security.manager -Djava.security.debug=failure -Djava.security.policy=./core/src/main/resources/bisq.policy

212
doc/protobuffer.md
View file

@ -108,115 +108,115 @@ public static final class DataAndSeqNrPair implements Serializable {
## Actually transformed subtypes of Message
```
I Message (io.bitsquare.p2p)
I AnonymousMessage (io.bitsquare.p2p.network.messages)
+ PreliminaryGetDataRequest (io.bitsquare.p2p.peers.getdata.messages)
C BroadcastMessage (io.bitsquare.p2p.storage.messages)
+ AddDataMessage (io.bitsquare.p2p.storage.messages)
+ RefreshTTLMessage (io.bitsquare.p2p.storage.messages)
+ RemoveDataMessage (io.bitsquare.p2p.storage.messages)
+ RemoveMailboxDataMessage (io.bitsquare.p2p.storage.messages)
+ CloseConnectionMessage (io.bitsquare.p2p.network.messages)
I DirectMessage (io.bitsquare.p2p.messaging)
I MailboxMessage (io.bitsquare.p2p.messaging)
+ DepositTxPublishedMessage (io.bitsquare.trade.protocol.trade.messages)
C DisputeMessage (io.bitsquare.arbitration.messages)
+ DisputeCommunicationMessage (io.bitsquare.arbitration.messages)
+ DisputeResultMessage (io.bitsquare.arbitration.messages)
+ OpenNewDisputeMessage (io.bitsquare.arbitration.messages)
+ PeerOpenedDisputeMessage (io.bitsquare.arbitration.messages)
+ PeerPublishedPayoutTxMessage (io.bitsquare.arbitration.messages)
+ FiatTransferStartedMessage (io.bitsquare.trade.protocol.trade.messages)
+ FinalizePayoutTxRequest (io.bitsquare.trade.protocol.trade.messages)
+ MockMailboxPayload (io.bitsquare.p2p.mocks)
+ PayDepositRequest (io.bitsquare.trade.protocol.trade.messages)
+ PayoutTxFinalizedMessage (io.bitsquare.trade.protocol.trade.messages)
+ PrefixedSealedAndSignedMessage (io.bitsquare.p2p.messaging)
+ PrivateNotificationMessage (io.bitsquare.alert)
T StressTestMailboxMessage (io.bitsquare.p2p.network)
T TestMessage (io.bitsquare.crypto)
C OfferMessage (io.bitsquare.trade.protocol.availability.messages)
+ OfferAvailabilityRequest (io.bitsquare.trade.protocol.availability.messages)
+ OfferAvailabilityResponse (io.bitsquare.trade.protocol.availability.messages)
T StressTestDirectMessage (io.bitsquare.p2p.network)
C TradeMessage (io.bitsquare.trade.protocol.trade.messages)
+ DepositTxPublishedMessage (io.bitsquare.trade.protocol.trade.messages)
D FiatTransferStartedMessage (io.bitsquare.trade.protocol.trade.messages)
D FinalizePayoutTxRequest (io.bitsquare.trade.protocol.trade.messages)
D PayDepositRequest (io.bitsquare.trade.protocol.trade.messages)
D PayoutTxFinalizedMessage (io.bitsquare.trade.protocol.trade.messages)
+ PublishDepositTxRequest (io.bitsquare.trade.protocol.trade.messages)
I GetDataRequest (io.bitsquare.p2p.peers.getdata.messages)
+ GetUpdatedDataRequest (io.bitsquare.p2p.peers.getdata.messages)
D PreliminaryGetDataRequest (io.bitsquare.p2p.peers.getdata.messages)
C KeepAliveMessage (io.bitsquare.p2p.peers.keepalive.messages)
+ Ping (io.bitsquare.p2p.peers.keepalive.messages)
+ Pong (io.bitsquare.p2p.peers.keepalive.messages)
T MockPayload (io.bitsquare.p2p.mocks)
C PeerExchangeMessage (io.bitsquare.p2p.peers.peerexchange.messages)
+ GetPeersRequest (io.bitsquare.p2p.peers.peerexchange.messages)
+ GetPeersResponse (io.bitsquare.p2p.peers.peerexchange.messages)
I SendersNodeAddressMessage (io.bitsquare.p2p.network.messages)
D GetPeersRequest (io.bitsquare.p2p.peers.peerexchange.messages)
D GetUpdatedDataRequest (io.bitsquare.p2p.peers.getdata.messages)
D PrefixedSealedAndSignedMessage (io.bitsquare.p2p.messaging)
I SupportedCapabilitiesMessage (io.bitsquare.p2p.messaging)
+ GetDataResponse (io.bitsquare.p2p.peers.getdata.messages)
D GetPeersRequest (io.bitsquare.p2p.peers.peerexchange.messages)
D GetPeersResponse (io.bitsquare.p2p.peers.peerexchange.messages)
D OfferAvailabilityRequest (io.bitsquare.trade.protocol.availability.messages)
D OfferAvailabilityResponse (io.bitsquare.trade.protocol.availability.messages)
D PreliminaryGetDataRequest (io.bitsquare.p2p.peers.getdata.messages)
I Message (io.bisq.p2p)
I AnonymousMessage (io.bisq.p2p.network.messages)
+ PreliminaryGetDataRequest (io.bisq.p2p.peers.getdata.messages)
C BroadcastMessage (io.bisq.p2p.storage.messages)
+ AddDataMessage (io.bisq.p2p.storage.messages)
+ RefreshTTLMessage (io.bisq.p2p.storage.messages)
+ RemoveDataMessage (io.bisq.p2p.storage.messages)
+ RemoveMailboxDataMessage (io.bisq.p2p.storage.messages)
+ CloseConnectionMessage (io.bisq.p2p.network.messages)
I DirectMessage (io.bisq.p2p.messaging)
I MailboxMessage (io.bisq.p2p.messaging)
+ DepositTxPublishedMessage (io.bisq.trade.protocol.trade.messages)
C DisputeMessage (io.bisq.arbitration.messages)
+ DisputeCommunicationMessage (io.bisq.arbitration.messages)
+ DisputeResultMessage (io.bisq.arbitration.messages)
+ OpenNewDisputeMessage (io.bisq.arbitration.messages)
+ PeerOpenedDisputeMessage (io.bisq.arbitration.messages)
+ PeerPublishedPayoutTxMessage (io.bisq.arbitration.messages)
+ FiatTransferStartedMessage (io.bisq.trade.protocol.trade.messages)
+ FinalizePayoutTxRequest (io.bisq.trade.protocol.trade.messages)
+ MockMailboxPayload (io.bisq.p2p.mocks)
+ PayDepositRequest (io.bisq.trade.protocol.trade.messages)
+ PayoutTxFinalizedMessage (io.bisq.trade.protocol.trade.messages)
+ PrefixedSealedAndSignedMessage (io.bisq.p2p.messaging)
+ PrivateNotificationMessage (io.bisq.alert)
T StressTestMailboxMessage (io.bisq.p2p.network)
T TestMessage (io.bisq.crypto)
C OfferMessage (io.bisq.trade.protocol.availability.messages)
+ OfferAvailabilityRequest (io.bisq.trade.protocol.availability.messages)
+ OfferAvailabilityResponse (io.bisq.trade.protocol.availability.messages)
T StressTestDirectMessage (io.bisq.p2p.network)
C TradeMessage (io.bisq.trade.protocol.trade.messages)
+ DepositTxPublishedMessage (io.bisq.trade.protocol.trade.messages)
D FiatTransferStartedMessage (io.bisq.trade.protocol.trade.messages)
D FinalizePayoutTxRequest (io.bisq.trade.protocol.trade.messages)
D PayDepositRequest (io.bisq.trade.protocol.trade.messages)
D PayoutTxFinalizedMessage (io.bisq.trade.protocol.trade.messages)
+ PublishDepositTxRequest (io.bisq.trade.protocol.trade.messages)
I GetDataRequest (io.bisq.p2p.peers.getdata.messages)
+ GetUpdatedDataRequest (io.bisq.p2p.peers.getdata.messages)
D PreliminaryGetDataRequest (io.bisq.p2p.peers.getdata.messages)
C KeepAliveMessage (io.bisq.p2p.peers.keepalive.messages)
+ Ping (io.bisq.p2p.peers.keepalive.messages)
+ Pong (io.bisq.p2p.peers.keepalive.messages)
T MockPayload (io.bisq.p2p.mocks)
C PeerExchangeMessage (io.bisq.p2p.peers.peerexchange.messages)
+ GetPeersRequest (io.bisq.p2p.peers.peerexchange.messages)
+ GetPeersResponse (io.bisq.p2p.peers.peerexchange.messages)
I SendersNodeAddressMessage (io.bisq.p2p.network.messages)
D GetPeersRequest (io.bisq.p2p.peers.peerexchange.messages)
D GetUpdatedDataRequest (io.bisq.p2p.peers.getdata.messages)
D PrefixedSealedAndSignedMessage (io.bisq.p2p.messaging)
I SupportedCapabilitiesMessage (io.bisq.p2p.messaging)
+ GetDataResponse (io.bisq.p2p.peers.getdata.messages)
D GetPeersRequest (io.bisq.p2p.peers.peerexchange.messages)
D GetPeersResponse (io.bisq.p2p.peers.peerexchange.messages)
D OfferAvailabilityRequest (io.bisq.trade.protocol.availability.messages)
D OfferAvailabilityResponse (io.bisq.trade.protocol.availability.messages)
D PreliminaryGetDataRequest (io.bisq.p2p.peers.getdata.messages)
```
== Actually transformed subtypes of Payload
```
+ Attachment (io.bitsquare.arbitration.payload)
I CapabilityRequiringPayload (io.bitsquare.p2p.storage.payload)
+ TradeStatistics (io.bitsquare.trade.statistics)
+ Contract (io.bitsquare.trade)
+ Dispute (io.bitsquare.arbitration)
+ DisputeResult (io.bitsquare.arbitration)
I ExpirablePayload (io.bitsquare.p2p.storage.payload)
I StoragePayload (io.bitsquare.p2p.storage.payload)
+ Alert (io.bitsquare.alert)
+ Arbitrator (io.bitsquare.arbitration)
+ Filter (io.bitsquare.filter)
I LazyProcessedStoragePayload (io.bitsquare.p2p.storage.payload)
+ CompensationRequestPayload (io.bitsquare.dao.compensation)
D TradeStatistics (io.bitsquare.trade.statistics)
+ MailboxStoragePayload (io.bitsquare.p2p.storage.payload)
+ Offer (io.bitsquare.trade.offer)
I PersistedStoragePayload (io.bitsquare.p2p.storage.payload)
D CompensationRequestPayload (io.bitsquare.dao.compensation)
D TradeStatistics (io.bitsquare.trade.statistics)
+ NodeAddress (io.bitsquare.p2p)
C+PaymentAccountContractData (io.bitsquare.payment)
+ AliPayAccountContractData (io.bitsquare.payment)
+ ChaseQuickPayAccountContractData (io.bitsquare.payment)
+ ClearXchangeAccountContractData (io.bitsquare.payment)
C+ CountryBasedPaymentAccountContractData (io.bitsquare.payment)
C+ BankAccountContractData (io.bitsquare.payment)
+ NationalBankAccountContractData (io.bitsquare.payment)
+ SameBankAccountContractData (io.bitsquare.payment)
+ SpecificBanksAccountContractData (io.bitsquare.payment)
+ CashDepositAccountContractData (io.bitsquare.payment)
+ SepaAccountContractData (io.bitsquare.payment)
+ CryptoCurrencyAccountContractData (io.bitsquare.payment)
+ FasterPaymentsAccountContractData (io.bitsquare.payment)
+ InteracETransferAccountContractData (io.bitsquare.payment)
+ OKPayAccountContractData (io.bitsquare.payment)
+ PerfectMoneyAccountContractData (io.bitsquare.payment)
+ SwishAccountContractData (io.bitsquare.payment)
+ USPostalMoneyOrderAccountContractData (io.bitsquare.payment)
+ Peer (io.bitsquare.p2p.peers.peerexchange)
+ PrivateNotification (io.bitsquare.alert)
+ ProtectedStorageEntry (io.bitsquare.p2p.storage.storageentry)
+ ProtectedMailboxStorageEntry (io.bitsquare.p2p.storage.storageentry)
+ PubKeyRing (io.bitsquare.common.crypto)
+ RawTransactionInput (io.bitsquare.btc.data)
I RequiresOwnerIsOnlinePayload (io.bitsquare.p2p.storage.payload)
D Offer (io.bitsquare.trade.offer)
+ SealedAndSigned (io.bitsquare.common.crypto)
+ Attachment (io.bisq.arbitration.payload)
I CapabilityRequiringPayload (io.bisq.p2p.storage.payload)
+ TradeStatistics (io.bisq.trade.statistics)
+ Contract (io.bisq.trade)
+ Dispute (io.bisq.arbitration)
+ DisputeResult (io.bisq.arbitration)
I ExpirablePayload (io.bisq.p2p.storage.payload)
I StoragePayload (io.bisq.p2p.storage.payload)
+ Alert (io.bisq.alert)
+ Arbitrator (io.bisq.arbitration)
+ Filter (io.bisq.filter)
I LazyProcessedStoragePayload (io.bisq.p2p.storage.payload)
+ CompensationRequestPayload (io.bisq.dao.compensation)
D TradeStatistics (io.bisq.trade.statistics)
+ MailboxStoragePayload (io.bisq.p2p.storage.payload)
+ Offer (io.bisq.trade.offer)
I PersistedStoragePayload (io.bisq.p2p.storage.payload)
D CompensationRequestPayload (io.bisq.dao.compensation)
D TradeStatistics (io.bisq.trade.statistics)
+ NodeAddress (io.bisq.p2p)
C+PaymentAccountContractData (io.bisq.payment)
+ AliPayAccountContractData (io.bisq.payment)
+ ChaseQuickPayAccountContractData (io.bisq.payment)
+ ClearXchangeAccountContractData (io.bisq.payment)
C+ CountryBasedPaymentAccountContractData (io.bisq.payment)
C+ BankAccountContractData (io.bisq.payment)
+ NationalBankAccountContractData (io.bisq.payment)
+ SameBankAccountContractData (io.bisq.payment)
+ SpecificBanksAccountContractData (io.bisq.payment)
+ CashDepositAccountContractData (io.bisq.payment)
+ SepaAccountContractData (io.bisq.payment)
+ CryptoCurrencyAccountContractData (io.bisq.payment)
+ FasterPaymentsAccountContractData (io.bisq.payment)
+ InteracETransferAccountContractData (io.bisq.payment)
+ OKPayAccountContractData (io.bisq.payment)
+ PerfectMoneyAccountContractData (io.bisq.payment)
+ SwishAccountContractData (io.bisq.payment)
+ USPostalMoneyOrderAccountContractData (io.bisq.payment)
+ Peer (io.bisq.p2p.peers.peerexchange)
+ PrivateNotification (io.bisq.alert)
+ ProtectedStorageEntry (io.bisq.p2p.storage.storageentry)
+ ProtectedMailboxStorageEntry (io.bisq.p2p.storage.storageentry)
+ PubKeyRing (io.bisq.common.crypto)
+ RawTransactionInput (io.bisq.btc.data)
I RequiresOwnerIsOnlinePayload (io.bisq.p2p.storage.payload)
D Offer (io.bisq.trade.offer)
+ SealedAndSigned (io.bisq.common.crypto)
```

2
doc/rpc_regtest/bitcoin.conf
View file

@ -5,7 +5,7 @@ txindex=1
#rpc
server=1
rpcuser=bitsquare
rpcuser=bisq
rpcpassword=...
# we want to test with 2 local apps so we need the output at 2 diff ports.

28
doc/seed-node-daemon.md
View file

@ -11,7 +11,7 @@ server:
- The code is contained in the ``SeedNode.jar`` file which is usually left
under ``seednode/target`` after building bisq.
- The seed node configuration is the ``Bitsquare_seed_node_HOST_PORT``
- The seed node configuration is the ``bisq_seed_node_HOST_PORT``
directory under ``~/.local/share`` (Unix), ``%APPDATA%`` (Windows) or
``~/Library/Application Support`` (Mac OS X).
@ -48,7 +48,7 @@ After the node runs successfully, interrupt it with Control-C.
## Init script
To allow the daemon to start automatically on system boot, use the attached
[init script](bitsquare-sn.init.sh). First edit it and change its
[init script](bisq-sn.init.sh). First edit it and change its
configuration variables to your needs, especially ``SN_ADDRESS``, ``SN_JAR``
and ``SN_USER``. In the previous example, the values would be:
@ -57,20 +57,20 @@ and ``SN_USER``. In the previous example, the values would be:
SN_USER=bsqsn
Put the customized script under ``/etc/init.d`` using a name without
extensions (e.g. ``bitsquare-sn``), make it executable, add it to the boot
extensions (e.g. ``bisq-sn``), make it executable, add it to the boot
sequence and finally start it:
# cp /path/to/bitsquare-sn.init.sh /etc/init.d/bitsquare-sn
# chmod a+rx /etc/init.d/bitsquare-sn
# update-rc.d bitsquare-sn defaults
# service bitsquare-sn start
# cp /path/to/bisq-sn.init.sh /etc/init.d/bisq-sn
# chmod a+rx /etc/init.d/bisq-sn
# update-rc.d bisq-sn defaults
# service bisq-sn start
Executing ``service bitsquare-sn status`` should report that the process is
Executing ``service bisq-sn status`` should report that the process is
running.
## Cron script
The attached [Cron script](bitsquare-sn.cron.sh) can be used to check the seed
The attached [Cron script](bisq-sn.cron.sh) can be used to check the seed
node daemon periodically and restart it if it is using too much memory (RSS at
the time, may change to VSS later).
@ -78,15 +78,15 @@ To enable this check, edit the script and change the ``MAX_RSS_MiB`` to
whatever limit (in MiB), copy it to ``/etc/cron.hourly`` and make it
executable:
# cp /path/to/bitsquare-sn.cron.sh /etc/cron.hourly/bitsquare-sn
# chmod a+rx /etc/cron.hourly/bitsquare-sn
# cp /path/to/bisq-sn.cron.sh /etc/cron.hourly/bisq-sn
# chmod a+rx /etc/cron.hourly/bisq-sn
The check will be run every hour. For more sophisticated checks, use a proper
monitor like [Monit](https://mmonit.com/monit/).
## Monitor script
The attached [monitor script](monitor-bitsquare-sn.cron.sh) can be used to
The attached [monitor script](monitor-bisq-sn.cron.sh) can be used to
watch several seed nodes by connecting to them over Tor, and report by email
if there were any failed connection attempts. The script uses the ``torify``
and ``nc`` tools, so make sure that you have the ``tor`` and some ``netcat``
@ -98,8 +98,8 @@ want to report to in ``REPORT_TO_EMAILS``; if you want to specify the set of
seed nodes to check, change the value of ``SEED_NODES``. Then copy the script
to ``/etc/cron.hourly`` and make it executable:
# cp /path/to/monitor-bitsquare-sn.cron.sh /etc/cron.hourly/monitor-bitsquare-sn
# chmod a+rx /etc/cron.hourly/monitor-bitsquare-sn
# cp /path/to/monitor-bisq-sn.cron.sh /etc/cron.hourly/monitor-bisq-sn
# chmod a+rx /etc/cron.hourly/monitor-bisq-sn
Since this script requires no special permissions, you may instead want to run
it from a normal user's crontab (e.g. the ``bsqsn`` user above).

2
doc/ui-development-notes.md
View file

@ -11,7 +11,7 @@ That interpretation is also confirmed by the Java FX reference: "A controller is
The described pattern is only applied yet to that package:
io.bitsquare.gui.trade.createoffer;
io.bisq.gui.trade.createoffer;
For prototyping the UI we stick first with a more rapid development style approach.

2
doc/update_fork_bitcoinj.sh
View file

@ -16,7 +16,7 @@ git commit -am"Qualify pom version for publication"
mvn clean install -DskipTests
git tag bitsquare-published-$COMMITHASH published
git tag bisq-published-$COMMITHASH published
git push -f origin published
git push --tags

6
gui/pom.xml
View file

@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -59,7 +59,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bisq.app.BitsquareAppMain</mainClass>
<mainClass>io.bisq.app.BisqAppMain</mainClass>
</transformer>
</transformers>
<filters>
@ -294,7 +294,7 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>core</artifactId>
<version>${project.parent.version}</version>
</dependency>

24
gui/src/main/java/io/bisq/app/BitsquareApp.java → gui/src/main/java/io/bisq/app/BisqApp.java
View file

@ -78,14 +78,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
public class BitsquareApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
public class BisqApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BisqApp.class);
private static final long LOG_MEMORY_PERIOD_MIN = 10;
private static Environment env;
private BitsquareAppModule bitsquareAppModule;
private BisqAppModule bisqAppModule;
private Injector injector;
private boolean popupOpened;
@ -98,14 +98,14 @@ public class BitsquareApp extends Application {
private boolean shutDownRequested;
public static void setEnvironment(Environment env) {
BitsquareApp.env = env;
BisqApp.env = env;
}
@Override
public void start(Stage stage) throws IOException {
BitsquareApp.primaryStage = stage;
BisqApp.primaryStage = stage;
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();
@ -149,11 +149,11 @@ public class BitsquareApp extends Application {
try {
// Guice
bitsquareAppModule = new BitsquareAppModule(env, primaryStage);
injector = Guice.createInjector(bitsquareAppModule);
bisqAppModule = new BisqAppModule(env, primaryStage);
injector = Guice.createInjector(bisqAppModule);
injector.getInstance(InjectorViewFactory.class).setInjector(injector);
Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
Version.setBtcNetworkId(injector.getInstance(BisqEnvironment.class).getBitcoinNetwork().ordinal());
if (Utilities.isLinux())
System.setProperty("prism.lcdtext", "false");
@ -182,7 +182,7 @@ public class BitsquareApp extends Application {
Font.loadFont(getClass().getResource("/fonts/VerdanaItalic.ttf").toExternalForm(), 13);
Font.loadFont(getClass().getResource("/fonts/VerdanaBoldItalic.ttf").toExternalForm(), 13);
scene.getStylesheets().setAll(
"/io/bisq/gui/bitsquare.css",
"/io/bisq/gui/bisq.css",
"/io/bisq/gui/images.css",
"/io/bisq/gui/CandleStickChart.css");
@ -293,7 +293,7 @@ public class BitsquareApp extends Application {
log.warn("Scene not available yet, we create a new scene. The bug might be caused by an exception in a constructor or by a circular dependency in guice.");
scene = new Scene(new StackPane(), 1000, 650);
scene.getStylesheets().setAll(
"/io/bisq/gui/bitsquare.css",
"/io/bisq/gui/bisq.css",
"/io/bisq/gui/images.css");
primaryStage.setScene(scene);
primaryStage.show();
@ -395,7 +395,7 @@ public class BitsquareApp extends Application {
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletsSetup.class).shutDownComplete.addListener((ov, o, n) -> {
bitsquareAppModule.close(injector);
bisqAppModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});

22
gui/src/main/java/io/bisq/app/BitsquareAppMain.java → gui/src/main/java/io/bisq/app/BisqAppMain.java
View file

@ -23,11 +23,11 @@ import joptsimple.OptionSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 BitsquareAppMain extends BitsquareExecutable {
private static final Logger log = LoggerFactory.getLogger(BitsquareAppMain.class);
public class BisqAppMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(BisqAppMain.class);
public static void main(String[] args) throws Exception {
// We don't want to do the full argument parsing here as that might easily change in update versions
@ -49,21 +49,21 @@ public class BitsquareAppMain extends BitsquareExecutable {
System.exit(EXIT_FAILURE);
return;
}
BitsquareEnvironment bitsquareEnvironment = getBitsquareEnvironment(options);
BisqEnvironment bisqEnvironment = getBisqEnvironment(options);
// need to call that before BitsquareAppMain().execute(args)
initAppDir(bitsquareEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY));
// need to call that before bisqAppMain().execute(args)
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:
Thread.currentThread().setContextClassLoader(BitsquareAppMain.class.getClassLoader());
Thread.currentThread().setContextClassLoader(BisqAppMain.class.getClassLoader());
new BitsquareAppMain().execute(args);
new BisqAppMain().execute(args);
}
@Override
protected void doExecute(OptionSet options) {
BitsquareApp.setEnvironment(getBitsquareEnvironment(options));
javafx.application.Application.launch(BitsquareApp.class);
BisqApp.setEnvironment(getBisqEnvironment(options));
javafx.application.Application.launch(BisqApp.class);
}
}

8
gui/src/main/java/io/bisq/app/BitsquareAppModule.java → gui/src/main/java/io/bisq/app/BisqAppModule.java
View file

@ -45,12 +45,12 @@ import java.io.File;
import static com.google.inject.name.Names.named;
class BitsquareAppModule extends AppModule {
private static final Logger log = LoggerFactory.getLogger(BitsquareAppModule.class);
class BisqAppModule extends AppModule {
private static final Logger log = LoggerFactory.getLogger(BisqAppModule.class);
private final Stage primaryStage;
public BitsquareAppModule(Environment env, Stage primaryStage) {
public BisqAppModule(Environment env, Stage primaryStage) {
super(env);
this.primaryStage = primaryStage;
}
@ -71,7 +71,7 @@ class BitsquareAppModule 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());

6
gui/src/main/java/io/bisq/gui/SystemTray.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui;
import io.bisq.BitsquareException;
import io.bisq.BisqException;
import io.bisq.common.UserThread;
import io.bisq.common.util.Utilities;
import io.bisq.gui.util.GUIUtil;
@ -110,7 +110,7 @@ public class SystemTray {
} catch (AWTException e1) {
log.error("Icon could not be added to system tray.", e1);
} catch (IOException e2) {
throw new BitsquareException(e2);
throw new BisqException(e2);
}
toggleShowHideItem.addActionListener(e -> {
@ -125,7 +125,7 @@ public class SystemTray {
aboutItem.addActionListener(e -> {
try {
GUIUtil.openWebPage("https://bitsquare.io");
GUIUtil.openWebPage("https://bisq.io");
} catch (Exception e1) {
e1.printStackTrace();
}

0
gui/src/main/java/io/bisq/gui/bitsquare.css → gui/src/main/java/io/bisq/gui/bisq.css
View file

10
gui/src/main/java/io/bisq/gui/main/MainView.java
View file

@ -17,9 +17,9 @@
package io.bisq.gui.main;
import io.bisq.BitsquareException;
import io.bisq.BisqException;
import io.bisq.app.AppOptionKeys;
import io.bisq.app.BitsquareEnvironment;
import io.bisq.app.BisqEnvironment;
import io.bisq.app.DevEnv;
import io.bisq.app.Version;
import io.bisq.common.UserThread;
@ -98,7 +98,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
private final ViewLoader viewLoader;
private final Navigation navigation;
private static Transitions transitions;
private final BitsquareEnvironment environment;
private final BisqEnvironment environment;
private final BSFormatter formatter;
private ChangeListener<String> walletServiceErrorMsgListener;
private ChangeListener<String> btcSyncIconIdListener;
@ -116,7 +116,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
@SuppressWarnings("WeakerAccess")
@Inject
public MainView(MainViewModel model, CachingViewLoader viewLoader, Navigation navigation, Transitions transitions,
BitsquareEnvironment environment, BSFormatter formatter) {
BisqEnvironment environment, BSFormatter formatter) {
super(model);
this.viewLoader = viewLoader;
this.navigation = navigation;
@ -226,7 +226,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
.filter(toggle -> toggle instanceof NavButton)
.filter(button -> viewClass == ((NavButton) button).viewClass)
.findFirst()
.orElseThrow(() -> new BitsquareException("No button matching %s found", viewClass))
.orElseThrow(() -> new BisqException("No button matching %s found", viewClass))
.setSelected(true);
});

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

@ -557,7 +557,7 @@ public class MainViewModel implements ViewModel {
// and if the unlimited Strength for cryptographic keys is set.
// If users compile themselves they might miss that step and then would get an exception in the trade.
// To avoid that we add here at startup a sample encryption and signing to see if it don't causes an exception.
// See: https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
// See: https://github.com/bisq/bisq/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
Thread checkCryptoThread = new Thread() {
@Override
public void run() {

6
gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java
View file

@ -18,7 +18,7 @@
package io.bisq.gui.main.account.content.backup;
import io.bisq.app.AppOptionKeys;
import io.bisq.app.BitsquareEnvironment;
import io.bisq.app.BisqEnvironment;
import io.bisq.common.util.Tuple2;
import io.bisq.common.util.Utilities;
import io.bisq.gui.common.view.ActivatableView;
@ -63,7 +63,7 @@ public class BackupView extends ActivatableView<GridPane, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private BackupView(Stage stage, Preferences preferences, BitsquareEnvironment environment) {
private BackupView(Stage stage, Preferences preferences, BisqEnvironment environment) {
super();
this.stage = stage;
this.preferences = preferences;
@ -131,7 +131,7 @@ public class BackupView extends ActivatableView<GridPane, Void> {
if (backupDirectory.length() > 0) {
try {
String dateString = new SimpleDateFormat("YYYY-MM-dd-HHmmss").format(new Date());
String destination = Paths.get(backupDirectory, "bitsquare_backup_" + dateString).toString();
String destination = Paths.get(backupDirectory, "bisq_backup_" + dateString).toString();
FileUtils.copyDirectory(dataDir,
new File(destination));
new Popup().feedback(Res.get("account.backup.success", destination)).show();

2
gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java
View file

@ -115,7 +115,7 @@ public class CompensationViewItem {
Scene scene = new Scene(anchorPane);
scene.getStylesheets().setAll(
"/io/bisq/gui/bitsquare.css",
"/io/bisq/gui/bisq.css",
"/io/bisq/gui/images.css");
Stage stage = new Stage();
stage.setTitle(Res.get("dao.voting.item.stage.title", compensationRequestPayload.getShortId()));

2
gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java
View file

@ -112,7 +112,7 @@ public class DepositView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
paymentLabelString = Res.get("funds.deposit.fundBitsquareWallet");
paymentLabelString = Res.get("funds.deposit.fundBisqWallet");
selectColumn.setText(Res.get("shared.select"));
addressColumn.setText(Res.get("shared.address"));
balanceColumn.setText(Res.get("shared.balanceWithCur"));

2
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
View file

@ -344,7 +344,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
String key = "securityDepositInfo";
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
.actionButtonText(Res.get("shared.faq"))
.onAction(() -> GUIUtil.openWebPage("https://bitsquare.io/faq#6"))
.onAction(() -> GUIUtil.openWebPage("https://bisq.io/faq#6"))
.useIUnderstandButton()
.dontShowAgainId(key, preferences)
.show();

2
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
View file

@ -337,7 +337,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
String key = "securityDepositInfo";
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
.actionButtonText(Res.get("shared.faq"))
.onAction(() -> GUIUtil.openWebPage("https://bitsquare.io/faq#6"))
.onAction(() -> GUIUtil.openWebPage("https://bisq.io/faq#6"))
.useIUnderstandButton()
.dontShowAgainId(key, preferences)
.show();

10
gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.overlays;
import io.bisq.app.BitsquareApp;
import io.bisq.app.BisqApp;
import io.bisq.common.Timer;
import io.bisq.common.UserThread;
import io.bisq.common.util.Utilities;
@ -320,7 +320,7 @@ public abstract class Overlay<T extends Overlay> {
public T useReportBugButton() {
this.closeButtonText = Res.get("shared.reportBug");
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bitsquare/bitsquare/issues"));
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq/bisq/issues"));
return (T) this;
}
@ -346,7 +346,7 @@ public abstract class Overlay<T extends Overlay> {
public T useShutDownButton() {
this.actionButtonText = Res.get("shared.shutDown");
this.actionHandlerOptional = Optional.of(BitsquareApp.shutDownHandler::run);
this.actionHandlerOptional = Optional.of(BisqApp.shutDownHandler::run);
return (T) this;
}
@ -706,7 +706,7 @@ public abstract class Overlay<T extends Overlay> {
gitHubButton.setOnAction(event -> {
Utilities.copyToClipboard(message);
GUIUtil.openWebPage("https://github.com/bitsquare/bitsquare/issues");
GUIUtil.openWebPage("https://github.com/bisq/bisq/issues");
});
Button forumButton = new Button(Res.get("popup.reportError.forum"));
@ -717,7 +717,7 @@ public abstract class Overlay<T extends Overlay> {
forumButton.setOnAction(event -> {
Utilities.copyToClipboard(message);
GUIUtil.openWebPage("http://forum.bitsquare.io");
GUIUtil.openWebPage("http://forum.bisq.io");
});
}

2
gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java
View file

@ -96,7 +96,7 @@ public class AddBitcoinNodesWindow extends Overlay<AddBitcoinNodesWindow> {
GridPane.setHalignment(label, HPos.LEFT);
HyperlinkWithIcon hyperlinkWithIcon = new HyperlinkWithIcon("Open bisq FAQ", AwesomeIcon.EXTERNAL_LINK);
hyperlinkWithIcon.setOnAction(e -> GUIUtil.openWebPage("https://bitsquare.io/faq/#privacy_btc"));
hyperlinkWithIcon.setOnAction(e -> GUIUtil.openWebPage("https://bisq.io/faq/#privacy_btc"));
GridPane.setRowIndex(hyperlinkWithIcon, ++rowIndex);
GridPane.setColumnIndex(hyperlinkWithIcon, 0);
GridPane.setMargin(hyperlinkWithIcon, new Insets(0, 0, 0, -4));

2
gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java
View file

@ -70,7 +70,7 @@ public class DisplayAlertMessageWindow extends Overlay<DisplayAlertMessageWindow
if (alert.isUpdateInfo) {
headLine = Res.get("displayAlertMessageWindow.update.headline");
headLineLabel.setStyle("-fx-text-fill: -fx-accent; -fx-font-weight: bold; -fx-font-size: 22;");
String url = "https://bitsquare.io/downloads";
String url = "https://bisq.io/downloads";
HyperlinkWithIcon hyperlinkWithIcon = FormBuilder.addLabelHyperlinkWithIcon(gridPane, ++rowIndex,
Res.get("displayAlertMessageWindow.update.download"), url, url).second;
hyperlinkWithIcon.setMaxWidth(550);

6
gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java
View file

@ -1,7 +1,7 @@
package io.bisq.gui.main.overlays.windows;
import com.google.inject.Inject;
import io.bisq.app.BitsquareApp;
import io.bisq.app.BisqApp;
import io.bisq.app.DevEnv;
import io.bisq.gui.main.overlays.Overlay;
import io.bisq.locale.Res;
@ -49,7 +49,7 @@ public class TacWindow extends Overlay<TacWindow> {
actionButtonText(Res.get("tacWindow.agree"));
closeButtonText(Res.get("tacWindow.disagree"));
onAction(() -> preferences.setTacAccepted(true));
onClose(BitsquareApp.shutDownHandler::run);
onClose(BisqApp.shutDownHandler::run);
super.show();
}
@ -59,7 +59,7 @@ public class TacWindow extends Overlay<TacWindow> {
protected void addMessage() {
super.addMessage();
addHyperlinkWithIcon(gridPane, ++rowIndex, Res.get("tacWindow.arbitrationSystem"),
"https://bitsquare.io/arbitration_system.pdf", -6);
"https://bisq.io/arbitration_system.pdf", -6);
}
@Override

2
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java
View file

@ -130,7 +130,7 @@ public class BuyerStep5View extends TradeStepView {
HBox hBox = new HBox();
hBox.setSpacing(10);
useSavingsWalletButton = new Button(Res.get("portfolio.pending.step5_buyer.moveToBitsquareWallet"));
useSavingsWalletButton = new Button(Res.get("portfolio.pending.step5_buyer.moveToBisqWallet"));
useSavingsWalletButton.setDefaultButton(false);
Label label = new Label(Res.get("shared.OR"));
label.setPadding(new Insets(5, 0, 0, 0));

10
gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.java
View file

@ -50,11 +50,11 @@ public class AboutView extends ActivatableViewAndModel<GridPane, Activatable> {
label.setWrapText(true);
GridPane.setColumnSpan(label, 2);
GridPane.setHalignment(label, HPos.LEFT);
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://bitsquare.io");
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://bisq.io");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/bitsquare/bitsquare");
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/bisq/bisq");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/bitsquare/bitsquare/blob/master/LICENSE");
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/bisq/bisq/blob/master/LICENSE");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
titledGroupBg = addTitledGroupBg(root, ++gridRow, 3, Res.get("setting.about.support"), Layout.GROUP_DISTANCE);
@ -63,9 +63,9 @@ public class AboutView extends ActivatableViewAndModel<GridPane, Activatable> {
label.setWrapText(true);
GridPane.setColumnSpan(label, 2);
GridPane.setHalignment(label, HPos.LEFT);
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bitsquare.io/contribute");
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bisq.io/contribute");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.donate"), "https://bitsquare.io/contribute/#donation");
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.donate"), "https://bisq.io/contribute/#donation");
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
titledGroupBg = addTitledGroupBg(root, ++gridRow, 3, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE);

6
gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java
View file

@ -17,7 +17,7 @@
package io.bisq.gui.main.settings.network;
import io.bisq.app.BitsquareApp;
import io.bisq.app.BisqApp;
import io.bisq.btc.wallet.WalletsSetup;
import io.bisq.common.Clock;
import io.bisq.common.UserThread;
@ -148,7 +148,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
.actionButtonText(Res.get("shared.applyAndShutDown"))
.onAction(() -> {
preferences.setUseTorForBitcoinJ(selected);
UserThread.runAfter(BitsquareApp.shutDownHandler::run, 500, TimeUnit.MILLISECONDS);
UserThread.runAfter(BisqApp.shutDownHandler::run, 500, TimeUnit.MILLISECONDS);
})
.closeButtonText(Res.get("shared.cancel"))
.onClose(() -> useTorForBtcJCheckBox.setSelected(!selected))
@ -188,7 +188,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
} else {
preferences.setBitcoinNodes(btcNodes.getText());
}
UserThread.runAfter(BitsquareApp.shutDownHandler::run, 500, TimeUnit.MILLISECONDS);
UserThread.runAfter(BisqApp.shutDownHandler::run, 500, TimeUnit.MILLISECONDS);
})
.closeButtonText(Res.get("shared.cancel"))
.onClose(() -> btcNodes.setText(btcNodesPreFocusText))

2
gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java
View file

@ -80,7 +80,7 @@ public final class AccountNrValidator extends BankValidator {
if (input != null) {
length = 11;
// Provided by sturles:
// https://github.com/bitsquare/bitsquare/pull/707
// https://github.com/bisq/bisq/pull/707
// https://no.wikipedia.org/wiki/MOD11#Implementasjoner_i_forskjellige_programmeringspr.C3.A5k
// https://en.wikipedia.org/wiki/International_Bank_Account_Number#Generating_IBAN_check_digits6

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

@ -13,45 +13,45 @@
<logger name="com.neemre.btcdcli4j" level="WARN"/>
<!-- <logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
<!-- <logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="io.bisq.locale.BSResources" level="ERROR"/>
&lt;!&ndash;<logger name="io.bitsquare.p2p" level="WARN"/>&ndash;&gt;
<logger name="io.bitsquare.btc.pricefeed" level="WARN"/>
&lt;!&ndash;<logger name="io.bisq.p2p" level="WARN"/>&ndash;&gt;
<logger name="io.bisq.btc.pricefeed" level="WARN"/>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="io.bitsquare.p2p.peers" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.getdata" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.keepalive" level="WARN"/>
<logger name="io.bitsquare.p2p.peers.peerexchange" level="WARN"/>-->
<logger name="io.bisq.p2p.peers" level="WARN"/>
<logger name="io.bisq.p2p.peers.getdata" level="WARN"/>
<logger name="io.bisq.p2p.peers.keepalive" level="WARN"/>
<logger name="io.bisq.p2p.peers.peerexchange" level="WARN"/>-->
<!--<logger name="io.bitsquare.p2p.network" level="WARN"/>-->
<!-- <logger name="io.bitsquare.p2p.P2PService" level="WARN"/>-->
<!--<logger name="io.bisq.p2p.network" level="WARN"/>-->
<!-- <logger name="io.bisq.p2p.P2PService" level="WARN"/>-->
<!-- <logger name="io.bitsquare.p2p.peers.PeerGroup" level="TRACE"/>
<!-- <logger name="io.bisq.p2p.peers.PeerGroup" level="TRACE"/>
<logger name="io.bitsquare.p2p.P2PService" level="TRACE"/>
<logger name="io.bitsquare.p2p.storage.ProtectedExpirableDataStorage" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.LocalhostNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.NetworkNode" level="TRACE"/>-->
<logger name="io.bisq.p2p.P2PService" level="TRACE"/>
<logger name="io.bisq.p2p.storage.ProtectedExpirableDataStorage" level="TRACE"/>
<logger name="io.bisq.p2p.network.LocalhostNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.NetworkNode" level="TRACE"/>-->
<!-- <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="WARN"/>
<logger name="io.bitsquare.btc.AddressBasedCoinSelector" level="WARN"/>
<logger name="io.bitsquare.storage.Storage" level="WARN"/>
<logger name="io.bisq.btc.AddressBasedCoinSelector" level="WARN"/>
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
<logger name="io.bitsquare.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bitsquare.storage.FileManager" level="WARN"/>
<logger name="io.bisq.gui.util.Profiler" level="ERROR"/>
<logger name="io.bisq.temp.storage.RemoteStorage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<logger name="org.bitcoinj" level="WARN"/>

20
gui/src/test/java/io/bisq/app/BitsquareEnvironmentTests.java → gui/src/test/java/io/bisq/app/BisqEnvironmentTests.java
View file

@ -23,23 +23,23 @@ import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertySource;
import org.springframework.mock.env.MockPropertySource;
import static io.bisq.app.BitsquareEnvironment.*;
import static io.bisq.app.BisqEnvironment.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.springframework.core.env.PropertySource.named;
public class BitsquareEnvironmentTests {
public class BisqEnvironmentTests {
@Test
public void testPropertySourcePrecedence() {
PropertySource commandlineProps = new MockPropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME)
PropertySource commandlineProps = new MockPropertySource(BISQ_COMMANDLINE_PROPERTY_SOURCE_NAME)
.withProperty("key.x", "x.commandline");
PropertySource filesystemProps = new MockPropertySource(BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME)
PropertySource filesystemProps = new MockPropertySource(BISQ_APP_DIR_PROPERTY_SOURCE_NAME)
.withProperty("key.x", "x.env")
.withProperty("key.y", "y.env");
ConfigurableEnvironment env = new BitsquareEnvironment(commandlineProps) {
ConfigurableEnvironment env = new BisqEnvironment(commandlineProps) {
@Override
PropertySource<?> appDirProperties() {
return filesystemProps;
@ -47,13 +47,13 @@ public class BitsquareEnvironmentTests {
};
MutablePropertySources propertySources = env.getPropertySources();
assertThat(propertySources.precedenceOf(named(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME)), equalTo(0));
assertThat(propertySources.precedenceOf(named(BISQ_COMMANDLINE_PROPERTY_SOURCE_NAME)), equalTo(0));
assertThat(propertySources.precedenceOf(named(SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)), equalTo(1));
assertThat(propertySources.precedenceOf(named(SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME)), equalTo(2));
assertThat(propertySources.precedenceOf(named(BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME)), equalTo(3));
assertThat(propertySources.precedenceOf(named(BITSQUARE_HOME_DIR_PROPERTY_SOURCE_NAME)), equalTo(4));
assertThat(propertySources.precedenceOf(named(BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME)), equalTo(5));
assertThat(propertySources.precedenceOf(named(BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME)), equalTo(6));
assertThat(propertySources.precedenceOf(named(BISQ_APP_DIR_PROPERTY_SOURCE_NAME)), equalTo(3));
assertThat(propertySources.precedenceOf(named(BISQ_HOME_DIR_PROPERTY_SOURCE_NAME)), equalTo(4));
assertThat(propertySources.precedenceOf(named(BISQ_CLASSPATH_PROPERTY_SOURCE_NAME)), equalTo(5));
assertThat(propertySources.precedenceOf(named(BISQ_DEFAULT_PROPERTY_SOURCE_NAME)), equalTo(6));
assertThat(propertySources.size(), equalTo(7));
assertThat(env.getProperty("key.x"), equalTo("x.commandline")); // commandline value wins due to precedence

2
gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java
View file

@ -17,7 +17,7 @@ import java.util.Set;
import static org.junit.Assert.assertEquals;
//TODO causes java.lang.NullPointerException
// at io.bitsquare.gui.main.market.trades.TradesChartsViewModel.getCurrencyCode(TradesChartsViewModel.java:209)
// at io.bisq.gui.main.market.trades.TradesChartsViewModel.getCurrencyCode(TradesChartsViewModel.java:209)
@Ignore
public class TradesChartsViewModelTest {
private static final Logger log = LoggerFactory.getLogger(TradesChartsViewModelTest.class);

4
headless/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -77,7 +77,7 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>core</artifactId>
<version>${project.parent.version}</version>
</dependency>

6
headless/src/main/java/io/bisq/headless/Headless.java
View file

@ -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;
@ -46,7 +46,7 @@ public class Headless {
}
public Headless() {
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();
@ -81,7 +81,7 @@ public class Headless {
headlessModule = new HeadlessModule(env);
injector = Guice.createInjector(headlessModule);
Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
Version.setBtcNetworkId(injector.getInstance(BisqEnvironment.class).getBitcoinNetwork().ordinal());
p2pService = injector.getInstance(P2PService.class);
offerBookService = injector.getInstance(OfferBookService.class);
openOfferManager = injector.getInstance(OpenOfferManager.class);

20
headless/src/main/java/io/bisq/headless/HeadlessMain.java
View file

@ -19,8 +19,8 @@ package io.bisq.headless;
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 joptsimple.OptionException;
import joptsimple.OptionParser;
@ -32,10 +32,10 @@ import java.util.Scanner;
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 HeadlessMain extends BitsquareExecutable {
public class HeadlessMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(HeadlessMain.class);
private Headless headless;
private boolean isStopped;
@ -49,7 +49,7 @@ public class HeadlessMain 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_headless");
BisqEnvironment.setDefaultAppName("bisq_headless");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
@ -67,10 +67,10 @@ public class HeadlessMain 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:
@ -81,7 +81,7 @@ public class HeadlessMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
Headless.setEnvironment(getBitsquareEnvironment(options));
Headless.setEnvironment(getBisqEnvironment(options));
UserThread.execute(() -> headless = new Headless());
while (!isStopped) {

4
headless/src/main/java/io/bisq/headless/HeadlessModule.java
View file

@ -20,7 +20,7 @@ package io.bisq.headless;
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 HeadlessModule 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());

12
headless/src/main/resources/logback.xml
View file

@ -30,12 +30,12 @@
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<!-- <logger name="io.bitsquare.p2p.peers.PeerGroup" level="INFO"/>
<logger name="io.bitsquare.p2p.P2PService" level="INFO"/>
<logger name="io.bitsquare.p2p.storage.ProtectedExpirableDataStorage" level="INFO"/>
<logger name="io.bitsquare.p2p.network.LocalhostNetworkNode" level="INFO"/>
<logger name="io.bitsquare.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.NetworkNode" level="TRACE"/>-->
<!-- <logger name="io.bisq.p2p.peers.PeerGroup" level="INFO"/>
<logger name="io.bisq.p2p.P2PService" level="INFO"/>
<logger name="io.bisq.p2p.storage.ProtectedExpirableDataStorage" level="INFO"/>
<logger name="io.bisq.p2p.network.LocalhostNetworkNode" level="INFO"/>
<logger name="io.bisq.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.NetworkNode" level="TRACE"/>-->
<logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="INFO"/>

2
jsocks/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
jtorproxy/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -13,12 +13,12 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>jsocks</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>jtorctl</artifactId>
<version>${project.parent.version}</version>
</dependency>

6
monitor/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -42,7 +42,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bitsquare.monitor.MonitorMain</mainClass>
<mainClass>io.bisq.monitor.MonitorMain</mainClass>
</transformer>
</transformers>
<filters>
@ -77,7 +77,7 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>core</artifactId>
<version>${project.parent.version}</version>
</dependency>

2
monitor/src/main/java/io/bitsquare/monitor/Gateway.java → monitor/src/main/java/io/bisq/monitor/Gateway.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.monitor;
package io.bisq.monitor;
import io.bisq.messages.trade.offer.payload.Offer;
import io.bisq.trade.offer.OfferBookService;

8
monitor/src/main/java/io/bitsquare/monitor/Monitor.java → monitor/src/main/java/io/bisq/monitor/Monitor.java
View file

@ -1,10 +1,10 @@
package io.bitsquare.monitor;
package io.bisq.monitor;
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;
@ -47,7 +47,7 @@ public class Monitor {
}
public Monitor() {
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();
@ -82,7 +82,7 @@ public class Monitor {
monitorModule = new MonitorModule(env);
injector = Guice.createInjector(monitorModule);
Version.setBtcNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal());
Version.setBtcNetworkId(injector.getInstance(BisqEnvironment.class).getBitcoinNetwork().ordinal());
p2pService = injector.getInstance(P2PService.class);
offerBookService = injector.getInstance(OfferBookService.class);
openOfferManager = injector.getInstance(OpenOfferManager.class);

22
monitor/src/main/java/io/bitsquare/monitor/MonitorMain.java → monitor/src/main/java/io/bisq/monitor/MonitorMain.java
View file

@ -15,12 +15,12 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.monitor;
package io.bisq.monitor;
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 joptsimple.OptionException;
import joptsimple.OptionParser;
@ -32,10 +32,10 @@ import java.util.Scanner;
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 MonitorMain extends BitsquareExecutable {
public class MonitorMain extends BisqExecutable {
private static final Logger log = LoggerFactory.getLogger(MonitorMain.class);
private Monitor monitor;
private boolean isStopped;
@ -49,7 +49,7 @@ public class MonitorMain 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_monitor");
BisqEnvironment.setDefaultAppName("bisq_monitor");
OptionParser parser = new OptionParser();
parser.allowsUnrecognizedOptions();
parser.accepts(AppOptionKeys.USER_DATA_DIR_KEY, description("User data directory", DEFAULT_USER_DATA_DIR))
@ -67,10 +67,10 @@ public class MonitorMain 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:
@ -81,7 +81,7 @@ public class MonitorMain extends BitsquareExecutable {
@Override
protected void doExecute(OptionSet options) {
Monitor.setEnvironment(getBitsquareEnvironment(options));
Monitor.setEnvironment(getBisqEnvironment(options));
UserThread.execute(() -> monitor = new Monitor());
while (!isStopped) {

6
monitor/src/main/java/io/bitsquare/monitor/MonitorModule.java → monitor/src/main/java/io/bisq/monitor/MonitorModule.java
View file

@ -15,12 +15,12 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.monitor;
package io.bisq.monitor;
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 MonitorModule 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());

12
monitor/src/main/resources/logback.xml
View file

@ -30,12 +30,12 @@
<logger name="io.bisq.storage.Storage" level="WARN"/>
<logger name="io.bisq.storage.FileManager" level="WARN"/>
<!-- <logger name="io.bitsquare.p2p.peers.PeerGroup" level="INFO"/>
<logger name="io.bitsquare.p2p.P2PService" level="INFO"/>
<logger name="io.bitsquare.p2p.storage.ProtectedExpirableDataStorage" level="INFO"/>
<logger name="io.bitsquare.p2p.network.LocalhostNetworkNode" level="INFO"/>
<logger name="io.bitsquare.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bitsquare.p2p.network.NetworkNode" level="TRACE"/>-->
<!-- <logger name="io.bisq.p2p.peers.PeerGroup" level="INFO"/>
<logger name="io.bisq.p2p.P2PService" level="INFO"/>
<logger name="io.bisq.p2p.storage.ProtectedExpirableDataStorage" level="INFO"/>
<logger name="io.bisq.p2p.network.LocalhostNetworkNode" level="INFO"/>
<logger name="io.bisq.p2p.network.TorNetworkNode" level="TRACE"/>
<logger name="io.bisq.p2p.network.NetworkNode" level="TRACE"/>-->
<logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="INFO"/>

6
network/pom.xml
View file

@ -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>
<artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<version>0.5.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -13,13 +13,13 @@
<dependencies>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>io.bitsquare</groupId>
<groupId>io.bisq</groupId>
<artifactId>jtorproxy</artifactId>
<version>${project.parent.version}</version>
</dependency>

8
network/src/main/java/io/bisq/BitsquareException.java → network/src/main/java/io/bisq/BisqException.java
View file

@ -17,19 +17,19 @@
package io.bisq;
public class BitsquareException extends RuntimeException {
public class BisqException extends RuntimeException {
private static final long serialVersionUID = 556191645860856173L;
public BitsquareException(Throwable cause) {
public BisqException(Throwable cause) {
super(cause);
}
public BitsquareException(String format, Object... args) {
public BisqException(String format, Object... args) {
super(String.format(format, args));
}
public BitsquareException(Throwable cause, String format, Object... args) {
public BisqException(Throwable cause, String format, Object... args) {
super(String.format(format, args), cause);
}
}

36
network/src/main/java/io/bisq/app/BitsquareEnvironment.java → network/src/main/java/io/bisq/app/BisqEnvironment.java
View file

@ -18,7 +18,7 @@
package io.bisq.app;
import ch.qos.logback.classic.Level;
import io.bisq.BitsquareException;
import io.bisq.BisqException;
import io.bisq.common.CommonOptionKeys;
import io.bisq.common.crypto.KeyStorage;
import io.bisq.common.util.Utilities;
@ -45,8 +45,8 @@ import java.util.Properties;
import static com.google.common.base.Preconditions.checkNotNull;
public class BitsquareEnvironment extends StandardEnvironment {
private static final Logger log = LoggerFactory.getLogger(BitsquareEnvironment.class);
public class BisqEnvironment extends StandardEnvironment {
private static final Logger log = LoggerFactory.getLogger(BisqEnvironment.class);
private static final String BITCOIN_NETWORK_PROP = "bitcoinNetwork.properties";
@ -61,11 +61,11 @@ public class BitsquareEnvironment extends StandardEnvironment {
public static final String LOG_LEVEL_DEFAULT = Level.INFO.levelStr;
public static final String BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME = "bitsquareCommandLineProperties";
public static final String BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME = "bitsquareAppDirProperties";
public static final String BITSQUARE_HOME_DIR_PROPERTY_SOURCE_NAME = "bitsquareHomeDirProperties";
public static final String BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME = "bitsquareClasspathProperties";
public static final String BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME = "bitsquareDefaultProperties";
public static final String BISQ_COMMANDLINE_PROPERTY_SOURCE_NAME = "bisqCommandLineProperties";
public static final String BISQ_APP_DIR_PROPERTY_SOURCE_NAME = "bisqAppDirProperties";
public static final String BISQ_HOME_DIR_PROPERTY_SOURCE_NAME = "bisqHomeDirProperties";
public static final String BISQ_CLASSPATH_PROPERTY_SOURCE_NAME = "bisqClasspathProperties";
public static final String BISQ_DEFAULT_PROPERTY_SOURCE_NAME = "bisqDefaultProperties";
private final ResourceLoader resourceLoader = new DefaultResourceLoader();
@ -111,12 +111,12 @@ public class BitsquareEnvironment extends StandardEnvironment {
return appDataDir;
}
public BitsquareEnvironment(OptionSet options) {
this(new JOptCommandLinePropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(
public BisqEnvironment(OptionSet options) {
this(new JOptCommandLinePropertySource(BISQ_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(
options)));
}
public BitsquareEnvironment(PropertySource commandLineProperties) {
public BisqEnvironment(PropertySource commandLineProperties) {
logLevel = commandLineProperties.containsProperty(CommonOptionKeys.LOG_LEVEL_KEY) ?
(String) commandLineProperties.getProperty(CommonOptionKeys.LOG_LEVEL_KEY) :
LOG_LEVEL_DEFAULT;
@ -197,12 +197,12 @@ public class BitsquareEnvironment extends StandardEnvironment {
// btcNetworkDir used in defaultProperties
propertySources.addLast(defaultProperties());
} catch (Exception ex) {
throw new BitsquareException(ex);
throw new BisqException(ex);
}
}
private Resource getAppDirPropertiesResource() {
String location = String.format("file:%s/bitsquare.properties", appDataDir);
String location = String.format("file:%s/bisq.properties", appDataDir);
return resourceLoader.getResource(location);
}
@ -210,21 +210,21 @@ public class BitsquareEnvironment extends StandardEnvironment {
Resource resource = getAppDirPropertiesResource();
if (!resource.exists())
return new PropertySource.StubPropertySource(BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME);
return new PropertySource.StubPropertySource(BISQ_APP_DIR_PROPERTY_SOURCE_NAME);
return new ResourcePropertySource(BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME, resource);
return new ResourcePropertySource(BISQ_APP_DIR_PROPERTY_SOURCE_NAME, resource);
}
private PropertySource<?> homeDirProperties() throws Exception {
return new PropertySource.StubPropertySource(BITSQUARE_HOME_DIR_PROPERTY_SOURCE_NAME);
return new PropertySource.StubPropertySource(BISQ_HOME_DIR_PROPERTY_SOURCE_NAME);
}
private PropertySource<?> classpathProperties() throws Exception {
return new PropertySource.StubPropertySource(BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME);
return new PropertySource.StubPropertySource(BISQ_CLASSPATH_PROPERTY_SOURCE_NAME);
}
private PropertySource<?> defaultProperties() {
return new PropertiesPropertySource(BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME, new Properties() {
return new PropertiesPropertySource(BISQ_DEFAULT_PROPERTY_SOURCE_NAME, new Properties() {
private static final long serialVersionUID = -8478089705207326165L;
{

2
network/src/main/java/io/bisq/crypto/EncryptionService.java
View file

@ -19,9 +19,9 @@ package io.bisq.crypto;
import com.google.protobuf.InvalidProtocolBufferException;
import io.bisq.common.crypto.*;
import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.Message;
import io.bisq.p2p.network.ProtoBufferUtilities;
import io.bitsquare.common.wire.proto.Messages;
import javax.crypto.SecretKey;
import javax.inject.Inject;

2
network/src/main/java/io/bisq/messages/alert/Alert.java
View file

@ -21,8 +21,8 @@ import com.google.common.annotations.VisibleForTesting;
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.payload.StoragePayload;
import io.bitsquare.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/alert/PrivateNotification.java
View file

@ -21,7 +21,7 @@ import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.crypto.Sig;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/alert/PrivateNotificationMessage.java
View file

@ -2,9 +2,9 @@ package io.bisq.messages.alert;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.messaging.MailboxMessage;
import io.bitsquare.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/arbitration/Arbitrator.java
View file

@ -20,9 +20,9 @@ package io.bisq.messages.arbitration;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.storage.payload.StoragePayload;
import io.bitsquare.common.wire.proto.Messages;
import java.security.PublicKey;
import java.util.Arrays;

2
network/src/main/java/io/bisq/messages/arbitration/Dispute.java
View file

@ -22,9 +22,9 @@ import io.bisq.app.Version;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.util.Utilities;
import io.bisq.common.wire.Payload;
import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.trade.payload.Contract;
import io.bisq.storage.Storage;
import io.bitsquare.common.wire.proto.Messages;
import javafx.beans.property.*;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

2
network/src/main/java/io/bisq/messages/arbitration/DisputeCommunicationMessage.java
View file

@ -19,9 +19,9 @@ package io.bisq.messages.arbitration;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.messages.arbitration.payload.Attachment;
import io.bisq.p2p.NodeAddress;
import io.bitsquare.common.wire.proto.Messages;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import org.slf4j.Logger;

2
network/src/main/java/io/bisq/messages/arbitration/DisputeResult.java
View file

@ -20,7 +20,7 @@ package io.bisq.messages.arbitration;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import javafx.beans.property.*;
import lombok.EqualsAndHashCode;
import org.bitcoinj.core.Coin;

2
network/src/main/java/io/bisq/messages/arbitration/DisputeResultMessage.java
View file

@ -19,8 +19,8 @@ package io.bisq.messages.arbitration;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bitsquare.common.wire.proto.Messages;
public final class DisputeResultMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.

2
network/src/main/java/io/bisq/messages/arbitration/OpenNewDisputeMessage.java
View file

@ -19,8 +19,8 @@ package io.bisq.messages.arbitration;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bitsquare.common.wire.proto.Messages;
public final class OpenNewDisputeMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.

2
network/src/main/java/io/bisq/messages/arbitration/PeerOpenedDisputeMessage.java
View file

@ -19,8 +19,8 @@ package io.bisq.messages.arbitration;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bitsquare.common.wire.proto.Messages;
public final class PeerOpenedDisputeMessage extends DisputeMessage {
// That object is sent over the wire, so we need to take care of version compatibility.

2
network/src/main/java/io/bisq/messages/arbitration/PeerPublishedPayoutTxMessage.java
View file

@ -20,8 +20,8 @@ package io.bisq.messages.arbitration;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bitsquare.common.wire.proto.Messages;
import java.util.Arrays;

2
network/src/main/java/io/bisq/messages/arbitration/payload/Attachment.java
View file

@ -3,7 +3,7 @@ package io.bisq.messages.arbitration.payload;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/availability/OfferAvailabilityRequest.java
View file

@ -20,8 +20,8 @@ package io.bisq.messages.availability;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
import io.bisq.common.crypto.PubKeyRing;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;

2
network/src/main/java/io/bisq/messages/availability/OfferAvailabilityResponse.java
View file

@ -21,8 +21,8 @@ package io.bisq.messages.availability;
import io.bisq.app.Capabilities;
import io.bisq.app.Version;
import io.bisq.common.util.ProtoBufferUtils;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.messaging.SupportedCapabilitiesMessage;
import io.bitsquare.common.wire.proto.Messages;
import javax.annotation.Nullable;
import java.util.ArrayList;

2
network/src/main/java/io/bisq/messages/btc/data/RawTransactionInput.java
View file

@ -20,7 +20,7 @@ package io.bisq.messages.btc.data;
import com.google.protobuf.ByteString;
import io.bisq.app.Version;
import io.bisq.common.wire.Payload;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import java.util.Arrays;

2
network/src/main/java/io/bisq/messages/dao/compensation/payload/CompensationRequestPayload.java
View file

@ -20,10 +20,10 @@ package io.bisq.messages.dao.compensation.payload;
import io.bisq.app.Version;
import io.bisq.common.crypto.Sig;
import io.bisq.common.util.JsonExclude;
import io.bisq.common.wire.proto.Messages;
import io.bisq.p2p.NodeAddress;
import io.bisq.p2p.storage.payload.LazyProcessedStoragePayload;
import io.bisq.p2p.storage.payload.PersistedStoragePayload;
import io.bitsquare.common.wire.proto.Messages;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Utils;
import org.slf4j.Logger;

2
network/src/main/java/io/bisq/messages/filter/payload/Filter.java
View file

@ -20,8 +20,8 @@ package io.bisq.messages.filter.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.storage.payload.StoragePayload;
import io.bitsquare.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/filter/payload/PaymentAccountFilter.java
View file

@ -1,7 +1,7 @@
package io.bisq.messages.filter.payload;
import io.bisq.app.Version;
import io.bitsquare.common.wire.proto.Messages;
import io.bisq.common.wire.proto.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
network/src/main/java/io/bisq/messages/locale/CurrencyUtil.java
View file

@ -71,7 +71,7 @@ public class CurrencyUtil {
}
// Don't make a PR for adding a coin but follow the steps described here:
// https://forum.bitsquare.io/t/how-to-add-your-favorite-altcoin/
// https://forum.bisq.io/t/how-to-add-your-favorite-altcoin/
public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
final List<CryptoCurrency> result = new ArrayList<>();

Some files were not shown because too many files have changed in this diff Show more