From aa1e141900c3df870ae6b5709f6b373e81e7e45d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 28 Mar 2015 23:12:18 +0100 Subject: [PATCH] Version 0.1.3 interrupted trade process working fine --- bootstrap/pom.xml | 2 +- .../app/bootstrap/BootstrapNode.java | 5 +- core/pom.xml | 6 +-- .../bitsquare/app/BitsquareEnvironment.java | 1 + .../java/io/bitsquare/app/UpdateProcess.java | 3 +- .../app/{ => gui}/BitsquareAppMain.java | 6 ++- .../io/bitsquare/btc/TradeWalletService.java | 14 +++--- .../bitsquare/gui/main/debug/DebugView.java | 32 ++++++------ .../gui/main/portfolio/PortfolioView.java | 2 +- .../trade/createoffer/CreateOfferView.java | 11 +++-- .../main/trade/offerbook/OfferBookView.java | 4 +- .../main/trade/takeoffer/TakeOfferView.java | 6 +-- .../trade/takeoffer/TakeOfferViewModel.java | 2 +- .../java/io/bitsquare/trade/TradeManager.java | 11 +++-- ...va => RequestPublishDepositTxMessage.java} | 22 ++++----- .../trade/offerer/OffererProtocol.java | 30 ++++++------ .../trade/offerer/tasks/CommitPayoutTx.java | 49 +++++++++++++++++++ ...rocessRequestPublishDepositTxMessage.java} | 10 ++-- ...ava => SendDepositTxPublishedMessage.java} | 6 +-- ...va => SendFiatTransferStartedMessage.java} | 6 +-- ...endRequestTakerDepositPaymentMessage.java} | 6 +-- .../protocol/trade/taker/TakerProtocol.java | 16 +++--- ...mitDepositTx.java => CommitDepositTx.java} | 8 +-- ...sitTx.java => CreateAndSignDepositTx.java} | 6 +-- ...java => SendPayoutTxPublishedMessage.java} | 6 +-- .../SendRequestDepositTxInputsMessage.java | 4 +- ...> SendRequestPublishDepositTxMessage.java} | 12 ++--- .../taker/tasks/VerifyOffererAccount.java | 5 +- package/instructions.txt | 2 +- package/linux/create_app.sh | 6 +-- package/linux/setup.sh | 8 +-- package/mac/Info.plist | 2 +- package/mac/Info.template.plist | 2 +- package/mac/create_app.sh | 14 +++--- package/mac/setup.sh | 12 ++--- package/mac/update.sh | 6 +-- package/windows/create_app.bat | 4 +- package/windows/setup.bat | 8 +-- pom.xml | 2 +- 39 files changed, 209 insertions(+), 148 deletions(-) rename core/src/main/java/io/bitsquare/app/{ => gui}/BitsquareAppMain.java (96%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/messages/{RequestOffererPublishDepositTxMessage.java => RequestPublishDepositTxMessage.java} (70%) create mode 100644 core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CommitPayoutTx.java rename core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/{ProcessRequestOffererPublishDepositTxMessage.java => ProcessRequestPublishDepositTxMessage.java} (84%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/{SendDepositTxToTaker.java => SendDepositTxPublishedMessage.java} (91%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/{SendBankTransferStartedMessage.java => SendFiatTransferStartedMessage.java} (94%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/{RequestTakerDepositPayment.java => SendRequestTakerDepositPaymentMessage.java} (90%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/{TakerCommitDepositTx.java => CommitDepositTx.java} (82%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/{TakerCreatesAndSignsDepositTx.java => CreateAndSignDepositTx.java} (90%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/{SendPayoutTxToOfferer.java => SendPayoutTxPublishedMessage.java} (93%) rename core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/{SendSignedTakerDepositTx.java => SendRequestPublishDepositTxMessage.java} (86%) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 899e926ff6..0feb62aeef 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.1.2-SNAPSHOT + 0.1.3-SNAPSHOT 4.0.0 diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java index 25864f21db..3504ac77ea 100644 --- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java +++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java @@ -39,6 +39,8 @@ import org.springframework.core.env.Environment; public class BootstrapNode { private static final Logger log = LoggerFactory.getLogger(BootstrapNode.class); + private static final String VERSION = "0.1.3"; + private static Peer peer = null; private final Environment env; @@ -51,7 +53,6 @@ public class BootstrapNode { public void start() { String name = env.getRequiredProperty(Node.NAME_KEY); int port = env.getProperty(Node.PORT_KEY, Integer.class, Node.DEFAULT_PORT); - try { Number160 peerId = Number160.createHash(name); @@ -94,7 +95,7 @@ public class BootstrapNode { } }); - log.info("Bootstrap node started with name " + name + " and port " + port); + log.info("Bootstrap node started with name " + name + " ,port " + port + " and version " + VERSION); new Thread(() -> { while (true) { if (peer.peerBean().peerMap().all().size() > 0) { diff --git a/core/pom.xml b/core/pom.xml index 0ab7ee3784..63caa8b142 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.1.2-SNAPSHOT + 0.1.3-SNAPSHOT core @@ -41,7 +41,7 @@ false - io.bitsquare.app.BitsquareAppMain + io.bitsquare.app.gui.BitsquareAppMain @@ -112,7 +112,7 @@ net.tomp2p tomp2p-all - 5.0-Beta3 + 5.0-Beta6 com.google.guava diff --git a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java index 862a05607f..8f223efbf2 100644 --- a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java +++ b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java @@ -18,6 +18,7 @@ package io.bitsquare.app; import io.bitsquare.BitsquareException; +import io.bitsquare.app.gui.BitsquareAppMain; import io.bitsquare.btc.UserAgent; import io.bitsquare.btc.WalletService; import io.bitsquare.gui.main.MainView; diff --git a/core/src/main/java/io/bitsquare/app/UpdateProcess.java b/core/src/main/java/io/bitsquare/app/UpdateProcess.java index 872b77174e..b2e48cc14a 100644 --- a/core/src/main/java/io/bitsquare/app/UpdateProcess.java +++ b/core/src/main/java/io/bitsquare/app/UpdateProcess.java @@ -17,6 +17,7 @@ package io.bitsquare.app; +import io.bitsquare.app.gui.BitsquareAppMain; import io.bitsquare.util.Utilities; import com.google.inject.Inject; @@ -101,7 +102,7 @@ public class UpdateProcess { }); timeoutTimer.start(); - String agent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + BUILD_VERSION; + String agent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + BitsquareAppMain.getVersion(); Path dataDirPath = new File(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY)).toPath(); Updater updater = new Updater(UPDATES_BASE_URL, agent, BUILD_VERSION, dataDirPath, ROOT_CLASS_PATH, UPDATE_SIGNING_KEYS, UPDATE_SIGNING_THRESHOLD) { diff --git a/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java similarity index 96% rename from core/src/main/java/io/bitsquare/app/BitsquareAppMain.java rename to core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java index 7e6c33bccc..e3d1849500 100644 --- a/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java +++ b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java @@ -15,9 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.app; +package io.bitsquare.app.gui; import io.bitsquare.BitsquareException; +import io.bitsquare.app.BitsquareApp; +import io.bitsquare.app.BitsquareEnvironment; +import io.bitsquare.app.BitsquareExecutable; +import io.bitsquare.app.UpdateProcess; import io.bitsquare.btc.BitcoinNetwork; import io.bitsquare.p2p.BootstrapNodes; import io.bitsquare.p2p.Node; diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java index 49f7927317..f70f85194e 100644 --- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java +++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java @@ -396,16 +396,16 @@ public class TradeWalletService { } // Commits the tx to the wallet and returns that - public Transaction commitsDepositTx(Transaction publishedDepositTx) throws VerificationException { - log.trace("takerCommitsDepositTx called"); - log.trace("publishedDepositTx " + publishedDepositTx.toString()); + public Transaction commitTx(Transaction tx) throws VerificationException { + log.trace("commitTx called"); + log.trace("tx " + tx.toString()); // We need to recreate the tx we get a null pointer otherwise - Transaction depositTx = new Transaction(params, publishedDepositTx.bitcoinSerialize()); - log.trace("depositTx " + depositTx.toString()); + Transaction transaction = new Transaction(params, tx.bitcoinSerialize()); + log.trace("transaction " + transaction.toString()); - wallet.receivePending(depositTx, null, true); - return depositTx; + wallet.receivePending(transaction, null, true); + return transaction; } // Returns local existing wallet transaction diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java index 4269986d50..35ba0ebe32 100644 --- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java +++ b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java @@ -33,10 +33,10 @@ import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateOffererDepositTxInputs; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestTakerDepositPayment; -import io.bitsquare.trade.protocol.trade.offerer.tasks.SendBankTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxToTaker; +import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendRequestTakerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.SignAndPublishDepositTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyAndSignContract; import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; @@ -47,12 +47,12 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRequestTakerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.CommitDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignDepositTx; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; @@ -103,17 +103,17 @@ public class DebugView extends InitializableView { OffererProtocol.class, ProcessRequestDepositTxInputsMessage.class, CreateOffererDepositTxInputs.class, - RequestTakerDepositPayment.class, + SendRequestTakerDepositPaymentMessage.class, - ProcessRequestOffererPublishDepositTxMessage.class, + ProcessRequestPublishDepositTxMessage.class, VerifyTakerAccount.class, VerifyAndSignContract.class, SignAndPublishDepositTx.class, - SendDepositTxToTaker.class, + SendDepositTxPublishedMessage.class, CreateAndSignPayoutTx.class, VerifyTakeOfferFeePayment.class, - SendBankTransferStartedMessage.class, + SendFiatTransferStartedMessage.class, ProcessPayoutTxPublishedMessage.class, Boolean.class, /* used as seperator*/ @@ -127,17 +127,17 @@ public class DebugView extends InitializableView { ProcessRequestTakerDepositPaymentMessage.class, VerifyOffererAccount.class, CreateAndSignContract.class, - TakerCreatesAndSignsDepositTx.class, - SendSignedTakerDepositTx.class, + CreateAndSignDepositTx.class, + SendRequestPublishDepositTxMessage.class, ProcessDepositTxPublishedMessage.class, - TakerCommitDepositTx.class, + CommitDepositTx.class, ProcessFiatTransferStartedMessage.class, SignAndPublishPayoutTx.class, VerifyOfferFeePayment.class, - SendPayoutTxToOfferer.class + SendPayoutTxPublishedMessage.class ) ); diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java index e6a632c50e..8604211ae7 100644 --- a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java @@ -76,7 +76,7 @@ public class PortfolioView extends ActivatableViewAndModel root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener); navigation.addListener(navigationListener); - navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); + // navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); /* if (tradeManager.getPendingTrades().size() == 0) navigation.navigateTo(MainView.class, PortfolioView.class, OffersView.class); diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java index cb066d3150..0b4bb8a685 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java @@ -34,7 +34,7 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView; import io.bitsquare.gui.main.help.Help; import io.bitsquare.gui.main.help.HelpId; import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.pending.PendingTradesView; +import io.bitsquare.gui.main.portfolio.offer.OffersView; import io.bitsquare.gui.main.trade.TradeView; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.BSResources; @@ -292,10 +292,10 @@ public class CreateOfferView extends ActivatableViewAndModel { // TODO temp just for testing - newValue = false; - close(); - navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); - + // newValue = false; + // close(); + //navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class, OffersView.class); + if (newValue) { overlayManager.blurContent(); @@ -315,6 +315,7 @@ public class CreateOfferView extends ActivatableViewAndModel { // TODO temp just for testing - newValue = false; - close(); - navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); + /* newValue = false; + close();*/ + //navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class); if (newValue) { overlayManager.blurContent(); diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java index 101442bc1c..c6e751f307 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java @@ -155,7 +155,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im switch (state) { case UNKNOWN: - log.error("Offer state is UNKNOWN. That must not happen."); + // TODO set spinner? break; case AVAILABLE: this.state.set(State.AMOUNT_SCREEN); diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 342faa1ab6..a9e62b680e 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -155,6 +155,7 @@ public class TradeManager { offerBookService.addOffer(offer, () -> log.debug("Successful removed open offer from DHT"), (message, throwable) -> log.error("Remove open offer from DHT failed. " + message)); + setupDepositPublishedListener(offererTrade); offererTrade.setStorage(openOfferTradesStorage); initTrade(offererTrade); @@ -163,9 +164,9 @@ public class TradeManager { // We continue an interrupted trade. // TODO if the peer has changed its IP address, we need to make another findPeer request. At the moment we use the peer stored in trade to // continue the trade, but that might fail. - initTrade(trade); - trade.updateDepositTxFromWallet(tradeWalletService); trade.setStorage(pendingTradesStorage); + trade.updateDepositTxFromWallet(tradeWalletService); + initTrade(trade); } // if there are messages in our mailbox we apply it and remove them from the DHT @@ -260,7 +261,11 @@ public class TradeManager { OffererTrade offererTrade = new OffererTrade(offer, openOfferTradesStorage); openOfferTrades.add(offererTrade); initTrade(offererTrade); + setupDepositPublishedListener(offererTrade); + resultHandler.handleResult(transaction); + } + private void setupDepositPublishedListener(OffererTrade offererTrade) { offererTrade.processStateProperty().addListener((ov, oldValue, newValue) -> { log.debug("offererTrade state = " + newValue); if (newValue == OffererTrade.OffererProcessState.DEPOSIT_PUBLISHED) { @@ -272,8 +277,6 @@ public class TradeManager { offererTrade.setStorage(pendingTradesStorage); } }); - - resultHandler.handleResult(transaction); } public void cancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestPublishDepositTxMessage.java similarity index 70% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestOffererPublishDepositTxMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestPublishDepositTxMessage.java index 3e970697a5..3ed27b8822 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestOffererPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/RequestPublishDepositTxMessage.java @@ -31,7 +31,7 @@ import java.util.List; import javax.annotation.concurrent.Immutable; @Immutable -public class RequestOffererPublishDepositTxMessage extends TradeMessage implements Serializable { +public class RequestPublishDepositTxMessage extends TradeMessage implements Serializable { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = 1L; @@ -45,16 +45,16 @@ public class RequestOffererPublishDepositTxMessage extends TradeMessage implemen public final Transaction takersPreparedDepositTx; public final List takerConnectedOutputsForAllInputs; - public RequestOffererPublishDepositTxMessage(String tradeId, - FiatAccount takerFiatAccount, - String takerAccountId, - PublicKey takerP2PSigPublicKey, - PublicKey takerP2PEncryptPublicKey, - String takerContractAsJson, - String takerContractSignature, - String takerPayoutAddressString, - Transaction takersPreparedDepositTx, - List takerConnectedOutputsForAllInputs) { + public RequestPublishDepositTxMessage(String tradeId, + FiatAccount takerFiatAccount, + String takerAccountId, + PublicKey takerP2PSigPublicKey, + PublicKey takerP2PEncryptPublicKey, + String takerContractAsJson, + String takerContractSignature, + String takerPayoutAddressString, + Transaction takersPreparedDepositTx, + List takerConnectedOutputsForAllInputs) { super(tradeId); this.takerFiatAccount = takerFiatAccount; this.takerAccountId = takerAccountId; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererProtocol.java index 74eebfd07e..a312aba95c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererProtocol.java @@ -29,17 +29,18 @@ import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailability import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.messages.TradeMessage; import io.bitsquare.trade.protocol.trade.offerer.models.OffererProcessModel; +import io.bitsquare.trade.protocol.trade.offerer.tasks.CommitPayoutTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateAndSignPayoutTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateOffererDepositTxInputs; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestTakerDepositPayment; -import io.bitsquare.trade.protocol.trade.offerer.tasks.SendBankTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxToTaker; +import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendRequestTakerDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendFiatTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.SignAndPublishDepositTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyAndSignContract; import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment; @@ -134,28 +135,28 @@ public class OffererProtocol implements Protocol { offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_RESERVED); TaskRunner taskRunner = new TaskRunner<>(offererTrade, - () -> log.debug("taskRunner at handleTakeOfferFeePayedMessage completed"), + () -> log.debug("taskRunner at handleRequestDepositTxInputsMessage completed"), this::handleTaskRunnerFault); taskRunner.addTasks( ProcessRequestDepositTxInputsMessage.class, CreateOffererDepositTxInputs.class, - RequestTakerDepositPayment.class + SendRequestTakerDepositPaymentMessage.class ); taskRunner.run(); } - private void handleRequestOffererPublishDepositTxMessage(RequestOffererPublishDepositTxMessage tradeMessage) { + private void handleRequestPublishDepositTxMessage(RequestPublishDepositTxMessage tradeMessage) { offererTradeProcessModel.setTradeMessage(tradeMessage); TaskRunner taskRunner = new TaskRunner<>(offererTrade, - () -> log.debug("taskRunner at handleRequestOffererPublishDepositTxMessage completed"), + () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"), this::handleTaskRunnerFault); taskRunner.addTasks( - ProcessRequestOffererPublishDepositTxMessage.class, + ProcessRequestPublishDepositTxMessage.class, VerifyTakerAccount.class, VerifyAndSignContract.class, SignAndPublishDepositTx.class, - SendDepositTxToTaker.class + SendDepositTxPublishedMessage.class ); taskRunner.run(); } @@ -173,7 +174,7 @@ public class OffererProtocol implements Protocol { taskRunner.addTasks( CreateAndSignPayoutTx.class, VerifyTakeOfferFeePayment.class, - SendBankTransferStartedMessage.class + SendFiatTransferStartedMessage.class ); taskRunner.run(); } @@ -195,6 +196,7 @@ public class OffererProtocol implements Protocol { this::handleTaskRunnerFault); taskRunner.addTasks(ProcessPayoutTxPublishedMessage.class); + taskRunner.addTasks(CommitPayoutTx.class); taskRunner.run(); } @@ -216,8 +218,8 @@ public class OffererProtocol implements Protocol { else if (tradeMessage instanceof RequestDepositTxInputsMessage) { handleRequestDepositTxInputsMessage((RequestDepositTxInputsMessage) tradeMessage, sender); } - else if (tradeMessage instanceof RequestOffererPublishDepositTxMessage) { - handleRequestOffererPublishDepositTxMessage((RequestOffererPublishDepositTxMessage) tradeMessage); + else if (tradeMessage instanceof RequestPublishDepositTxMessage) { + handleRequestPublishDepositTxMessage((RequestPublishDepositTxMessage) tradeMessage); } else if (tradeMessage instanceof PayoutTxPublishedMessage) { handlePayoutTxPublishedMessage((PayoutTxPublishedMessage) tradeMessage); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CommitPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CommitPayoutTx.java new file mode 100644 index 0000000000..8e12702c9a --- /dev/null +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CommitPayoutTx.java @@ -0,0 +1,49 @@ +/* + * This file is part of Bitsquare. + * + * Bitsquare is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * Bitsquare is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Bitsquare. If not, see . + */ + +package io.bitsquare.trade.protocol.trade.offerer.tasks; + +import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.OffererTrade; + +import org.bitcoinj.core.Transaction; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CommitPayoutTx extends OffererTradeTask { + private static final Logger log = LoggerFactory.getLogger(CommitPayoutTx.class); + + public CommitPayoutTx(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { + super(taskHandler, offererTradeProcessModel); + } + + @Override + protected void doRun() { + try { + Transaction transaction = offererTradeProcessModel.getTradeWalletService().commitTx(offererTrade.getPayoutTx()); + + offererTrade.setPayoutTx(transaction); + + complete(); + } catch (Throwable t) { + t.printStackTrace(); + offererTrade.setThrowable(t); + failed(t); + } + } +} \ No newline at end of file diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestPublishDepositTxMessage.java similarity index 84% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestPublishDepositTxMessage.java index 2c0657a905..85338958c8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestPublishDepositTxMessage.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.OffererTrade; -import io.bitsquare.trade.protocol.trade.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,17 +27,17 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.*; import static io.bitsquare.util.Validator.*; -public class ProcessRequestOffererPublishDepositTxMessage extends OffererTradeTask { - private static final Logger log = LoggerFactory.getLogger(ProcessRequestOffererPublishDepositTxMessage.class); +public class ProcessRequestPublishDepositTxMessage extends OffererTradeTask { + private static final Logger log = LoggerFactory.getLogger(ProcessRequestPublishDepositTxMessage.class); - public ProcessRequestOffererPublishDepositTxMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { + public ProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { super(taskHandler, offererTradeProcessModel); } @Override protected void doRun() { try { - RequestOffererPublishDepositTxMessage message = (RequestOffererPublishDepositTxMessage) offererTradeProcessModel.getTradeMessage(); + RequestPublishDepositTxMessage message = (RequestPublishDepositTxMessage) offererTradeProcessModel.getTradeMessage(); checkTradeId(offererTradeProcessModel.getId(), message); checkNotNull(message); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxPublishedMessage.java similarity index 91% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxToTaker.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxPublishedMessage.java index 658901a3bf..7200f57691 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxToTaker.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxPublishedMessage.java @@ -25,10 +25,10 @@ import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SendDepositTxToTaker extends OffererTradeTask { - private static final Logger log = LoggerFactory.getLogger(SendDepositTxToTaker.class); +public class SendDepositTxPublishedMessage extends OffererTradeTask { + private static final Logger log = LoggerFactory.getLogger(SendDepositTxPublishedMessage.class); - public SendDepositTxToTaker(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { + public SendDepositTxPublishedMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { super(taskHandler, offererTradeProcessModel); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendFiatTransferStartedMessage.java similarity index 94% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendFiatTransferStartedMessage.java index 20d04bfae7..1bb123452b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendFiatTransferStartedMessage.java @@ -25,10 +25,10 @@ import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SendBankTransferStartedMessage extends OffererTradeTask { - private static final Logger log = LoggerFactory.getLogger(SendBankTransferStartedMessage.class); +public class SendFiatTransferStartedMessage extends OffererTradeTask { + private static final Logger log = LoggerFactory.getLogger(SendFiatTransferStartedMessage.class); - public SendBankTransferStartedMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { + public SendFiatTransferStartedMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { super(taskHandler, offererTradeProcessModel); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendRequestTakerDepositPaymentMessage.java similarity index 90% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendRequestTakerDepositPaymentMessage.java index 9e674b7977..80d3e13488 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendRequestTakerDepositPaymentMessage.java @@ -25,10 +25,10 @@ import io.bitsquare.trade.protocol.trade.messages.RequestTakerDepositPaymentMess import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RequestTakerDepositPayment extends OffererTradeTask { - private static final Logger log = LoggerFactory.getLogger(RequestTakerDepositPayment.class); +public class SendRequestTakerDepositPaymentMessage extends OffererTradeTask { + private static final Logger log = LoggerFactory.getLogger(SendRequestTakerDepositPaymentMessage.class); - public RequestTakerDepositPayment(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { + public SendRequestTakerDepositPaymentMessage(TaskRunner taskHandler, OffererTrade offererTradeProcessModel) { super(taskHandler, offererTradeProcessModel); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerProtocol.java index b73c5baf91..532fb26c8b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerProtocol.java @@ -35,12 +35,12 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessFiatTransferStartedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRequestTakerDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestDepositTxInputsMessage; -import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestPublishDepositTxMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx; -import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.CommitDepositTx; +import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignDepositTx; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; @@ -123,8 +123,8 @@ public class TakerProtocol implements Protocol { ProcessRequestTakerDepositPaymentMessage.class, VerifyOffererAccount.class, CreateAndSignContract.class, - TakerCreatesAndSignsDepositTx.class, - SendSignedTakerDepositTx.class + CreateAndSignDepositTx.class, + SendRequestPublishDepositTxMessage.class ); taskRunner.run(); } @@ -138,7 +138,7 @@ public class TakerProtocol implements Protocol { taskRunner.addTasks( ProcessDepositTxPublishedMessage.class, - TakerCommitDepositTx.class + CommitDepositTx.class ); taskRunner.run(); } @@ -175,7 +175,7 @@ public class TakerProtocol implements Protocol { taskRunner.addTasks( SignAndPublishPayoutTx.class, VerifyOfferFeePayment.class, - SendPayoutTxToOfferer.class + SendPayoutTxPublishedMessage.class ); taskRunner.run(); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CommitDepositTx.java similarity index 82% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CommitDepositTx.java index 37222f9399..50ec9dd1b3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CommitDepositTx.java @@ -25,10 +25,10 @@ import org.bitcoinj.core.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCommitDepositTx extends TakerTradeTask { - private static final Logger log = LoggerFactory.getLogger(TakerCommitDepositTx.class); +public class CommitDepositTx extends TakerTradeTask { + private static final Logger log = LoggerFactory.getLogger(CommitDepositTx.class); - public TakerCommitDepositTx(TaskRunner taskHandler, TakerTrade model) { + public CommitDepositTx(TaskRunner taskHandler, TakerTrade model) { super(taskHandler, model); } @@ -36,7 +36,7 @@ public class TakerCommitDepositTx extends TakerTradeTask { protected void doRun() { try { // To access tx confidence we need to add that tx into our wallet. - Transaction depositTx = takerTradeProcessModel.getTradeWalletService().commitsDepositTx(takerTrade.getDepositTx()); + Transaction depositTx = takerTradeProcessModel.getTradeWalletService().commitTx(takerTrade.getDepositTx()); takerTrade.setDepositTx(depositTx); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignDepositTx.java similarity index 90% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignDepositTx.java index 21a9a4c3f0..17d6ba1f7a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignDepositTx.java @@ -27,10 +27,10 @@ import org.bitcoinj.core.Coin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerCreatesAndSignsDepositTx extends TakerTradeTask { - private static final Logger log = LoggerFactory.getLogger(TakerCreatesAndSignsDepositTx.class); +public class CreateAndSignDepositTx extends TakerTradeTask { + private static final Logger log = LoggerFactory.getLogger(CreateAndSignDepositTx.class); - public TakerCreatesAndSignsDepositTx(TaskRunner taskHandler, TakerTrade model) { + public CreateAndSignDepositTx(TaskRunner taskHandler, TakerTrade model) { super(taskHandler, model); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxPublishedMessage.java similarity index 93% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxPublishedMessage.java index f2f5fdb670..40410c6946 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxPublishedMessage.java @@ -25,10 +25,10 @@ import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SendPayoutTxToOfferer extends TakerTradeTask { - private static final Logger log = LoggerFactory.getLogger(SendPayoutTxToOfferer.class); +public class SendPayoutTxPublishedMessage extends TakerTradeTask { + private static final Logger log = LoggerFactory.getLogger(SendPayoutTxPublishedMessage.class); - public SendPayoutTxToOfferer(TaskRunner taskHandler, TakerTrade model) { + public SendPayoutTxPublishedMessage(TaskRunner taskHandler, TakerTrade model) { super(taskHandler, model); } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java index 933d2897c8..a188f2f211 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java @@ -40,13 +40,13 @@ public class SendRequestDepositTxInputsMessage extends TakerTradeTask { protected void doRun() { try { assert takerTradeProcessModel.getTakeOfferFeeTx() != null; - RequestDepositTxInputsMessage msg = new RequestDepositTxInputsMessage( + RequestDepositTxInputsMessage message = new RequestDepositTxInputsMessage( takerTradeProcessModel.getId(), takerTradeProcessModel.getTakeOfferFeeTx().getHashAsString(), takerTrade.getTradeAmount(), takerTradeProcessModel.taker.getTradeWalletPubKey()); - takerTradeProcessModel.getMessageService().sendMessage(takerTrade.getTradingPeer(), msg, new SendMessageListener() { + takerTradeProcessModel.getMessageService().sendMessage(takerTrade.getTradingPeer(), message, new SendMessageListener() { @Override public void handleResult() { log.trace("Sending TakeOfferFeePayedMessage succeeded."); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestPublishDepositTxMessage.java similarity index 86% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestPublishDepositTxMessage.java index 3a9574862d..b283927924 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestPublishDepositTxMessage.java @@ -20,22 +20,22 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.p2p.listener.SendMessageListener; import io.bitsquare.trade.TakerTrade; -import io.bitsquare.trade.protocol.trade.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SendSignedTakerDepositTx extends TakerTradeTask { - private static final Logger log = LoggerFactory.getLogger(SendSignedTakerDepositTx.class); +public class SendRequestPublishDepositTxMessage extends TakerTradeTask { + private static final Logger log = LoggerFactory.getLogger(SendRequestPublishDepositTxMessage.class); - public SendSignedTakerDepositTx(TaskRunner taskHandler, TakerTrade model) { + public SendRequestPublishDepositTxMessage(TaskRunner taskHandler, TakerTrade model) { super(taskHandler, model); } @Override protected void doRun() { try { - RequestOffererPublishDepositTxMessage tradeMessage = new RequestOffererPublishDepositTxMessage( + RequestPublishDepositTxMessage tradeMessage = new RequestPublishDepositTxMessage( takerTradeProcessModel.getId(), takerTradeProcessModel.taker.getFiatAccount(), takerTradeProcessModel.taker.getAccountId(), @@ -56,7 +56,7 @@ public class SendSignedTakerDepositTx extends TakerTradeTask { @Override public void handleFault() { - appendToErrorMessage("Sending RequestOffererDepositPublicationMessage failed"); + appendToErrorMessage("Sending RequestOffererPublishDepositTxMessage failed"); takerTrade.setErrorMessage(errorMessage); takerTrade.setProcessState(TakerTrade.TakerProcessState.MESSAGE_SENDING_FAILED); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java index b65c95b2c3..bf6ce98272 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java @@ -34,9 +34,8 @@ public class VerifyOffererAccount extends TakerTradeTask { protected void doRun() { try { if (takerTradeProcessModel.getBlockChainService().verifyAccountRegistration()) { - if (takerTradeProcessModel.getBlockChainService().isAccountBlackListed(takerTradeProcessModel.offerer.getAccountId(), takerTradeProcessModel - .offerer - .getFiatAccount())) { + if (takerTradeProcessModel.getBlockChainService().isAccountBlackListed(takerTradeProcessModel.offerer.getAccountId(), + takerTradeProcessModel.offerer.getFiatAccount())) { failed("Taker is blacklisted."); } else { diff --git a/package/instructions.txt b/package/instructions.txt index 2205302ab2..286b0e3d44 100644 --- a/package/instructions.txt +++ b/package/instructions.txt @@ -3,7 +3,7 @@ Binary build instructions with Update FX: Binary build: 1. Set version numbers in UpdateProcess, BitsquareAppMain and pom files. Check in changes. -2. Remove previous build files under gui/updatefx. Use wallet file form backup if not there. Run setup.sh. Key in UpdateProcess must be same as reported in +2. Remove previous build files under core/updatefx. Use wallet file form backup if not there. Run setup.sh. Key in UpdateProcess must be same as reported in console. 3. Run create_app.sh 4. Upload index to server diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index 90addab06e..dc4e955631 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -21,9 +21,9 @@ $JAVA_HOME/bin/javapackager \ -name Bitsquare \ -title Bitsquare \ -vendor Bitsquare \ - -outdir gui/deploy \ - -srcfiles gui/updatefx/builds/processed/$buildVersion.jar \ - -appclass io.bitsquare.app.gui.BitsquareAppMain \ + -outdir core/deploy \ + -srcfiles core/updatefx/builds/processed/$buildVersion.jar \ + -appclass io.bitsquare.app.core.BitsquareAppMain \ -outfile Bitsquare cd package/linux diff --git a/package/linux/setup.sh b/package/linux/setup.sh index 36f216a353..641102b3a7 100644 --- a/package/linux/setup.sh +++ b/package/linux/setup.sh @@ -3,9 +3,9 @@ # setup dirs cd ../../ -mkdir gui/updatefx -mkdir gui/updatefx/builds -mkdir gui/updatefx/builds/processed -mkdir gui/deploy +mkdir core/updatefx +mkdir core/updatefx/builds +mkdir core/updatefx/builds/processed +mkdir core/deploy cd package/linux \ No newline at end of file diff --git a/package/mac/Info.plist b/package/mac/Info.plist index 89d72ba2b5..b3e3483a7f 100644 --- a/package/mac/Info.plist +++ b/package/mac/Info.plist @@ -35,7 +35,7 @@ JVMRuntime .. JVMMainClassName - io.bitsquare.app.gui.BitsquareAppMain + io.bitsquare.app.core.BitsquareAppMain JVMAppClasspath JVMMainJarName diff --git a/package/mac/Info.template.plist b/package/mac/Info.template.plist index 9e4fa3946d..04712d32d5 100644 --- a/package/mac/Info.template.plist +++ b/package/mac/Info.template.plist @@ -35,7 +35,7 @@ JVMRuntime .. JVMMainClassName - io.bitsquare.app.gui.BitsquareAppMain + io.bitsquare.app.core.BitsquareAppMain JVMAppClasspath JVMMainJarName diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index e467e248ad..246349fc78 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -5,10 +5,10 @@ cd ../../ set -e # Extract the version number. buildVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + buildVersion -buildVersion=$( sed -n 's/^.*final int BUILD_VERSION = //p' gui/src/main/java/io/bitsquare/app/gui/UpdateProcess.java ) +buildVersion=$( sed -n 's/^.*final int BUILD_VERSION = //p' core/src/main/java/io/bitsquare/app/UpdateProcess.java ) # remove trailing; buildVersion="${buildVersion:0:${#buildVersion}-1}" -fullVersion=$( sed -n 's/^.*final String VERSION = "//p' gui/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java ) +fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/BitsquareAppMain.java ) # remove trailing "; fullVersion="${fullVersion:0:${#fullVersion}-2}".$buildVersion @@ -20,9 +20,9 @@ sed "s|JAR_NAME_STRING_GOES_HERE|$buildVersion.jar|" package/mac/Info.template.p mvn clean package -DskipTests -Dmaven.javadoc.skip=true -cp gui/target/shaded.jar gui/updatefx/builds/$buildVersion.jar +cp core/target/shaded.jar core/updatefx/builds/$buildVersion.jar -java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx +java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ core/updatefx $JAVA_HOME/bin/javapackager \ -deploy \ @@ -35,9 +35,9 @@ $JAVA_HOME/bin/javapackager \ -name Bitsquare \ -title Bitsquare \ -vendor Bitsquare \ - -outdir gui/deploy \ - -srcfiles gui/updatefx/builds/processed/$buildVersion.jar \ - -appclass io.bitsquare.app.gui.BitsquareAppMain \ + -outdir core/deploy \ + -srcfiles core/updatefx/builds/processed/$buildVersion.jar \ + -appclass io.bitsquare.app.core.BitsquareAppMain \ -outfile Bitsquare cd package/mac \ No newline at end of file diff --git a/package/mac/setup.sh b/package/mac/setup.sh index 9a852cfa91..9f42c7ac2c 100644 --- a/package/mac/setup.sh +++ b/package/mac/setup.sh @@ -2,14 +2,14 @@ # setup dirs cd ../../ -mkdir gui/updatefx -mkdir gui/updatefx/builds -mkdir gui/updatefx/builds/processed -mkdir gui/updatefx/site -mkdir gui/deploy +mkdir core/updatefx +mkdir core/updatefx/builds +mkdir core/updatefx/builds/processed +mkdir core/updatefx/site +mkdir core/deploy # create key/wallet. Copy wallet key to UpdateProcess and use wallet for other OS builds -java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx +java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ core/updatefx cd package/mac diff --git a/package/mac/update.sh b/package/mac/update.sh index 85d207169e..c55a051523 100644 --- a/package/mac/update.sh +++ b/package/mac/update.sh @@ -5,13 +5,13 @@ cd ../../ set -e # Extract the version number. buildVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + buildVersion -buildVersion=$( sed -n 's/^.*final int BUILD_VERSION = //p' gui/src/main/java/io/bitsquare/app/gui/UpdateProcess.java ) +buildVersion=$( sed -n 's/^.*final int BUILD_VERSION = //p' core/src/main/java/io/bitsquare/app/UpdateProcess.java ) # remove trailing; buildVersion="${buildVersion:0:${#buildVersion}-1}" echo buildVersion = $buildVersion mvn clean package -DskipTests -Dmaven.javadoc.skip=true -cp gui/target/shaded.jar gui/updatefx/builds/$buildVersion.jar -java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ gui/updatefx +cp core/target/shaded.jar core/updatefx/builds/$buildVersion.jar +java -jar ./updatefx/updatefx-app-1.2.jar --url=http://bitsquare.io/updateFX/ core/updatefx cd package/mac \ No newline at end of file diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index 25e94275c5..e093b2d708 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -8,9 +8,9 @@ cd ..\..\ :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works -call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.1.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre" +call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.1.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir core\deploy -appclass io.bitsquare.app.core.BitsquareAppMain -srcfiles "core\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre" :: 32 bit build -:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.1.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre" +:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.1.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir core\deploy -appclass io.bitsquare.app.core.BitsquareAppMain -srcfiles "core\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre" cd package\windows \ No newline at end of file diff --git a/package/windows/setup.bat b/package/windows/setup.bat index 68cda37596..4e0758cc3f 100644 --- a/package/windows/setup.bat +++ b/package/windows/setup.bat @@ -1,9 +1,9 @@ cd ..\..\ :: setup dirs -mkdir gui\updatefx -mkdir gui\updatefx\builds -mkdir gui\updatefx\builds\processed -mkdir gui\deploy +mkdir core\updatefx +mkdir core\updatefx\builds +mkdir core\updatefx\builds\processed +mkdir core\deploy cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index 33927ec62e..26e4b91fba 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.1.2-SNAPSHOT + 0.1.3-SNAPSHOT The decentralized bitcoin exchange https://bitsquare.io