bisq-network · sqrrm · Dec 28, 2020 · Dec 16, 2020 · Dec 16, 2020 · Dec 14, 2020
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ configure(subprojects) {
 
     ext { // in alphabetical order
         bcVersion = '1.63'
-        bitcoinjVersion = 'dcf8af0'
+        bitcoinjVersion = '2a80db4'
         btcdCli4jVersion = '27b94333'
         codecVersion = '1.13'
         easybindVersion = '1.0.3'
@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.1-SNAPSHOT'
+    version = '1.5.2-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

diff --git a/common/src/main/java/bisq/common/app/AsciiLogo.java b/common/src/main/java/bisq/common/app/AsciiLogo.java
@@ -22,25 +22,26 @@
 @Slf4j
 public class AsciiLogo {
     public static void showAsciiLogo() {
-        log.info("\n\n" +
-                "                    ........                  ......                                                                         \n" +
-                "                ..............                ......                                                                         \n" +
-                "              .................               ......                                                                         \n" +
-                "            ......   ..........   ..          ......                                                                         \n" +
-                "           ......      ......   ......        ...............        .....     .........         ..........                  \n" +
-                "          .......              ........       ..................     .....   .............     ...............               \n" +
-                "          ......               ........       ..........  .......    .....  ......   ...     ........   .......              \n" +
-                "         ......                   .....       .......        .....   .....  .....            .....        ......             \n" +
-                "         ......    ...        ...             ......         ......  .....   ...........    ......         ......            \n" +
-                "         ......   .....      ....             ......         ......  .....    ............  .....          ......            \n" +
-                "          ......                               .....         ......  .....         ........ ......         ......            \n" +
-                "           ......       ....        ...        ......       ......   .....    ..     ......  ......      ........            \n" +
-                "            ........     ..      .......        .................    .....  ..............    ...................            \n" +
-                "             ..........       .........           .............      .....   ............       .................            \n" +
-                "               ......................                 .....                      ....               ....   ......            \n" +
-                "                  ................                                                                         ......            \n" +
-                "                        ....                                                                               ......            \n" +
-                "                                                                                                           ......            \n" +
-                "\n\n");
+        String ls = System.lineSeparator();
+        log.info(ls + ls +
+                "                    ........                  ......                                                                         " + ls +
+                "                ..............                ......                                                                         " + ls +
+                "              .................               ......                                                                         " + ls +
+                "            ......   ..........   ..          ......                                                                         " + ls +
+                "           ......      ......   ......        ...............        .....     .........         ..........                  " + ls +
+                "          .......              ........       ..................     .....   .............     ...............               " + ls +
+                "          ......               ........       ..........  .......    .....  ......   ...     ........   .......              " + ls +
+                "         ......                   .....       .......        .....   .....  .....            .....        ......             " + ls +
+                "         ......    ...        ...             ......         ......  .....   ...........    ......         ......            " + ls +
+                "         ......   .....      ....             ......         ......  .....    ............  .....          ......            " + ls +
+                "          ......                               .....         ......  .....         ........ ......         ......            " + ls +
+                "           ......       ....        ...        ......       ......   .....    ..     ......  ......      ........            " + ls +
+                "            ........     ..      .......        .................    .....  ..............    ...................            " + ls +
+                "             ..........       .........           .............      .....   ............       .................            " + ls +
+                "               ......................                 .....                      ....               ....   ......            " + ls +
+                "                  ................                                                                         ......            " + ls +
+                "                        ....                                                                               ......            " + ls +
+                "                                                                                                           ......            " + ls +
+                ls + ls);
     }
 }
diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
@@ -30,14 +30,14 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.5.1";
+    public static final String VERSION = "1.5.2";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
      * This must not contain each version but only those where we add new version-tagged resource files for
      * historical data stores.
      */
-    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0");
+    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
@@ -136,6 +136,7 @@ public String getDisplayString() {
     private final User user;
     private final SignedWitnessService signedWitnessService;
     private final ChargeBackRisk chargeBackRisk;
+    private final AccountAgeWitnessStorageService accountAgeWitnessStorageService;
     private final FilterManager filterManager;
     @Getter
     private final AccountAgeWitnessUtils accountAgeWitnessUtils;
@@ -167,6 +168,7 @@ public AccountAgeWitnessService(KeyRing keyRing,
         this.user = user;
         this.signedWitnessService = signedWitnessService;
         this.chargeBackRisk = chargeBackRisk;
+        this.accountAgeWitnessStorageService = accountAgeWitnessStorageService;
         this.filterManager = filterManager;
 
         accountAgeWitnessUtils = new AccountAgeWitnessUtils(
@@ -190,10 +192,10 @@ public void onAllServicesInitialized() {
         });
 
         // At startup the P2PDataStorage initializes earlier, otherwise we get the listener called.
-        p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap().values().forEach(e -> {
-            if (e instanceof AccountAgeWitness)
-                addToMap((AccountAgeWitness) e);
-        });
+        accountAgeWitnessStorageService.getMapOfAllData().values().stream()
+                .filter(e -> e instanceof AccountAgeWitness)
+                .map(e -> (AccountAgeWitness) e)
+                .forEach(this::addToMap);
 
         if (p2PService.isBootstrapped()) {
             onBootStrapped();

diff --git a/core/src/main/java/bisq/core/app/WalletAppSetup.java b/core/src/main/java/bisq/core/app/WalletAppSetup.java
@@ -107,7 +107,7 @@ void init(@Nullable Consumer<String> chainFileLockedExceptionHandler,
               Runnable downloadCompleteHandler,
               Runnable walletInitializedHandler) {
         log.info("Initialize WalletAppSetup with BitcoinJ version {} and hash of BitcoinJ commit {}",
-                VersionMessage.BITCOINJ_VERSION, "dcf8af0");
+                VersionMessage.BITCOINJ_VERSION, "2a80db4");
 
         ObjectProperty<Throwable> walletServiceException = new SimpleObjectProperty<>();
         btcInfoBinding = EasyBind.combine(walletsSetup.downloadPercentageProperty(),

diff --git a/core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java b/core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java
@@ -371,7 +371,7 @@ private boolean processPeersDaoStateHash(DaoStateHash daoStateHash, Optional<Nod
             if (this.isInConflictWithSeedNode)
                 log.warn("Conflict with seed nodes: {}", conflictMsg);
             else if (this.isInConflictWithNonSeedNode)
-                log.info("Conflict with non-seed nodes: {}", conflictMsg);
+                log.debug("Conflict with non-seed nodes: {}", conflictMsg);
         }
 
 

diff --git a/core/src/main/java/bisq/core/filter/FilterManager.java b/core/src/main/java/bisq/core/filter/FilterManager.java
@@ -466,7 +466,11 @@ private void onFilterAddedFromNetwork(Filter newFilter) {
         Filter currentFilter = getFilter();
 
         if (!isFilterPublicKeyInList(newFilter)) {
-            log.warn("isFilterPublicKeyInList failed. Filter.getSignerPubKeyAsHex={}", newFilter.getSignerPubKeyAsHex());
+            if (newFilter.getSignerPubKeyAsHex() != null && !newFilter.getSignerPubKeyAsHex().isEmpty()) {
+                log.warn("isFilterPublicKeyInList failed. Filter.getSignerPubKeyAsHex={}", newFilter.getSignerPubKeyAsHex());
+            } else {
+                log.info("isFilterPublicKeyInList failed. Filter.getSignerPubKeyAsHex not set (expected case for pre v1.3.9 filter)");
+            }
             return;
         }
         if (!isSignatureValid(newFilter)) {
@@ -593,7 +597,7 @@ private String getSignature(Filter filterWithoutSig) {
     private boolean isFilterPublicKeyInList(Filter filter) {
         String signerPubKeyAsHex = filter.getSignerPubKeyAsHex();
         if (!isPublicKeyInList(signerPubKeyAsHex)) {
-            log.warn("Invalid filter (expected case for pre v1.3.9 filter as we still keep that in the network " +
+            log.info("Invalid filter (expected case for pre v1.3.9 filter as we still keep that in the network " +
                             "but the new version does not recognize it as valid filter): " +
                             "signerPubKeyAsHex from filter is not part of our pub key list. " +
                             "signerPubKeyAsHex={}, publicKeys={}, filterCreationDate={}",
@@ -606,7 +610,7 @@ private boolean isFilterPublicKeyInList(Filter filter) {
     private boolean isPublicKeyInList(String pubKeyAsHex) {
         boolean isPublicKeyInList = publicKeys.contains(pubKeyAsHex);
         if (!isPublicKeyInList) {
-            log.warn("pubKeyAsHex is not part of our pub key list. pubKeyAsHex={}, publicKeys={}", pubKeyAsHex, publicKeys);
+            log.info("pubKeyAsHex is not part of our pub key list (expected case for pre v1.3.9 filter). pubKeyAsHex={}, publicKeys={}", pubKeyAsHex, publicKeys);
         }
         return isPublicKeyInList;
     }

diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java
@@ -301,7 +301,6 @@ public static List<TradeCurrency> getAllTransferwiseCurrencies() {
                 new FiatCurrency("MAD"),
                 new FiatCurrency("NPR"),
                 new FiatCurrency("NZD"),
-                new FiatCurrency("NGN"),
                 new FiatCurrency("NOK"),
                 new FiatCurrency("PKR"),
                 new FiatCurrency("PEN"),

diff --git a/core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java b/core/src/main/java/bisq/core/notifications/alerts/MyOfferTakenEvents.java
@@ -55,8 +55,9 @@ public void onAllServicesInitialized() {
     }
 
     private void onOpenOfferRemoved(OpenOffer openOffer) {
-        log.info("We got a offer removed. id={}, state={}", openOffer.getId(), openOffer.getState());
-        if (openOffer.getState() == OpenOffer.State.RESERVED) {
+        OpenOffer.State state = openOffer.getState();
+        if (state == OpenOffer.State.RESERVED) {
+            log.info("We got a offer removed. id={}, state={}", openOffer.getId(), state);
             String shortId = openOffer.getShortId();
             MobileMessage message = new MobileMessage(Res.get("account.notifications.offer.message.title"),
                     Res.get("account.notifications.offer.message.msg", shortId),

diff --git a/core/src/main/java/bisq/core/payment/PaymentAccount.java b/core/src/main/java/bisq/core/payment/PaymentAccount.java
@@ -97,12 +97,25 @@ public protobuf.PaymentAccount toProtoMessage() {
     }
 
     public static PaymentAccount fromProto(protobuf.PaymentAccount proto, CoreProtoResolver coreProtoResolver) {
-        PaymentAccount account = PaymentAccountFactory.getPaymentAccount(PaymentMethod.getPaymentMethodById(proto.getPaymentMethod().getId()));
+        String paymentMethodId = proto.getPaymentMethod().getId();
+        List<TradeCurrency> tradeCurrencies = proto.getTradeCurrenciesList().stream()
+                .map(TradeCurrency::fromProto)
+                .collect(Collectors.toList());
+
+        // We need to remove NGN for Transferwise
+        Optional<TradeCurrency> ngnTwOptional = tradeCurrencies.stream()
+                .filter(e -> paymentMethodId.equals(PaymentMethod.TRANSFERWISE_ID))
+                .filter(e -> e.getCode().equals("NGN"))
+                .findAny();
+        // We cannot remove it in the stream as it would cause a concurrentModificationException
+        ngnTwOptional.ifPresent(tradeCurrencies::remove);
+
+        PaymentAccount account = PaymentAccountFactory.getPaymentAccount(PaymentMethod.getPaymentMethodById(paymentMethodId));
         account.getTradeCurrencies().clear();
         account.setId(proto.getId());
         account.setCreationDate(proto.getCreationDate());
         account.setAccountName(proto.getAccountName());
-        account.getTradeCurrencies().addAll(proto.getTradeCurrenciesList().stream().map(TradeCurrency::fromProto).collect(Collectors.toList()));
+        account.getTradeCurrencies().addAll(tradeCurrencies);
         account.setPaymentAccountPayload(coreProtoResolver.fromProto(proto.getPaymentAccountPayload()));
 
         if (proto.hasSelectedTradeCurrency())

diff --git a/core/src/main/java/bisq/core/provider/ProvidersRepository.java b/core/src/main/java/bisq/core/provider/ProvidersRepository.java
@@ -79,10 +79,8 @@ public void applyBannedNodes(@Nullable List<String> bannedNodes) {
         fillProviderList();
         selectNextProviderBaseUrl();
 
-        if (bannedNodes == null) {
-            log.info("Selected provider baseUrl={}, providerList={}", baseUrl, providerList);
-        } else if (!bannedNodes.isEmpty()) {
-            log.warn("We have banned provider nodes: bannedNodes={}, selected provider baseUrl={}, providerList={}",
+        if (bannedNodes != null && !bannedNodes.isEmpty()) {
+            log.info("Excluded provider nodes from filter: nodes={}, selected provider baseUrl={}, providerList={}",
                     bannedNodes, baseUrl, providerList);
         }
     }

diff --git a/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java b/core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java
@@ -47,19 +47,19 @@ static void setSupportedCapabilities(Config config) {
         if (config.daoActivated) {
             maybeApplyDaoFullMode(config);
         }
+
+        log.info(Capabilities.app.prettyPrint());
     }
 
     public static void maybeApplyDaoFullMode(Config config) {
         // If we set dao full mode at the preferences view we add the capability there. We read the preferences a
         // bit later than we call that method so we have to add DAO_FULL_NODE Capability at preferences as well to
         // be sure it is set in both cases.
         if (config.fullDaoNode) {
-            log.info("Set Capability.DAO_FULL_NODE");
             Capabilities.app.addAll(Capability.DAO_FULL_NODE);
         } else {
             // A lite node has the capability to receive bsq blocks. We do not want to send BSQ blocks to full nodes
             // as they ignore them anyway.
-            log.info("Set Capability.RECEIVE_BSQ_BLOCK");
             Capabilities.app.addAll(Capability.RECEIVE_BSQ_BLOCK);
         }
     }

diff --git a/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java b/core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
@@ -286,8 +286,10 @@ private Result getPhaseResult() {
                 log.info(info);
                 return Result.VALID.info(info);
             } else {
-                String info = MessageFormat.format("We received a {0} but we are are not in the expected phase. " +
-                                "Expected phases={1}, Trade phase={2}, Trade state= {3}, tradeId={4}",
+                String info = MessageFormat.format("We received a {0} but we are are not in the expected phase.\n" +
+                                "This can be an expected case if we get a repeated CounterCurrencyTransferStartedMessage " +
+                                "after we have already received one as the peer re-sends that message at each startup.\n" +
+                                "Expected phases={1},\nTrade phase={2},\nTrade state= {3},\ntradeId={4}",
                         trigger,
                         expectedPhases,
                         trade.getPhase(),

diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
@@ -196,7 +196,7 @@ protected FluentProtocol expect(FluentProtocol.Condition condition) {
                 .condition(condition)
                 .resultHandler(result -> {
                     if (!result.isValid()) {
-                        log.error(result.getInfo());
+                        log.warn(result.getInfo());
                         handleTaskRunnerFault(null,
                                 result.name(),
                                 result.getInfo());

diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
@@ -132,11 +132,8 @@ public void onAllServicesInitialized() {
             onP2pNetworkAndWalletReady();
         } else {
             p2pNetworkAndWalletReady = EasyBind.combine(isP2pBootstrapped, hasSufficientBtcPeers, isBtcBlockDownloadComplete,
-                    (bootstrapped, sufficientPeers, downloadComplete) -> {
-                        log.info("isP2pBootstrapped={}, hasSufficientBtcPeers={} isBtcBlockDownloadComplete={}",
-                                bootstrapped, sufficientPeers, downloadComplete);
-                        return bootstrapped && sufficientPeers && downloadComplete;
-                    });
+                    (bootstrapped, sufficientPeers, downloadComplete) ->
+                            bootstrapped && sufficientPeers && downloadComplete);
 
             p2pNetworkAndWalletReadyListener = (observable, oldValue, newValue) -> {
                 if (newValue) {