From be4a25abb0e83bb9c6f7c91fe0e8bfcf125c8608 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 18 Jan 2016 13:04:15 +0100 Subject: [PATCH] use bitcoin as currency in lowercase --- .../main/java/io/bitsquare/app/Version.java | 11 ++++- .../arbitration/messages/DisputeMessage.java | 2 +- .../availability/messages/OfferMessage.java | 2 +- .../protocol/trade/messages/TradeMessage.java | 2 +- .../java/io/bitsquare/app/BitsquareApp.java | 2 +- .../gui/components/AddressTextField.java | 4 +- .../changepassword/ChangePasswordView.fxml | 2 +- .../content/password/PasswordView.java | 2 +- .../content/seedwords/SeedWordsView.java | 4 +- .../bitsquare/gui/main/offer/OfferView.java | 2 +- .../offer/createoffer/CreateOfferView.java | 4 +- .../main/offer/takeoffer/TakeOfferView.java | 4 +- .../portfolio/openoffer/OpenOffersView.java | 40 ----------------- .../portfolio/pendingtrades/BuyerSubView.java | 4 +- .../pendingtrades/SellerSubView.java | 8 ++-- .../steps/ConfirmPaymentReceivedView.java | 4 +- .../settings/network/NetworkSettingsView.java | 2 +- .../io/bitsquare/gui/util/BSFormatter.java | 2 +- .../util/validation/BtcAddressValidator.java | 2 +- .../resources/i18n/displayStrings.properties | 44 +++++++++---------- .../crypto/SealedAndSignedMessage.java | 2 +- .../java/io/bitsquare/p2p/P2PService.java | 2 +- .../io/bitsquare/p2p/SeedNodeP2PService.java | 2 +- .../p2p/messaging/DecryptedMsgWithPubKey.java | 2 +- .../io/bitsquare/p2p/network/Connection.java | 2 +- .../bitsquare/p2p/network/IllegalRequest.java | 2 +- .../messages/CloseConnectionMessage.java | 2 +- .../io/bitsquare/p2p/peers/PeerManager.java | 21 +++++++-- .../p2p/peers/SeedNodePeerManager.java | 18 ++++++-- .../messages/auth/AuthenticationMessage.java | 2 +- .../p2p/peers/messages/data/DataRequest.java | 2 +- .../p2p/peers/messages/data/DataResponse.java | 2 +- .../messages/peers/PeerExchangeMessage.java | 2 +- .../java/io/bitsquare/p2p/seed/SeedNode.java | 4 +- .../p2p/seed/SeedNodesRepository.java | 2 +- .../messages/DataBroadcastMessage.java | 2 +- .../crypto/EncryptionServiceTests.java | 2 +- .../p2p/mocks/MockMailboxMessage.java | 2 +- .../io/bitsquare/p2p/mocks/MockMessage.java | 2 +- package/mac/create_app.sh | 1 + 40 files changed, 109 insertions(+), 114 deletions(-) diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java index a876a1af37..92d0e85b83 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -38,7 +38,15 @@ public class Version { public static final long PROTOCOL_VERSION = 1; // The version for the bitcoin network (Mainnet = 0, TestNet = 1, Regtest = 2) - public static int NETWORK_ID; + private static int NETWORK_ID; + + public static int getNetworkId() { + return NETWORK_ID; + } + + public static void setNetworkId(int networkId) { + NETWORK_ID = networkId; + } public static void printVersion() { log.info("Version{" + @@ -50,4 +58,5 @@ public class Version { '}'); } + } diff --git a/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMessage.java b/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMessage.java index 41a53585e0..5e1b166e49 100644 --- a/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMessage.java +++ b/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMessage.java @@ -21,7 +21,7 @@ import io.bitsquare.app.Version; import io.bitsquare.p2p.messaging.MailboxMessage; public abstract class DisputeMessage implements MailboxMessage { - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); @Override public int networkId() { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java index 1e03ca7cd9..8e0a98d267 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java @@ -27,7 +27,7 @@ public abstract class OfferMessage implements MailMessage { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public final String offerId; protected OfferMessage(String offerId) { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java index dff389c102..5eb3abb2ae 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java @@ -27,7 +27,7 @@ public abstract class TradeMessage implements MailMessage { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public final String tradeId; @Override diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java index d70319c014..fcc289906e 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -128,7 +128,7 @@ public class BitsquareApp extends Application { injector = Guice.createInjector(bitsquareAppModule); injector.getInstance(InjectorViewFactory.class).setInjector(injector); - Version.NETWORK_ID = injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal(); + Version.setNetworkId(injector.getInstance(BitsquareEnvironment.class).getBitcoinNetwork().ordinal()); // load the main view and create the main scene CachingViewLoader viewLoader = injector.getInstance(CachingViewLoader.class); diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java index e97079313f..e89926efc9 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java +++ b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java @@ -62,13 +62,13 @@ public class AddressTextField extends AnchorPane { textField.setId("address-text-field"); textField.setEditable(false); textField.textProperty().bind(address); - Tooltip.install(textField, new Tooltip("Open your default Bitcoin wallet with that address.")); + Tooltip.install(textField, new Tooltip("Open your default bitcoin wallet with that address.")); textField.setOnMouseClicked(mouseEvent -> { try { Utilities.openURI(URI.create(getBitcoinURI())); } catch (Exception e) { log.warn(e.getMessage()); - new Popup().warning("Opening a system Bitcoin wallet application has failed. " + + new Popup().warning("Opening a default bitcoin wallet application has failed. " + "Perhaps you don't have one installed?").show(); } }); diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml index 1b95321a87..33788b90aa 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml @@ -60,7 +60,7 @@ + text="Protect your wallet with a strong password. You need to enter the password any time you withdraw bitcoin from your trading wallets. You can change the password later in the settings. Open the help menu for more information."/> diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java index 04ba6a9541..1e279a88b1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java @@ -142,7 +142,7 @@ public class PasswordView extends ActivatableView { addTitledGroupBg(root, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE); addMultilineLabel(root, gridRow, "With password protection you need to enter your password when" + - " withdrawing Bitcoin out of your wallet or " + + " withdrawing bitcoin out of your wallet or " + "if you want to view or restore a wallet from seed words.\n" + "For the transactions used in the trade process we don't support password protection as that would make automatic offer " + "execution impossible.", diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java index c2ff517fe4..650a701950 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java @@ -178,8 +178,8 @@ public class SeedWordsView extends ActivatableView { .headLine("Wallet is not empty") .warning("You must empty this wallet out before attempting to restore an older one, as mixing wallets " + "together can lead to invalidated backups.\n\n" + - "Please finalize your trades, close all your open offers and go to the Funds section to withdraw your Bitcoin.\n" + - "In case you cannot access your Bitcoin you can use the emergency tool to empty the wallet.\n" + + "Please finalize your trades, close all your open offers and go to the Funds section to withdraw your bitcoin.\n" + + "In case you cannot access your bitcoin you can use the emergency tool to empty the wallet.\n" + "To open that emergency tool press cmd + e.") .show(); } else if (wallet.isEncrypted()) { diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java index 883369edf8..82391646c3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java @@ -116,7 +116,7 @@ public abstract class OfferView extends ActivatableView { if (viewClass == OfferBookView.class && offerBookView == null) { view = viewLoader.load(viewClass); // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens. - final Tab tab = new Tab(direction == Offer.Direction.BUY ? "Buy Bitcoin" : "Sell Bitcoin"); + final Tab tab = new Tab(direction == Offer.Direction.BUY ? "Buy bitcoin" : "Sell bitcoin"); tab.setClosable(false); tab.setContent(view.getRoot()); tabPane.getTabs().add(tab); diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java index 6160dcc6b7..9fca480304 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java @@ -225,9 +225,9 @@ public class CreateOfferView extends ActivatableViewAndModel popover.hide()); - }*/ - private void setOfferIdColumnCellFactory() { offerIdColumn.setCellValueFactory((openOfferListItem) -> new ReadOnlyObjectWrapper<>(openOfferListItem.getValue())); offerIdColumn.setCellFactory( diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java index ad07e654b1..3b60750293 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java @@ -104,7 +104,7 @@ public class BuyerSubView extends TradeSubView { startPayment.setCompleted(); showItem(waitPaymentReceived); - ((WaitPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Waiting for the Bitcoin sellers confirmation " + + ((WaitPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Waiting for the bitcoin sellers confirmation " + "that the {0} payment has arrived.", model.getCurrencyCode())); break; @@ -116,7 +116,7 @@ public class BuyerSubView extends TradeSubView { showItem(waitPayoutUnlock); ((WaitPayoutLockTimeView) tradeStepDetailsView).setInfoLabelText("The payout transaction is signed and finalized by both parties." + - "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your Bitcoin."); + "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your bitcoin."); } break; case REQUEST_WITHDRAWAL: diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java index 77380a18d8..554702ce31 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java @@ -93,7 +93,7 @@ public class SellerSubView extends TradeSubView { showItem(waitTxInBlockchain); ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText("Deposit transaction has been published. " + - "The Bitcoin buyer need to wait for at least one blockchain confirmation."); + "The bitcoin buyer need to wait for at least one blockchain confirmation."); break; case WAIT_FOR_FIAT_PAYMENT_STARTED: waitTxInBlockchain.setCompleted(); @@ -110,11 +110,11 @@ public class SellerSubView extends TradeSubView { showItem(confirmPaymentReceived); if (model.isBlockChainMethod()) { - ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The Bitcoin buyer has started the {0} payment. " + + ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The bitcoin buyer has started the {0} payment. " + "Check your Altcoin wallet or Block explorer and confirm when you have received the payment.", model.getCurrencyCode())); } else { - ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The Bitcoin buyer has started the {0} payment. " + + ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The bitcoin buyer has started the {0} payment. " + "Check your payment account and confirm when you have received the payment.", model.getCurrencyCode())); } @@ -141,7 +141,7 @@ public class SellerSubView extends TradeSubView { showItem(waitPayoutUnlock); ((WaitPayoutLockTimeView) tradeStepDetailsView).setInfoLabelText("The payout transaction is signed and finalized by both parties." + - "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your Bitcoin."); + "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your bitcoin."); break; case REQUEST_WITHDRAWAL: waitTxInBlockchain.setCompleted(); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmPaymentReceivedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmPaymentReceivedView.java index b22d37d642..a2e53e6edf 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmPaymentReceivedView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmPaymentReceivedView.java @@ -113,8 +113,8 @@ public class ConfirmPaymentReceivedView extends TradeStepDetailsView { if (preferences.showAgain(key) && !BitsquareApp.DEV_MODE) { new Popup().headLine("Confirmation") .message("Do you have received the payment from your trading partner?\n\n" + - "Please note that as soon you have confirmed the locked Bitcoin will be released.\n" + - "There is no way to reverse a Bitcoin payment.") + "Please note that as soon you have confirmed the locked bitcoin will be released.\n" + + "There is no way to reverse a bitcoin payment.") .dontShowAgainId(key, preferences) .actionButtonText("Yes I have received the payment") .closeButtonText("No") diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java index 82d91c8df9..99a19e33ee 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java @@ -84,7 +84,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel> dbStorage; + @Nullable + private Storage> dbStorage; private final CopyOnWriteArraySet authenticationListeners = new CopyOnWriteArraySet<>(); protected final Map authenticatedPeers = new HashMap<>(); @@ -80,7 +81,7 @@ public class PeerManager implements MessageListener, ConnectionListener { Log.traceCall(); this.networkNode = networkNode; - dbStorage = new Storage<>(storageDir); + createDbStorage(storageDir); peerExchangeManager = new PeerExchangeManager(networkNode, () -> getAuthenticatedAndReportedPeers(), @@ -92,10 +93,18 @@ public class PeerManager implements MessageListener, ConnectionListener { init(); } + protected void createDbStorage(File storageDir) { + dbStorage = new Storage<>(storageDir); + } + private void init() { networkNode.addMessageListener(this); networkNode.addConnectionListener(this); + initPersistedPeers(); + } + + protected void initPersistedPeers() { HashSet persistedPeers = dbStorage.initAndGetPersisted("persistedPeers"); if (persistedPeers != null) { log.info("We have persisted reported peers. " + @@ -712,7 +721,9 @@ public class PeerManager implements MessageListener, ConnectionListener { ReportedPeer reportedPeer = new ReportedPeer(peerAddress); if (persistedPeers.contains(reportedPeer)) { persistedPeers.remove(reportedPeer); - dbStorage.queueUpForSave(persistedPeers, 5000); + + if (dbStorage != null) + dbStorage.queueUpForSave(persistedPeers, 5000); } } @@ -885,7 +896,9 @@ public class PeerManager implements MessageListener, ConnectionListener { persistedPeers.remove(list.get(i)); } } - dbStorage.queueUpForSave(persistedPeers); + + if (dbStorage != null) + dbStorage.queueUpForSave(persistedPeers); } printReportedPeers(); diff --git a/network/src/main/java/io/bitsquare/p2p/peers/SeedNodePeerManager.java b/network/src/main/java/io/bitsquare/p2p/peers/SeedNodePeerManager.java index a20a5c8b06..29cfa0a1ce 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/SeedNodePeerManager.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/SeedNodePeerManager.java @@ -15,8 +15,9 @@ import static com.google.common.base.Preconditions.checkArgument; public class SeedNodePeerManager extends PeerManager { private static final Logger log = LoggerFactory.getLogger(SeedNodePeerManager.class); - public SeedNodePeerManager(NetworkNode networkNode, File storageDir) { - super(networkNode, storageDir); + + public SeedNodePeerManager(NetworkNode networkNode) { + super(networkNode, null); } public void authenticateToSeedNode() { @@ -32,6 +33,17 @@ public class SeedNodePeerManager extends PeerManager { startCheckSeedNodeConnectionTask(); } + @Override + protected void createDbStorage(File storageDir) { + // Do nothing. + // The seed node does not store persisted peers in the local db + } + + @Override + protected void initPersistedPeers() { + // Do nothing. + // The seed node does not store persisted peers in the local db + } @Override protected void onFirstSeedNodeAuthenticated() { @@ -70,5 +82,5 @@ public class SeedNodePeerManager extends PeerManager { } } - + } diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationMessage.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationMessage.java index ff5b4f2bdd..e165c7b926 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationMessage.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/auth/AuthenticationMessage.java @@ -5,7 +5,7 @@ import io.bitsquare.p2p.Address; import io.bitsquare.p2p.Message; public abstract class AuthenticationMessage implements Message { - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public final Address senderAddress; diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataRequest.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataRequest.java index 9dd5ef2386..e8201fa564 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataRequest.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataRequest.java @@ -7,7 +7,7 @@ public final class DataRequest implements Message { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public DataRequest() { } diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataResponse.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataResponse.java index 4e6b007d94..1b5edc4bdc 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataResponse.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/data/DataResponse.java @@ -9,7 +9,7 @@ import java.util.HashSet; public final class DataResponse implements Message { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public final HashSet set; diff --git a/network/src/main/java/io/bitsquare/p2p/peers/messages/peers/PeerExchangeMessage.java b/network/src/main/java/io/bitsquare/p2p/peers/messages/peers/PeerExchangeMessage.java index d0e8de7449..a2856397e3 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/messages/peers/PeerExchangeMessage.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/messages/peers/PeerExchangeMessage.java @@ -4,7 +4,7 @@ import io.bitsquare.app.Version; import io.bitsquare.p2p.Message; public abstract class PeerExchangeMessage implements Message { - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); @Override public int networkId() { diff --git a/network/src/main/java/io/bitsquare/p2p/seed/SeedNode.java b/network/src/main/java/io/bitsquare/p2p/seed/SeedNode.java index e2630b2170..6faaaff3b9 100644 --- a/network/src/main/java/io/bitsquare/p2p/seed/SeedNode.java +++ b/network/src/main/java/io/bitsquare/p2p/seed/SeedNode.java @@ -60,7 +60,7 @@ public class SeedNode { int networkId = Integer.parseInt(arg1); checkArgument(networkId > -1 && networkId < 3, "networkId out of scope (Mainnet = 0, TestNet = 1, Regtest = 2)"); - Version.NETWORK_ID = networkId; + Version.setNetworkId(networkId); if (args.length > 2) { String arg2 = args[2]; int maxConnections = Integer.parseInt(arg2); @@ -100,7 +100,7 @@ public class SeedNode { } public void createAndStartP2PService(boolean useDetailedLogging) { - createAndStartP2PService(mySeedNodeAddress, useLocalhost, Version.NETWORK_ID, useDetailedLogging, progArgSeedNodes, null); + createAndStartP2PService(mySeedNodeAddress, useLocalhost, Version.getNetworkId(), useDetailedLogging, progArgSeedNodes, null); } @VisibleForTesting diff --git a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java index 45698572ad..9ac2e8a248 100644 --- a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java +++ b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java @@ -49,7 +49,7 @@ public class SeedNodesRepository { new Address("localhost:4002") ); - public Set
geSeedNodeAddresses(boolean useLocalhost, int networkId) { + public Set
getSeedNodeAddresses(boolean useLocalhost, int networkId) { String networkIdAsString = String.valueOf(networkId); Set
addresses = useLocalhost ? localhostSeedNodeAddresses : torSeedNodeAddresses; Set
filtered = addresses.stream() diff --git a/network/src/main/java/io/bitsquare/p2p/storage/messages/DataBroadcastMessage.java b/network/src/main/java/io/bitsquare/p2p/storage/messages/DataBroadcastMessage.java index e8fceb758c..220eb73159 100644 --- a/network/src/main/java/io/bitsquare/p2p/storage/messages/DataBroadcastMessage.java +++ b/network/src/main/java/io/bitsquare/p2p/storage/messages/DataBroadcastMessage.java @@ -4,7 +4,7 @@ import io.bitsquare.app.Version; import io.bitsquare.p2p.Message; public abstract class DataBroadcastMessage implements Message { - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); @Override public int networkId() { diff --git a/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java b/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java index 9e3acef9ec..d44e5f5475 100644 --- a/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java +++ b/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java @@ -81,7 +81,7 @@ public class EncryptionServiceTests { final class TestMessage implements MailboxMessage { public String data = "test"; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public TestMessage(String data) { this.data = data; diff --git a/network/src/test/java/io/bitsquare/p2p/mocks/MockMailboxMessage.java b/network/src/test/java/io/bitsquare/p2p/mocks/MockMailboxMessage.java index fb2e41239c..d95ca7d975 100644 --- a/network/src/test/java/io/bitsquare/p2p/mocks/MockMailboxMessage.java +++ b/network/src/test/java/io/bitsquare/p2p/mocks/MockMailboxMessage.java @@ -6,7 +6,7 @@ import io.bitsquare.p2p.messaging.MailboxMessage; import io.bitsquare.p2p.storage.data.ExpirablePayload; public final class MockMailboxMessage implements MailboxMessage, ExpirablePayload { - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public String msg; public Address senderAddress; public long ttl; diff --git a/network/src/test/java/io/bitsquare/p2p/mocks/MockMessage.java b/network/src/test/java/io/bitsquare/p2p/mocks/MockMessage.java index 93fea2a2e6..82e7e04eb0 100644 --- a/network/src/test/java/io/bitsquare/p2p/mocks/MockMessage.java +++ b/network/src/test/java/io/bitsquare/p2p/mocks/MockMessage.java @@ -7,7 +7,7 @@ import io.bitsquare.p2p.storage.data.ExpirablePayload; public final class MockMessage implements Message, ExpirablePayload { public String msg; public long ttl; - private final int networkId = Version.NETWORK_ID; + private final int networkId = Version.getNetworkId(); public MockMessage(String msg) { this.msg = msg; diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index d8a464fe64..aead8439bb 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -12,6 +12,7 @@ mvn clean package -DskipTests -Dmaven.javadoc.skip=true cp gui/target/shaded.jar "gui/deploy/Bitsquare-$fullVersion.jar" cp gui/target/shaded.jar "/Users/mk/vm_shared_ubuntu/Bitsquare-$fullVersion.jar" cp gui/target/shaded.jar "/Users/mk/vm_shared_windows/Bitsquare-$fullVersion.jar" +cp seednode/target/SeedNode.jar "gui/deploy/SeedNode.jar" $JAVA_HOME/bin/javapackager \ -deploy \