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

Rename WalletService to BitcoinWalletService

Browse source
This commit is contained in:
Manfred Karrer 2016-12-08 00:11:05 +01:00
parent 3654fa815e
commit 7357a1afd1
50 changed files with 152 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/io/bitsquare/arbitration/DisputeManager.java
View file

@ -23,8 +23,8 @@ import io.bitsquare.app.Log;
import io.bitsquare.arbitration.messages.*;
import io.bitsquare.arbitration.payload.Attachment;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.exceptions.TransactionVerificationException;
import io.bitsquare.btc.exceptions.WalletException;
import io.bitsquare.common.Timer;
@ -69,7 +69,7 @@ public class DisputeManager {
private static final Logger log = LoggerFactory.getLogger(DisputeManager.class);
private final TradeWalletService tradeWalletService;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeManager tradeManager;
private ClosedTradableManager closedTradableManager;
private final OpenOfferManager openOfferManager;
@ -93,7 +93,7 @@ public class DisputeManager {
@Inject
public DisputeManager(P2PService p2PService,
TradeWalletService tradeWalletService,
WalletService walletService,
BitcoinWalletService walletService,
TradeManager tradeManager,
ClosedTradableManager closedTradableManager,
OpenOfferManager openOfferManager,

2
core/src/main/java/io/bitsquare/btc/BitcoinModule.java
View file

@ -57,7 +57,7 @@ public class BitcoinModule extends AppModule {
bind(AddressEntryList.class).in(Singleton.class);
bind(TradeWalletService.class).in(Singleton.class);
bind(WalletService.class).in(Singleton.class);
bind(BitcoinWalletService.class).in(Singleton.class);
bind(BlockchainService.class).in(Singleton.class);
bind(PriceFeedService.class).in(Singleton.class);

20
core/src/main/java/io/bitsquare/btc/WalletService.java → core/src/main/java/io/bitsquare/btc/BitcoinWalletService.java
View file

@ -73,8 +73,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
* WalletService handles all non trade specific wallet and bitcoin related services.
* It startup the wallet app kit and initialized the wallet.
*/
public class WalletService {
private static final Logger log = LoggerFactory.getLogger(WalletService.class);
public class BitcoinWalletService {
private static final Logger log = LoggerFactory.getLogger(BitcoinWalletService.class);
private static final long STARTUP_TIMEOUT_SEC = 60;
@ -113,14 +113,14 @@ public class WalletService {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public WalletService(RegTestHost regTestHost,
TradeWalletService tradeWalletService,
AddressEntryList addressEntryList,
UserAgent userAgent,
Preferences preferences,
FeeService feeService,
Socks5ProxyProvider socks5ProxyProvider,
@Named(BtcOptionKeys.WALLET_DIR) File appDir) {
public BitcoinWalletService(RegTestHost regTestHost,
TradeWalletService tradeWalletService,
AddressEntryList addressEntryList,
UserAgent userAgent,
Preferences preferences,
FeeService feeService,
Socks5ProxyProvider socks5ProxyProvider,
@Named(BtcOptionKeys.WALLET_DIR) File appDir) {
this.regTestHost = regTestHost;
this.tradeWalletService = tradeWalletService;
this.addressEntryList = addressEntryList;

20
core/src/main/java/io/bitsquare/btc/TradeWalletService.java
View file

@ -167,7 +167,7 @@ public class TradeWalletService {
checkNotNull(wallet, "Wallet must not be null");
wallet.completeTx(sendRequest);
WalletService.printTxWithInputs("tradingFeeTx", tradingFeeTx);
BitcoinWalletService.printTxWithInputs("tradingFeeTx", tradingFeeTx);
return tradingFeeTx;
}
@ -235,7 +235,7 @@ public class TradeWalletService {
verifyTransaction(dummyTX);
WalletService.printTxWithInputs("dummyTX", dummyTX);
BitcoinWalletService.printTxWithInputs("dummyTX", dummyTX);
List<RawTransactionInput> rawTransactionInputList = dummyTX.getInputs().stream()
.map(e -> {
@ -403,7 +403,7 @@ public class TradeWalletService {
verifyTransaction(preparedDepositTx);
WalletService.printTxWithInputs("preparedDepositTx", preparedDepositTx);
BitcoinWalletService.printTxWithInputs("preparedDepositTx", preparedDepositTx);
return new PreparedDepositTxAndOffererInputs(offererRawTransactionInputs, preparedDepositTx.bitcoinSerialize());
}
@ -489,7 +489,7 @@ public class TradeWalletService {
// Add all outputs from offerersDepositTx to depositTx
offerersDepositTx.getOutputs().forEach(depositTx::addOutput);
WalletService.printTxWithInputs("offerersDepositTx", offerersDepositTx);
BitcoinWalletService.printTxWithInputs("offerersDepositTx", offerersDepositTx);
// Sign inputs
int start = takerIsSeller ? buyerInputs.size() : 0;
@ -503,7 +503,7 @@ public class TradeWalletService {
verifyTransaction(depositTx);
checkWalletConsistency();
WalletService.printTxWithInputs("depositTx", depositTx);
BitcoinWalletService.printTxWithInputs("depositTx", depositTx);
// Broadcast depositTx
checkNotNull(walletAppKit);
@ -573,7 +573,7 @@ public class TradeWalletService {
verifyTransaction(preparedPayoutTx);
WalletService.printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
BitcoinWalletService.printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
return sellerSignature.encodeToDER();
}
@ -647,7 +647,7 @@ public class TradeWalletService {
TransactionInput input = payoutTx.getInput(0);
input.setScriptSig(inputScript);
WalletService.printTxWithInputs("payoutTx", payoutTx);
BitcoinWalletService.printTxWithInputs("payoutTx", payoutTx);
verifyTransaction(payoutTx);
checkWalletConsistency();
@ -728,7 +728,7 @@ public class TradeWalletService {
verifyTransaction(preparedPayoutTx);
WalletService.printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
BitcoinWalletService.printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
return arbitratorSignature.encodeToDER();
}
@ -817,7 +817,7 @@ public class TradeWalletService {
checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
input.verify(input.getConnectedOutput());
WalletService.printTxWithInputs("disputed payoutTx", payoutTx);
BitcoinWalletService.printTxWithInputs("disputed payoutTx", payoutTx);
// As we use lockTime the tx will not be relayed as it is not considered standard.
// We need to broadcast on our own when we reached the block height. Both peers will do the broadcast.
@ -942,7 +942,7 @@ public class TradeWalletService {
TransactionInput input = payoutTx.getInput(0);
input.setScriptSig(inputScript);
WalletService.printTxWithInputs("payoutTx", payoutTx);
BitcoinWalletService.printTxWithInputs("payoutTx", payoutTx);
verifyTransaction(payoutTx);
checkWalletConsistency();

4
core/src/main/java/io/bitsquare/trade/Trade.java
View file

@ -25,8 +25,8 @@ import io.bitsquare.app.Log;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.crypto.KeyRing;
import io.bitsquare.common.taskrunner.Model;
import io.bitsquare.crypto.DecryptedMsgWithPubKey;
@ -228,7 +228,7 @@ public abstract class Trade implements Tradable, Model {
}
public void init(P2PService p2PService,
WalletService walletService,
BitcoinWalletService walletService,
TradeWalletService tradeWalletService,
ArbitratorManager arbitratorManager,
TradeManager tradeManager,

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

@ -22,8 +22,8 @@ import io.bitsquare.app.Log;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.AddressEntryException;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.crypto.KeyRing;
@ -81,7 +81,7 @@ public class TradeManager {
private final User user;
private final KeyRing keyRing;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private final OpenOfferManager openOfferManager;
private final ClosedTradableManager closedTradableManager;
@ -105,7 +105,7 @@ public class TradeManager {
@Inject
public TradeManager(User user,
KeyRing keyRing,
WalletService walletService,
BitcoinWalletService walletService,
TradeWalletService tradeWalletService,
OpenOfferManager openOfferManager,
ClosedTradableManager closedTradableManager,

6
core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
View file

@ -21,8 +21,8 @@ import com.google.inject.Inject;
import io.bitsquare.app.DevFlags;
import io.bitsquare.app.Log;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.common.Timer;
import io.bitsquare.common.UserThread;
@ -78,7 +78,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
private final KeyRing keyRing;
private final User user;
private final P2PService p2PService;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private final OfferBookService offerBookService;
private final ClosedTradableManager closedTradableManager;
@ -98,7 +98,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
public OpenOfferManager(KeyRing keyRing,
User user,
P2PService p2PService,
WalletService walletService,
BitcoinWalletService walletService,
TradeWalletService tradeWalletService,
OfferBookService offerBookService,
ClosedTradableManager closedTradableManager,

6
core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.trade.protocol.placeoffer;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.taskrunner.Model;
import io.bitsquare.trade.offer.Offer;
import io.bitsquare.trade.offer.OfferBookService;
@ -34,7 +34,7 @@ public class PlaceOfferModel implements Model {
public final Offer offer;
public final Coin reservedFundsForOffer;
public final boolean useSavingsWallet;
public final WalletService walletService;
public final BitcoinWalletService walletService;
public final TradeWalletService tradeWalletService;
public final OfferBookService offerBookService;
public final User user;
@ -44,7 +44,7 @@ public class PlaceOfferModel implements Model {
public PlaceOfferModel(Offer offer,
Coin reservedFundsForOffer,
boolean useSavingsWallet,
WalletService walletService,
BitcoinWalletService walletService,
TradeWalletService tradeWalletService,
OfferBookService offerBookService,
User user) {

4
core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.placeoffer.tasks;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.p2p.NodeAddress;
@ -49,7 +49,7 @@ public class CreateOfferFeeTx extends Task<PlaceOfferModel> {
log.debug("selectedArbitratorAddress " + selectedArbitratorNodeAddress);
Arbitrator selectedArbitrator = model.user.getAcceptedArbitratorByAddress(selectedArbitratorNodeAddress);
checkNotNull(selectedArbitrator, "selectedArbitrator must not be null at CreateOfferFeeTx");
WalletService walletService = model.walletService;
BitcoinWalletService walletService = model.walletService;
String id = offer.getId();
Transaction transaction = model.tradeWalletService.createTradingFeeTx(
walletService.getOrCreateAddressEntry(id, AddressEntry.Context.OFFER_FUNDING).getAddress(),

8
core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java
View file

@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.data.RawTransactionInput;
import io.bitsquare.common.crypto.KeyRing;
import io.bitsquare.common.crypto.PubKeyRing;
@ -60,7 +60,7 @@ public class ProcessModel implements Model, Serializable {
// Transient/Immutable
transient private TradeManager tradeManager;
transient private OpenOfferManager openOfferManager;
transient private WalletService walletService;
transient private BitcoinWalletService walletService;
transient private TradeWalletService tradeWalletService;
transient private ArbitratorManager arbitratorManager;
transient private Offer offer;
@ -104,7 +104,7 @@ public class ProcessModel implements Model, Serializable {
TradeManager tradeManager,
OpenOfferManager openOfferManager,
P2PService p2PService,
WalletService walletService,
BitcoinWalletService walletService,
TradeWalletService tradeWalletService,
ArbitratorManager arbitratorManager,
User user,
@ -139,7 +139,7 @@ public class ProcessModel implements Model, Serializable {
return openOfferManager;
}
public WalletService getWalletService() {
public BitcoinWalletService getWalletService() {
return walletService;
}

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.tasks.buyer;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.data.PreparedDepositTxAndOffererInputs;
import io.bitsquare.common.crypto.Hash;
import io.bitsquare.common.taskrunner.TaskRunner;
@ -53,7 +53,7 @@ public class OffererCreatesAndSignsDepositTxAsBuyer extends TradeTask {
byte[] contractHash = Hash.getHash(trade.getContractAsJson());
trade.setContractHash(contractHash);
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
String id = processModel.getOffer().getId();
AddressEntry buyerMultiSigAddressEntry = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.MULTI_SIG);
buyerMultiSigAddressEntry.setLockedTradeAmount(buyerInputAmount.subtract(trade.getTxFee()));

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.tasks.buyer;
import com.google.common.util.concurrent.FutureCallback;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.data.RawTransactionInput;
import io.bitsquare.common.crypto.Hash;
import io.bitsquare.common.taskrunner.TaskRunner;
@ -55,7 +55,7 @@ public class SignAndPublishDepositTxAsBuyer extends TradeTask {
byte[] contractHash = Hash.getHash(trade.getContractAsJson());
trade.setContractHash(contractHash);
ArrayList<RawTransactionInput> buyerInputs = processModel.getRawTransactionInputs();
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
AddressEntry buyerMultiSigAddressEntry = walletService.getOrCreateAddressEntry(processModel.getOffer().getId(), AddressEntry.Context.MULTI_SIG);
buyerMultiSigAddressEntry.setLockedTradeAmount(Coin.valueOf(buyerInputs.stream().mapToLong(input -> input.value).sum()).subtract(trade.getTxFee()));
walletService.saveAddressEntryList();

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

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.tasks.offerer;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.taskrunner.TaskRunner;
@ -51,7 +51,7 @@ public class SetupDepositBalanceListener extends TradeTask {
try {
runInterceptHook();
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
Address address = walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE).getAddress();
balanceListener = new BalanceListener(address) {
@Override

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.tasks.seller;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.data.PreparedDepositTxAndOffererInputs;
import io.bitsquare.common.crypto.Hash;
import io.bitsquare.common.taskrunner.TaskRunner;
@ -53,7 +53,7 @@ public class OffererCreatesAndSignsDepositTxAsSeller extends TradeTask {
byte[] contractHash = Hash.getHash(trade.getContractAsJson());
trade.setContractHash(contractHash);
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
String id = processModel.getOffer().getId();
AddressEntry sellerMultiSigAddressEntry = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.MULTI_SIG);
sellerMultiSigAddressEntry.setLockedTradeAmount(sellerInputAmount.subtract(trade.getTxFee()));

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.tasks.seller;
import com.google.common.util.concurrent.FutureCallback;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.data.RawTransactionInput;
import io.bitsquare.common.crypto.Hash;
import io.bitsquare.common.taskrunner.TaskRunner;
@ -54,7 +54,7 @@ public class SignAndPublishDepositTxAsSeller extends TradeTask {
trade.setContractHash(contractHash);
ArrayList<RawTransactionInput> sellerInputs = processModel.getRawTransactionInputs();
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
AddressEntry sellerMultiSigAddressEntry = walletService.getOrCreateAddressEntry(processModel.getOffer().getId(), AddressEntry.Context.MULTI_SIG);
sellerMultiSigAddressEntry.setLockedTradeAmount(Coin.valueOf(sellerInputs.stream().mapToLong(input -> input.value).sum()).subtract(trade.getTxFee()));
walletService.saveAddressEntryList();

4
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.trade.protocol.trade.tasks.seller;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
@ -54,7 +54,7 @@ public class SignPayoutTx extends TradeTask {
lockTimeAsBlockHeight = processModel.getTradeWalletService().getLastBlockSeenHeight() + lockTime;
trade.setLockTimeAsBlockHeight(lockTimeAsBlockHeight);
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
String id = processModel.getOffer().getId();
byte[] payoutTxSignature = processModel.getTradeWalletService().sellerSignsPayoutTx(
trade.getDepositTx(),

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

@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.tasks.taker;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.p2p.NodeAddress;
import io.bitsquare.trade.Trade;
@ -49,7 +49,7 @@ public class CreateTakeOfferFeeTx extends TradeTask {
log.debug("selectedArbitratorAddress " + selectedArbitratorNodeAddress);
Arbitrator selectedArbitrator = user.getAcceptedArbitratorByAddress(selectedArbitratorNodeAddress);
checkNotNull(selectedArbitrator, "selectedArbitrator must not be null at CreateTakeOfferFeeTx");
WalletService walletService = processModel.getWalletService();
BitcoinWalletService walletService = processModel.getWalletService();
String id = model.getOffer().getId();
Transaction createTakeOfferFeeTx = processModel.getTradeWalletService().createTradingFeeTx(
walletService.getOrCreateAddressEntry(id, AddressEntry.Context.OFFER_FUNDING).getAddress(),

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

@ -23,8 +23,8 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import io.bitsquare.alert.AlertManager;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.CommonOptionKeys;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.handlers.ResultHandler;
@ -208,14 +208,14 @@ public class BitsquareApp extends Application {
} else if (new KeyCodeCombination(KeyCode.F, KeyCombination.ALT_DOWN).match(keyEvent)) {
showFPSWindow();
} else if (new KeyCodeCombination(KeyCode.J, KeyCombination.ALT_DOWN).match(keyEvent)) {
WalletService walletService = injector.getInstance(WalletService.class);
BitcoinWalletService walletService = injector.getInstance(BitcoinWalletService.class);
if (walletService.getWallet() != null)
new ShowWalletDataWindow(walletService).information("Wallet raw data").show();
else
new Popup<>().warning("The wallet is not initialized yet").show();
} else if (DevFlags.DEV_MODE && new KeyCodeCombination(KeyCode.G, KeyCombination.ALT_DOWN).match(keyEvent)) {
TradeWalletService tradeWalletService = injector.getInstance(TradeWalletService.class);
WalletService walletService = injector.getInstance(WalletService.class);
BitcoinWalletService walletService = injector.getInstance(BitcoinWalletService.class);
if (walletService.getWallet() != null)
new SpendFromDepositTxWindow(tradeWalletService).information("Emergency wallet tool").show();
else
@ -402,12 +402,12 @@ public class BitsquareApp extends Application {
injector.getInstance(TradeManager.class).shutDown();
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletService.class).shutDownDone.addListener((ov, o, n) -> {
injector.getInstance(BitcoinWalletService.class).shutDownDone.addListener((ov, o, n) -> {
bitsquareAppModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});
injector.getInstance(WalletService.class).shutDown();
injector.getInstance(BitcoinWalletService.class).shutDown();
});
});
// we wait max 20 sec.

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

@ -17,7 +17,7 @@
package io.bitsquare.gui.components;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.gui.util.BSFormatter;
import javafx.scene.control.TextField;
import javafx.scene.effect.BlurType;
@ -29,10 +29,10 @@ import org.bitcoinj.core.Coin;
public class BalanceTextField extends AnchorPane {
private static WalletService walletService;
private static BitcoinWalletService walletService;
private Coin targetAmount;
public static void setWalletService(WalletService walletService) {
public static void setWalletService(BitcoinWalletService walletService) {
BalanceTextField.walletService = walletService;
}

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

@ -17,7 +17,7 @@
package io.bitsquare.gui.components;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.AddressConfidenceListener;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.components.indicator.TxConfidenceIndicator;
@ -36,11 +36,11 @@ import org.bitcoinj.core.TransactionConfidence;
public class BalanceWithConfirmationTextField extends AnchorPane {
private static WalletService walletService;
private static BitcoinWalletService walletService;
private BalanceListener balanceListener;
private AddressConfidenceListener confidenceListener;
public static void setWalletService(WalletService walletService) {
public static void setWalletService(BitcoinWalletService walletService) {
BalanceWithConfirmationTextField.walletService = walletService;
}

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

@ -19,7 +19,7 @@ package io.bitsquare.gui.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.TxConfidenceListener;
import io.bitsquare.common.util.Utilities;
import io.bitsquare.gui.components.indicator.TxConfidenceIndicator;
@ -43,9 +43,9 @@ public class TxIdTextField extends AnchorPane {
TxIdTextField.preferences = preferences;
}
private static WalletService walletService;
private static BitcoinWalletService walletService;
public static void setWalletService(WalletService walletService) {
public static void setWalletService(BitcoinWalletService walletService) {
TxIdTextField.walletService = walletService;
}

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

@ -30,8 +30,8 @@ import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.arbitration.Dispute;
import io.bitsquare.arbitration.DisputeManager;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.provider.fee.FeeService;
import io.bitsquare.btc.provider.price.MarketPrice;
@ -98,7 +98,7 @@ import java.util.stream.Collectors;
public class MainViewModel implements ViewModel {
private static final Logger log = LoggerFactory.getLogger(MainViewModel.class);
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private final ArbitratorManager arbitratorManager;
private final P2PService p2PService;
@ -176,7 +176,7 @@ public class MainViewModel implements ViewModel {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public MainViewModel(WalletService walletService, TradeWalletService tradeWalletService,
public MainViewModel(BitcoinWalletService walletService, TradeWalletService tradeWalletService,
PriceFeedService priceFeedService,
ArbitratorManager arbitratorManager, P2PService p2PService, TradeManager tradeManager,
OpenOfferManager openOfferManager, DisputeManager disputeManager, Preferences preferences,

6
gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
View file

@ -21,7 +21,7 @@ import com.google.inject.Inject;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.crypto.KeyRing;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
@ -44,7 +44,7 @@ class ArbitratorRegistrationViewModel extends ActivatableViewModel {
private final ArbitratorManager arbitratorManager;
private User user;
private final P2PService p2PService;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final KeyRing keyRing;
final BooleanProperty registrationEditDisabled = new SimpleBooleanProperty(true);
@ -67,7 +67,7 @@ class ArbitratorRegistrationViewModel extends ActivatableViewModel {
public ArbitratorRegistrationViewModel(ArbitratorManager arbitratorManager,
User user,
P2PService p2PService,
WalletService walletService,
BitcoinWalletService walletService,
KeyRing keyRing) {
this.arbitratorManager = arbitratorManager;
this.user = user;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.account.content.password;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.common.util.Tuple3;
import io.bitsquare.crypto.ScryptUtil;
@ -47,7 +47,7 @@ import static io.bitsquare.gui.util.FormBuilder.*;
public class PasswordView extends ActivatableView<GridPane, Void> {
private final PasswordValidator passwordValidator;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private PasswordTextField passwordField;
@ -65,7 +65,7 @@ public class PasswordView extends ActivatableView<GridPane, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private PasswordView(PasswordValidator passwordValidator, WalletService walletService, TradeWalletService tradeWalletService) {
private PasswordView(PasswordValidator passwordValidator, BitcoinWalletService walletService, TradeWalletService tradeWalletService) {
this.passwordValidator = passwordValidator;
this.walletService = walletService;
this.tradeWalletService = tradeWalletService;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.gui.main.account.content.seedwords;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import io.bitsquare.app.BitsquareApp;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.UserThread;
import io.bitsquare.gui.common.view.ActivatableView;
import io.bitsquare.gui.common.view.FxmlView;
@ -54,7 +54,7 @@ import static javafx.beans.binding.Bindings.createBooleanBinding;
@FxmlView
public class SeedWordsView extends ActivatableView<GridPane, Void> {
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final WalletPasswordWindow walletPasswordWindow;
private Preferences preferences;
@ -80,7 +80,7 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private SeedWordsView(WalletService walletService, WalletPasswordWindow walletPasswordWindow, Preferences preferences) {
private SeedWordsView(BitcoinWalletService walletService, WalletPasswordWindow walletPasswordWindow, Preferences preferences) {
this.walletService = walletService;
this.walletPasswordWindow = walletPasswordWindow;
this.preferences = preferences;

4
gui/src/main/java/io/bitsquare/gui/main/dao/wallet/dashboard/TokenDashboardView.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.gui.main.dao.wallet.dashboard;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.gui.common.view.ActivatableView;
import io.bitsquare.gui.common.view.FxmlView;
import io.bitsquare.gui.util.BSFormatter;
@ -47,7 +47,7 @@ public class TokenDashboardView extends ActivatableView<GridPane, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private TokenDashboardView(WalletService walletService, BSFormatter formatter) {
private TokenDashboardView(BitcoinWalletService walletService, BSFormatter formatter) {
tokenWallet = walletService.getTokenWallet();
this.formatter = formatter;
}

4
gui/src/main/java/io/bitsquare/gui/main/dao/wallet/receive/TokenReceiveView.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.dao.wallet.receive;
import io.bitsquare.app.DevFlags;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.UserThread;
import io.bitsquare.gui.common.view.ActivatableView;
import io.bitsquare.gui.common.view.FxmlView;
@ -64,7 +64,7 @@ public class TokenReceiveView extends ActivatableView<GridPane, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private TokenReceiveView(WalletService walletService, BSFormatter formatter) {
private TokenReceiveView(BitcoinWalletService walletService, BSFormatter formatter) {
tokenWallet = walletService.getTokenWallet();
this.formatter = formatter;
paymentLabelString = "Fund Bitsquare token wallet";

6
gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.funds.deposit;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.listeners.TxConfidenceListener;
import io.bitsquare.gui.components.indicator.TxConfidenceIndicator;
@ -37,7 +37,7 @@ public class DepositListItem {
private final Logger log = LoggerFactory.getLogger(this.getClass());
private final StringProperty balance = new SimpleStringProperty();
private final WalletService walletService;
private final BitcoinWalletService walletService;
private Coin balanceAsCoin;
private final TxConfidenceIndicator txConfidenceIndicator;
private final Tooltip tooltip;
@ -46,7 +46,7 @@ public class DepositListItem {
private TxConfidenceListener txConfidenceListener;
private int numTxOutputs = 0;
public DepositListItem(AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
public DepositListItem(AddressEntry addressEntry, BitcoinWalletService walletService, BSFormatter formatter) {
this.walletService = walletService;
addressString = addressEntry.getAddressString();

6
gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.gui.main.funds.deposit;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.app.DevFlags;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.provider.fee.FeeService;
import io.bitsquare.common.UserThread;
@ -82,7 +82,7 @@ public class DepositView extends ActivatableView<VBox, Void> {
private Label addressLabel, amountLabel;
private InputTextField amountTextField;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private FeeService feeService;
private final BSFormatter formatter;
private final Preferences preferences;
@ -99,7 +99,7 @@ public class DepositView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private DepositView(WalletService walletService,
private DepositView(BitcoinWalletService walletService,
FeeService feeService,
BSFormatter formatter,
Preferences preferences) {

6
gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedListItem.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.funds.locked;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.trade.Tradable;
@ -40,12 +40,12 @@ public class LockedListItem {
private final Label balanceLabel;
private final Trade trade;
private final AddressEntry addressEntry;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final BSFormatter formatter;
private final String addressString;
private Coin balance;
public LockedListItem(Trade trade, AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
public LockedListItem(Trade trade, AddressEntry addressEntry, BitcoinWalletService walletService, BSFormatter formatter) {
this.trade = trade;
this.addressEntry = addressEntry;
this.walletService = walletService;

6
gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.funds.locked;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.common.view.ActivatableView;
import io.bitsquare.gui.common.view.FxmlView;
@ -58,7 +58,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<LockedListItem, LockedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn, confidenceColumn;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeManager tradeManager;
private final OpenOfferManager openOfferManager;
private final Preferences preferences;
@ -77,7 +77,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private LockedView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
private LockedView(BitcoinWalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
BSFormatter formatter, OfferDetailsWindow offerDetailsWindow, TradeDetailsWindow tradeDetailsWindow) {
this.walletService = walletService;
this.tradeManager = tradeManager;

6
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java
View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.funds.reserved;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.trade.Tradable;
@ -40,12 +40,12 @@ public class ReservedListItem {
private final Label balanceLabel;
private final OpenOffer openOffer;
private final AddressEntry addressEntry;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final BSFormatter formatter;
private final String addressString;
private Coin balance;
public ReservedListItem(OpenOffer openOffer, AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
public ReservedListItem(OpenOffer openOffer, AddressEntry addressEntry, BitcoinWalletService walletService, BSFormatter formatter) {
this.openOffer = openOffer;
this.addressEntry = addressEntry;
this.walletService = walletService;

6
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.funds.reserved;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.common.view.ActivatableView;
import io.bitsquare.gui.common.view.FxmlView;
@ -58,7 +58,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<ReservedListItem, ReservedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn, confidenceColumn;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeManager tradeManager;
private final OpenOfferManager openOfferManager;
private final Preferences preferences;
@ -77,7 +77,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private ReservedView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
private ReservedView(BitcoinWalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
BSFormatter formatter, OfferDetailsWindow offerDetailsWindow, TradeDetailsWindow tradeDetailsWindow) {
this.walletService = walletService;
this.tradeManager = tradeManager;

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

@ -17,7 +17,7 @@
package io.bitsquare.gui.main.funds.transactions;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.TxConfidenceListener;
import io.bitsquare.gui.components.indicator.TxConfidenceIndicator;
import io.bitsquare.gui.util.BSFormatter;
@ -39,7 +39,7 @@ public class TransactionsListItem {
private String dateString;
private final Date date;
private final String txId;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TxConfidenceIndicator txConfidenceIndicator;
private final Tooltip tooltip;
@Nullable
@ -62,7 +62,7 @@ public class TransactionsListItem {
txId = null;
}
public TransactionsListItem(Transaction transaction, WalletService walletService, Optional<Tradable> tradableOptional, BSFormatter formatter) {
public TransactionsListItem(Transaction transaction, BitcoinWalletService walletService, Optional<Tradable> tradableOptional, BSFormatter formatter) {
this.formatter = formatter;
txId = transaction.getHashAsString();
this.walletService = walletService;

6
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View file

@ -20,7 +20,7 @@ package io.bitsquare.gui.main.funds.transactions;
import com.googlecode.jcsv.writer.CSVEntryConverter;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.arbitration.DisputeManager;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.common.util.Tuple4;
import io.bitsquare.common.util.Utilities;
@ -79,7 +79,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
private final ObservableList<TransactionsListItem> observableList = FXCollections.observableArrayList();
private final SortedList<TransactionsListItem> sortedList = new SortedList<>(observableList);
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeManager tradeManager;
private final OpenOfferManager openOfferManager;
private final ClosedTradableManager closedTradableManager;
@ -99,7 +99,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private TransactionsView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager,
private TransactionsView(BitcoinWalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager,
ClosedTradableManager closedTradableManager, FailedTradesManager failedTradesManager,
BSFormatter formatter, Preferences preferences, TradeDetailsWindow tradeDetailsWindow,
DisputeManager disputeManager, Stage stage,

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

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.funds.withdrawal;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.gui.util.BSFormatter;
import javafx.scene.control.Label;
@ -30,12 +30,12 @@ public class WithdrawalListItem {
private final BalanceListener balanceListener;
private final Label balanceLabel;
private final AddressEntry addressEntry;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final BSFormatter formatter;
private Coin balance;
private final String addressString;
public WithdrawalListItem(AddressEntry addressEntry, WalletService walletService,
public WithdrawalListItem(AddressEntry addressEntry, BitcoinWalletService walletService,
BSFormatter formatter) {
this.addressEntry = addressEntry;
this.walletService = walletService;

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

@ -22,8 +22,8 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.app.DevFlags;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.AddressEntryException;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.InsufficientFundsException;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.provider.fee.FeeService;
import io.bitsquare.common.UserThread;
@ -75,7 +75,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<WithdrawalListItem, WithdrawalListItem> addressColumn, balanceColumn, selectColumn;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeManager tradeManager;
private final ClosedTradableManager closedTradableManager;
private final FailedTradesManager failedTradesManager;
@ -100,7 +100,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private WithdrawalView(WalletService walletService, TradeManager tradeManager,
private WithdrawalView(BitcoinWalletService walletService, TradeManager tradeManager,
ClosedTradableManager closedTradableManager,
FailedTradesManager failedTradesManager,
BSFormatter formatter, Preferences preferences,

6
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.app.DevFlags;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.blockchain.BlockchainService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.provider.fee.FeeService;
@ -63,7 +63,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
class CreateOfferDataModel extends ActivatableDataModel {
private final OpenOfferManager openOfferManager;
final WalletService walletService;
final BitcoinWalletService walletService;
final TradeWalletService tradeWalletService;
private final Preferences preferences;
private final User user;
@ -121,7 +121,7 @@ class CreateOfferDataModel extends ActivatableDataModel {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
CreateOfferDataModel(OpenOfferManager openOfferManager, WalletService walletService, TradeWalletService tradeWalletService,
CreateOfferDataModel(OpenOfferManager openOfferManager, BitcoinWalletService walletService, TradeWalletService tradeWalletService,
Preferences preferences, User user, KeyRing keyRing, P2PService p2PService, PriceFeedService priceFeedService,
FeeService feeService, Navigation navigation, BlockchainService blockchainService, BSFormatter formatter) {
this.openOfferManager = openOfferManager;

6
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -21,8 +21,8 @@ import com.google.inject.Inject;
import io.bitsquare.app.DevFlags;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.blockchain.BlockchainService;
import io.bitsquare.btc.listeners.BalanceListener;
import io.bitsquare.btc.provider.fee.FeeService;
@ -60,7 +60,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
class TakeOfferDataModel extends ActivatableDataModel {
private final TradeManager tradeManager;
final TradeWalletService tradeWalletService;
final WalletService walletService;
final BitcoinWalletService walletService;
private final User user;
private final FeeService feeService;
private final Preferences preferences;
@ -103,7 +103,7 @@ class TakeOfferDataModel extends ActivatableDataModel {
@Inject
TakeOfferDataModel(TradeManager tradeManager, TradeWalletService tradeWalletService,
WalletService walletService, User user, FeeService feeService,
BitcoinWalletService walletService, User user, FeeService feeService,
Preferences preferences, PriceFeedService priceFeedService, BlockchainService blockchainService,
BSFormatter formatter) {
this.tradeManager = tradeManager;

6
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.arbitration.Dispute;
import io.bitsquare.arbitration.DisputeManager;
import io.bitsquare.arbitration.DisputeResult;
import io.bitsquare.btc.AddressEntry;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.exceptions.TransactionVerificationException;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.util.Tuple2;
@ -63,7 +63,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
private final BSFormatter formatter;
private final DisputeManager disputeManager;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private Dispute dispute;
private Optional<Runnable> finalizeDisputeHandlerOptional = Optional.empty();
@ -93,7 +93,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public DisputeSummaryWindow(BSFormatter formatter, DisputeManager disputeManager, WalletService walletService, TradeWalletService tradeWalletService) {
public DisputeSummaryWindow(BSFormatter formatter, DisputeManager disputeManager, BitcoinWalletService walletService, TradeWalletService tradeWalletService) {
this.formatter = formatter;
this.disputeManager = disputeManager;
this.walletService = walletService;

6
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EmptyWalletWindow.java
View file

@ -18,8 +18,8 @@
package io.bitsquare.gui.main.overlays.windows;
import io.bitsquare.app.DevFlags;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.Restrictions;
import io.bitsquare.btc.WalletService;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.gui.components.InputTextField;
@ -50,7 +50,7 @@ import static io.bitsquare.gui.util.FormBuilder.*;
public class EmptyWalletWindow extends Overlay<EmptyWalletWindow> {
private static final Logger log = LoggerFactory.getLogger(EmptyWalletWindow.class);
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final WalletPasswordWindow walletPasswordWindow;
private OpenOfferManager openOfferManager;
private final BSFormatter formatter;
@ -64,7 +64,7 @@ public class EmptyWalletWindow extends Overlay<EmptyWalletWindow> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public EmptyWalletWindow(WalletService walletService, WalletPasswordWindow walletPasswordWindow,
public EmptyWalletWindow(BitcoinWalletService walletService, WalletPasswordWindow walletPasswordWindow,
OpenOfferManager openOfferManager, BSFormatter formatter) {
this.walletService = walletService;
this.walletPasswordWindow = walletPasswordWindow;

6
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ShowWalletDataWindow.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.gui.main.overlays.windows;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.common.util.Utilities;
import io.bitsquare.gui.main.overlays.Overlay;
@ -34,14 +34,14 @@ import static io.bitsquare.gui.util.FormBuilder.addLabelTextArea;
public class ShowWalletDataWindow extends Overlay<ShowWalletDataWindow> {
private static final Logger log = LoggerFactory.getLogger(ShowWalletDataWindow.class);
private WalletService walletService;
private BitcoinWalletService walletService;
///////////////////////////////////////////////////////////////////////////////////////////
// Public API
///////////////////////////////////////////////////////////////////////////////////////////
public ShowWalletDataWindow(WalletService walletService) {
public ShowWalletDataWindow(BitcoinWalletService walletService) {
this.walletService = walletService;
type = Type.Attention;
}

6
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/WalletPasswordWindow.java
View file

@ -19,7 +19,7 @@ package io.bitsquare.gui.main.overlays.windows;
import com.google.common.base.Splitter;
import io.bitsquare.app.BitsquareApp;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.crypto.ScryptUtil;
@ -67,7 +67,7 @@ import static javafx.beans.binding.Bindings.createBooleanBinding;
public class WalletPasswordWindow extends Overlay<WalletPasswordWindow> {
private static final Logger log = LoggerFactory.getLogger(WalletPasswordWindow.class);
private final WalletService walletService;
private final BitcoinWalletService walletService;
private Button unlockButton;
private AesKeyHandler aesKeyHandler;
private PasswordTextField passwordTextField;
@ -95,7 +95,7 @@ public class WalletPasswordWindow extends Overlay<WalletPasswordWindow> {
}
@Inject
public WalletPasswordWindow(WalletService walletService) {
public WalletPasswordWindow(BitcoinWalletService walletService) {
this.walletService = walletService;
type = Type.Attention;
width = 800;

6
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.app.Log;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.arbitration.Dispute;
import io.bitsquare.arbitration.DisputeManager;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.TradeWalletService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.provider.fee.FeeService;
import io.bitsquare.common.crypto.KeyRing;
import io.bitsquare.common.handlers.ErrorMessageHandler;
@ -68,7 +68,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
public class PendingTradesDataModel extends ActivatableDataModel {
public final TradeManager tradeManager;
public final WalletService walletService;
public final BitcoinWalletService walletService;
private final TradeWalletService tradeWalletService;
private FeeService feeService;
private final User user;
@ -94,7 +94,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public PendingTradesDataModel(TradeManager tradeManager, WalletService walletService, TradeWalletService tradeWalletService, FeeService feeService,
public PendingTradesDataModel(TradeManager tradeManager, BitcoinWalletService walletService, TradeWalletService tradeWalletService, FeeService feeService,
User user, KeyRing keyRing, DisputeManager disputeManager, Preferences preferences, P2PService p2PService,
Navigation navigation, WalletPasswordWindow walletPasswordWindow, NotificationCenter notificationCenter) {
this.tradeManager = tradeManager;

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

@ -164,7 +164,7 @@ public class BuyerStep5View extends TradeStepView {
private void reviewWithdrawal() {
Coin amount = trade.getPayoutAmount();
WalletService walletService = model.dataModel.walletService;
BitcoinWalletService walletService = model.dataModel.walletService;
AddressEntry fromAddressesEntry = walletService.getOrCreateAddressEntry(trade.getId(), AddressEntry.Context.TRADE_PAYOUT);
String fromAddresses = fromAddressesEntry.getAddressString();

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

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings.network;
import io.bitsquare.app.BitsquareApp;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.Clock;
import io.bitsquare.common.UserThread;
import io.bitsquare.gui.common.model.Activatable;
@ -67,7 +67,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
TableColumn<P2pNetworkListItem, String> onionAddressColumn, connectionTypeColumn, creationDateColumn,
roundTripTimeColumn, sentBytesColumn, receivedBytesColumn, peerTypeColumn;
private final WalletService walletService;
private final BitcoinWalletService walletService;
private final Preferences preferences;
private Clock clock;
private final BSFormatter formatter;
@ -81,7 +81,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
private String btcNodesPreFocusText;
@Inject
public NetworkSettingsView(WalletService walletService, P2PService p2PService, Preferences preferences, Clock clock,
public NetworkSettingsView(BitcoinWalletService walletService, P2PService p2PService, Preferences preferences, Clock clock,
BSFormatter formatter) {
super();
this.walletService = walletService;

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

@ -8,7 +8,7 @@ import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.Log;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.CommonOptionKeys;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.handlers.ResultHandler;
@ -135,12 +135,12 @@ public class Headless {
injector.getInstance(ArbitratorManager.class).shutDown();
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletService.class).shutDownDone.addListener((ov, o, n) -> {
injector.getInstance(BitcoinWalletService.class).shutDownDone.addListener((ov, o, n) -> {
headlessModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});
injector.getInstance(WalletService.class).shutDown();
injector.getInstance(BitcoinWalletService.class).shutDown();
});
});
// we wait max 5 sec.

6
monitor/src/main/java/io/bitsquare/monitor/Monitor.java
View file

@ -8,7 +8,7 @@ import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.Log;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.CommonOptionKeys;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.handlers.ResultHandler;
@ -138,12 +138,12 @@ public class Monitor {
injector.getInstance(ArbitratorManager.class).shutDown();
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletService.class).shutDownDone.addListener((ov, o, n) -> {
injector.getInstance(BitcoinWalletService.class).shutDownDone.addListener((ov, o, n) -> {
monitorModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});
injector.getInstance(WalletService.class).shutDown();
injector.getInstance(BitcoinWalletService.class).shutDown();
});
});
// we wait max 5 sec.

6
seednode/src/main/java/io/bitsquare/seednode/SeedNode.java
View file

@ -8,7 +8,7 @@ import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.Log;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.common.CommonOptionKeys;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.handlers.ResultHandler;
@ -104,12 +104,12 @@ public class SeedNode {
injector.getInstance(ArbitratorManager.class).shutDown();
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletService.class).shutDownDone.addListener((ov, o, n) -> {
injector.getInstance(BitcoinWalletService.class).shutDownDone.addListener((ov, o, n) -> {
seedNodeModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});
injector.getInstance(WalletService.class).shutDown();
injector.getInstance(BitcoinWalletService.class).shutDown();
});
});
// we wait max 5 sec.

6
statistics/src/main/java/io/bitsquare/statistics/Statistics.java
View file

@ -8,7 +8,7 @@ import io.bitsquare.app.BitsquareEnvironment;
import io.bitsquare.app.Log;
import io.bitsquare.app.Version;
import io.bitsquare.arbitration.ArbitratorManager;
import io.bitsquare.btc.WalletService;
import io.bitsquare.btc.BitcoinWalletService;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.common.CommonOptionKeys;
import io.bitsquare.common.UserThread;
@ -117,12 +117,12 @@ public class Statistics {
injector.getInstance(ArbitratorManager.class).shutDown();
injector.getInstance(OpenOfferManager.class).shutDown(() -> {
injector.getInstance(P2PService.class).shutDown(() -> {
injector.getInstance(WalletService.class).shutDownDone.addListener((ov, o, n) -> {
injector.getInstance(BitcoinWalletService.class).shutDownDone.addListener((ov, o, n) -> {
statisticsModule.close(injector);
log.debug("Graceful shutdown completed");
resultHandler.handleResult();
});
injector.getInstance(WalletService.class).shutDown();
injector.getInstance(BitcoinWalletService.class).shutDown();
});
});
// we wait max 5 sec.