Add Tether token support via ERC20 and Omni

bisq-network · Aug 26, 2020 · 585d3ec · 585d3ec
1 parent f45a26c
commit 585d3ec
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/assets/src/main/java/bisq/asset/coins/TetherOmni.java b/assets/src/main/java/bisq/asset/coins/TetherOmni.java
@@ -0,0 +1,10 @@
+package bisq.asset.coins;
+
+import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+
+public class TetherOmni extends Coin {
+    public TetherOmni() {
+        super("Tether (Omni)", "USDT-O", new Base58BitcoinAddressValidator());
+    }
+}
diff --git a/assets/src/main/java/bisq/asset/tokens/TetherERC20.java b/assets/src/main/java/bisq/asset/tokens/TetherERC20.java
@@ -0,0 +1,9 @@
+package bisq.asset.tokens;
+
+import bisq.asset.Erc20Token;
+
+public class TetherERC20 extends Erc20Token {
+    public TetherERC20() {
+        super("Tether (ERC20)", "USDT-E");
+    }
+}
diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset
@@ -104,6 +104,7 @@ bisq.asset.coins.Spectrecoin
 bisq.asset.coins.Starwels
 bisq.asset.coins.SUB1X
 bisq.asset.coins.TEO
+bisq.asset.coins.TetherOmni
 bisq.asset.coins.TurtleCoin
 bisq.asset.coins.UnitedCommunityCoin
 bisq.asset.coins.Unobtanium
@@ -123,6 +124,7 @@ bisq.asset.coins.ZeroClassic
 bisq.asset.tokens.AugmintEuro
 bisq.asset.tokens.DaiStablecoin
 bisq.asset.tokens.EtherStone
+bisq.asset.tokens.TetherERC20
 bisq.asset.tokens.TrueUSD
 bisq.asset.tokens.USDCoin
 bisq.asset.tokens.VectorspaceAI
diff --git a/core/src/main/java/bisq/core/provider/price/PriceProvider.java b/core/src/main/java/bisq/core/provider/price/PriceProvider.java
@@ -70,7 +70,11 @@ public Tuple2<Map<String, Long>, Map<String, MarketPrice>> getAll() throws IOExc
                 final double price = (Double) treeMap.get("price");
                 // json uses double for our timestampSec long value...
                 final long timestampSec = MathUtils.doubleToLong((Double) treeMap.get("timestampSec"));
-                marketPriceMap.put(currencyCode, new MarketPrice(currencyCode, price, timestampSec, true));
+                if (currencyCode.equals("USDT")) {
+                    addPrice(marketPriceMap, "USDT-O", price, timestampSec);
+                    addPrice(marketPriceMap, "USDT-E", price, timestampSec);
+                }
+                addPrice(marketPriceMap, currencyCode, price, timestampSec);
             } catch (Throwable t) {
                 log.error(t.toString());
                 t.printStackTrace();
@@ -80,6 +84,10 @@ public Tuple2<Map<String, Long>, Map<String, MarketPrice>> getAll() throws IOExc
         return new Tuple2<>(tsMap, marketPriceMap);
     }
 
+    private void addPrice(Map<String, MarketPrice> marketPriceMap, String currencyCode, double price, long timestampSec) {
+        marketPriceMap.put(currencyCode, new MarketPrice(currencyCode, price, timestampSec, true));
+    }
+
     public String getBaseUrl() {
         return httpClient.getBaseUrl();
     }

diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java
@@ -534,11 +534,10 @@ private String getPriceProviderTooltipString() {
 
         String selectedCurrencyCode = model.getPriceFeedService().getCurrencyCode();
         MarketPrice selectedMarketPrice = model.getPriceFeedService().getMarketPrice(selectedCurrencyCode);
-
         return Res.get("mainView.marketPrice.tooltip",
                 "Bisq Price Index for " + selectedCurrencyCode,
                 "",
-                DisplayUtils.formatTime(new Date(selectedMarketPrice.getTimestampSec())),
+                selectedMarketPrice != null ? DisplayUtils.formatTime(new Date(selectedMarketPrice.getTimestampSec())) : Res.get("shared.na"),
                 model.getPriceFeedService().getProviderNodeAddress());
     }