mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-03 18:56:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #104 from bitcoinj-0.12

Browse source
This commit is contained in:
Chris Beams 2014-10-03 13:59:25 +02:00
commit 18c944da50
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
76 changed files with 226 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/codeStyleSettings.xml generated
View file

@ -18,7 +18,7 @@
<value> <value>
<package name="io.bitsquare" withSubpackages="true" static="false" /> <package name="io.bitsquare" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />
<package name="com.google.bitcoin" withSubpackages="true" static="false" /> <package name="org.bitcoinj" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />
<package name="com.google.common" withSubpackages="true" static="false" /> <package name="com.google.common" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />

2
build.gradle
View file

@ -28,7 +28,7 @@ repositories {
} }
dependencies { dependencies {
compile 'com.google:bitcoinj:0.12.308de4e-SNAPSHOT' compile 'org.bitcoinj:bitcoinj-core:0.12'
compile 'net.tomp2p:tomp2p-all:5.0-Alpha24.805623c-SNAPSHOT' compile 'net.tomp2p:tomp2p-all:5.0-Alpha24.805623c-SNAPSHOT'
compile 'org.slf4j:slf4j-api:1.7.7' compile 'org.slf4j:slf4j-api:1.7.7'
compile 'ch.qos.logback:logback-core:1.1.2' compile 'ch.qos.logback:logback-core:1.1.2'

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

@ -17,15 +17,15 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import com.google.bitcoin.core.TransactionOutput; import org.bitcoinj.core.TransactionOutput;
import com.google.bitcoin.params.RegTestParams; import org.bitcoinj.params.RegTestParams;
import com.google.bitcoin.wallet.CoinSelection; import org.bitcoinj.wallet.CoinSelection;
import com.google.bitcoin.wallet.DefaultCoinSelector; import org.bitcoinj.wallet.DefaultCoinSelector;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* This class implements a {@link com.google.bitcoin.wallet.CoinSelector} which attempts to get the highest priority * This class implements a {@link org.bitcoinj.wallet.CoinSelector} which attempts to get the highest priority
* possible. This means that the transaction is the most likely to get confirmed. Note that this means we may end up * 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. * "spending" more priority than would be required to get the transaction we are creating confirmed.
*/ */

8
src/main/java/io/bitsquare/btc/AddressEntry.java
View file

@ -17,10 +17,10 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import com.google.bitcoin.crypto.DeterministicKey; import org.bitcoinj.crypto.DeterministicKey;
import java.io.Serializable; import java.io.Serializable;

10
src/main/java/io/bitsquare/btc/FeePolicy.java
View file

@ -17,11 +17,11 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import javax.inject.Inject; import javax.inject.Inject;

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

@ -17,8 +17,8 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
// Lets see if we get more restriction otherwise move it to other class // Lets see if we get more restriction otherwise move it to other class
public class Restrictions { public class Restrictions {

62
src/main/java/io/bitsquare/btc/WalletFacade.java
View file

@ -24,31 +24,31 @@ import io.bitsquare.btc.listeners.TxConfidenceListener;
import io.bitsquare.crypto.CryptoFacade; import io.bitsquare.crypto.CryptoFacade;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import com.google.bitcoin.core.ScriptException; import org.bitcoinj.core.ScriptException;
import com.google.bitcoin.core.Sha256Hash; import org.bitcoinj.core.Sha256Hash;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import com.google.bitcoin.core.TransactionInput; import org.bitcoinj.core.TransactionInput;
import com.google.bitcoin.core.TransactionOutPoint; import org.bitcoinj.core.TransactionOutPoint;
import com.google.bitcoin.core.TransactionOutput; import org.bitcoinj.core.TransactionOutput;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import com.google.bitcoin.core.VerificationException; import org.bitcoinj.core.VerificationException;
import com.google.bitcoin.core.Wallet; import org.bitcoinj.core.Wallet;
import com.google.bitcoin.core.WalletEventListener; import org.bitcoinj.core.WalletEventListener;
import com.google.bitcoin.crypto.DeterministicKey; import org.bitcoinj.crypto.DeterministicKey;
import com.google.bitcoin.crypto.TransactionSignature; import org.bitcoinj.crypto.TransactionSignature;
import com.google.bitcoin.kits.WalletAppKit; import org.bitcoinj.kits.WalletAppKit;
import com.google.bitcoin.params.MainNetParams; import org.bitcoinj.params.MainNetParams;
import com.google.bitcoin.params.RegTestParams; import org.bitcoinj.params.RegTestParams;
import com.google.bitcoin.script.Script; import org.bitcoinj.script.Script;
import com.google.bitcoin.script.ScriptBuilder; import org.bitcoinj.script.ScriptBuilder;
import com.google.bitcoin.utils.Threading; import org.bitcoinj.utils.Threading;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory;
import lighthouse.files.AppDirectory; import lighthouse.files.AppDirectory;
import static com.google.bitcoin.script.ScriptOpCodes.OP_RETURN; import static org.bitcoinj.script.ScriptOpCodes.OP_RETURN;
/** /**
* TODO: use walletextension (with protobuffer) instead of saving addressEntryList via storage * TODO: use walletextension (with protobuffer) instead of saving addressEntryList via storage
@ -802,7 +802,7 @@ public class WalletFacade {
} }
log.trace("check if it can be correctly spent for input 1"); log.trace("check if it can be correctly spent for input 1");
input.getScriptSig().correctlySpends(tx, 1, scriptPubKey, false); input.getScriptSig().correctlySpends(tx, 1, scriptPubKey);
log.trace("verify tx"); log.trace("verify tx");
tx.verify(); tx.verify();
@ -917,12 +917,12 @@ public class WalletFacade {
throw new ScriptException("Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey); throw new ScriptException("Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey);
} }
input.getScriptSig().correctlySpends(tx, 0, scriptPubKey, false); input.getScriptSig().correctlySpends(tx, 0, scriptPubKey);
log.trace("check if it can be correctly spent for input 0 OK"); log.trace("check if it can be correctly spent for input 0 OK");
TransactionInput input1 = tx.getInput(1); TransactionInput input1 = tx.getInput(1);
scriptPubKey = input1.getConnectedOutput().getScriptPubKey(); scriptPubKey = input1.getConnectedOutput().getScriptPubKey();
input1.getScriptSig().correctlySpends(tx, 1, scriptPubKey, false); input1.getScriptSig().correctlySpends(tx, 1, scriptPubKey);
log.trace("check if it can be correctly spent for input 1 OK"); log.trace("check if it can be correctly spent for input 1 OK");
/* /*
@ -1053,7 +1053,7 @@ public class WalletFacade {
tx.verify(); tx.verify();
log.trace("check if it can be correctly spent for ms input"); log.trace("check if it can be correctly spent for ms input");
tx.getInput(0).getScriptSig().correctlySpends(tx, 0, multiSigScript, false); tx.getInput(0).getScriptSig().correctlySpends(tx, 0, multiSigScript);
log.trace("verify multiSigOutput"); log.trace("verify multiSigOutput");
tx.getInput(0).verify(multiSigOutput); tx.getInput(0).verify(multiSigOutput);
@ -1140,7 +1140,7 @@ public class WalletFacade {
void downloadComplete(); void downloadComplete();
} }
private class BlockChainDownloadListener extends com.google.bitcoin.core.DownloadListener { private class BlockChainDownloadListener extends org.bitcoinj.core.DownloadListener {
@Override @Override
protected void progress(double percent, int blocksSoFar, Date date) { protected void progress(double percent, int blocksSoFar, Date date) {
super.progress(percent, blocksSoFar, date); super.progress(percent, blocksSoFar, date);

4
src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.btc.listeners; package io.bitsquare.btc.listeners;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
public class AddressConfidenceListener { public class AddressConfidenceListener {
private final Address address; private final Address address;

4
src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.btc.listeners; package io.bitsquare.btc.listeners;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
public class BalanceListener { public class BalanceListener {
private Address address; private Address address;

2
src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.btc.listeners; package io.bitsquare.btc.listeners;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
public class TxConfidenceListener { public class TxConfidenceListener {
private final String txID; private final String txID;

8
src/main/java/io/bitsquare/crypto/CryptoFacade.java
View file

@ -17,10 +17,10 @@
package io.bitsquare.crypto; package io.bitsquare.crypto;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.Sha256Hash; import org.bitcoinj.core.Sha256Hash;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import com.google.bitcoin.crypto.KeyCrypterException; import org.bitcoinj.crypto.KeyCrypterException;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;

8
src/main/java/io/bitsquare/di/BitSquareModule.java
View file

@ -41,10 +41,10 @@ import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.ConfigLoader; import io.bitsquare.util.ConfigLoader;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import com.google.bitcoin.params.MainNetParams; import org.bitcoinj.params.MainNetParams;
import com.google.bitcoin.params.RegTestParams; import org.bitcoinj.params.RegTestParams;
import com.google.bitcoin.params.TestNet3Params; import org.bitcoinj.params.TestNet3Params;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Provider; import com.google.inject.Provider;

4
src/main/java/io/bitsquare/gui/components/AddressTextField.java
View file

@ -19,8 +19,8 @@ package io.bitsquare.gui.components;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.uri.BitcoinURI; import org.bitcoinj.uri.BitcoinURI;
import java.awt.*; import java.awt.*;

6
src/main/java/io/bitsquare/gui/components/BalanceTextField.java
View file

@ -23,9 +23,9 @@ import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.effect.*; import javafx.scene.effect.*;

2
src/main/java/io/bitsquare/gui/components/Popups.java
View file

@ -21,7 +21,7 @@ import io.bitsquare.BitSquare;
import io.bitsquare.gui.OverlayManager; import io.bitsquare.gui.OverlayManager;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import com.google.bitcoin.store.BlockStoreException; import org.bitcoinj.store.BlockStoreException;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;

2
src/main/java/io/bitsquare/gui/components/TxIdTextField.java
View file

@ -21,7 +21,7 @@ import io.bitsquare.btc.WalletFacade;
import io.bitsquare.btc.listeners.TxConfidenceListener; import io.bitsquare.btc.listeners.TxConfidenceListener;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import java.awt.*; import java.awt.*;

12
src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
View file

@ -31,12 +31,12 @@ import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Wallet; import org.bitcoinj.core.Wallet;
import com.google.bitcoin.core.WalletEventListener; import org.bitcoinj.core.WalletEventListener;
import com.google.bitcoin.script.Script; import org.bitcoinj.script.Script;
import java.net.URL; import java.net.URL;

6
src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java
View file

@ -25,9 +25,9 @@ import io.bitsquare.gui.UIModel;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

4
src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.gui.PresentationModel;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.inject.Inject; import com.google.inject.Inject;

4
src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java
View file

@ -30,8 +30,8 @@ import io.bitsquare.settings.Settings;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import com.google.inject.Inject; import com.google.inject.Inject;

10
src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
View file

@ -22,11 +22,11 @@ import io.bitsquare.btc.listeners.AddressConfidenceListener;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import com.google.bitcoin.core.TransactionOutput; import org.bitcoinj.core.TransactionOutput;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

2
src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java
View file

@ -22,7 +22,7 @@ import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import java.net.URL; import java.net.URL;

6
src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
View file

@ -24,9 +24,9 @@ import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

8
src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalViewCB.java
View file

@ -26,10 +26,10 @@ import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

10
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java
View file

@ -28,11 +28,11 @@ import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

4
src/main/java/io/bitsquare/gui/main/trade/TradeNavigator.java
View file

@ -19,8 +19,8 @@ package io.bitsquare.gui.main.trade;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
public interface TradeNavigator { public interface TradeNavigator {
void createOffer(Coin amount, Fiat price); void createOffer(Coin amount, Fiat price);

4
src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java
View file

@ -27,8 +27,8 @@ import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import io.bitsquare.util.ViewLoader; import io.bitsquare.util.ViewLoader;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.io.IOException; import java.io.IOException;

6
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java
View file

@ -32,9 +32,9 @@ import io.bitsquare.trade.Direction;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;

6
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
View file

@ -26,9 +26,9 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Direction; import io.bitsquare.trade.Direction;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import javax.inject.Inject; import javax.inject.Inject;

4
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View file

@ -33,8 +33,8 @@ import io.bitsquare.gui.util.ImageUtil;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Direction; import io.bitsquare.trade.Direction;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.net.URL; import java.net.URL;

6
src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookModel.java
View file

@ -28,9 +28,9 @@ import io.bitsquare.trade.Offer;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;

4
src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookPM.java
View file

@ -26,8 +26,8 @@ import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Direction; import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;

6
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
View file

@ -27,9 +27,9 @@ import io.bitsquare.trade.Offer;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;

4
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java
View file

@ -26,8 +26,8 @@ import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Direction; import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import javax.inject.Inject; import javax.inject.Inject;

2
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
View file

@ -35,7 +35,7 @@ import io.bitsquare.locale.BSResources;
import io.bitsquare.trade.Direction; import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import java.net.URL; import java.net.URL;

18
src/main/java/io/bitsquare/gui/util/BSFormatter.java
View file

@ -24,9 +24,9 @@ import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.CoinFormat; import org.bitcoinj.utils.Fiat;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.MonetaryFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -66,12 +66,12 @@ public class BSFormatter {
// Input of a group separator (1,123,45) lead to an validation error. // Input of a group separator (1,123,45) lead to an validation error.
// Note: BtcFormat was intended to be used, but it lead to many problems (automatic format to mBit, // Note: BtcFormat was intended to be used, but it lead to many problems (automatic format to mBit,
// no way to remove grouping separator). It seems to be not optimal for user input formatting. // no way to remove grouping separator). It seems to be not optimal for user input formatting.
private CoinFormat coinFormat = CoinFormat.BTC.repeatOptionalDecimals(2, 1); private MonetaryFormat coinFormat = MonetaryFormat.BTC.repeatOptionalDecimals(2, 1);
private String currencyCode = Currency.getInstance(Locale.getDefault()).getCurrencyCode(); private String currencyCode = Currency.getInstance(Locale.getDefault()).getCurrencyCode();
// format is like: 1,00 never more then 2 decimals // format is like: 1,00 never more then 2 decimals
private final CoinFormat fiatFormat = CoinFormat.FIAT.repeatOptionalDecimals(0, 0).code(0, currencyCode); private final MonetaryFormat fiatFormat = MonetaryFormat.FIAT.repeatOptionalDecimals(0, 0).code(0, currencyCode);
@Inject @Inject
@ -95,7 +95,7 @@ public class BSFormatter {
public void useMilliBitFormat(boolean useMilliBit) { public void useMilliBitFormat(boolean useMilliBit) {
this.useMilliBit = useMilliBit; this.useMilliBit = useMilliBit;
coinFormat = getCoinFormat(); coinFormat = getMonetaryFormat();
scale = useMilliBit ? 0 : 3; scale = useMilliBit ? 0 : 3;
} }
@ -106,11 +106,11 @@ public class BSFormatter {
this.locale = locale; this.locale = locale;
} }
private CoinFormat getCoinFormat() { private MonetaryFormat getMonetaryFormat() {
if (useMilliBit) if (useMilliBit)
return CoinFormat.MBTC.repeatOptionalDecimals(2, 1); return MonetaryFormat.MBTC.repeatOptionalDecimals(2, 1);
else else
return CoinFormat.BTC.repeatOptionalDecimals(2, 1); return MonetaryFormat.BTC.repeatOptionalDecimals(2, 1);
} }
public void setFiatCurrencyCode(String currencyCode) { public void setFiatCurrencyCode(String currencyCode) {

6
src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
View file

@ -17,9 +17,9 @@
package io.bitsquare.gui.util.validation; package io.bitsquare.gui.util.validation;
import com.google.bitcoin.core.Address; import org.bitcoinj.core.Address;
import com.google.bitcoin.core.AddressFormatException; import org.bitcoinj.core.AddressFormatException;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import javax.inject.Inject; import javax.inject.Inject;

2
src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.util.validation;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import java.math.BigDecimal; import java.math.BigDecimal;

2
src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.util.validation;
import io.bitsquare.locale.BSResources; import io.bitsquare.locale.BSResources;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import java.math.BigDecimal; import java.math.BigDecimal;

2
src/main/java/io/bitsquare/persistence/Persistence.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.persistence;
import io.bitsquare.BitSquare; import io.bitsquare.BitSquare;
import io.bitsquare.util.FileUtil; import io.bitsquare.util.FileUtil;
import com.google.bitcoin.utils.Threading; import org.bitcoinj.utils.Threading;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;

6
src/main/java/io/bitsquare/settings/Settings.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.settings;
import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import com.google.bitcoin.utils.CoinFormat; import org.bitcoinj.utils.MonetaryFormat;
import java.io.Serializable; import java.io.Serializable;
@ -42,8 +42,8 @@ public class Settings implements Serializable {
// which will be used for multiplying with the amount to get the collateral size in BTC. // which will be used for multiplying with the amount to get the collateral size in BTC.
private String btcDenominationString = CoinFormat.CODE_BTC; private String btcDenominationString = MonetaryFormat.CODE_BTC;
final transient StringProperty btcDenomination = new SimpleStringProperty(CoinFormat.CODE_BTC); final transient StringProperty btcDenomination = new SimpleStringProperty(MonetaryFormat.CODE_BTC);
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Constructor // Constructor

2
src/main/java/io/bitsquare/trade/Contract.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.trade;
import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccount;
import io.bitsquare.util.DSAKeyUtil; import io.bitsquare.util.DSAKeyUtil;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import java.io.Serializable; import java.io.Serializable;

6
src/main/java/io/bitsquare/trade/Offer.java
View file

@ -21,9 +21,9 @@ import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccountType; import io.bitsquare.bank.BankAccountType;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.io.Serializable; import java.io.Serializable;

6
src/main/java/io/bitsquare/trade/Trade.java
View file

@ -17,9 +17,9 @@
package io.bitsquare.trade; package io.bitsquare.trade;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.io.Serializable; import java.io.Serializable;

6
src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -41,9 +41,9 @@ import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.trade.handlers; package io.bitsquare.trade.handlers;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
public interface TransactionResultHandler { public interface TransactionResultHandler {
void onResult(Transaction transaction); void onResult(Transaction transaction);

2
src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
View file

@ -28,7 +28,7 @@ import io.bitsquare.trade.protocol.createoffer.tasks.CreateOfferFeeTx;
import io.bitsquare.trade.protocol.createoffer.tasks.PublishOfferToDHT; import io.bitsquare.trade.protocol.createoffer.tasks.PublishOfferToDHT;
import io.bitsquare.trade.protocol.createoffer.tasks.VerifyOffer; import io.bitsquare.trade.protocol.createoffer.tasks.VerifyOffer;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/BroadCastOfferFeeTx.java
View file

@ -21,7 +21,7 @@ import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.FaultHandler;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

2
src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/CreateOfferFeeTx.java
View file

@ -21,7 +21,7 @@ import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.FaultHandler;
import io.bitsquare.trade.handlers.TransactionResultHandler; import io.bitsquare.trade.handlers.TransactionResultHandler;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
View file

@ -41,10 +41,10 @@ import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDep
import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import java.security.PublicKey; import java.security.PublicKey;

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocolListener.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer;
import io.bitsquare.trade.Offer; import io.bitsquare.trade.Offer;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
public interface BuyerAcceptsOfferProtocolListener { public interface BuyerAcceptsOfferProtocolListener {
void onOfferAccepted(Offer offer); void onOfferAccepted(Offer offer);

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.messages;
import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.trade.TradeMessage;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import java.io.Serializable; import java.io.Serializable;

8
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
View file

@ -20,10 +20,10 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
View file

@ -23,8 +23,8 @@ import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import net.tomp2p.peers.PeerAddress; import net.tomp2p.peers.PeerAddress;

4
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java
View file

@ -24,8 +24,8 @@ import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import javafx.util.Pair; import javafx.util.Pair;

4
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
View file

@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener; import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

4
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
View file

@ -24,8 +24,8 @@ import io.bitsquare.trade.Offer;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import java.security.PublicKey; import java.security.PublicKey;

6
src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java
View file

@ -41,9 +41,9 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import java.security.PublicKey; import java.security.PublicKey;

2
src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocolListener.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
public interface SellerTakesOfferProtocolListener { public interface SellerTakesOfferProtocolListener {
void onDepositTxPublished(Transaction depositTx); void onDepositTxPublished(Transaction depositTx);

2
src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.messages;
import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.trade.TradeMessage;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import java.io.Serializable; import java.io.Serializable;

4
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
View file

@ -24,8 +24,8 @@ import io.bitsquare.trade.Offer;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.util.Utilities; import io.bitsquare.util.Utilities;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.ECKey; import org.bitcoinj.core.ECKey;
import java.security.PublicKey; import java.security.PublicKey;

6
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
View file

@ -20,9 +20,9 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
View file

@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import com.google.bitcoin.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

4
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
View file

@ -25,8 +25,8 @@ import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import java.security.PublicKey; import java.security.PublicKey;

2
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java
View file

@ -23,7 +23,7 @@ import io.bitsquare.trade.handlers.ExceptionHandler;
import io.bitsquare.trade.handlers.ResultHandler; import io.bitsquare.trade.handlers.ResultHandler;
import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage; import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import net.tomp2p.peers.PeerAddress; import net.tomp2p.peers.PeerAddress;

6
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
View file

@ -20,9 +20,9 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.trade.handlers.ExceptionHandler; import io.bitsquare.trade.handlers.ExceptionHandler;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;

2
src/main/java/io/bitsquare/util/DSAKeyUtil.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.util; package io.bitsquare.util;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import java.security.KeyPair; import java.security.KeyPair;
import java.security.KeyPairGenerator; import java.security.KeyPairGenerator;

2
src/main/java/io/bitsquare/util/FileUtil.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.util; package io.bitsquare.util;
import com.google.bitcoin.core.Utils; import org.bitcoinj.core.Utils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

4
src/main/java/io/bitsquare/util/Utilities.java
View file

@ -63,7 +63,7 @@ public class Utilities {
Object result = null; Object result = null;
try { try {
ByteArrayInputStream byteInputStream = ByteArrayInputStream byteInputStream =
new ByteArrayInputStream(com.google.bitcoin.core.Utils.parseAsHexOrBase58(serializedHexString)); new ByteArrayInputStream(org.bitcoinj.core.Utils.parseAsHexOrBase58(serializedHexString));
try (ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream)) { try (ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream)) {
result = objectInputStream.readObject(); result = objectInputStream.readObject();
@ -88,7 +88,7 @@ public class Utilities {
ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream); ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
objectOutputStream.writeObject(serializable); objectOutputStream.writeObject(serializable);
result = com.google.bitcoin.core.Utils.HEX.encode(byteArrayOutputStream.toByteArray()); result = org.bitcoinj.core.Utils.HEX.encode(byteArrayOutputStream.toByteArray());
byteArrayOutputStream.close(); byteArrayOutputStream.close();
objectOutputStream.close(); objectOutputStream.close();

2
src/main/java/io/bitsquare/util/Validator.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.util; package io.bitsquare.util;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -25,7 +25,7 @@
<logger name="io.bitsquare" level="TRACE"/> <logger name="io.bitsquare" level="TRACE"/>
<logger name="com.google.bitcoin" level="WARN"/> <logger name="org.bitcoinj" level="WARN"/>
<logger name="net.tomp2p" level="WARN"/> <logger name="net.tomp2p" level="WARN"/>
<logger name="io.netty.util" level="WARN"/> <logger name="io.netty.util" level="WARN"/>
@ -37,16 +37,16 @@
<logger name="io.bitsquare.gui.util.Profiler" level="TRACE"/> <logger name="io.bitsquare.gui.util.Profiler" level="TRACE"/>
<!-- <!--
<logger name="com.google.bitcoin.core.Wallet" level="OFF"/> <logger name="org.bitcoinj.core.Wallet" level="OFF"/>
<logger name="com.google.bitcoin.core.MemoryPool" level="OFF"/> <logger name="org.bitcoinj.core.MemoryPool" level="OFF"/>
<logger name="com.google.bitcoin.net.discovery.DnsDiscovery" level="OFF"/> <logger name="org.bitcoinj.net.discovery.DnsDiscovery" level="OFF"/>
<logger name="com.google.bitcoin.core.DownloadListener" level="OFF"/> <logger name="org.bitcoinj.core.DownloadListener" level="OFF"/>
<logger name="com.google.bitcoin.core.TransactionOutput" level="OFF"/> <logger name="org.bitcoinj.core.TransactionOutput" level="OFF"/>
<logger name="com.google.bitcoin.core.BitcoinSerializer" level="OFF"/> <logger name="org.bitcoinj.core.BitcoinSerializer" level="OFF"/>
<logger name="com.google.bitcoin.core.Peer" level="OFF"/> <logger name="org.bitcoinj.core.Peer" level="OFF"/>
<logger name="com.google.bitcoin.core.PeerGroup" level="OFF"/> <logger name="org.bitcoinj.core.PeerGroup" level="OFF"/>
<logger name="com.google.bitcoin.core.PeerSocketHandler" level="OFF"/> <logger name="org.bitcoinj.core.PeerSocketHandler" level="OFF"/>
<logger name="com.google.bitcoin.net.NioClientManager" level="OFF"/> <logger name="org.bitcoinj.net.NioClientManager" level="OFF"/>
<logger name="com.google.bitcoin.net.ConnectionHandler" level="OFF"/> <logger name="org.bitcoinj.net.ConnectionHandler" level="OFF"/>
--> -->
</configuration> </configuration>

4
src/test/java/io/bitsquare/btc/RestrictionsTest.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.btc; package io.bitsquare.btc;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.Transaction; import org.bitcoinj.core.Transaction;
import org.junit.Test; import org.junit.Test;

4
src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java
View file

@ -24,8 +24,8 @@ import io.bitsquare.gui.util.validation.FiatValidator;
import io.bitsquare.locale.Country; import io.bitsquare.locale.Country;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.utils.Fiat; import org.bitcoinj.utils.Fiat;
import java.util.Locale; import java.util.Locale;

2
src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.util;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import java.util.Locale; import java.util.Locale;

4
src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.gui.util.validation; package io.bitsquare.gui.util.validation;
import com.google.bitcoin.core.Coin; import org.bitcoinj.core.Coin;
import com.google.bitcoin.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import org.junit.Test; import org.junit.Test;