diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java index 86902b5b10..b2db1949cb 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/BuyerAsOffererModel.java @@ -28,11 +28,13 @@ import io.bitsquare.user.User; import org.bitcoinj.core.Transaction; +import java.io.Serializable; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BuyerAsOffererModel extends OfferSharedModel { - +public class BuyerAsOffererModel extends OfferSharedModel implements Serializable { + private static final long serialVersionUID = 5000457153390911569L; private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererModel.class); private final Trade trade; @@ -42,11 +44,6 @@ public class BuyerAsOffererModel extends OfferSharedModel { private Transaction publishedDepositTx; private String takeOfferFeeTxId; - - /////////////////////////////////////////////////////////////////////////////////////////// - // Constructor - /////////////////////////////////////////////////////////////////////////////////////////// - public BuyerAsOffererModel(Trade trade, TradeMessageService tradeMessageService, WalletService walletService, diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java index f28a88c827..fa253fea90 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererModel.java @@ -24,9 +24,13 @@ import org.bitcoinj.core.ECKey; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionOutput; +import java.io.Serializable; + import java.util.List; -public class OffererModel { +public class OffererModel implements Serializable { + private static final long serialVersionUID = -1845177552607819927L; + public byte[] pubKey; public ECKey.ECDSASignature payoutSignature; public Coin payoutAmount; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java index b65d7de33d..de9feea293 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/TakerModel.java @@ -24,11 +24,15 @@ import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionOutput; +import java.io.Serializable; + import java.security.PublicKey; import java.util.List; -public class TakerModel { +public class TakerModel implements Serializable{ + private static final long serialVersionUID = 2660909397210346486L; + public Peer peer; public String accountId; public FiatAccount fiatAccount; 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 index f034f1deb4..eecb935523 100644 --- 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 @@ -23,9 +23,13 @@ import org.bitcoinj.core.Coin; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.TransactionOutput; +import java.io.Serializable; + import java.util.List; -public class OffererModel { +public class OffererModel implements Serializable { + private static final long serialVersionUID = 1582902150121576205L; + public OffererModel(Peer peer) { this.peer = peer; } 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 index 26e8dd690c..e3aba69a23 100644 --- 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 @@ -25,15 +25,17 @@ 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 java.io.Serializable; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SellerAsTakerModel extends OfferSharedModel { +public class SellerAsTakerModel extends OfferSharedModel implements Serializable { + private static final long serialVersionUID = -963501132927618376L; private static final Logger log = LoggerFactory.getLogger(SellerAsTakerModel.class); private final Trade trade; 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 index e622d01d23..afa883edff 100644 --- 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 @@ -23,15 +23,19 @@ import org.bitcoinj.core.Coin; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionOutput; +import java.io.Serializable; + import java.util.List; -class TakerModel { - +public class TakerModel implements Serializable { + private static final long serialVersionUID = -4041809885931756860L; + public List connectedOutputsForAllInputs; public List outputs; public Transaction depositTx; public FiatAccount fiatAccount; public String accountId; public Coin payoutAmount; + public byte[] pubKey; }