fix price provider selection, remove local provider for production

core/src/main/java/haveno/core/locale/CryptoCurrency.java

@@ -19,10 +19,8 @@ package haveno.core.locale;
 
 
 import com.google.protobuf.Message;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-@EqualsAndHashCode(callSuper = true)
 public final class CryptoCurrency extends TradeCurrency {
     // http://boschista.deviantart.com/journal/Cool-ASCII-Symbols-214218618
     private final static String PREFIX = "✦ ";

core/src/main/java/haveno/core/locale/CurrencyUtil.java

@@ -201,7 +201,6 @@ public class CurrencyUtil {
         result.add(new CryptoCurrency("ETH", "Ether"));
         result.add(new CryptoCurrency("LTC", "Litecoin"));
         result.add(new CryptoCurrency("USDT-ERC20", "Tether USD (ERC20)"));
-        result.add(new CryptoCurrency("USDT-TRC20", "Tether USD (TRC20)"));
         result.sort(TradeCurrency::compareTo);
         return result;
     }

core/src/main/java/haveno/core/locale/TradeCurrency.java

@@ -19,19 +19,16 @@ package haveno.core.locale;
 
 import haveno.common.proto.ProtobufferRuntimeException;
 import haveno.common.proto.persistable.PersistablePayload;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
-@EqualsAndHashCode
 @ToString
 @Getter
 @Slf4j
 public abstract class TradeCurrency implements PersistablePayload, Comparable<TradeCurrency> {
     protected final String code;
-    @EqualsAndHashCode.Exclude
     protected final String name;
 
     public TradeCurrency(String code, String name) {
@@ -82,4 +79,23 @@ public abstract class TradeCurrency implements PersistablePayload, Comparable<Tr
         return this.name.compareTo(other.name);
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj instanceof TradeCurrency) {
+            TradeCurrency other = (TradeCurrency) obj;
+            return code.equals(other.code);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return code.hashCode();
+    }
 }

core/src/main/java/haveno/core/locale/TraditionalCurrency.java

@@ -36,14 +36,12 @@ package haveno.core.locale;
 
 
 import com.google.protobuf.Message;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
 import java.util.Currency;
 import java.util.Locale;
 
-@EqualsAndHashCode(callSuper = true)
 @ToString
 @Getter
 public final class TraditionalCurrency extends TradeCurrency {

core/src/main/java/haveno/core/offer/Offer.java

@@ -200,7 +200,7 @@ public class Offer implements NetworkPayload, PersistablePayload {
                 return null;
             }
         } else {
-            log.warn("We don't have a market price. " +
+            log.trace("We don't have a market price. " +
                     "That case could only happen if you don't have a price feed.");
             return null;
         }

core/src/main/java/haveno/core/provider/ProvidersRepository.java

@@ -93,7 +93,7 @@ public class ProvidersRepository {
         fillProviderList();
 
         // select next provider if current provider is null or banned
-        if (baseUrl == null || isBanned(baseUrl)) selectNextProviderBaseUrl();
+        if (baseUrl.isEmpty() || isBanned(baseUrl)) selectNextProviderBaseUrl();
 
         if (bannedNodes != null && !bannedNodes.isEmpty()) {
             log.info("Excluded provider nodes from filter: nodes={}, selected provider baseUrl={}, providerList={}", bannedNodes, baseUrl, providerList);
@@ -140,7 +140,7 @@ public class ProvidersRepository {
                     "http://173.230.142.36:8078/");
             } else {
                 providers = new ArrayList<String>();
-                providers.add(DEFAULT_LOCAL_NODE); // try local provider first
+                //providers.add(DEFAULT_LOCAL_NODE); // try local provider first
                 providers.addAll(DEFAULT_NODES);
             }
         } else {

desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.java

@@ -187,7 +187,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
     @Override
     protected void activate() {
         // We want to have it updated in case an asset got removed
-        allCryptoCurrencies = FXCollections.observableArrayList(CurrencyUtil.getActiveSortedCryptoCurrencies( filterManager));
+        allCryptoCurrencies = FXCollections.observableArrayList(CurrencyUtil.getActiveSortedCryptoCurrencies(filterManager));
         allCryptoCurrencies.removeAll(cryptoCurrencies);
 
         activateGeneralOptions();