mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,

Browse source 
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
This commit is contained in:
chimp1984 2021-10-19 22:42:20 +02:00
parent 4b968ce00c
commit 09aa24ce2d
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
51 changed files with 82 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
View file

@ -33,8 +33,8 @@ import bisq.core.payment.payload.PaymentMethod;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.user.User;

2
core/src/main/java/bisq/core/api/model/TradeInfo.java
View file

@ -17,8 +17,8 @@
package bisq.core.api.model;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.common.Payload;

2
core/src/main/java/bisq/core/support/dispute/Dispute.java
View file

@ -21,7 +21,7 @@ import bisq.core.locale.Res;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.support.SupportType;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtoUtil;

2
core/src/main/java/bisq/core/support/dispute/DisputeListService.java
View file

@ -17,7 +17,7 @@
package bisq.core.support.dispute;
import bisq.core.trade.Contract;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/support/dispute/DisputeManager.java
View file

@ -35,11 +35,11 @@ import bisq.core.support.dispute.messages.DisputeResultMessage;
import bisq.core.support.dispute.messages.OpenNewDisputeMessage;
import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.network.p2p.BootstrapListener;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
View file

@ -24,7 +24,7 @@ import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeList;
import bisq.core.support.dispute.DisputeManager;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.trade.Contract;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.DontShowAgainLookup;
import bisq.common.crypto.Hash;

2
core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
View file

@ -40,11 +40,11 @@ import bisq.core.support.dispute.messages.OpenNewDisputeMessage;
import bisq.core.support.dispute.messages.PeerOpenedDisputeMessage;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.messages.SupportMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.network.p2p.AckMessageSourceType;
import bisq.network.p2p.NodeAddress;

4
core/src/main/java/bisq/core/trade/TradableList.java
View file

@ -20,6 +20,10 @@ package bisq.core.trade;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOffer;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.ProtobufferRuntimeException;

1
core/src/main/java/bisq/core/trade/Trade.java
View file

@ -28,6 +28,7 @@ import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.support.dispute.refund.RefundResultState;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.ProcessModelServiceProvider;
import bisq.core.trade.txproof.AssetTxProofResult;

4
core/src/main/java/bisq/core/trade/TradeManager.java
View file

@ -34,6 +34,10 @@ import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.handlers.TradeResultHandler;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
import bisq.core.trade.protocol.MakerProtocol;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.ProcessModelServiceProvider;

1
core/src/main/java/bisq/core/trade/TradeUtil.java
View file

@ -20,6 +20,7 @@ package bisq.core.trade;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.common.crypto.KeyRing;
import bisq.common.util.Tuple2;

7
core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsMakerTrade.java
View file

@ -15,11 +15,14 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.MakerTrade;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;
@ -100,7 +103,7 @@ public final class BuyerAsMakerTrade extends BuyerTrade implements MakerTrade {
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
return fromProto(trade,
return Trade.fromProto(trade,
proto,
coreProtoResolver);
}

7
core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerAsTakerTrade.java
View file

@ -15,11 +15,14 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.TakerTrade;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;
@ -91,7 +94,7 @@ public final class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade {
if (uid == null) {
uid = UUID.randomUUID().toString();
}
return fromProto(new BuyerAsTakerTrade(
return Trade.fromProto(new BuyerAsTakerTrade(
Offer.fromProto(proto.getOffer()),
Coin.valueOf(proto.getTradeAmountAsLong()),
Coin.valueOf(proto.getTxFeeAsLong()),

3
core/src/main/java/bisq/core/trade/BuyerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/BuyerTrade.java
View file

@ -15,10 +15,11 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/Contract.java → core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
View file

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.locale.CurrencyUtil;
import bisq.core.monetary.Price;

7
core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsMakerTrade.java
View file

@ -15,11 +15,14 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.MakerTrade;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;
@ -101,7 +104,7 @@ public final class SellerAsMakerTrade extends SellerTrade implements MakerTrade
trade.setTradePrice(proto.getTradePrice());
trade.setTradingPeerNodeAddress(proto.hasTradingPeerNodeAddress() ? NodeAddress.fromProto(proto.getTradingPeerNodeAddress()) : null);
return fromProto(trade,
return Trade.fromProto(trade,
proto,
coreProtoResolver);
}

7
core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/SellerAsTakerTrade.java
View file

@ -15,11 +15,14 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.proto.CoreProtoResolver;
import bisq.core.trade.TakerTrade;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;
@ -91,7 +94,7 @@ public final class SellerAsTakerTrade extends SellerTrade implements TakerTrade
if (uid == null) {
uid = UUID.randomUUID().toString();
}
return fromProto(new SellerAsTakerTrade(
return Trade.fromProto(new SellerAsTakerTrade(
Offer.fromProto(proto.getOffer()),
Coin.valueOf(proto.getTradeAmountAsLong()),
Coin.valueOf(proto.getTxFeeAsLong()),

3
core/src/main/java/bisq/core/trade/SellerTrade.java → core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java
View file

@ -15,11 +15,12 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
package bisq.core.trade.model.bisq_v1;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.CurrencyUtil;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java
View file

@ -17,12 +17,12 @@
package bisq.core.trade.protocol;
import bisq.core.trade.BuyerAsMakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.buyer.BuyerFinalizesDelayedPayoutTx;

2
core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
View file

@ -19,13 +19,13 @@ package bisq.core.trade.protocol;
import bisq.core.offer.Offer;
import bisq.core.trade.BuyerAsTakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.buyer.BuyerFinalizesDelayedPayoutTx;

2
core/src/main/java/bisq/core/trade/protocol/BuyerProtocol.java
View file

@ -17,12 +17,12 @@
package bisq.core.trade.protocol;
import bisq.core.trade.BuyerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.DelayedPayoutTxSignatureRequest;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.messages.PayoutTxPublishedMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;

2
core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java
View file

@ -18,13 +18,13 @@
package bisq.core.trade.protocol;
import bisq.core.trade.SellerAsMakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.DepositTxMessage;
import bisq.core.trade.messages.InputsForDepositTxRequest;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.maker.MakerCreateAndSignContract;

2
core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java
View file

@ -19,12 +19,12 @@ package bisq.core.trade.protocol;
import bisq.core.offer.Offer;
import bisq.core.trade.SellerAsTakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.InputsForDepositTxResponse;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.seller.SellerCreatesDelayedPayoutTx;

2
core/src/main/java/bisq/core/trade/protocol/SellerProtocol.java
View file

@ -17,12 +17,12 @@
package bisq.core.trade.protocol;
import bisq.core.trade.SellerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;
import bisq.core.trade.messages.DelayedPayoutTxSignatureResponse;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.messages.TradeMessage;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.protocol.tasks.ApplyFilter;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;

8
core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
View file

@ -17,11 +17,11 @@
package bisq.core.trade.protocol;
import bisq.core.trade.BuyerAsMakerTrade;
import bisq.core.trade.BuyerAsTakerTrade;
import bisq.core.trade.SellerAsMakerTrade;
import bisq.core.trade.SellerAsTakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.BuyerAsTakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
public class TradeProtocolFactory {
public static TradeProtocol getNewTradeProtocol(Trade trade) {

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java
View file

@ -21,9 +21,9 @@ import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.DepositTxAndDelayedPayoutTxMessage;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.util.Validator;

4
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerCreateAndSignContract.java
View file

@ -19,9 +19,9 @@ package bisq.core.trade.protocol.tasks.maker;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.BuyerAsMakerTrade;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.BuyerAsMakerTrade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java
View file

@ -20,8 +20,8 @@ package bisq.core.trade.protocol.tasks.mediation;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SendMediatedPayoutSignatureMessage.java
View file

@ -18,9 +18,9 @@
package bisq.core.trade.protocol.tasks.mediation;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.MediatedPayoutTxSignatureMessage;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.network.p2p.NodeAddress;

2
core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java
View file

@ -20,8 +20,8 @@ package bisq.core.trade.protocol.tasks.mediation;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerProcessShareBuyerPaymentAccountMessage.java
View file

@ -35,9 +35,9 @@
package bisq.core.trade.protocol.tasks.seller;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.ShareBuyerPaymentAccountMessage;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java
View file

@ -21,8 +21,8 @@ import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.model.RawTransactionInput;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask;

4
core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerVerifyAndSignContract.java
View file

@ -19,9 +19,9 @@ package bisq.core.trade.protocol.tasks.taker;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Contract;
import bisq.core.trade.SellerAsTakerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
import bisq.core.trade.protocol.ProcessModel;
import bisq.core.trade.protocol.TradingPeer;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
View file

@ -21,8 +21,8 @@ import bisq.core.locale.CurrencyTuple;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.BuyerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.P2PDataStorage;

2
core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
View file

@ -22,11 +22,11 @@ import bisq.core.filter.FilterManager;
import bisq.core.locale.Res;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.SellerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.protocol.SellerProtocol;
import bisq.core.trade.txproof.AssetTxProofResult;
import bisq.core.trade.txproof.AssetTxProofService;

2
core/src/test/java/bisq/core/account/witness/AccountAgeWitnessServiceTest.java
View file

@ -31,7 +31,7 @@ import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.trade.Contract;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;

2
desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
View file

@ -22,9 +22,9 @@ import bisq.core.offer.Offer;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.Contract;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.common.crypto.PubKeyRing;

4
desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java
View file

@ -29,11 +29,11 @@ import bisq.desktop.main.support.dispute.client.refund.RefundClientView;
import bisq.core.locale.Res;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.BuyerTrade;
import bisq.core.trade.MakerTrade;
import bisq.core.trade.SellerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
View file

@ -37,7 +37,7 @@ import bisq.core.support.dispute.agent.DisputeAgentLookupMap;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.Contract;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;
import bisq.core.util.coin.CoinFormatter;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -46,8 +46,8 @@ import bisq.core.support.dispute.DisputeManager;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.Contract;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.util.FormattingUtils;
import bisq.core.util.ParsingUtils;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -33,9 +33,9 @@ import bisq.core.offer.Offer;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.support.dispute.agent.DisputeAgentLookupMap;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.txproof.AssetTxProofResult;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
View file

@ -40,9 +40,9 @@ import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.bisq_v1.OfferPayload;
import bisq.core.trade.Contract;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.Preferences;
import bisq.network.p2p.NodeAddress;

2
desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java
View file

@ -30,8 +30,8 @@ import bisq.desktop.util.GUIUtil;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.common.config.Config;
import bisq.common.util.Utilities;

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -47,11 +47,11 @@ import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.BuyerTrade;
import bisq.core.trade.SellerTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeDataValidation;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.BuyerTrade;
import bisq.core.trade.model.bisq_v1.SellerTrade;
import bisq.core.trade.protocol.BuyerProtocol;
import bisq.core.trade.protocol.DisputeProtocol;
import bisq.core.trade.protocol.SellerProtocol;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
View file

@ -40,8 +40,8 @@ import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.traderchat.TradeChatSession;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file

@ -32,10 +32,10 @@ import bisq.core.offer.Offer;
import bisq.core.offer.OfferUtil;
import bisq.core.provider.fee.FeeService;
import bisq.core.provider.mempool.MempoolService;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.User;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -31,8 +31,8 @@ import bisq.core.locale.Res;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.mediation.MediationResultState;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -42,8 +42,8 @@ import bisq.core.payment.payload.SepaAccountPayload;
import bisq.core.payment.payload.SepaInstantAccountPayload;
import bisq.core.payment.payload.USPostalMoneyOrderAccountPayload;
import bisq.core.payment.payload.WesternUnionAccountPayload;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.trade.txproof.AssetTxProofResult;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.util.VolumeUtil;

2
desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file

@ -52,9 +52,9 @@ import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;

2
desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java
View file

@ -35,8 +35,8 @@ import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.mediation.MediationSession;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.trade.Contract;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;

2
desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java
View file

@ -33,8 +33,8 @@ import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.support.dispute.refund.RefundSession;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.trade.Contract;
import bisq.core.trade.TradeManager;
import bisq.core.trade.model.bisq_v1.Contract;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;