Rename network-messages module to wire. Further refactorings.

core/src/main/java/io/bisq/offer/Offer.java

@@ -11,8 +11,8 @@ import io.bisq.offer.availability.OfferAvailabilityModel;
 import io.bisq.offer.availability.OfferAvailabilityProtocol;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.crypto.PubKeyRing;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.provider.price.MarketPrice;
 import io.bisq.provider.price.PriceFeedService;
 import javafx.beans.property.*;

core/src/main/java/io/bisq/offer/OfferBookService.java

@@ -26,8 +26,8 @@ import io.bisq.common.util.Utilities;
 import io.bisq.p2p.BootstrapListener;
 import io.bisq.p2p.storage.HashMapChangedListener;
 import io.bisq.p2p.storage.P2PService;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.p2p.storage.ProtectedStorageEntry;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.provider.price.PriceFeedService;
 import io.bisq.storage.PlainTextWrapper;
 import io.bisq.storage.Storage;

core/src/main/java/io/bisq/offer/OfferForJson.java

@@ -2,8 +2,8 @@ package io.bisq.offer;
 
 import io.bisq.common.util.MathUtils;
 import io.bisq.locale.CurrencyUtil;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.utils.Fiat;

core/src/main/java/io/bisq/offer/OpenOfferManager.java

@@ -41,8 +41,8 @@ import io.bisq.p2p.SendDirectMessageListener;
 import io.bisq.p2p.peers.PeerManager;
 import io.bisq.p2p.storage.P2PService;
 import io.bisq.payload.NodeAddress;
-import io.bisq.payload.trade.offer.AvailabilityResult;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.AvailabilityResult;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.provider.price.PriceFeedService;
 import io.bisq.storage.Storage;
 import io.bisq.trade.TradableList;

core/src/main/java/io/bisq/offer/availability/OfferAvailabilityProtocol.java

@@ -28,7 +28,7 @@ import io.bisq.message.offer.OfferMessage;
 import io.bisq.offer.availability.tasks.ProcessOfferAvailabilityResponse;
 import io.bisq.offer.availability.tasks.SendOfferAvailabilityRequest;
 import io.bisq.p2p.DecryptedDirectMessageListener;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.util.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/offer/availability/tasks/ProcessOfferAvailabilityResponse.java

@@ -21,8 +21,8 @@ import io.bisq.common.taskrunner.Task;
 import io.bisq.common.taskrunner.TaskRunner;
 import io.bisq.message.offer.OfferAvailabilityResponse;
 import io.bisq.offer.availability.OfferAvailabilityModel;
-import io.bisq.payload.trade.offer.AvailabilityResult;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.AvailabilityResult;
+import io.bisq.payload.offer.OfferPayload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/io/bisq/offer/availability/tasks/SendOfferAvailabilityRequest.java

@@ -22,7 +22,7 @@ import io.bisq.common.taskrunner.TaskRunner;
 import io.bisq.message.offer.OfferAvailabilityRequest;
 import io.bisq.offer.availability.OfferAvailabilityModel;
 import io.bisq.p2p.SendDirectMessageListener;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/io/bisq/offer/placeoffer/tasks/BroadcastCreateOfferFeeTx.java

@@ -21,7 +21,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import io.bisq.common.taskrunner.Task;
 import io.bisq.common.taskrunner.TaskRunner;
 import io.bisq.offer.placeoffer.PlaceOfferModel;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import org.bitcoinj.core.Transaction;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/offer/placeoffer/tasks/ValidateOffer.java

@@ -24,7 +24,7 @@ import io.bisq.common.taskrunner.TaskRunner;
 import io.bisq.message.trade.TradeMessage;
 import io.bisq.offer.Offer;
 import io.bisq.offer.placeoffer.PlaceOfferModel;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.provider.fee.FeeService;
 import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;

core/src/main/java/io/bisq/trade/TradeManager.java

@@ -43,7 +43,7 @@ import io.bisq.p2p.DecryptedMsgWithPubKey;
 import io.bisq.p2p.messaging.DecryptedMailboxListener;
 import io.bisq.p2p.storage.P2PService;
 import io.bisq.payload.NodeAddress;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.trade.statistics.TradeStatistics;
 import io.bisq.provider.price.PriceFeedService;
 import io.bisq.storage.Storage;

core/src/main/java/io/bisq/trade/protocol/ArbitrationSelectionRule.java

@@ -18,7 +18,7 @@
 package io.bisq.trade.protocol;
 
 import io.bisq.payload.NodeAddress;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import org.bitcoinj.core.Sha256Hash;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/bisq/trade/protocol/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java

@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class OffererCreatesAndSignsDepositTxAsBuyer extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsDepositTxAsBuyer.class);

core/src/main/java/io/bisq/trade/protocol/tasks/buyer/SignAndFinalizePayoutTx.java

@@ -30,6 +30,8 @@ import org.bitcoinj.crypto.DeterministicKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class SignAndFinalizePayoutTx extends TradeTask {
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(SignAndFinalizePayoutTx.class);

core/src/main/java/io/bisq/trade/protocol/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java

@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class OffererCreatesAndSignsDepositTxAsSeller extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(OffererCreatesAndSignsDepositTxAsSeller.class);

core/src/main/java/io/bisq/trade/protocol/tasks/seller/SignPayoutTx.java

@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Arrays;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class SignPayoutTx extends TradeTask {
     @SuppressWarnings("unused")

core/src/main/java/io/bisq/trade/protocol/tasks/taker/SendPayDepositRequest.java

@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class SendPayDepositRequest extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(SendPayDepositRequest.class);

core/src/main/java/io/bisq/trade/protocol/tasks/taker/VerifyAndSignContract.java

@@ -36,6 +36,7 @@ import java.util.Arrays;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class VerifyAndSignContract extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(VerifyAndSignContract.class);

core/src/main/java/io/bisq/trade/statistics/TradeStatisticsForJson.java

@@ -2,7 +2,7 @@ package io.bisq.trade.statistics;
 
 import io.bisq.common.util.MathUtils;
 import io.bisq.locale.CurrencyUtil;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.trade.statistics.TradeStatistics;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;

doc/protobuffer.md

@@ -16,7 +16,7 @@ There are a number of reasons why protobuffer was chosen, here are some of them:
 
 ## Where are the protobuffer related files? 
 
-The protobuffer schema file(s), generated classes and domain classes are in the 'network-messages' module.
+The protobuffer schema file(s), generated classes and domain classes are in the 'wire' module.
 
 ## How is serialisation done (Java -> Protobuffer)
 

gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java

@@ -25,8 +25,8 @@ import io.bisq.gui.components.TableGroupHeadline;
 import io.bisq.gui.main.overlays.popups.Popup;
 import io.bisq.gui.util.ImageUtil;
 import io.bisq.gui.util.Layout;
-import io.bisq.locale.Res;
 import io.bisq.locale.LanguageUtil;
+import io.bisq.locale.Res;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;

gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java

@@ -32,7 +32,7 @@ import io.bisq.gui.util.GUIUtil;
 import io.bisq.locale.CurrencyUtil;
 import io.bisq.locale.Res;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java

@@ -31,7 +31,7 @@ import io.bisq.gui.util.GUIUtil;
 import io.bisq.locale.CurrencyUtil;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.provider.price.PriceFeedService;
 import io.bisq.user.Preferences;
 import javafx.beans.property.ObjectProperty;

gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java

@@ -20,8 +20,8 @@ package io.bisq.gui.main.market.spread;
 import io.bisq.gui.common.view.ActivatableViewAndModel;
 import io.bisq.gui.common.view.FxmlView;
 import io.bisq.gui.util.BSFormatter;
-import io.bisq.locale.Res;
 import io.bisq.locale.CurrencyUtil;
+import io.bisq.locale.Res;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.ListChangeListener;
 import javafx.collections.transformation.SortedList;

gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java

@@ -24,7 +24,7 @@ import io.bisq.gui.main.offer.offerbook.OfferBookListItem;
 import io.bisq.gui.util.BSFormatter;
 import io.bisq.locale.CurrencyUtil;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.provider.price.MarketPrice;
 import io.bisq.provider.price.PriceFeedService;
 import javafx.collections.FXCollections;

gui/src/main/java/io/bisq/gui/main/offer/OfferView.java

@@ -31,7 +31,7 @@ import io.bisq.locale.CurrencyUtil;
 import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.user.Preferences;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;

gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java

@@ -38,8 +38,8 @@ import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
 import io.bisq.offer.OpenOfferManager;
 import io.bisq.p2p.storage.P2PService;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.BankAccountContractData;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.*;
 import io.bisq.provider.fee.FeeService;
 import io.bisq.provider.price.PriceFeedService;

gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java

@@ -47,7 +47,7 @@ import io.bisq.gui.util.Layout;
 import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.user.Preferences;
 import javafx.beans.value.ChangeListener;

gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java

@@ -45,7 +45,7 @@ import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
 import io.bisq.p2p.storage.P2PService;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.provider.price.MarketPrice;
 import io.bisq.provider.price.PriceFeedService;

gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java

@@ -20,7 +20,7 @@ package io.bisq.gui.main.offer.offerbook;
 import io.bisq.app.Log;
 import io.bisq.offer.Offer;
 import io.bisq.offer.OfferBookService;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.trade.TradeManager;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;

gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java

@@ -40,8 +40,8 @@ import io.bisq.locale.FiatCurrency;
 import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;

gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java

@@ -35,8 +35,8 @@ import io.bisq.offer.Offer;
 import io.bisq.offer.OpenOfferManager;
 import io.bisq.p2p.storage.P2PService;
 import io.bisq.payload.NodeAddress;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.PaymentAccountUtil;
 import io.bisq.provider.price.PriceFeedService;
 import io.bisq.trade.Trade;

gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java

@@ -30,8 +30,8 @@ import io.bisq.locale.CurrencyUtil;
 import io.bisq.locale.Res;
 import io.bisq.offer.Offer;
 import io.bisq.payload.arbitration.Arbitrator;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.payment.PaymentAccountUtil;
 import io.bisq.provider.fee.FeeService;

gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java

@@ -48,7 +48,7 @@ import io.bisq.gui.util.Layout;
 import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.user.Preferences;
 import javafx.beans.property.SimpleBooleanProperty;

gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java

@@ -35,8 +35,8 @@ import io.bisq.p2p.network.Connection;
 import io.bisq.p2p.network.ConnectionListener;
 import io.bisq.p2p.storage.P2PService;
 import io.bisq.payload.arbitration.Arbitrator;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.trade.Trade;
 import javafx.beans.property.*;

gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java

@@ -11,9 +11,9 @@ import io.bisq.gui.main.disputes.trader.TraderDisputeView;
 import io.bisq.gui.main.portfolio.PortfolioView;
 import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesView;
 import io.bisq.locale.Res;
-import io.bisq.user.Preferences;
 import io.bisq.trade.Trade;
 import io.bisq.trade.TradeManager;
+import io.bisq.user.Preferences;
 import javafx.collections.ListChangeListener;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;

gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java

@@ -26,10 +26,10 @@ import io.bisq.gui.util.Layout;
 import io.bisq.locale.CountryUtil;
 import io.bisq.locale.Res;
 import io.bisq.payload.arbitration.Dispute;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentAccountContractData;
 import io.bisq.payload.payment.PaymentMethod;
 import io.bisq.payload.trade.Contract;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.user.Preferences;
 import javafx.geometry.Insets;
 import javafx.scene.Scene;

gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java

@@ -33,8 +33,8 @@ import io.bisq.gui.util.Transitions;
 import io.bisq.locale.Res;
 import io.bisq.payload.arbitration.Dispute;
 import io.bisq.payload.arbitration.DisputeResult;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.trade.Contract;
-import io.bisq.payload.trade.offer.OfferPayload;
 import javafx.beans.binding.Bindings;
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;

gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java

@@ -34,8 +34,8 @@ import io.bisq.locale.BankUtil;
 import io.bisq.locale.CountryUtil;
 import io.bisq.locale.Res;
 import io.bisq.offer.Offer;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentMethod;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.user.Preferences;
 import io.bisq.user.User;

gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java

@@ -20,7 +20,7 @@ package io.bisq.gui.main.portfolio.closedtrades;
 import com.google.inject.Inject;
 import io.bisq.gui.common.model.ActivatableDataModel;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.trade.Tradable;
 import io.bisq.trade.closed.ClosedTradableManager;
 import javafx.collections.FXCollections;

gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java

@@ -20,7 +20,7 @@ package io.bisq.gui.main.portfolio.failedtrades;
 import com.google.inject.Inject;
 import io.bisq.gui.common.model.ActivatableDataModel;
 import io.bisq.offer.Offer;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.trade.Trade;
 import io.bisq.trade.failed.FailedTradesManager;
 import javafx.collections.FXCollections;

gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java

@@ -24,7 +24,7 @@ import io.bisq.gui.common.model.ActivatableDataModel;
 import io.bisq.offer.Offer;
 import io.bisq.offer.OpenOffer;
 import io.bisq.offer.OpenOfferManager;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.provider.price.PriceFeedService;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;

gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java

@@ -40,8 +40,8 @@ import io.bisq.offer.Offer;
 import io.bisq.p2p.storage.P2PService;
 import io.bisq.payload.arbitration.Arbitrator;
 import io.bisq.payload.arbitration.Dispute;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.PaymentAccountContractData;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.provider.fee.FeeService;
 import io.bisq.trade.BuyerTrade;
 import io.bisq.trade.SellerTrade;

gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java

@@ -29,9 +29,9 @@ import io.bisq.gui.components.TitledGroupBg;
 import io.bisq.gui.main.overlays.popups.Popup;
 import io.bisq.gui.util.BSFormatter;
 import io.bisq.locale.Res;
-import io.bisq.user.Preferences;
-import io.bisq.p2p.storage.P2PService;
 import io.bisq.p2p.network.Statistic;
+import io.bisq.p2p.storage.P2PService;
+import io.bisq.user.Preferences;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;

gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java

@@ -30,8 +30,8 @@ import io.bisq.gui.util.BSFormatter;
 import io.bisq.gui.util.ImageUtil;
 import io.bisq.gui.util.Layout;
 import io.bisq.locale.*;
-import io.bisq.user.BlockChainExplorer;
 import io.bisq.provider.fee.FeeService;
+import io.bisq.user.BlockChainExplorer;
 import io.bisq.user.Preferences;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;

gui/src/main/java/io/bisq/gui/util/BSFormatter.java

@@ -23,7 +23,7 @@ import io.bisq.locale.LanguageUtil;
 import io.bisq.locale.Res;
 import io.bisq.offer.Offer;
 import io.bisq.payload.NodeAddress;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.user.Preferences;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DurationFormatUtils;

gui/src/main/java/io/bisq/gui/util/GUIUtil.java

@@ -26,12 +26,12 @@ import io.bisq.app.DevEnv;
 import io.bisq.common.util.Utilities;
 import io.bisq.gui.components.indicator.TxConfidenceIndicator;
 import io.bisq.gui.main.overlays.popups.Popup;
-import io.bisq.locale.Res;
 import io.bisq.locale.CurrencyUtil;
+import io.bisq.locale.Res;
 import io.bisq.locale.TradeCurrency;
-import io.bisq.user.Preferences;
 import io.bisq.payment.PaymentAccount;
 import io.bisq.storage.Storage;
+import io.bisq.user.Preferences;
 import io.bisq.user.User;
 import javafx.collections.ObservableList;
 import javafx.geometry.Orientation;

gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java

@@ -18,8 +18,8 @@
 package io.bisq.gui.util.validation;
 
 
-import io.bisq.locale.Res;
 import io.bisq.locale.BankUtil;
+import io.bisq.locale.Res;
 import org.apache.commons.lang3.StringUtils;
 
 public final class AccountNrValidator extends BankValidator {

gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java

@@ -18,8 +18,8 @@
 package io.bisq.gui.util.validation;
 
 
-import io.bisq.locale.Res;
 import io.bisq.locale.BankUtil;
+import io.bisq.locale.Res;
 
 public final class BankIdValidator extends BankValidator {
     public BankIdValidator(String countryCode) {

gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java

@@ -18,8 +18,8 @@
 package io.bisq.gui.util.validation;
 
 
-import io.bisq.locale.Res;
 import io.bisq.locale.BankUtil;
+import io.bisq.locale.Res;
 
 public final class BranchIdValidator extends BankValidator {
 

gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java

@@ -1,7 +1,7 @@
 package io.bisq.gui.main.market.trades;
 
 import io.bisq.gui.main.market.trades.charts.CandleData;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.trade.statistics.TradeStatistics;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;

gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java

@@ -4,8 +4,8 @@ import io.bisq.locale.Country;
 import io.bisq.locale.CryptoCurrency;
 import io.bisq.locale.FiatCurrency;
 import io.bisq.offer.Offer;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.payment.*;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payment.*;
 import org.junit.Test;
 import org.slf4j.Logger;

network-messages/src/main/java/io/bisq/message/ToProtoBuffer.java

@@ -1,10 +0,0 @@
-package io.bisq.message;
-
-import com.google.protobuf.Message;
-
-/**
- * Created by mike on 30/01/2017.
- */
-public interface ToProtoBuffer {
-    Message toProtoBuf();
-}

network-messages/src/main/java/io/bisq/proto/ProtoBufferUtils.java

@@ -1,13 +0,0 @@
-package io.bisq.proto;
-
-import io.bisq.app.Version;
-import io.bisq.common.wire.proto.Messages;
-
-/**
- * Created by mike on 14/03/2017.
- */
-public class ProtoBufferUtils {
-    public static Messages.Envelope.Builder getBaseEnvelope() {
-        return Messages.Envelope.newBuilder().setP2PNetworkVersion(Version.P2P_NETWORK_VERSION);
-    }
-}

network/pom.xml

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.bisq</groupId>
-            <artifactId>network-messages</artifactId>
+            <artifactId>wire</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 

network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java

@@ -37,13 +37,13 @@ import io.bisq.payload.crypto.SealedAndSigned;
 import io.bisq.payload.dao.compensation.CompensationRequestPayload;
 import io.bisq.payload.filter.Filter;
 import io.bisq.payload.filter.PaymentAccountFilter;
+import io.bisq.payload.offer.AvailabilityResult;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.p2p.peers.peerexchange.Peer;
 import io.bisq.payload.p2p.storage.ProtectedMailboxStorageEntry;
 import io.bisq.payload.p2p.storage.ProtectedStorageEntry;
 import io.bisq.payload.payment.*;
 import io.bisq.payload.trade.Contract;
-import io.bisq.payload.trade.offer.AvailabilityResult;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.payload.trade.statistics.TradeStatistics;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.output.WriterOutputStream;

network/src/test/java/io/bisq/p2p/network/ProtoBufferUtilitiesTest.java

@@ -1,7 +1,7 @@
 package io.bisq.p2p.network;
 
 import io.bisq.common.wire.proto.Messages;
-import io.bisq.payload.trade.offer.OfferPayload;
+import io.bisq.payload.offer.OfferPayload;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java

@@ -19,8 +19,8 @@ import io.bisq.p2p.storage.mocks.MockData;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.StoragePayload;
 import io.bisq.payload.alert.Alert;
+import io.bisq.payload.offer.OfferPayload;
 import io.bisq.payload.p2p.storage.ProtectedStorageEntry;
-import io.bisq.payload.trade.offer.OfferPayload;
 import io.bisq.storage.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import mockit.Mocked;

pom.xml

@@ -44,7 +44,7 @@
         <module>jsocks</module>
         <module>jtorctl</module>
         <module>jtorproxy</module>
-        <module>network-messages</module>
+        <module>wire</module>
         <module>network</module>
         <module>gui</module>
         <module>seednode</module>
@@ -258,14 +258,14 @@
                                 <configuration>
                                     <tasks>
                                         <path id="proto.path">
-                                            <fileset dir="network-messages/src/main/proto">
+                                            <fileset dir="wire/src/main/proto">
                                                 <include name="**/*.proto"/>
                                             </fileset>
                                         </path>
                                         <pathconvert pathsep=" " property="proto.files" refid="proto.path"/>
                                         <exec executable="protoc" failonerror="true">
-                                            <arg value="--java_out=./network-messages/src/main/java"/>
-                                            <arg value="-Inetwork-messages/src/main/proto"/>
+                                            <arg value="--java_out=./wire/src/main/java"/>
+                                            <arg value="-Iwire/src/main/proto"/>
                                             <arg line="${proto.files}"/>
                                         </exec>
                                     </tasks>

wire/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>network-messages</artifactId>
+    <artifactId>wire</artifactId>
 
     <dependencies>
         <dependency>

wire/src/main/java/io/bisq/message/ToProtoBuffer.java

@@ -0,0 +1,16 @@
+package io.bisq.message;
+
+import com.google.protobuf.Message;
+import io.bisq.app.Version;
+import io.bisq.common.wire.proto.Messages;
+
+/**
+ * Created by mike on 30/01/2017.
+ */
+public interface ToProtoBuffer {
+    static Messages.Envelope.Builder getBaseEnvelope() {
+        return Messages.Envelope.newBuilder().setP2PNetworkVersion(Version.P2P_NETWORK_VERSION);
+    }
+
+    Message toProtoBuf();
+}

wire/src/main/java/io/bisq/message/alert/PrivateNotificationMessage.java

@@ -2,10 +2,10 @@ package io.bisq.message.alert;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.message.p2p.MailboxMessage;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.alert.PrivateNotification;
-import io.bisq.proto.ProtoBufferUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +42,7 @@ public class PrivateNotificationMessage implements MailboxMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setPrivateNotificationMessage(baseEnvelope.getPrivateNotificationMessageBuilder()
                 .setMessageVersion(messageVersion)
                 .setUid(uid)

wire/src/main/java/io/bisq/message/arbitration/DisputeCommunicationMessage.java

@@ -19,9 +19,9 @@ package io.bisq.message.arbitration;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.arbitration.Attachment;
-import io.bisq.proto.ProtoBufferUtils;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import org.slf4j.Logger;
@@ -203,7 +203,7 @@ public final class DisputeCommunicationMessage extends DisputeMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setDisputeCommunicationMessage(Messages.DisputeCommunicationMessage.newBuilder()
                 .setDate(date)
                 .setTradeId(tradeId)

wire/src/main/java/io/bisq/message/arbitration/DisputeResultMessage.java

@@ -19,9 +19,9 @@ package io.bisq.message.arbitration;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.arbitration.DisputeResult;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class DisputeResultMessage extends DisputeMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -62,7 +62,7 @@ public final class DisputeResultMessage extends DisputeMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setDisputeResultMessage(Messages.DisputeResultMessage.newBuilder()
                 .setDisputeResult(disputeResult.toProtoBuf())
                 .setMyNodeAddress(myNodeAddress.toProtoBuf())

wire/src/main/java/io/bisq/message/arbitration/OpenNewDisputeMessage.java

@@ -19,9 +19,9 @@ package io.bisq.message.arbitration;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.arbitration.Dispute;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class OpenNewDisputeMessage extends DisputeMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -68,7 +68,7 @@ public final class OpenNewDisputeMessage extends DisputeMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setOpenNewDisputeMessage(Messages.OpenNewDisputeMessage.newBuilder()
                 .setDispute(dispute.toProtoBuf()).setMyNodeAddress(myNodeAddress.toProtoBuf()).setUid(getUID())).build();
     }

wire/src/main/java/io/bisq/message/arbitration/PeerOpenedDisputeMessage.java

@@ -19,9 +19,9 @@ package io.bisq.message.arbitration;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.NodeAddress;
 import io.bisq.payload.arbitration.Dispute;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class PeerOpenedDisputeMessage extends DisputeMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -67,7 +67,7 @@ public final class PeerOpenedDisputeMessage extends DisputeMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setPeerOpenedDisputeMessage(Messages.PeerOpenedDisputeMessage.newBuilder()
                 .setDispute(dispute.toProtoBuf())
                 .setMyNodeAddress(myNodeAddress.toProtoBuf())

wire/src/main/java/io/bisq/message/arbitration/PeerPublishedPayoutTxMessage.java

@@ -20,8 +20,8 @@ package io.bisq.message.arbitration;
 import com.google.protobuf.ByteString;
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.NodeAddress;
-import io.bisq.proto.ProtoBufferUtils;
 
 import java.util.Arrays;
 
@@ -75,7 +75,7 @@ public final class PeerPublishedPayoutTxMessage extends DisputeMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setPeerPublishedPayoutTxMessage(Messages.PeerPublishedPayoutTxMessage.newBuilder()
                 .setTransaction(ByteString.copyFrom(transaction))
                 .setTradeId(tradeId)

wire/src/main/java/io/bisq/message/offer/OfferAvailabilityResponse.java

@@ -21,9 +21,9 @@ package io.bisq.message.offer;
 import io.bisq.app.Capabilities;
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.message.p2p.SupportedCapabilitiesMessage;
-import io.bisq.payload.trade.offer.AvailabilityResult;
-import io.bisq.proto.ProtoBufferUtils;
+import io.bisq.payload.offer.AvailabilityResult;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -62,7 +62,7 @@ public final class OfferAvailabilityResponse extends OfferMessage implements Sup
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setOfferAvailabilityResponse(Messages.OfferAvailabilityResponse.newBuilder().setMessageVersion(getMessageVersion())
                 .setOfferId(offerId)
                 .setAvailabilityResult(Messages.AvailabilityResult.forNumber(availabilityResult.ordinal()))

wire/src/main/java/io/bisq/message/p2p/peers/keepalive/Ping.java

@@ -2,7 +2,7 @@ package io.bisq.message.p2p.peers.keepalive;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
-import io.bisq.proto.ProtoBufferUtils;
+import io.bisq.message.ToProtoBuffer;
 
 public final class Ping extends KeepAliveMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -17,7 +17,7 @@ public final class Ping extends KeepAliveMessage {
     }
 
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setPing(baseEnvelope.getPingBuilder()
                 .setNonce(nonce)
                 .setLastRoundTripTime(lastRoundTripTime)).build();

wire/src/main/java/io/bisq/message/p2p/peers/keepalive/Pong.java

@@ -2,7 +2,7 @@ package io.bisq.message.p2p.peers.keepalive;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
-import io.bisq.proto.ProtoBufferUtils;
+import io.bisq.message.ToProtoBuffer;
 
 public final class Pong extends KeepAliveMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -23,7 +23,7 @@ public final class Pong extends KeepAliveMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setPong(Messages.Pong.newBuilder().setRequestNonce(requestNonce)).build();
     }
 }

wire/src/main/java/io/bisq/message/p2p/storage/AddDataMessage.java

@@ -2,9 +2,9 @@ package io.bisq.message.p2p.storage;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.p2p.storage.ProtectedMailboxStorageEntry;
 import io.bisq.payload.p2p.storage.ProtectedStorageEntry;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class AddDataMessage extends BroadcastMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -40,7 +40,7 @@ public final class AddDataMessage extends BroadcastMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         Messages.AddDataMessage.Builder builder;
         Messages.ProtectedStorageEntryOrProtectedMailboxStorageEntry.Builder choiceBuilder;
         choiceBuilder = Messages.ProtectedStorageEntryOrProtectedMailboxStorageEntry.newBuilder();

wire/src/main/java/io/bisq/message/p2p/storage/RemoveDataMessage.java

@@ -2,8 +2,8 @@ package io.bisq.message.p2p.storage;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.p2p.storage.ProtectedStorageEntry;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class RemoveDataMessage extends BroadcastMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -40,7 +40,7 @@ public final class RemoveDataMessage extends BroadcastMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setRemoveDataMessage(Messages.RemoveDataMessage.newBuilder()
                 .setProtectedStorageEntry((Messages.ProtectedStorageEntry) protectedStorageEntry.toProtoBuf())).build();
 

wire/src/main/java/io/bisq/message/p2p/storage/RemoveMailboxDataMessage.java

@@ -2,8 +2,8 @@ package io.bisq.message.p2p.storage;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.payload.p2p.storage.ProtectedMailboxStorageEntry;
-import io.bisq.proto.ProtoBufferUtils;
 
 public final class RemoveMailboxDataMessage extends BroadcastMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
@@ -39,7 +39,7 @@ public final class RemoveMailboxDataMessage extends BroadcastMessage {
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setRemoveMailboxDataMessage(Messages.RemoveMailboxDataMessage.newBuilder()
                 .setProtectedStorageEntry(protectedMailboxStorageEntry.toProtoBuf())).build();
 

wire/src/main/java/io/bisq/message/trade/DepositTxPublishedMessage.java

@@ -20,9 +20,9 @@ package io.bisq.message.trade;
 import com.google.protobuf.ByteString;
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.message.p2p.MailboxMessage;
 import io.bisq.payload.NodeAddress;
-import io.bisq.proto.ProtoBufferUtils;
 
 import javax.annotation.concurrent.Immutable;
 import java.util.Arrays;
@@ -84,7 +84,7 @@ public final class DepositTxPublishedMessage extends TradeMessage implements Mai
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setDepositTxPublishedMessage(Messages.DepositTxPublishedMessage.newBuilder()
                 .setMessageVersion(getMessageVersion())
                 .setTradeId(tradeId)

wire/src/main/java/io/bisq/message/trade/FiatTransferStartedMessage.java

@@ -19,9 +19,9 @@ package io.bisq.message.trade;
 
 import io.bisq.app.Version;
 import io.bisq.common.wire.proto.Messages;
+import io.bisq.message.ToProtoBuffer;
 import io.bisq.message.p2p.MailboxMessage;
 import io.bisq.payload.NodeAddress;
-import io.bisq.proto.ProtoBufferUtils;
 
 import javax.annotation.concurrent.Immutable;
 import java.util.UUID;
@@ -93,7 +93,7 @@ public final class FiatTransferStartedMessage extends TradeMessage implements Ma
 
     @Override
     public Messages.Envelope toProtoBuf() {
-        Messages.Envelope.Builder baseEnvelope = ProtoBufferUtils.getBaseEnvelope();
+        Messages.Envelope.Builder baseEnvelope = ToProtoBuffer.getBaseEnvelope();
         return baseEnvelope.setFiatTransferStartedMessage(baseEnvelope.getFiatTransferStartedMessageBuilder()
                 .setMessageVersion(getMessageVersion())
                 .setTradeId(tradeId)