mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2434 from ManfredKarrer/remove-not-traded-assets

Browse source 
Remove not traded assets
This commit is contained in:
Manfred Karrer 2019-02-18 12:33:31 -05:00 • committed by GitHub
commit dc8fa91367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
assets/src/main/java/bisq/asset/coins/Gridcoin.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
package bisq.asset.coins;
import bisq.asset.Coin;
import bisq.asset.DefaultAddressValidator;
public class Gridcoin extends Coin {
public Gridcoin() {
super("Gridcoin", "GRC", new DefaultAddressValidator());
}
}

31
assets/src/main/java/bisq/asset/coins/LitecoinZ.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
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"));
}
}

39
assets/src/main/java/bisq/asset/coins/ZeroOneCoin.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
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};
}
}
}

3
assets/src/main/resources/META-INF/services/bisq.asset.Asset
View file

@ -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

27
assets/src/test/java/bisq/asset/coins/GridcoinTest.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
package bisq.asset.coins;
import bisq.asset.AbstractAssetWithDefaultValidatorTest;
public class GridcoinTest extends AbstractAssetWithDefaultValidatorTest {
public GridcoinTest() {
super(new Gridcoin());
}
}

43
assets/src/test/java/bisq/asset/coins/LitecoinZTest.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
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");
}
}

46
assets/src/test/java/bisq/asset/coins/ZeroOneCoinTest.java
View file

@ -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 <http://www.gnu.org/licenses/>.
*/
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");
}
}

4
core/src/main/java/bisq/core/locale/CurrencyUtil.java
View file

@ -132,7 +132,6 @@ public class CurrencyUtil {
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 class CurrencyUtil {
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;
}

24
core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java
View file

@ -141,7 +141,7 @@ public class AssetTradeActivityCheck {
"\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 @@ public class AssetTradeActivityCheck {
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);
}
}

2
core/src/test/java/bisq/core/trade/TradableListTest.java
View file

@ -33,6 +33,8 @@ import static io.bisq.generated.protobuffer.PB.PersistableEnvelope.MessageCase.T
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
//TODO cannot be run in IntelliJ IDE as parameter is not supported. OfferPayload is final so it is not so trivial to
// replace that.
public class TradableListTest {
@Test