From 59920bb9948347e2d5c671c1f07b3f8cf0086da4 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 18 Feb 2019 12:06:21 -0500 Subject: [PATCH] Remove not traded assets - Remove Gridcoin, LitecoinZ and ZeroOneCoin - Update getMainCryptoCurrencies and getRemovedCryptoCurrencies methods - Update isWarmingUp method Insufficiently traded assets: Gridcoin (GRC): Trade amount: 0.0055 BTC, number of trades: 1 Not traded assets: 01coin (ZOC) LitecoinZ (LTZ) --- .../main/java/bisq/asset/coins/Gridcoin.java | 28 ----------- .../main/java/bisq/asset/coins/LitecoinZ.java | 31 ------------- .../java/bisq/asset/coins/ZeroOneCoin.java | 39 ---------------- .../META-INF/services/bisq.asset.Asset | 3 -- .../java/bisq/asset/coins/GridcoinTest.java | 27 ----------- .../java/bisq/asset/coins/LitecoinZTest.java | 43 ----------------- .../bisq/asset/coins/ZeroOneCoinTest.java | 46 ------------------- .../java/bisq/core/locale/CurrencyUtil.java | 4 +- .../statistics/AssetTradeActivityCheck.java | 24 +++++++++- 9 files changed, 26 insertions(+), 219 deletions(-) delete mode 100644 assets/src/main/java/bisq/asset/coins/Gridcoin.java delete mode 100644 assets/src/main/java/bisq/asset/coins/LitecoinZ.java delete mode 100644 assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java delete mode 100644 assets/src/test/java/bisq/asset/coins/GridcoinTest.java delete mode 100644 assets/src/test/java/bisq/asset/coins/LitecoinZTest.java delete mode 100644 assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java diff --git a/assets/src/main/java/bisq/asset/coins/Gridcoin.java b/assets/src/main/java/bisq/asset/coins/Gridcoin.java deleted file mode 100644 index 717573613c3..00000000000 --- a/assets/src/main/java/bisq/asset/coins/Gridcoin.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.Coin; -import bisq.asset.DefaultAddressValidator; - -public class Gridcoin extends Coin { - - public Gridcoin() { - super("Gridcoin", "GRC", new DefaultAddressValidator()); - } -} diff --git a/assets/src/main/java/bisq/asset/coins/LitecoinZ.java b/assets/src/main/java/bisq/asset/coins/LitecoinZ.java deleted file mode 100644 index 735834cb830..00000000000 --- a/assets/src/main/java/bisq/asset/coins/LitecoinZ.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.AltCoinAccountDisclaimer; -import bisq.asset.Coin; -import bisq.asset.RegexAddressValidator; - -@AltCoinAccountDisclaimer("account.altcoin.popup.LTZ.msg") -public class LitecoinZ extends Coin { - - public LitecoinZ() { - super("LitecoinZ", "LTZ", new RegexAddressValidator("^L.*", "validation.altcoin.ltz.zAddressesNotSupported")); - } - -} diff --git a/assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java b/assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java deleted file mode 100644 index 0fc6b3849cd..00000000000 --- a/assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.Base58BitcoinAddressValidator; -import bisq.asset.Coin; -import bisq.asset.NetworkParametersAdapter; - -public class ZeroOneCoin extends Coin { - - public ZeroOneCoin() { - super("01coin", "ZOC", new Base58BitcoinAddressValidator(new ZeroOneCoinAddressParams())); - } - - - public static class ZeroOneCoinAddressParams extends NetworkParametersAdapter { - - public ZeroOneCoinAddressParams() { - addressHeader = 80; - p2shHeader = 10; - acceptableAddressCodes = new int[]{addressHeader, p2shHeader}; - } - } -} diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset index b2e508dd352..bcf56cc37bc 100644 --- a/assets/src/main/resources/META-INF/services/bisq.asset.Asset +++ b/assets/src/main/resources/META-INF/services/bisq.asset.Asset @@ -36,14 +36,12 @@ bisq.asset.coins.EtherClassic bisq.asset.coins.FourtyTwo bisq.asset.coins.Fujicoin bisq.asset.coins.GambleCoin -bisq.asset.coins.Gridcoin bisq.asset.coins.Grin bisq.asset.coins.Horizen bisq.asset.coins.IdaPay bisq.asset.coins.Iridium bisq.asset.coins.Kekcoin bisq.asset.coins.Litecoin -bisq.asset.coins.LitecoinZ bisq.asset.coins.Lytix bisq.asset.coins.Mask bisq.asset.coins.Mile @@ -78,7 +76,6 @@ bisq.asset.coins.Zcash bisq.asset.coins.Zcoin bisq.asset.coins.ZelCash bisq.asset.coins.Zero -bisq.asset.coins.ZeroOneCoin bisq.asset.tokens.AugmintEuro bisq.asset.tokens.DaiStablecoin bisq.asset.tokens.EtherStone diff --git a/assets/src/test/java/bisq/asset/coins/GridcoinTest.java b/assets/src/test/java/bisq/asset/coins/GridcoinTest.java deleted file mode 100644 index 62b1241db51..00000000000 --- a/assets/src/test/java/bisq/asset/coins/GridcoinTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.AbstractAssetWithDefaultValidatorTest; - -public class GridcoinTest extends AbstractAssetWithDefaultValidatorTest { - - public GridcoinTest() { - super(new Gridcoin()); - } -} diff --git a/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java b/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java deleted file mode 100644 index e8f2e63ed0b..00000000000 --- a/assets/src/test/java/bisq/asset/coins/LitecoinZTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; - -import org.junit.Test; - -public class LitecoinZTest extends AbstractAssetTest { - - public LitecoinZTest() { - super(new LitecoinZ()); - } - - @Test - public void testValidAddresses() { - assertValidAddress("L17opZaVcRK4h9MV4KhkCmzUBa56BxSRb8A"); - assertValidAddress("L1EjNbAPVtg8jE9EyvbsA7epibZ9j8bdYmV"); - } - - @Test - public void testInvalidAddresses() { - assertInvalidAddress("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem"); - assertInvalidAddress("38NwrYsD1HxQW5zfLT0QcUUXGMPvQgzTSn"); - assertInvalidAddress("8tP9rh3SH6n9cSLmV22vnSNNw56LKGpLrB"); - assertInvalidAddress("8Zbvjr"); - } -} diff --git a/assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java b/assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java deleted file mode 100644 index 0dfdac67d1e..00000000000 --- a/assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; - -import org.junit.Test; - -public class ZeroOneCoinTest extends AbstractAssetTest { - - public ZeroOneCoinTest() { - super(new ZeroOneCoin()); - } - - @Test - public void testValidAddresses() { - assertValidAddress("ZN17ww22Kg1cqM2VykoDwZW4fCTCvxGQMb"); - assertValidAddress("ZZJG1oqJ9VWHAy5AuE7bAugqoYvcGtPJcH"); - assertValidAddress("ZaUSzTWurWuaBw4zr8E4oEN25DzJK9vwbR"); - assertValidAddress("5AchYc7iQS7ynce7hNZ6Ya8djsbm5N9JBS"); - } - - @Test - public void testInvalidAddresses() { - assertInvalidAddress("ZaUSzTWurWuaBw4zr8E4oEN25DzJK9vqqe"); - assertInvalidAddress("ZN17ww22Kg1cqM2VykoDwZW4fCTCvxGQM"); - assertInvalidAddress("ZaUSzTWurWuaBw4zr8E4oEN25DzJK9vwbb"); - assertInvalidAddress("Zb17ww22Kg1cqM2VykoDwZW4fCTCvxGQMb"); - } - -} \ No newline at end of file diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index 96510e26df4..b429410a379 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -132,7 +132,6 @@ public static List getMainCryptoCurrencies() { result.add(new CryptoCurrency("DASH", "Dash")); result.add(new CryptoCurrency("DCR", "Decred")); result.add(new CryptoCurrency("ETH", "Ether")); - result.add(new CryptoCurrency("GRC", "Gridcoin")); result.add(new CryptoCurrency("GRIN", "Grin")); result.add(new CryptoCurrency("LTC", "Litecoin")); result.add(new CryptoCurrency("XMR", "Monero")); @@ -152,6 +151,9 @@ public static List getRemovedCryptoCurrencies() { currencies.add(new CryptoCurrency("SC", "SpaceCash")); currencies.add(new CryptoCurrency("PPI", "PiedPiper Coin")); currencies.add(new CryptoCurrency("PEPECASH", "Pepe Cash")); + currencies.add(new CryptoCurrency("GRC", "Gridcoin")); + currencies.add(new CryptoCurrency("LTZ", "LitecoinZ")); + currencies.add(new CryptoCurrency("ZOC", "01coin")); return currencies; } diff --git a/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java b/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java index 5e3e00d4823..96af82e1209 100644 --- a/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java +++ b/core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java @@ -141,7 +141,7 @@ public void onAllServicesInitialized() { "\n\n" + newAssets.toString() + "\n\n" + sufficientlyTraded.toString(); // Utilities.copyToClipboard(result); - log.debug(result); + log.info(result); } private boolean isWarmingUp(String code) { @@ -194,6 +194,28 @@ private boolean isWarmingUp(String code) { newlyAdded.add("WEB"); newlyAdded.add("WRKZ"); + // v0.9.3 - nothing added, was hotfix + + // v0.9.4 (Feb 18 2019) + newlyAdded.add("ADE"); + newlyAdded.add("ASK"); + newlyAdded.add("AEUR"); + newlyAdded.add("AUS"); + newlyAdded.add("CASH2"); + newlyAdded.add("DARX"); + newlyAdded.add("CRDS"); + newlyAdded.add("CRCL"); + newlyAdded.add("DAI"); + newlyAdded.add("ONION"); + newlyAdded.add("FJC"); + newlyAdded.add("LYTX"); + newlyAdded.add("MILE"); + newlyAdded.add("PRSN"); + newlyAdded.add("TUSD"); + newlyAdded.add("USDC"); + newlyAdded.add("VXV"); + newlyAdded.add("ZEL"); + return newlyAdded.contains(code); } }