diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 9fbffb0e09..ea3cbbba99 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -38,9 +38,9 @@ import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailability import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel; import io.bitsquare.trade.protocol.placeoffer.PlaceOfferProtocol; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererProtocol; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerProtocol; import io.bitsquare.user.AccountSettings; import io.bitsquare.user.User; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java index b6c1d7230b..64d6a85244 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java @@ -22,6 +22,7 @@ import io.bitsquare.network.Peer; import io.bitsquare.trade.Trade; import io.bitsquare.trade.handlers.MessageHandler; import io.bitsquare.trade.protocol.trade.TradeMessage; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.offerer.tasks.GetOffererDepositTxInputs; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestDepositTxInputsMessage; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java index 656a758eaf..559cb04d50 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java @@ -20,6 +20,7 @@ package io.bitsquare.trade.protocol.trade.offerer; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java similarity index 96% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java index 9dbf1371ad..86902b5b10 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer; +package io.bitsquare.trade.protocol.trade.offerer.models; import io.bitsquare.btc.BlockChainService; import io.bitsquare.btc.WalletService; @@ -24,7 +24,6 @@ import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.Trade; import io.bitsquare.trade.TradeMessageService; import io.bitsquare.trade.protocol.trade.OfferSharedModel; -import io.bitsquare.trade.protocol.trade.TakerModel; import io.bitsquare.user.User; import org.bitcoinj.core.Transaction; @@ -36,14 +35,10 @@ public class BuyerAsOffererModel extends OfferSharedModel { private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererModel.class); - private final Trade trade; - - public final TakerModel taker; public final OffererModel offerer; - private Transaction publishedDepositTx; private String takeOfferFeeTxId; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java similarity index 90% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererModel.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java index c2d124aa4c..f28a88c827 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java @@ -15,7 +15,9 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade.offerer; +package io.bitsquare.trade.protocol.trade.offerer.models; + +import io.bitsquare.network.Peer; import org.bitcoinj.core.Coin; import org.bitcoinj.core.ECKey; @@ -31,4 +33,5 @@ public class OffererModel { public List connectedOutputsForAllInputs; public List outputs; public Transaction payoutTx; + public Peer peer; } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java similarity index 95% rename from core/src/main/java/io/bitsquare/trade/protocol/trade/TakerModel.java rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java index 6e39d9a69e..b65d7de33d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TakerModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol.trade; +package io.bitsquare.trade.protocol.trade.offerer.models; import io.bitsquare.fiat.FiatAccount; import io.bitsquare.network.Peer; @@ -40,5 +40,4 @@ public class TakerModel { public List outputs; public String payoutAddress; public byte[] pubKey; - } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java index c189b4dade..364ae1faaf 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java @@ -22,7 +22,7 @@ import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java index 39190df956..64ccaeac9d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestDepositTxInputsMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestDepositTxInputsMessage.java index fe50496722..457f2e4945 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestDepositTxInputsMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestDepositTxInputsMessage.java @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.taker.messages.RequestDepositTxInputsMessage; import org.slf4j.Logger; 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/ProcessRequestOffererPublishDepositTxMessage.java index 36bdb0941f..2fbc3a4f39 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/ProcessRequestOffererPublishDepositTxMessage.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; import org.slf4j.Logger; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java index 8aedb32190..81676f29f8 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; 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/SendBankTransferStartedMessage.java index 3bd741234c..8cee98b350 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/SendBankTransferStartedMessage.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java index bec111a2be..5494a851d1 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java index c2a0c87699..1db00e4578 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java index 9fd1db23a9..1f7c4e96a5 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java index 3f39fae14c..4c20d2a94d 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java @@ -21,7 +21,7 @@ import io.bitsquare.btc.TradeWalletService; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import org.bitcoinj.core.Coin; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java index b95ab930cb..7b56e4a2c3 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.util.Utilities; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java index 68323fb016..b7c72bde37 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java index 1973c87e8c..f373e5f0a6 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; -import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel; +import io.bitsquare.trade.protocol.trade.offerer.models.BuyerAsOffererModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java deleted file mode 100644 index f556e1a2b8..0000000000 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * 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.taker; - -import io.bitsquare.btc.BlockChainService; -import io.bitsquare.btc.WalletService; -import io.bitsquare.crypto.SignatureService; -import io.bitsquare.fiat.FiatAccount; -import io.bitsquare.network.Peer; -import io.bitsquare.persistence.Persistence; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeMessageService; -import io.bitsquare.trade.protocol.trade.OfferSharedModel; -import io.bitsquare.user.User; - -import org.bitcoinj.core.Coin; -import org.bitcoinj.core.ECKey; -import org.bitcoinj.core.Transaction; -import org.bitcoinj.core.TransactionOutput; - -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class SellerAsTakerModel extends OfferSharedModel { - private static final Logger log = LoggerFactory.getLogger(SellerAsTakerModel.class); - - // provided - private final Trade trade; - private final Peer offerer; - - // derived - private final byte[] takerPubKey; - - // written/read by task - private Transaction depositTx; - private Transaction payoutTx; - private Coin takerPayoutAmount; - private byte[] offererPubKey; - private Coin offererPayoutAmount; - private String offererPayoutAddress; - private List offererConnectedOutputsForAllInputs; - private List offererOutputs; - private List takerConnectedOutputsForAllInputs; - private List takerOutputs; - private Transaction takerDepositTx; - private Transaction publishedDepositTx; - private FiatAccount takerFiatAccount; - private String takerAccountId; - private ECKey.ECDSASignature offererSignature; - private Transaction takeOfferFeeTx; - - public SellerAsTakerModel(Trade trade, - Peer offerer, - TradeMessageService tradeMessageService, - WalletService walletService, - BlockChainService blockChainService, - SignatureService signatureService, - User user, - Persistence persistence) { - super(trade.getOffer(), - tradeMessageService, - walletService, - blockChainService, - signatureService, - user, - persistence); - - this.trade = trade; - this.offerer = offerer; - takerPubKey = getAddressEntry().getPubKey(); - } - - // getter/setter - public byte[] getTakerPubKey() { - return takerPubKey; - } - - public void setOffererPubKey(byte[] offererPubKey) { - this.offererPubKey = offererPubKey; - } - - public List getOffererConnectedOutputsForAllInputs() { - return offererConnectedOutputsForAllInputs; - } - - public void setOffererConnectedOutputsForAllInputs(List offererConnectedOutputsForAllInputs) { - this.offererConnectedOutputsForAllInputs = offererConnectedOutputsForAllInputs; - } - - public List getOffererOutputs() { - return offererOutputs; - } - - public void setOffererOutputs(List offererOutputs) { - this.offererOutputs = offererOutputs; - } - - public Trade getTrade() { - return trade; - } - - public Peer getOfferer() { - return offerer; - } - - public Transaction getPayoutTx() { - return payoutTx; - } - - public void setPayoutTx(Transaction payoutTx) { - this.payoutTx = payoutTx; - } - - public byte[] getOffererPubKey() { - return offererPubKey; - } - - public Transaction getDepositTx() { - return depositTx; - } - - public void setDepositTx(Transaction depositTx) { - this.depositTx = depositTx; - } - - public Coin getOffererPayoutAmount() { - return offererPayoutAmount; - } - - public void setOffererPayoutAmount(Coin offererPayoutAmount) { - this.offererPayoutAmount = offererPayoutAmount; - } - - public Coin getTakerPayoutAmount() { - return takerPayoutAmount; - } - - public void setTakerPayoutAmount(Coin takerPayoutAmount) { - this.takerPayoutAmount = takerPayoutAmount; - } - - public String getOffererPayoutAddress() { - return offererPayoutAddress; - } - - public void setOffererPayoutAddress(String offererPayoutAddress) { - this.offererPayoutAddress = offererPayoutAddress; - } - - public void setTakerConnectedOutputsForAllInputs(List takerConnectedOutputsForAllInputs) { - this.takerConnectedOutputsForAllInputs = takerConnectedOutputsForAllInputs; - } - - public List getTakerConnectedOutputsForAllInputs() { - return takerConnectedOutputsForAllInputs; - } - - public void setTakerOutputs(List takerOutputs) { - this.takerOutputs = takerOutputs; - } - - public List getTakerOutputs() { - return takerOutputs; - } - - public void setTakerDepositTx(Transaction takerDepositTx) { - this.takerDepositTx = takerDepositTx; - } - - public Transaction getTakerDepositTx() { - return takerDepositTx; - } - - public void setPublishedDepositTx(Transaction publishedDepositTx) { - this.publishedDepositTx = publishedDepositTx; - } - - public Transaction getPublishedDepositTx() { - return publishedDepositTx; - } - - public void setTakerFiatAccount(FiatAccount takerFiatAccount) { - this.takerFiatAccount = takerFiatAccount; - } - - public FiatAccount getTakerFiatAccount() { - return takerFiatAccount; - } - - public void setTakerAccountId(String takerAccountId) { - this.takerAccountId = takerAccountId; - } - - public String getTakerAccountId() { - return takerAccountId; - } - - public ECKey.ECDSASignature getOffererSignature() { - return offererSignature; - } - - public void setOffererSignature(ECKey.ECDSASignature offererSignature) { - this.offererSignature = offererSignature; - } - - public void setTakeOfferFeeTx(Transaction takeOfferFeeTx) { - this.takeOfferFeeTx = takeOfferFeeTx; - } - - public Transaction getTakeOfferFeeTx() { - return takeOfferFeeTx; - } - -} diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java index ffb09707d8..fec7391e71 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java @@ -25,6 +25,7 @@ import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.trade.protocol.trade.taker.tasks.BroadcastTakeOfferFeeTx; import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignContract; import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java index 9fcd6da563..983bf88823 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java @@ -20,6 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker; import io.bitsquare.common.handlers.ErrorMessageHandler; import io.bitsquare.common.handlers.ResultHandler; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java new file mode 100644 index 0000000000..f5827894a6 --- /dev/null +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java @@ -0,0 +1,41 @@ +/* + * 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.taker.models; + +import io.bitsquare.network.Peer; + +import org.bitcoinj.core.Coin; +import org.bitcoinj.core.ECKey; +import org.bitcoinj.core.TransactionOutput; + +import java.util.List; + +public class OffererModel { + public OffererModel(Peer peer) { + this.peer = peer; + } + + public Peer peer; + public byte[] pubKey; + public Coin payoutAmount; + public String payoutAddress; + public List connectedOutputsForAllInputs; + public List outputs; + public ECKey.ECDSASignature signature; + +} diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java new file mode 100644 index 0000000000..3b78a20340 --- /dev/null +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java @@ -0,0 +1,103 @@ +/* + * 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.taker.models; + +import io.bitsquare.btc.BlockChainService; +import io.bitsquare.btc.WalletService; +import io.bitsquare.crypto.SignatureService; +import io.bitsquare.network.Peer; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.trade.Trade; +import io.bitsquare.trade.TradeMessageService; +import io.bitsquare.trade.protocol.trade.OfferSharedModel; +import io.bitsquare.trade.protocol.trade.offerer.models.TakerModel; +import io.bitsquare.user.User; + +import org.bitcoinj.core.Transaction; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SellerAsTakerModel extends OfferSharedModel { + private static final Logger log = LoggerFactory.getLogger(SellerAsTakerModel.class); + + private final Trade trade; + public final TakerModel taker; + public final OffererModel offerer; + + private Transaction publishedDepositTx; + private Transaction takeOfferFeeTx; + private Transaction payoutTx; + + public SellerAsTakerModel(Trade trade, + Peer offererPeer, + TradeMessageService tradeMessageService, + WalletService walletService, + BlockChainService blockChainService, + SignatureService signatureService, + User user, + Persistence persistence) { + super(trade.getOffer(), + tradeMessageService, + walletService, + blockChainService, + signatureService, + user, + persistence); + + this.trade = trade; + + taker = new TakerModel(); + offerer = new OffererModel(offererPeer); + + taker.pubKey = getAddressEntry().getPubKey(); + } + + + public Trade getTrade() { + return trade; + } + + public Transaction getPublishedDepositTx() { + return publishedDepositTx; + } + + public void setPublishedDepositTx(Transaction publishedDepositTx) { + this.publishedDepositTx = publishedDepositTx; + } + + public Transaction getTakeOfferFeeTx() { + return takeOfferFeeTx; + } + + public void setTakeOfferFeeTx(Transaction takeOfferFeeTx) { + this.takeOfferFeeTx = takeOfferFeeTx; + } + + public void setDepositTx(Transaction transaction) { + + } + + public Transaction getPayoutTx() { + return payoutTx; + } + + public void setPayoutTx(Transaction payoutTx) { + this.payoutTx = payoutTx; + } +} diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java new file mode 100644 index 0000000000..e779036045 --- /dev/null +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java @@ -0,0 +1,37 @@ +/* + * 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.taker.models; + +import io.bitsquare.fiat.FiatAccount; + +import org.bitcoinj.core.Coin; +import org.bitcoinj.core.Transaction; +import org.bitcoinj.core.TransactionOutput; + +import java.util.List; + +public class TakerModel { + + public List connectedOutputsForAllInputs; + public List outputs; + public Transaction depositTx; + public FiatAccount fiatAccount; + public String accountId; + public Coin payoutAmount; + +} diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java index ab7c10cb17..35edb629c4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java index 88cd3e66df..87775a4855 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java @@ -21,7 +21,7 @@ import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Contract; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.util.Utilities; import org.slf4j.Logger; @@ -41,9 +41,9 @@ public class CreateAndSignContract extends Task { model.getOffer(), trade.getTradeAmount(), model.getTakeOfferFeeTx().getHashAsString(), - model.getTakerAccountId(), + model.taker.accountId, model.getAccountId(), - model.getTakerFiatAccount(), + model.taker.fiatAccount, model.getFiatAccount(), model.getOffer().getMessagePublicKey(), model.getNetworkPubKey()); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java index 2feb04f5e2..eac989413a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.bitcoinj.core.Transaction; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java index 90fedc8941..794dc24803 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java @@ -17,10 +17,10 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; -import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.bitcoinj.core.ECKey; @@ -44,10 +44,10 @@ public class ProcessBankTransferStartedMessage extends Task BankTransferStartedMessage message = (BankTransferStartedMessage) model.getTradeMessage(); model.setDepositTx(checkNotNull(message.getDepositTx())); - model.setOffererSignature(checkNotNull(ECKey.ECDSASignature.decodeFromDER(message.getOffererSignature()))); - model.setOffererPayoutAmount(positiveCoinOf(nonZeroCoinOf(message.getOffererPayoutAmount()))); - model.setTakerPayoutAmount(positiveCoinOf(nonZeroCoinOf(message.getTakerPayoutAmount()))); - model.setOffererPayoutAddress(nonEmptyStringOf(message.getOffererPayoutAddress())); + model.offerer.signature = checkNotNull(ECKey.ECDSASignature.decodeFromDER(message.getOffererSignature())); + model.offerer.payoutAmount = positiveCoinOf(nonZeroCoinOf(message.getOffererPayoutAmount())); + model.taker.payoutAmount = positiveCoinOf(nonZeroCoinOf(message.getTakerPayoutAmount())); + model.offerer.payoutAddress = nonEmptyStringOf(message.getOffererPayoutAddress()); complete(); } catch (Throwable t) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java index 4f7c058527..77c9b11efc 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java index 4bd1214200..871f93ba2b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java @@ -17,10 +17,10 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; -import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,13 +41,12 @@ public class ProcessRequestDepositPaymentMessage extends Task 0); - model.setOffererOutputs(checkNotNull(message.getOffererOutputs())); - model.setOffererPubKey(checkNotNull(message.getOffererPubKey())); - - model.setTakerFiatAccount(checkNotNull(message.getFiatAccount())); - model.setTakerAccountId(nonEmptyStringOf(message.getAccountId())); + model.offerer.outputs = checkNotNull(message.getOffererOutputs()); + model.offerer.pubKey = checkNotNull(message.getOffererPubKey()); + model.taker.fiatAccount = checkNotNull(message.getFiatAccount()); + model.taker.accountId = nonEmptyStringOf(message.getAccountId()); complete(); } catch (Throwable t) { 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/SendPayoutTxToOfferer.java index 3a55b111ee..1c3411ec99 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/SendPayoutTxToOfferer.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; @@ -36,7 +36,7 @@ public class SendPayoutTxToOfferer extends Task { @Override protected void doRun() { PayoutTxPublishedMessage tradeMessage = new PayoutTxPublishedMessage(model.getId(), model.getPayoutTx()); - model.getTradeMessageService().sendMessage(model.getOfferer(), tradeMessage, new SendMessageListener() { + model.getTradeMessageService().sendMessage(model.offerer.peer, tradeMessage, new SendMessageListener() { @Override public void handleResult() { log.trace("PayoutTxPublishedMessage successfully arrived at peer"); 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 199f669ccb..eb73cdd80b 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 @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.trade.Trade; import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; import io.bitsquare.trade.protocol.trade.taker.messages.RequestDepositTxInputsMessage; @@ -42,10 +42,10 @@ public class SendRequestDepositTxInputsMessage extends Task model.getId(), model.getTakeOfferFeeTx().getHashAsString(), model.getTrade().getTradeAmount(), - model.getTakerPubKey() + model.taker.pubKey ); - model.getTradeMessageService().sendMessage(model.getOfferer(), msg, new SendMessageListener() { + model.getTradeMessageService().sendMessage(model.offerer.peer, msg, 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/SendSignedTakerDepositTx.java index ddfa941644..3ba7694b3b 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/SendSignedTakerDepositTx.java @@ -17,11 +17,11 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; -import io.bitsquare.trade.listeners.SendMessageListener; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; -import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.listeners.SendMessageListener; +import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,12 +43,12 @@ public class SendSignedTakerDepositTx extends Task { model.getTrade().getContractAsJson(), model.getTrade().getTakerContractSignature(), model.getAddressEntry().getAddressString(), - model.getTakerDepositTx(), - model.getTakerConnectedOutputsForAllInputs(), - model.getTakerOutputs() + model.taker.depositTx, + model.taker.connectedOutputsForAllInputs, + model.taker.outputs ); - model.getTradeMessageService().sendMessage(model.getOfferer(), tradeMessage, new SendMessageListener() { + model.getTradeMessageService().sendMessage(model.offerer.peer, tradeMessage, new SendMessageListener() { @Override public void handleResult() { complete(); diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java index 40434f48cc..fef4b1ccde 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; @@ -43,13 +43,13 @@ public class SignAndPublishPayoutTx extends Task { try { model.getTradeWalletService().takerSignsAndPublishPayoutTx( model.getPublishedDepositTx(), - model.getOffererSignature(), - model.getOffererPayoutAmount(), - model.getTakerPayoutAmount(), - model.getOffererPayoutAddress(), + model.offerer.signature, + model.offerer.payoutAmount, + model.taker.payoutAmount, + model.offerer.payoutAddress, model.getAddressEntry(), - model.getOffererPubKey(), - model.getTakerPubKey(), + model.offerer.pubKey, + model.taker.pubKey, model.getArbitratorPubKey(), new FutureCallback() { @Override 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/TakerCommitDepositTx.java index e8ba2da18f..139b45e3c9 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/TakerCommitDepositTx.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; 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/TakerCreatesAndSignsDepositTx.java index 43d0584f33..3904247740 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/TakerCreatesAndSignsDepositTx.java @@ -19,10 +19,10 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.TradeWalletService; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.Trade; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.bitcoinj.core.Coin; @@ -45,17 +45,17 @@ public class TakerCreatesAndSignsDepositTx extends Task { TradeWalletService.TransactionDataResult result = model.getTradeWalletService().takerCreatesAndSignsDepositTx( takerInputAmount, msOutputAmount, - model.getOffererConnectedOutputsForAllInputs(), - model.getOffererOutputs(), + model.offerer.connectedOutputsForAllInputs, + model.offerer.outputs, model.getAddressEntry(), - model.getOffererPubKey(), - model.getTakerPubKey(), + model.offerer.pubKey, + model.taker.pubKey, model.getArbitratorPubKey()); - model.setTakerConnectedOutputsForAllInputs(result.getConnectedOutputsForAllInputs()); - model.setTakerOutputs(result.getOutputs()); - model.setTakerDepositTx(result.getDepositTx()); + model.taker.connectedOutputsForAllInputs = result.getConnectedOutputsForAllInputs(); + model.taker.outputs = result.getOutputs(); + model.taker.depositTx = result.getDepositTx(); complete(); } catch (Exception e) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java index 15ec5c6a2b..64628eee71 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; 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 781116f459..72f9bf3c36 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 @@ -17,9 +17,9 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; -import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel; import io.bitsquare.common.taskrunner.Task; import io.bitsquare.common.taskrunner.TaskRunner; +import io.bitsquare.trade.protocol.trade.taker.models.SellerAsTakerModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ public class VerifyOffererAccount extends Task { @Override protected void doRun() { if (model.getBlockChainService().verifyAccountRegistration()) { - if (model.getBlockChainService().isAccountBlackListed(model.getTakerAccountId(), model.getTakerFiatAccount())) { + if (model.getBlockChainService().isAccountBlackListed(model.taker.accountId, model.taker.fiatAccount)) { failed("Taker is blacklisted."); } else {