[WIP] Atomic bsq trades

apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java

@@ -1,6 +1,6 @@
 package bisq.apitest.method.trade;
 
-import bisq.core.trade.model.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 /**
  * A test fixture encapsulating expected trade protocol status.

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java

@@ -37,13 +37,13 @@
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.cli.TableFormat.formatOfferTable;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.model.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.model.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.model.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.model.trade.Trade.State.BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG;
-import static bisq.core.trade.model.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
-import static bisq.core.trade.model.trade.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
-import static bisq.core.trade.model.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java

@@ -37,10 +37,10 @@
 import static bisq.apitest.config.ApiTestConfig.BSQ;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.model.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.model.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.model.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.model.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java

@@ -55,10 +55,10 @@
 import static bisq.apitest.config.ApiTestConfig.BSQ;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.model.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.model.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.model.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.model.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.*;
 import static protobuf.Offer.State.OFFER_FEE_PAID;

apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java

@@ -38,14 +38,14 @@
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.cli.TableFormat.formatOfferTable;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.model.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.model.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.model.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.model.trade.Trade.Phase.WITHDRAWN;
-import static bisq.core.trade.model.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
-import static bisq.core.trade.model.trade.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
-import static bisq.core.trade.model.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
-import static bisq.core.trade.model.trade.Trade.State.WITHDRAW_COMPLETED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.WITHDRAWN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.WITHDRAW_COMPLETED;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java

@@ -37,11 +37,11 @@
 import static bisq.apitest.config.ApiTestConfig.BTC;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.model.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.model.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.model.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.model.trade.Trade.Phase.WITHDRAWN;
-import static bisq.core.trade.model.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.WITHDRAWN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java

@@ -33,9 +33,9 @@
 import bisq.core.support.dispute.Dispute;
 import bisq.core.support.dispute.DisputeResult;
 import bisq.core.support.dispute.arbitration.TraderDataItem;
-import bisq.core.trade.model.Contract;
-import bisq.core.trade.model.trade.Trade;
-import bisq.core.trade.protocol.TradingPeer;
+import bisq.core.trade.model.bisq_v1.Contract;
+import bisq.core.trade.model.bisq_v1.Trade;
+import bisq.core.trade.protocol.bisq_v1.TradingPeer;
 import bisq.core.user.User;
 
 import bisq.network.p2p.BootstrapListener;
@@ -308,7 +308,7 @@ public Optional<AccountAgeWitness> findWitness(Offer offer) {
     }
 
     private Optional<AccountAgeWitness> findTradePeerWitness(Trade trade) {
-        TradingPeer tradingPeer = trade.getProcessModel().getTradingPeer();
+        TradingPeer tradingPeer = trade.getProcessModel().getTradePeer();
         return (tradingPeer == null ||
                 tradingPeer.getPaymentAccountPayload() == null ||
                 tradingPeer.getPubKeyRing() == null) ?
@@ -731,8 +731,8 @@ public void arbitratorSignAccountAgeWitness(AccountAgeWitness accountAgeWitness,
     public Optional<SignedWitness> traderSignAndPublishPeersAccountAgeWitness(Trade trade) {
         AccountAgeWitness peersWitness = findTradePeerWitness(trade).orElse(null);
         Coin tradeAmount = trade.getTradeAmount();
-        checkNotNull(trade.getProcessModel().getTradingPeer().getPubKeyRing(), "Peer must have a keyring");
-        PublicKey peersPubKey = trade.getProcessModel().getTradingPeer().getPubKeyRing().getSignaturePubKey();
+        checkNotNull(trade.getProcessModel().getTradePeer().getPubKeyRing(), "Peer must have a keyring");
+        PublicKey peersPubKey = trade.getProcessModel().getTradePeer().getPubKeyRing().getSignaturePubKey();
         checkNotNull(peersWitness, "Not able to find peers witness, unable to sign for trade {}",
                 trade.toString());
         checkNotNull(tradeAmount, "Trade amount must not be null");

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java

@@ -20,7 +20,7 @@
 import bisq.core.account.sign.SignedWitness;
 import bisq.core.account.sign.SignedWitnessService;
 import bisq.core.payment.payload.PaymentAccountPayload;
-import bisq.core.trade.model.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 import bisq.network.p2p.storage.P2PDataStorage;
 

core/src/main/java/bisq/core/api/CoreApi.java

@@ -26,8 +26,8 @@
 import bisq.core.payment.PaymentAccount;
 import bisq.core.payment.payload.PaymentMethod;
 import bisq.core.trade.misc.TradeResultHandler;
-import bisq.core.trade.model.bsqswap.BsqSwapTrade;
-import bisq.core.trade.model.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
+import bisq.core.trade.model.bsq_swap.BsqSwapTrade;
 import bisq.core.trade.statistics.TradeStatistics3;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 

core/src/main/java/bisq/core/api/CoreTradesService.java

@@ -23,15 +23,15 @@
 import bisq.core.offer.OfferUtil;
 import bisq.core.offer.takeoffer.TakeBsqSwapOfferModel;
 import bisq.core.offer.takeoffer.TakeOfferModel;
-import bisq.core.trade.misc.ClosedTradableManager;
 import bisq.core.trade.misc.TradeResultHandler;
 import bisq.core.trade.misc.TradeUtil;
+import bisq.core.trade.model.ClosedTradableManager;
 import bisq.core.trade.model.Tradable;
 import bisq.core.trade.model.TradeManager;
-import bisq.core.trade.model.bsqswap.BsqSwapTrade;
-import bisq.core.trade.model.trade.Trade;
-import bisq.core.trade.protocol.trade.BuyerProtocol;
-import bisq.core.trade.protocol.trade.SellerProtocol;
+import bisq.core.trade.model.bisq_v1.Trade;
+import bisq.core.trade.model.bsq_swap.BsqSwapTrade;
+import bisq.core.trade.protocol.bisq_v1.BuyerProtocol;
+import bisq.core.trade.protocol.bisq_v1.SellerProtocol;
 import bisq.core.user.User;
 import bisq.core.util.validation.BtcAddressValidator;
 
@@ -111,7 +111,6 @@ void takeBsqSwapOffer(Offer offer,
                 takeOfferModel);
         tradeManager.onTakeBsqSwapOffer(offer,
                 takeBsqSwapOfferModel.getAmount().getValue(),  // TODO get rid of jfx property dep?
-                takeBsqSwapOfferModel.getTradePrice().getValue(),
                 takeBsqSwapOfferModel.getBsqSwapTxHelper().getTxFeePerVbyte().getValue(),
                 takeBsqSwapOfferModel.getMakerFee().getValue(),
                 takeBsqSwapOfferModel.getTakerFee().getValue(),
@@ -243,7 +242,7 @@ void withdrawFunds(String tradeId, String toAddress, String memo) {
     BsqSwapTrade getBsqSwapTrade(String tradeId) {
         coreWalletsService.verifyWalletsAreAvailable();
         coreWalletsService.verifyEncryptedWalletIsUnlocked();
-        return tradeManager.getBsqSwapTradeById(tradeId).orElseThrow(() ->
+        return tradeManager.findBsqSwapTradeById(tradeId).orElseThrow(() ->
                 new IllegalArgumentException(format("trade with id '%s' not found", tradeId)));
     }
 

core/src/main/java/bisq/core/api/model/BsqSwapTradeInfo.java

@@ -17,7 +17,7 @@
 
 package bisq.core.api.model;
 
-import bisq.core.trade.model.bsqswap.BsqSwapTrade;
+import bisq.core.trade.model.bsq_swap.BsqSwapTrade;
 
 import bisq.common.Payload;
 
@@ -86,30 +86,31 @@ public static BsqSwapTradeInfo toBsqSwapTradeInfo(BsqSwapTrade trade) {
         return toBsqSwapTradeInfo(trade, null);
     }
 
+    //TODO
     public static BsqSwapTradeInfo toBsqSwapTradeInfo(BsqSwapTrade trade, String role) {
         return new BsqSwapTradeInfoBuilder()
                 .withBsqSwapOffer(toBsqSwapOfferInfo(trade.getOffer()))
                 .withTradeId(trade.getId())
                 .withTempTradingPeerNodeAddress(trade.getBsqSwapProtocolModel().getTempTradingPeerNodeAddress().getFullAddress())
                 .withPeerNodeAddress(trade.getPeerNodeAddress().getFullAddress())
                 .withTxId(trade.getTxId())
-                .withBsqTradeAmount(trade.getBsqSwapProtocolModel().getBsqTradeAmount())
-                .withBsqMaxTradeAmount(trade.getBsqSwapProtocolModel().getBsqMaxTradeAmount())
-                .withBsqMinTradeAmount(trade.getBsqSwapProtocolModel().getBsqMinTradeAmount())
-                .withBtcTradeAmount(trade.getBsqSwapProtocolModel().getBtcTradeAmount())
-                .withBtcMaxTradeAmount(trade.getBsqSwapProtocolModel().getBtcMaxTradeAmount())
-                .withBtcMinTradeAmount(trade.getBsqSwapProtocolModel().getBtcMinTradeAmount())
-                .withTradePrice(trade.getBsqSwapProtocolModel().getTradePrice())
-                .withBsqMakerTradeFee(trade.getBsqSwapProtocolModel().getBsqMakerTradeFee())
-                .withBsqTakerTradeFee(trade.getBsqSwapProtocolModel().getBsqTakerTradeFee())
-                .withTxFeePerVbyte(trade.getBsqSwapProtocolModel().getTxFeePerVbyte())
-                .withTxFee(trade.getBsqSwapProtocolModel().getTxFee())
-                .withMakerBsqAddress(trade.getBsqSwapProtocolModel().getMakerBsqAddress())
-                .withMakerBtcAddress(trade.getBsqSwapProtocolModel().getMakerBtcAddress())
-                .withTakerBsqAddress(trade.getBsqSwapProtocolModel().getTakerBsqAddress())
-                .withTakerBtcAddress(trade.getBsqSwapProtocolModel().getTakerBtcAddress())
+                /*   .withBsqTradeAmount(trade.getBsqSwapProtocolModel().getBsqTradeAmount())
+                   .withBsqMaxTradeAmount(trade.getBsqSwapProtocolModel().getBsqMaxTradeAmount())
+                   .withBsqMinTradeAmount(trade.getBsqSwapProtocolModel().getBsqMinTradeAmount())
+                   .withBtcTradeAmount(trade.getBsqSwapProtocolModel().getBtcTradeAmount())
+                   .withBtcMaxTradeAmount(trade.getBsqSwapProtocolModel().getBtcMaxTradeAmount())
+                   .withBtcMinTradeAmount(trade.getBsqSwapProtocolModel().getBtcMinTradeAmount())
+                   .withTradePrice(trade.getBsqSwapProtocolModel().getTradePrice())
+                   .withBsqMakerTradeFee(trade.getBsqSwapProtocolModel().getBsqMakerTradeFee())
+                   .withBsqTakerTradeFee(trade.getBsqSwapProtocolModel().getBsqTakerTradeFee())
+                   .withTxFeePerVbyte(trade.getBsqSwapProtocolModel().getTxFeePerVbyte())
+                   .withTxFee(trade.getBsqSwapProtocolModel().getTxFee())
+                   .withMakerBsqAddress(trade.getBsqSwapProtocolModel().getMakerBsqAddress())
+                   .withMakerBtcAddress(trade.getBsqSwapProtocolModel().getMakerBtcAddress())
+                   .withTakerBsqAddress(trade.getBsqSwapProtocolModel().getTakerBsqAddress())
+                   .withTakerBtcAddress(trade.getBsqSwapProtocolModel().getTakerBtcAddress())*/
                 .withTakeOfferDate(trade.getTakeOfferDate())
-                .withState(trade.getState().name())
+                .withState(trade.getTradeState().name())
                 .withErrorMessage(trade.getErrorMessage())
                 .build();
     }

core/src/main/java/bisq/core/api/model/TradeInfo.java

@@ -17,8 +17,8 @@
 
 package bisq.core.api.model;
 
-import bisq.core.trade.model.Contract;
-import bisq.core.trade.model.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Contract;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 import bisq.common.Payload;
 
@@ -138,8 +138,8 @@ public static TradeInfo toTradeInfo(Trade trade, String role, boolean isMyOffer)
                 .withTradeVolume(trade.getTradeVolume() == null ? 0 : trade.getTradeVolume().getValue())
                 .withTradingPeerNodeAddress(Objects.requireNonNull(
                         trade.getTradingPeerNodeAddress()).getHostNameWithoutPostFix())
-                .withState(trade.getState().name())
-                .withPhase(trade.getPhase().name())
+                .withState(trade.getTradeState().name())
+                .withPhase(trade.getTradePhase().name())
                 .withTradePeriodState(trade.getTradePeriodState().name())
                 .withIsDepositPublished(trade.isDepositPublished())
                 .withIsDepositConfirmed(trade.isDepositConfirmed())

core/src/main/java/bisq/core/app/BisqExecutable.java

@@ -22,7 +22,7 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.dao.DaoSetup;
 import bisq.core.dao.node.full.RpcService;
-import bisq.core.offer.BsqSwapWalletWatcher;
+import bisq.core.offer.BsqSwapOfferManager;
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.provider.price.PriceFeedService;
 import bisq.core.setup.CorePersistedDataHost;
@@ -228,7 +228,7 @@ public void gracefulShutDown(ResultHandler resultHandler) {
         }
 
         try {
-            injector.getInstance(BsqSwapWalletWatcher.class).shutDown();
+            injector.getInstance(BsqSwapOfferManager.class).shutDown();
             injector.getInstance(PriceFeedService.class).shutDown();
             injector.getInstance(ArbitratorManager.class).shutDown();
             injector.getInstance(TradeStatisticsManager.class).shutDown();

core/src/main/java/bisq/core/app/DomainInitialisation.java

@@ -33,7 +33,7 @@
 import bisq.core.notifications.alerts.TradeEvents;
 import bisq.core.notifications.alerts.market.MarketAlerts;
 import bisq.core.notifications.alerts.price.PriceAlert;
-import bisq.core.offer.BsqSwapWalletWatcher;
+import bisq.core.offer.BsqSwapOfferManager;
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.offer.TriggerPriceService;
 import bisq.core.payment.AmazonGiftCardAccount;
@@ -49,10 +49,10 @@
 import bisq.core.support.dispute.refund.RefundManager;
 import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
 import bisq.core.support.traderchat.TraderChatManager;
-import bisq.core.trade.misc.ClosedTradableManager;
-import bisq.core.trade.misc.FailedTradesManager;
+import bisq.core.trade.model.ClosedTradableManager;
+import bisq.core.trade.model.FailedTradesManager;
 import bisq.core.trade.model.TradeManager;
-import bisq.core.trade.model.bsqswap.BsqSwapTradeManager;
+import bisq.core.trade.model.bsq_swap.BsqSwapTradeManager;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 import bisq.core.trade.txproof.xmr.XmrTxProofService;
 import bisq.core.user.User;
@@ -115,7 +115,7 @@ public class DomainInitialisation {
     private final DaoStateSnapshotService daoStateSnapshotService;
     private final TriggerPriceService triggerPriceService;
     private final MempoolService mempoolService;
-    private final BsqSwapWalletWatcher bsqSwapWalletWatcher;
+    private final BsqSwapOfferManager bsqSwapOfferManager;
 
     @Inject
     public DomainInitialisation(ClockWatcher clockWatcher,
@@ -155,7 +155,7 @@ public DomainInitialisation(ClockWatcher clockWatcher,
                                 DaoStateSnapshotService daoStateSnapshotService,
                                 TriggerPriceService triggerPriceService,
                                 MempoolService mempoolService,
-                                BsqSwapWalletWatcher bsqSwapWalletWatcher) {
+                                BsqSwapOfferManager bsqSwapOfferManager) {
         this.clockWatcher = clockWatcher;
         this.tradeLimits = tradeLimits;
         this.arbitrationManager = arbitrationManager;
@@ -193,7 +193,7 @@ public DomainInitialisation(ClockWatcher clockWatcher,
         this.daoStateSnapshotService = daoStateSnapshotService;
         this.triggerPriceService = triggerPriceService;
         this.mempoolService = mempoolService;
-        this.bsqSwapWalletWatcher = bsqSwapWalletWatcher;
+        this.bsqSwapOfferManager = bsqSwapOfferManager;
     }
 
     public void initDomainServices(Consumer<String> rejectedTxErrorMessageHandler,
@@ -223,7 +223,7 @@ public void initDomainServices(Consumer<String> rejectedTxErrorMessageHandler,
         xmrTxProofService.onAllServicesInitialized();
 
         openOfferManager.onAllServicesInitialized();
-        bsqSwapWalletWatcher.onAllServicesInitialized();
+        bsqSwapOfferManager.onAllServicesInitialized();
 
         balances.onAllServicesInitialized();
 

core/src/main/java/bisq/core/app/WalletAppSetup.java

@@ -26,7 +26,7 @@
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.provider.fee.FeeService;
 import bisq.core.trade.model.TradeManager;
-import bisq.core.trade.model.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 import bisq.core.user.Preferences;
 import bisq.core.util.FormattingUtils;