diff --git a/build.gradle b/build.gradle index a47c714..2247441 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { } } //cross-compilation stuff for Java 7 - assert (System.env.JDK_7_HOME != null): "Set environment property JDK_7_HOME" + assert (System.env.JDK_7_HOME != null): "Set environment variable JDK_7_HOME" project.ext.targetJavaHome = System.env.JDK_7_HOME def javaExecutablesPath = new File(targetJavaHome, 'bin') def javaExecutables = [:].withDefault { execName -> diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4d1f572 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +projectGroup=com.generalbytes.batm.public +projectVersion=1.0.4-SNAPSHOT \ No newline at end of file diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle index 2f6983d..7540019 100644 --- a/server_extensions_api/build.gradle +++ b/server_extensions_api/build.gradle @@ -1,6 +1,10 @@ apply plugin: "java" apply plugin: "distribution" apply plugin: "gb-gradle" +apply plugin: 'maven-publish' + +group = projectGroup +version = projectVersion jar { baseName 'batm_server_extensions_api' @@ -20,3 +24,21 @@ dependencies { compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25') compile(group: 'com.sun.mail', name: 'javax.mail', version: '1.4.7') } + +publishing { + repositories { + maven { + credentials { + username gbArtifactoryUser + password gbArtifactoryPassword + } + url gbArtifactoryUploadUrl + } + } + + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} \ No newline at end of file diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ICurrencies.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java similarity index 65% rename from server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ICurrencies.java rename to server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java index dc81276..22ea896 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/ICurrencies.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java @@ -18,7 +18,11 @@ package com.generalbytes.batm.server.extensions; -public interface ICurrencies { +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class Currencies { public static final String BTC = "BTC"; public static final String BCH = "BCH"; //Bitcoin Cash public static final String BTX = "BTX"; //BitCore @@ -57,4 +61,50 @@ public interface ICurrencies { public static final String XAF = "XAF"; public static final String XAU = "XAU"; //gold public static final String NONE = ""; + + public static final List FIAT_CURRENCIES; + public static final List CRYPTO_CURRENCIES; + + static { + List crypto = new ArrayList<>(); + crypto.add(BTC); + crypto.add(BCH); + crypto.add(BTX); + crypto.add(ETH); + crypto.add(LTC); + crypto.add(VIA); + crypto.add(DEX); + crypto.add(DASH); + crypto.add(DOGE); + crypto.add(FLASH); + crypto.add(MAX); + crypto.add(LEO); + crypto.add(NLG); + crypto.add(GRS); + crypto.add(ICG); + crypto.add(NBT); + crypto.add(NXT); + crypto.add(POT); + crypto.add(SMART); + crypto.add(START); + crypto.add(TKN); + crypto.add(WDC); + crypto.add(XMR); + CRYPTO_CURRENCIES = Collections.unmodifiableList(crypto); + + List fiat = new ArrayList<>(); + fiat.add(CAD); + fiat.add(CHF); + fiat.add(CNY); + fiat.add(CZK); + fiat.add(EUR); + fiat.add(GBP); + fiat.add(HUF); + fiat.add(JPY); + fiat.add(SGD); + fiat.add(USD); + fiat.add(XAF); + fiat.add(XAU); + FIAT_CURRENCIES = Collections.unmodifiableList(fiat); + } } diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle index 3c127ce..7da0690 100644 --- a/server_extensions_extra/build.gradle +++ b/server_extensions_extra/build.gradle @@ -1,6 +1,10 @@ apply plugin: "java" apply plugin: "distribution" apply plugin: "gb-gradle" +apply plugin: 'maven-publish' + +group = projectGroup +version = projectVersion jar { baseName 'batm_server_extensions_extra' @@ -44,3 +48,21 @@ distributions { } } } + +publishing { + repositories { + maven { + credentials { + username gbArtifactoryUser + password gbArtifactoryPassword + } + url gbArtifactoryUploadUrl + } + } + + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java index 59ac32c..6890c96 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/BitcoinExtension.java @@ -51,7 +51,7 @@ public class BitcoinExtension implements IExtension{ String apiSecret = paramTokenizer.nextToken(); return new BitfinexExchange(apiKey, apiSecret); } else if ("itbit".equalsIgnoreCase(prefix)) { - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; String userId = paramTokenizer.nextToken(); String accountId = paramTokenizer.nextToken(); String clientKey = paramTokenizer.nextToken(); @@ -105,7 +105,7 @@ public class BitcoinExtension implements IExtension{ if (protocol != null && username != null && password != null && hostname != null && port != null && accountName != null) { String rpcURL = protocol + "://" + username + ":" + password + "@" + hostname + ":" + port; - return new BATMBitcoindRPCWallet(rpcURL, accountName, ICurrencies.BTC); + return new BATMBitcoindRPCWallet(rpcURL, accountName, Currencies.BTC); } }else if ("bitcoincashd".equalsIgnoreCase(walletType)) { //"bitcoind:protocol:user:password:ip:port:accountname" @@ -123,7 +123,7 @@ public class BitcoinExtension implements IExtension{ if (protocol != null && username != null && password != null && hostname !=null && port != null && accountName != null) { String rpcURL = protocol +"://" + username +":" + password + "@" + hostname +":" + port; - return new BATMBitcoindRPCWallet(rpcURL,accountName, ICurrencies.BCH); + return new BATMBitcoindRPCWallet(rpcURL,accountName, Currencies.BCH); } }else if ("bitcore".equalsIgnoreCase(walletType)) { //bitcore:apiKey:proxyUrl String apiKey = st.nextToken(); @@ -155,7 +155,7 @@ public class BitcoinExtension implements IExtension{ if ("btcfix".equalsIgnoreCase(rsType)) { BigDecimal rate = BigDecimal.ZERO; - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { try { rate = new BigDecimal(st.nextToken()); @@ -173,7 +173,7 @@ public class BitcoinExtension implements IExtension{ }else if ("mrcoin".equalsIgnoreCase(rsType)) { return new MrCoinRateSource(); }else if ("itbit".equalsIgnoreCase(rsType)) { - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken().toUpperCase(); } @@ -186,10 +186,10 @@ public class BitcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.ETH); - result.add(ICurrencies.LTC); - result.add(ICurrencies.BCH); + result.add(Currencies.BTC); + result.add(Currencies.ETH); + result.add(Currencies.LTC); + result.add(Currencies.BCH); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java index a0e08a5..5e34d19 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/bitfinex/BitfinexExchange.java @@ -73,20 +73,20 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced public Set getCryptoCurrencies() { Set cryptoCurrencies = new HashSet(); - cryptoCurrencies.add(ICurrencies.BTC); - cryptoCurrencies.add(ICurrencies.ETH); - cryptoCurrencies.add(ICurrencies.LTC); + cryptoCurrencies.add(Currencies.BTC); + cryptoCurrencies.add(Currencies.ETH); + cryptoCurrencies.add(Currencies.LTC); return cryptoCurrencies; } public Set getFiatCurrencies() { Set fiatCurrencies = new HashSet(); - fiatCurrencies.add(ICurrencies.USD); + fiatCurrencies.add(Currencies.USD); return fiatCurrencies; } public String getPreferredFiatCurrency() { - return ICurrencies.USD; + return Currencies.USD; } @@ -148,7 +148,7 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced } public BigDecimal getFiatBalance(String fiatCurrency) { - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrency)) { + if (!Currencies.USD.equalsIgnoreCase(fiatCurrency)) { return BigDecimal.ZERO; } log.debug("Calling Bitfinex exchange (getBalance)"); @@ -197,8 +197,8 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced log.error("Bitfinex implementation supports only " + Arrays.toString(getCryptoCurrencies().toArray())); return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { - log.error("Bitfinex supports only " + ICurrencies.USD ); + if (!Currencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { + log.error("Bitfinex supports only " + Currencies.USD ); return null; } @@ -266,8 +266,8 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced log.error("Bitfinex implementation supports only " + Arrays.toString(getCryptoCurrencies().toArray())); return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { - log.error("Bitfinex supports only " + ICurrencies.USD ); + if (!Currencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { + log.error("Bitfinex supports only " + Currencies.USD ); return null; } return new PurchaseCoinsTask(amount,cryptoCurrency,fiatCurrencyToUse,description); @@ -295,8 +295,8 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced log.error("Bitfinex implementation supports only " + Arrays.toString(getCryptoCurrencies().toArray())); return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { - log.error("Bitfinex supports only " + ICurrencies.USD ); + if (!Currencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { + log.error("Bitfinex supports only " + Currencies.USD ); return null; } @@ -364,8 +364,8 @@ public class BitfinexExchange implements IExchangeAdvanced, IRateSourceAdvanced log.error("Bitfinex implementation supports only " + Arrays.toString(getCryptoCurrencies().toArray())); return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { - log.error("Bitfinex supports only " + ICurrencies.USD ); + if (!Currencies.USD.equalsIgnoreCase(fiatCurrencyToUse)) { + log.error("Bitfinex supports only " + Currencies.USD ); return null; } return new SellCoinsTask(amount,cryptoCurrency,fiatCurrencyToUse,description); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/itbit/ItBitExchange.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/itbit/ItBitExchange.java index b46ded1..e71afbe 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/itbit/ItBitExchange.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/exchanges/itbit/ItBitExchange.java @@ -20,7 +20,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.itbit; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.XChangeExchange; import org.knowm.xchange.ExchangeSpecification; import org.knowm.xchange.dto.account.AccountInfo; @@ -59,16 +60,16 @@ public class ItBitExchange extends XChangeExchange { @Override public Set getCryptoCurrencies() { Set cryptoCurrencies = new HashSet<>(); - cryptoCurrencies.add(ICurrencies.BTC); + cryptoCurrencies.add(Currencies.BTC); return cryptoCurrencies; } @Override public Set getFiatCurrencies() { Set fiatCurrencies = new HashSet<>(); - fiatCurrencies.add(ICurrencies.USD); - fiatCurrencies.add(ICurrencies.EUR); - fiatCurrencies.add(ICurrencies.SGD); + fiatCurrencies.add(Currencies.USD); + fiatCurrencies.add(Currencies.EUR); + fiatCurrencies.add(Currencies.SGD); return fiatCurrencies; } @@ -89,7 +90,7 @@ public class ItBitExchange extends XChangeExchange { @Override protected String translateCryptoCurrencySymbolToExchangeSpecificSymbol(String from) { - if (ICurrencies.BTC.equalsIgnoreCase(from)) { + if (Currencies.BTC.equalsIgnoreCase(from)) { return "XBT"; } return from; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/bitcoinpay/BitcoinPayPP.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/bitcoinpay/BitcoinPayPP.java index 417c135..fce1e23 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/bitcoinpay/BitcoinPayPP.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/bitcoinpay/BitcoinPayPP.java @@ -18,7 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.paymentprocessors.bitcoinpay; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IPaymentProcessor; import com.generalbytes.batm.server.extensions.IPaymentProcessorPaymentResponse; import com.generalbytes.batm.server.extensions.IPaymentProcessorPaymentStatus; @@ -169,7 +170,7 @@ public class BitcoinPayPP implements IPaymentProcessor{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); + result.add(Currencies.BTC); return result; } @@ -177,9 +178,9 @@ public class BitcoinPayPP implements IPaymentProcessor{ @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); - result.add(ICurrencies.CZK); + result.add(Currencies.USD); + result.add(Currencies.EUR); + result.add(Currencies.CZK); return result; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/coinofsale/CoinOfSalePP.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/coinofsale/CoinOfSalePP.java index 8416830..1708a12 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/coinofsale/CoinOfSalePP.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/paymentprocessors/coinofsale/CoinOfSalePP.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.paymentprocessors.coinofsale; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IPaymentProcessor; import com.generalbytes.batm.server.extensions.IPaymentProcessorPaymentResponse; import com.generalbytes.batm.server.extensions.IPaymentProcessorPaymentStatus; @@ -43,16 +44,16 @@ public class CoinOfSalePP implements IPaymentProcessor { @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); + result.add(Currencies.BTC); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); - result.add(ICurrencies.CZK); + result.add(Currencies.USD); + result.add(Currencies.EUR); + result.add(Currencies.CZK); return result; } @@ -60,7 +61,7 @@ public class CoinOfSalePP implements IPaymentProcessor { public IPaymentProcessorPaymentResponse requestPayment(BigDecimal amount, String currency, String settledCurrency, String reference) { CoSPaymentResponseDTO res = api.createPayment(token, pin, amount, currency); if (res != null) { - return new COSPPResponse(res.getAddress(),res.getBitcoin_price(),ICurrencies.BTC,res.getFiat_price(),res.getFiat_currency(),res.getAddress(),reference); + return new COSPPResponse(res.getAddress(),res.getBitcoin_price(),Currencies.BTC,res.getFiat_price(),res.getFiat_currency(),res.getAddress(),reference); } return null; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/FixPriceRateSource.java index 6bcebde..ea5a260 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/FixPriceRateSource.java @@ -18,7 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -27,29 +28,29 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); + result.add(Currencies.BTC); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.BTC.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -58,8 +59,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/bity/BityRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/bity/BityRateSource.java index d1736cd..c05e7ab 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/bity/BityRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/bity/BityRateSource.java @@ -19,7 +19,8 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.sources.bity; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSourceAdvanced; import com.generalbytes.batm.server.extensions.extra.bitcoin.sources.bity.dto.RateInfo; import si.mazi.rescu.RestProxyFactory; @@ -37,14 +38,14 @@ public class BityRateSource implements IRateSourceAdvanced{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); + result.add(Currencies.BTC); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.CHF); + result.add(Currencies.CHF); return result; } @@ -55,7 +56,7 @@ public class BityRateSource implements IRateSourceAdvanced{ @Override public String getPreferredFiatCurrency() { - return ICurrencies.CHF; + return Currencies.CHF; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/mrcoin/MrCoinRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/mrcoin/MrCoinRateSource.java index 9b20e58..f5c6ca9 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/mrcoin/MrCoinRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/sources/mrcoin/MrCoinRateSource.java @@ -20,7 +20,8 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.sources.mrcoin; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSourceAdvanced; import com.generalbytes.batm.server.extensions.extra.bitcoin.sources.mrcoin.dto.RateInfo; import si.mazi.rescu.RestProxyFactory; @@ -38,16 +39,16 @@ public class MrCoinRateSource implements IRateSourceAdvanced{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.ETH); + result.add(Currencies.BTC); + result.add(Currencies.ETH); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.EUR); - result.add(ICurrencies.HUF); + result.add(Currencies.EUR); + result.add(Currencies.HUF); return result; } @@ -58,7 +59,7 @@ public class MrCoinRateSource implements IRateSourceAdvanced{ @Override public String getPreferredFiatCurrency() { - return ICurrencies.HUF; + return Currencies.HUF; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcoind/BATMBitcoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcoind/BATMBitcoindRPCWallet.java index 8f1e223..bfd6879 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcoind/BATMBitcoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcoind/BATMBitcoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.bitcoind; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ import java.util.Set; public class BATMBitcoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(BATMBitcoindRPCWallet.class); - private String cryptoCurrency = ICurrencies.BTC; + private String cryptoCurrency = Currencies.BTC; private String accountName; private BitcoinJSONRPCClient client; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcore/BitcoreWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcore/BitcoreWallet.java index 5f98fa2..93af884 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcore/BitcoreWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcoin/wallets/bitcore/BitcoreWallet.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.bitcoin.wallets.bitcore; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,12 +93,12 @@ public class BitcoreWallet implements IWallet { @Override public Set getCryptoCurrencies() { HashSet s = new HashSet(); - s.add(ICurrencies.BTC); + s.add(Currencies.BTC); return s; } @Override public String getPreferredCryptoCurrency() { - return ICurrencies.BTC; + return Currencies.BTC; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/BitcoreExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/BitcoreExtension.java index 73bf0b5..734f975 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/BitcoreExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/BitcoreExtension.java @@ -69,7 +69,7 @@ public class BitcoreExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.BTX.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.BTX.equalsIgnoreCase(cryptoCurrency)) { return new BitcoreAddressValidator(); } return null; @@ -94,7 +94,7 @@ public class BitcoreExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -113,7 +113,7 @@ public class BitcoreExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTX); + result.add(Currencies.BTX); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/sources/FixPriceRateSource.java index 1e8fa39..7ba2886 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/sources/FixPriceRateSource.java @@ -1,6 +1,6 @@ package com.generalbytes.batm.server.extensions.extra.bitcore.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -10,28 +10,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTX); + result.add(Currencies.BTX); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.BTX.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.BTX.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -40,8 +40,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/wallets/bitcored/BitcoredRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/wallets/bitcored/BitcoredRPCWallet.java index ab6d54a..235f4cc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/wallets/bitcored/BitcoredRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/bitcore/wallets/bitcored/BitcoredRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.bitcore.wallets.bitcored; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class BitcoredRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(BitcoredRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.BTX; + private static final String CRYPTO_CURRENCY = Currencies.BTX; public BitcoredRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/DashExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/DashExtension.java index 8029d6d..fb1a3e0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/DashExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/DashExtension.java @@ -77,7 +77,7 @@ public class DashExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.DASH.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.DASH.equalsIgnoreCase(cryptoCurrency)) { return new DashAddressValidator(); } return null; @@ -97,7 +97,7 @@ public class DashExtension implements IExtension{ if (st.hasMoreTokens()) { return new CryptodiggersRateSource(st.nextToken().toUpperCase()); } - return new CryptodiggersRateSource(ICurrencies.USD); + return new CryptodiggersRateSource(Currencies.USD); } else if ("dashfix".equalsIgnoreCase(exchangeType)) { BigDecimal rate = BigDecimal.ZERO; if (st.hasMoreTokens()) { @@ -106,13 +106,13 @@ public class DashExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } return new FixPriceRateSource(rate, preferedFiatCurrency); } else if ("coinmarketcap".equalsIgnoreCase(exchangeType)) { - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -125,13 +125,13 @@ public class DashExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.BTX); - result.add(ICurrencies.BCH); - result.add(ICurrencies.LTC); - result.add(ICurrencies.XMR); - result.add(ICurrencies.DASH); - result.add(ICurrencies.POT); + result.add(Currencies.BTC); + result.add(Currencies.BTX); + result.add(Currencies.BCH); + result.add(Currencies.LTC); + result.add(Currencies.XMR); + result.add(Currencies.DASH); + result.add(Currencies.POT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/FixPriceRateSource.java index 5be08e8..80e07b5 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.dash.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.DASH); + result.add(Currencies.DASH); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.DASH.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.DASH.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/cddash/CryptodiggersRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/cddash/CryptodiggersRateSource.java index 7544c87..e1d1882 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/cddash/CryptodiggersRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/cddash/CryptodiggersRateSource.java @@ -17,8 +17,9 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.dash.sources.cddash; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.extra.dash.sources.cddash.*; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,16 +40,16 @@ public class CryptodiggersRateSource implements IRateSource{ private static HashMap rateTimes = new HashMap(); private static final long MAXIMUM_ALLOWED_TIME_OFFSET = 30 * 1000; //30sec - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; private ICryptodiggersRateAPI api; public CryptodiggersRateSource(String preferedFiatCurrency) { this(); - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @@ -70,16 +71,16 @@ public class CryptodiggersRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.DASH.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.DASH.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } String key = cryptoCurrency +"_" + fiatCurrency; synchronized (rateAmounts) { - + long now = System.currentTimeMillis(); BigDecimal amount = rateAmounts.get(key); if (amount == null) { @@ -108,16 +109,16 @@ public class CryptodiggersRateSource implements IRateSource{ private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { String cd_fiatCurrency; cd_fiatCurrency="2"; - if(ICurrencies.USD.equalsIgnoreCase(fiatCurrency)){ + if(Currencies.USD.equalsIgnoreCase(fiatCurrency)){ cd_fiatCurrency="2"; } - if(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency)){ + if(Currencies.EUR.equalsIgnoreCase(fiatCurrency)){ cd_fiatCurrency="1"; } - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.DASH.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.DASH.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } CryptodiggersResponse ticker = api.getTicker("19",cd_fiatCurrency); @@ -135,16 +136,16 @@ public class CryptodiggersRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - //result.add(ICurrencies.BTC); - result.add(ICurrencies.DASH); + //result.add(Currencies.BTC); + result.add(Currencies.DASH); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java index 1573f17..823df81 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -16,15 +17,15 @@ import si.mazi.rescu.RestProxyFactory; public class CoinmarketcapRateSource implements IRateSource { private ICoinmarketcapAPI api; - private String preferredFiatCurrency = ICurrencies.USD; + private String preferredFiatCurrency = Currencies.USD; public CoinmarketcapRateSource(String preferedFiatCurrency) { this(); - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferredFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferredFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferredFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferredFiatCurrency = Currencies.USD; } } @@ -35,29 +36,31 @@ public class CoinmarketcapRateSource implements IRateSource { @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.BCH); - result.add(ICurrencies.BTX); - result.add(ICurrencies.LTC); - result.add(ICurrencies.ETH); - result.add(ICurrencies.DASH); - result.add(ICurrencies.XMR); - result.add(ICurrencies.POT); + result.add(Currencies.BTC); + result.add(Currencies.BCH); + result.add(Currencies.BTX); + result.add(Currencies.LTC); + result.add(Currencies.ETH); + result.add(Currencies.DASH); + result.add(Currencies.XMR); + result.add(Currencies.POT); + result.add(Currencies.FLASH); + return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override public String getPreferredFiatCurrency() { - return ICurrencies.USD; + return Currencies.USD; } @@ -66,11 +69,16 @@ public class CoinmarketcapRateSource implements IRateSource { if (!getFiatCurrencies().contains(fiatCurrency)) { return null; } - CMCTicker[] tickers = api.getTickers(fiatCurrency); + CMCTicker[] tickers; + if(Currencies.FLASH.equalsIgnoreCase(cryptoCurrency)){ + tickers = api.getTickers(cryptoCurrency,fiatCurrency); + }else + tickers = api.getTickers(fiatCurrency); + for (int i = 0; i < tickers.length; i++) { CMCTicker ticker = tickers[i]; if (cryptoCurrency.equalsIgnoreCase(ticker.getSymbol())) { - if (ICurrencies.EUR.equalsIgnoreCase(fiatCurrency)) { + if (Currencies.EUR.equalsIgnoreCase(fiatCurrency)) { return ticker.getPrice_eur(); }else{ return ticker.getPrice_usd(); @@ -81,8 +89,8 @@ public class CoinmarketcapRateSource implements IRateSource { } // public static void main(String[] args) { -// CoinmarketcapRateSource rs = new CoinmarketcapRateSource(ICurrencies.EUR); -// BigDecimal exchangeRateLast = rs.getExchangeRateLast(ICurrencies.BTC, ICurrencies.EUR); +// CoinmarketcapRateSource rs = new CoinmarketcapRateSource(Currencies.EUR); +// BigDecimal exchangeRateLast = rs.getExchangeRateLast(Currencies.BTC, Currencies.EUR); // System.out.println("exchangeRateLast = " + exchangeRateLast); // } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java index 798e2b6..230136f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java @@ -17,10 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @Path("/v1/ticker") @@ -29,4 +26,8 @@ public interface ICoinmarketcapAPI { @GET @Path("/") CMCTicker[] getTickers(@QueryParam("convert") String fiatCurrency); + + @GET + @Path("/{cryptoToGet}/?convert={convert}") + CMCTicker[] getTickers(@PathParam("cryptoToGet") String cryptoToGet,@QueryParam("convert") String fiatCurrency); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/wallets/dashd/DashRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/wallets/dashd/DashRPCWallet.java index 2ba3d32..d96e749 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/wallets/dashd/DashRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/wallets/dashd/DashRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.dash.wallets.dashd; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class DashRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(DashRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.DASH; + private static final String CRYPTO_CURRENCY = Currencies.DASH; public DashRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dexacoin/DexCoinSupport.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dexacoin/DexCoinSupport.java index 45f8bef..c489fd3 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dexacoin/DexCoinSupport.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dexacoin/DexCoinSupport.java @@ -10,7 +10,7 @@ import java.util.StringTokenizer; public class DexCoinSupport implements IExchange, IWallet, IRateSource, IExtension, ICryptoAddressValidator { - private static final String CRYPTO_CURRENCY = ICurrencies.DEX; + private static final String CRYPTO_CURRENCY = Currencies.DEX; private static final BigDecimal WALLET_BALANCE = new BigDecimal("1000000"); private static final BigDecimal EXCHANGE_BALANCE = new BigDecimal("2000000"); private static final String WALLET_ADDRESS = CRYPTO_CURRENCY.substring(1) + "GnubsaWBQf6J2TTvNLF5xLkMydhTjWsQi"; @@ -24,11 +24,11 @@ public class DexCoinSupport implements IExchange, IWallet, IRateSource, IExtensi public DexCoinSupport(String preferredFiatCurrency, BigDecimal rate) { this.rate = rate; this.preferredFiatCurrency = preferredFiatCurrency; - if (ICurrencies.EUR.equalsIgnoreCase(preferredFiatCurrency)) { - this.preferredFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferredFiatCurrency)) { + this.preferredFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferredFiatCurrency)) { - this.preferredFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferredFiatCurrency)) { + this.preferredFiatCurrency = Currencies.USD; } } @@ -135,7 +135,7 @@ public class DexCoinSupport implements IExchange, IWallet, IRateSource, IExtensi } catch (Throwable e) { } } - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken().toUpperCase(); } @@ -172,7 +172,7 @@ public class DexCoinSupport implements IExchange, IWallet, IRateSource, IExtensi } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/DogecoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/DogecoinExtension.java index 59fd9ac..a39e829 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/DogecoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/DogecoinExtension.java @@ -84,7 +84,7 @@ public class DogecoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { return new DogecoinAddressValidator(); } return null; @@ -111,7 +111,7 @@ public class DogecoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -124,7 +124,7 @@ public class DogecoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.DOGE); + result.add(Currencies.DOGE); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/FixPriceRateSource.java index 608529f..1057a51 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.dogecoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.DOGE); + result.add(Currencies.DOGE); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/chainso/ChainSoRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/chainso/ChainSoRateSource.java index 74c3823..29896a0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/chainso/ChainSoRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/sources/chainso/ChainSoRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.dogecoin.sources.chainso; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +31,10 @@ public class ChainSoRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrency)) { + if (!Currencies.USD.equalsIgnoreCase(fiatCurrency)) { return null; } @@ -65,10 +66,10 @@ public class ChainSoRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.DOGE.equalsIgnoreCase(cryptoCurrency)) { return null; } - if (!ICurrencies.USD.equalsIgnoreCase(fiatCurrency)) { + if (!Currencies.USD.equalsIgnoreCase(fiatCurrency)) { return null; } @@ -88,19 +89,19 @@ public class ChainSoRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.DOGE); + result.add(Currencies.DOGE); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); + result.add(Currencies.USD); return result; } @Override public String getPreferredFiatCurrency() { - return ICurrencies.USD; + return Currencies.USD; } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/blockio/BlockIOWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/blockio/BlockIOWallet.java index 524d303..9fd6152 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/blockio/BlockIOWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/blockio/BlockIOWallet.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.dogecoin.wallets.blockio; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import si.mazi.rescu.RestProxyFactory; @@ -44,15 +45,15 @@ public class BlockIOWallet implements IWallet { @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.LTC); - result.add(ICurrencies.DOGE); + result.add(Currencies.BTC); + result.add(Currencies.LTC); + result.add(Currencies.DOGE); return result; } @Override public String getPreferredCryptoCurrency() { - return ICurrencies.BTC; + return Currencies.BTC; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/dogecoind/DogecoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/dogecoind/DogecoindRPCWallet.java index f4be616..bfec97a 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/dogecoind/DogecoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dogecoin/wallets/dogecoind/DogecoindRPCWallet.java @@ -19,7 +19,8 @@ package com.generalbytes.batm.server.extensions.extra.dogecoin.wallets.dogecoind import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,7 @@ import java.util.Set; public class DogecoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(DogecoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.DOGE; + private static final String CRYPTO_CURRENCY = Currencies.DOGE; public DogecoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/FlashcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/FlashcoinExtension.java index 6ffd330..700fdea 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/FlashcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/FlashcoinExtension.java @@ -71,7 +71,7 @@ public class FlashcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { return new FlashcoinAddressValidator(); } return null; @@ -94,13 +94,13 @@ public class FlashcoinExtension implements IExtension{ String exchangeType = st.nextToken(); if ("cryptopia".equalsIgnoreCase(exchangeType)) { - String preferredFiatCurrency = ICurrencies.BTC; + String preferredFiatCurrency = Currencies.BTC; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken(); } return new CryptopiaRateSource(preferredFiatCurrency); }else if ("coinexchange".equalsIgnoreCase(exchangeType)) { - String preferredFiatCurrency = ICurrencies.BTC; + String preferredFiatCurrency = Currencies.BTC; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken(); } @@ -115,7 +115,7 @@ public class FlashcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -128,7 +128,7 @@ public class FlashcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.FLASH); + result.add(Currencies.FLASH); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/FixPriceRateSource.java index 062c9db..6830abc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.flashcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.FLASH); + result.add(Currencies.FLASH); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/coinexchange/CoinexchangeRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/coinexchange/CoinexchangeRateSource.java index ea551db..d33609c 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/coinexchange/CoinexchangeRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/coinexchange/CoinexchangeRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.flashcoin.sources.coinexchange; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,7 @@ public class CoinexchangeRateSource implements IRateSource { public CoinexchangeRateSource(String preferedFiatCurrency) { if (!getFiatCurrencies().contains(preferedFiatCurrency)) { - preferedFiatCurrency = ICurrencies.BTC; + preferedFiatCurrency = Currencies.BTC; } this.preferedFiatCurrency = preferedFiatCurrency; @@ -38,15 +39,15 @@ public class CoinexchangeRateSource implements IRateSource { @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.FLASH); + result.add(Currencies.FLASH); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - // result.add(ICurrencies.LTC); + result.add(Currencies.BTC); + // result.add(Currencies.LTC); return result; } @@ -92,13 +93,13 @@ public class CoinexchangeRateSource implements IRateSource { } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { return null; //unsupported currency } String key = null; switch(fiatCurrency){ - case ICurrencies.BTC: + case Currencies.BTC: key = "684"; break; default: @@ -113,7 +114,7 @@ public class CoinexchangeRateSource implements IRateSource { return null; } public static void main(String[] args) { - CoinexchangeRateSource rs = new CoinexchangeRateSource(ICurrencies.BTC); - BigDecimal exchangeRateLast = rs.getExchangeRateLast(ICurrencies.FLASH, ICurrencies.BTC); + CoinexchangeRateSource rs = new CoinexchangeRateSource(Currencies.BTC); + BigDecimal exchangeRateLast = rs.getExchangeRateLast(Currencies.FLASH, Currencies.BTC); } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/cryptopia/CryptopiaRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/cryptopia/CryptopiaRateSource.java index ff0d229..9205dbd 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/cryptopia/CryptopiaRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/sources/cryptopia/CryptopiaRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.flashcoin.sources.cryptopia; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,7 @@ public class CryptopiaRateSource implements IRateSource { public CryptopiaRateSource(String preferedFiatCurrency) { if (!getFiatCurrencies().contains(preferedFiatCurrency)) { - preferedFiatCurrency = ICurrencies.BTC; + preferedFiatCurrency = Currencies.BTC; } this.preferedFiatCurrency = preferedFiatCurrency; @@ -38,15 +39,15 @@ public class CryptopiaRateSource implements IRateSource { @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.FLASH); + result.add(Currencies.FLASH); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - // result.add(ICurrencies.LTC); + result.add(Currencies.BTC); + // result.add(Currencies.LTC); return result; } @@ -92,7 +93,7 @@ public class CryptopiaRateSource implements IRateSource { } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.FLASH.equalsIgnoreCase(cryptoCurrency)) { return null; //unsupported currency } String key = cryptoCurrency +"_" + fiatCurrency; @@ -104,10 +105,10 @@ public class CryptopiaRateSource implements IRateSource { return null; } public static void main(String[] args) { - CryptopiaRateSource rs = new CryptopiaRateSource(ICurrencies.BTC); - BigDecimal exchangeRateLast = rs.getExchangeRateLast(ICurrencies.FLASH, ICurrencies.BTC); + CryptopiaRateSource rs = new CryptopiaRateSource(Currencies.BTC); + BigDecimal exchangeRateLast = rs.getExchangeRateLast(Currencies.FLASH, Currencies.BTC); System.out.println("BTC exchangeRateLast = " + exchangeRateLast); - exchangeRateLast = rs.getExchangeRateLast(ICurrencies.FLASH, ICurrencies.LTC); + exchangeRateLast = rs.getExchangeRateLast(Currencies.FLASH, Currencies.LTC); System.out.println("LTC exchangeRateLast = " + exchangeRateLast); } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/wallets/flashcoind/FlashcoinRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/wallets/flashcoind/FlashcoinRPCWallet.java index 3876027..04a69f3 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/wallets/flashcoind/FlashcoinRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/flashcoin/wallets/flashcoind/FlashcoinRPCWallet.java @@ -20,7 +20,7 @@ package com.generalbytes.batm.server.extensions.extra.flashcoin.wallets.flashcoi import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ import java.util.Set; public class FlashcoinRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(FlashcoinRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.FLASH; + private static final String CRYPTO_CURRENCY = Currencies.FLASH; public FlashcoinRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/GroestlcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/GroestlcoinExtension.java index 795d32b..d276a1d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/GroestlcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/GroestlcoinExtension.java @@ -70,7 +70,7 @@ public class GroestlcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.GRS.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.GRS.equalsIgnoreCase(cryptoCurrency)) { return new GroestlcoinAddressValidator(); } return null; @@ -95,7 +95,7 @@ public class GroestlcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -119,7 +119,7 @@ public class GroestlcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.GRS); + result.add(Currencies.GRS); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/FixPriceRateSource.java index 688b673..86526ea 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.groestlcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.GRS); + result.add(Currencies.GRS); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.GRS.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.GRS.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,7 +44,7 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.EUR); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/GroestlcoinTickerRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/GroestlcoinTickerRateSource.java index 2667caf..ad0c9e6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/GroestlcoinTickerRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/sources/GroestlcoinTickerRateSource.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.groestlcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,10 +44,10 @@ public class GroestlcoinTickerRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.GRS.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.GRS.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } @@ -78,15 +79,15 @@ public class GroestlcoinTickerRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.GRS.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.GRS.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } GroestlcoinTickerResponse ticker = api.getTicker(); if (ticker != null && ticker.getEUR() != null) { - if (ICurrencies.EUR.equalsIgnoreCase(fiatCurrency)){ + if (Currencies.EUR.equalsIgnoreCase(fiatCurrency)){ return ticker.getEUR().getSell15m(); } return null; @@ -97,20 +98,20 @@ public class GroestlcoinTickerRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.GRS); + result.add(Currencies.GRS); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.EUR); + result.add(Currencies.EUR); return result; } @Override public String getPreferredFiatCurrency() { - return ICurrencies.EUR; + return Currencies.EUR; } public static void main(String[] args) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/wallets/groestlcoind/GroestlcoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/wallets/groestlcoind/GroestlcoindRPCWallet.java index 6d52774..ae28b21 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/wallets/groestlcoind/GroestlcoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/groestlcoin/wallets/groestlcoind/GroestlcoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.groestlcoin.wallets.groest import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class GroestlcoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(GroestlcoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.GRS; + private static final String CRYPTO_CURRENCY = Currencies.GRS; public GroestlcoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/GuldenExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/GuldenExtension.java index e22644f..61c3960 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/GuldenExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/GuldenExtension.java @@ -70,7 +70,7 @@ public class GuldenExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.NLG.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NLG.equalsIgnoreCase(cryptoCurrency)) { return new GuldenAddressValidator(); } return null; @@ -95,7 +95,7 @@ public class GuldenExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -119,7 +119,7 @@ public class GuldenExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NLG); + result.add(Currencies.NLG); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/FixPriceRateSource.java index 0a7d6a0..e0dbdf6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.gulden.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NLG); + result.add(Currencies.NLG); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.NLG.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NLG.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,7 +44,7 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.EUR); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/GuldenTickerRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/GuldenTickerRateSource.java index 3bc3703..2c023bb 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/GuldenTickerRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/sources/GuldenTickerRateSource.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.gulden.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,10 +44,10 @@ public class GuldenTickerRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.NLG.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.NLG.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } @@ -78,15 +79,15 @@ public class GuldenTickerRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.NLG.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.NLG.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } GuldenTickerResponse ticker = api.getTicker(); if (ticker != null && ticker.getEUR() != null) { - if (ICurrencies.EUR.equalsIgnoreCase(fiatCurrency)){ + if (Currencies.EUR.equalsIgnoreCase(fiatCurrency)){ return ticker.getEUR().getSell15m(); } return null; @@ -97,20 +98,20 @@ public class GuldenTickerRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NLG); + result.add(Currencies.NLG); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.EUR); + result.add(Currencies.EUR); return result; } @Override public String getPreferredFiatCurrency() { - return ICurrencies.EUR; + return Currencies.EUR; } public static void main(String[] args) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/wallets/guldend/GuldendRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/wallets/guldend/GuldendRPCWallet.java index 60a10b1..0164d0d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/wallets/guldend/GuldendRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/gulden/wallets/guldend/GuldendRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.gulden.wallets.guldend; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class GuldendRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(GuldendRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.NLG; + private static final String CRYPTO_CURRENCY = Currencies.NLG; public GuldendRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/LeocoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/LeocoinExtension.java index 78cc8c6..e736f2b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/LeocoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/LeocoinExtension.java @@ -69,7 +69,7 @@ public class LeocoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.LEO.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.LEO.equalsIgnoreCase(cryptoCurrency)) { return new LeocoinAddressValidator(); } return null; @@ -94,7 +94,7 @@ public class LeocoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -114,7 +114,7 @@ public class LeocoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.LEO); + result.add(Currencies.LEO); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/sources/FixPriceRateSource.java index a1a9c43..6335801 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.leocoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.LEO); + result.add(Currencies.LEO); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.LEO.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.LEO.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/wallets/leocoind/LeocoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/wallets/leocoind/LeocoindRPCWallet.java index 53b08cd..221c105 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/wallets/leocoind/LeocoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/leocoin/wallets/leocoind/LeocoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.leocoin.wallets.leocoind; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class LeocoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(LeocoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.LEO; + private static final String CRYPTO_CURRENCY = Currencies.LEO; public LeocoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/LitecoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/LitecoinExtension.java index d87634f..f8da48e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/LitecoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/LitecoinExtension.java @@ -68,7 +68,7 @@ public class LitecoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.LTC.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.LTC.equalsIgnoreCase(cryptoCurrency)) { return new LitecoinAddressValidator(); } return null; @@ -103,7 +103,7 @@ public class LitecoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -116,7 +116,7 @@ public class LitecoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.LTC); + result.add(Currencies.LTC); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/FixPriceRateSource.java index 1008354..636566f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.litecoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; - } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + for (String fiatCurrency : Currencies.FIAT_CURRENCIES) { + if (fiatCurrency.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = fiatCurrency; + break; + } } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.LTC); + result.add(Currencies.LTC); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.LTC.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.LTC.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/btce/BTCeRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/btce/BTCeRateSource.java index 6de2673..62c01c3 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/btce/BTCeRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/sources/btce/BTCeRateSource.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.litecoin.sources.btce; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,16 +34,16 @@ public class BTCeRateSource implements IRateSource{ private static HashMap rateTimes = new HashMap(); private static final long MAXIMUM_ALLOWED_TIME_OFFSET = 30 * 1000; //30sec - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; private IBTCeRateAPI api; public BTCeRateSource(String preferedFiatCurrency) { this(); - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @@ -52,10 +53,10 @@ public class BTCeRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.LTC.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.LTC.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } @@ -87,10 +88,10 @@ public class BTCeRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.LTC.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.LTC.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } BTCeResponse ticker = api.getTicker(cryptoCurrency.toLowerCase(), fiatCurrency.toLowerCase()); @@ -103,16 +104,16 @@ public class BTCeRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.BTC); - result.add(ICurrencies.LTC); + result.add(Currencies.BTC); + result.add(Currencies.LTC); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/wallets/litecoind/LitecoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/wallets/litecoind/LitecoindRPCWallet.java index c197967..8e66fe1 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/wallets/litecoind/LitecoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/litecoin/wallets/litecoind/LitecoindRPCWallet.java @@ -19,7 +19,8 @@ package com.generalbytes.batm.server.extensions.extra.litecoin.wallets.litecoind import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,7 @@ import java.util.Set; public class LitecoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(LitecoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.LTC; + private static final String CRYPTO_CURRENCY = Currencies.LTC; public LitecoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/MaxcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/MaxcoinExtension.java index d0546e1..dd3c07e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/MaxcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/MaxcoinExtension.java @@ -70,7 +70,7 @@ public class MaxcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.MAX.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.MAX.equalsIgnoreCase(cryptoCurrency)) { return new MaxcoinAddressValidator(); } return null; @@ -97,7 +97,7 @@ public class MaxcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -116,7 +116,7 @@ public class MaxcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.MAX); + result.add(Currencies.MAX); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/FixPriceRateSource.java index 30ea65e..d3165bf 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.maxcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.MAX); + result.add(Currencies.MAX); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.MAX.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.MAX.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/MaxcoinTickerRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/MaxcoinTickerRateSource.java index d00fbd2..28d6070 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/MaxcoinTickerRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/sources/MaxcoinTickerRateSource.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.maxcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,10 +44,10 @@ public class MaxcoinTickerRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.MAX.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.MAX.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } @@ -78,17 +79,17 @@ public class MaxcoinTickerRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.MAX.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.MAX.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } MaxcoinTickerResponse ticker = api.getTicker(); if (ticker != null) { - if (ICurrencies.USD.equalsIgnoreCase(fiatCurrency)){ + if (Currencies.USD.equalsIgnoreCase(fiatCurrency)){ return ticker.getMpusd(); - }else if (ICurrencies.USD.equalsIgnoreCase(fiatCurrency)){ + }else if (Currencies.USD.equalsIgnoreCase(fiatCurrency)){ return ticker.getBtceuro(); } return null; @@ -99,26 +100,26 @@ public class MaxcoinTickerRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.MAX); + result.add(Currencies.MAX); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override public String getPreferredFiatCurrency() { - return ICurrencies.USD; + return Currencies.USD; } public static void main(String[] args) { MaxcoinTickerRateSource rs = new MaxcoinTickerRateSource(); - BigDecimal exchangeRateLast = rs.getExchangeRateLast(ICurrencies.MAX, ICurrencies.USD); + BigDecimal exchangeRateLast = rs.getExchangeRateLast(Currencies.MAX, Currencies.USD); System.out.println("exchangeRateLast = " + exchangeRateLast); } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/wallets/maxcoind/MaxcoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/wallets/maxcoind/MaxcoindRPCWallet.java index 9a369ac..2ad666b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/wallets/maxcoind/MaxcoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/maxcoin/wallets/maxcoind/MaxcoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.maxcoin.wallets.maxcoind; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class MaxcoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(MaxcoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.MAX; + private static final String CRYPTO_CURRENCY = Currencies.MAX; public MaxcoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/NubitsExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/NubitsExtension.java index a9d9773..b2d98ea 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/NubitsExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/NubitsExtension.java @@ -1,7 +1,6 @@ package com.generalbytes.batm.server.extensions.extra.nubits; import com.generalbytes.batm.server.extensions.*; -import com.generalbytes.batm.server.extensions.extra.nubits.NubitsAddressValidator; import com.generalbytes.batm.server.extensions.extra.nubits.sources.FixPriceRateSource; import com.generalbytes.batm.server.extensions.extra.nubits.wallets.nud.NubitsRPCWallet; import com.generalbytes.batm.server.extensions.watchlist.IWatchList; @@ -52,7 +51,7 @@ public class NubitsExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.NBT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NBT.equalsIgnoreCase(cryptoCurrency)) { return new NubitsAddressValidator(); } return null; @@ -77,7 +76,7 @@ public class NubitsExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -96,7 +95,7 @@ public class NubitsExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NBT); + result.add(Currencies.NBT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/sources/FixPriceRateSource.java index d271f9d..b1ba457 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.nubits.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NBT); + result.add(Currencies.NBT); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.NBT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NBT.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/wallets/nud/NubitsRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/wallets/nud/NubitsRPCWallet.java index ce8dc54..dce15dc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/wallets/nud/NubitsRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nubits/wallets/nud/NubitsRPCWallet.java @@ -2,7 +2,7 @@ package com.generalbytes.batm.server.extensions.extra.nubits.wallets.nud; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,7 @@ import java.util.Set; */ public class NubitsRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(NubitsRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.NBT; + private static final String CRYPTO_CURRENCY = Currencies.NBT; public NubitsRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/NXTExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/NXTExtension.java index 3ba1862..bc81d89 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/NXTExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/NXTExtension.java @@ -64,7 +64,7 @@ public class NXTExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.NXT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NXT.equalsIgnoreCase(cryptoCurrency)) { return new NXTAddressValidator(); } return null; @@ -89,13 +89,13 @@ public class NXTExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } return new FixPriceRateSource(rate,preferedFiatCurrency); }else if ("poloniexrs".equalsIgnoreCase(rsType)) { - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken(); } @@ -114,7 +114,7 @@ public class NXTExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NXT); + result.add(Currencies.NXT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/FixPriceRateSource.java index a0e3dad..257b960 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/FixPriceRateSource.java @@ -18,7 +18,7 @@ package com.generalbytes.batm.server.extensions.extra.nxt.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -28,28 +28,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate, String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NXT); + result.add(Currencies.NXT); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.NXT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.NXT.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -58,8 +58,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/poloniex/PoloniexRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/poloniex/PoloniexRateSource.java index c89abbf..ac0cf75 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/poloniex/PoloniexRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/sources/poloniex/PoloniexRateSource.java @@ -17,7 +17,8 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.nxt.sources.poloniex; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitfinex.BitfinexExchange; import org.slf4j.Logger; @@ -42,7 +43,7 @@ public class PoloniexRateSource implements IRateSource{ public PoloniexRateSource(String preferedFiatCurrency) { if (preferedFiatCurrency == null) { - preferedFiatCurrency = ICurrencies.USD; + preferedFiatCurrency = Currencies.USD; } this.preferedFiatCurrency = preferedFiatCurrency; btcRs = new BitfinexExchange("***","***"); @@ -62,14 +63,14 @@ public class PoloniexRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NXT); + result.add(Currencies.NXT); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.NXT.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.NXT.equalsIgnoreCase(cryptoCurrency)) { return null; } String key = cryptoCurrency +"_" + fiatCurrency; @@ -100,7 +101,7 @@ public class PoloniexRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.NXT.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.NXT.equalsIgnoreCase(cryptoCurrency)) { return null; //unsupported currency } OrderBookResponse orderBookResponse = api.returnOrderBook("returnOrderBook", "BTC_NXT", 10000); @@ -122,7 +123,7 @@ public class PoloniexRateSource implements IRateSource{ // System.out.println("tradableLimit = " + tradableLimit);; if (tradableLimit != null) { - BigDecimal btcRate = btcRs.getExchangeRateLast(ICurrencies.BTC, fiatCurrency); + BigDecimal btcRate = btcRs.getExchangeRateLast(Currencies.BTC, fiatCurrency); if (btcRate != null) { return btcRate.multiply(tradableLimit); } @@ -134,7 +135,7 @@ public class PoloniexRateSource implements IRateSource{ } public static void main(String[] args) { - PoloniexRateSource rs = new PoloniexRateSource(ICurrencies.USD); - System.out.println("rs = " + rs.getExchangeRateLast(ICurrencies.NXT,ICurrencies.USD)); + PoloniexRateSource rs = new PoloniexRateSource(Currencies.USD); + System.out.println("rs = " + rs.getExchangeRateLast(Currencies.NXT,Currencies.USD)); } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/wallets/mynxt/MynxtWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/wallets/mynxt/MynxtWallet.java index 2a12047..0542ffe 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/wallets/mynxt/MynxtWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/nxt/wallets/mynxt/MynxtWallet.java @@ -18,7 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.nxt.wallets.mynxt; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import com.generalbytes.batm.server.extensions.extra.nxt.NXTAddressValidator; import com.generalbytes.batm.server.extensions.extra.nxt.wallets.mynxt.dto.*; @@ -53,13 +54,13 @@ public class MynxtWallet implements IWallet{ @Override public String getPreferredCryptoCurrency() { - return ICurrencies.NXT; + return Currencies.NXT; } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.NXT); + result.add(Currencies.NXT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/PotcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/PotcoinExtension.java index 274b0e6..d9e3a5a 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/PotcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/PotcoinExtension.java @@ -40,7 +40,7 @@ public class PotcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.POT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.POT.equalsIgnoreCase(cryptoCurrency)) { return new PotcoinAddressValidator(); } return null; @@ -70,7 +70,7 @@ public class PotcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.CAD; + String preferedFiatCurrency = Currencies.CAD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -84,7 +84,7 @@ public class PotcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.POT); + result.add(Currencies.POT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/sources/FixPriceRateSource.java index 6ed0301..616baf5 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.potcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -10,28 +11,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.CAD; + private String preferedFiatCurrency = Currencies.CAD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.CAD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.CAD; + if (Currencies.CAD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.CAD; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.POT); + result.add(Currencies.POT); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.POT.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.POT.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -40,8 +41,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.CAD); + result.add(Currencies.USD); + result.add(Currencies.CAD); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/wallets/potwallet/Potwallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/wallets/potwallet/Potwallet.java index b56b62e..a3190d9 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/wallets/potwallet/Potwallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/potcoin/wallets/potwallet/Potwallet.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.potcoin.wallets.potwallet; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; @@ -45,13 +46,13 @@ public class Potwallet implements IWallet { @Override public String getPreferredCryptoCurrency() { - return ICurrencies.POT; + return Currencies.POT; } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.POT); + result.add(Currencies.POT); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/SmartcashExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/SmartcashExtension.java index 7b6185c..c80590b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/SmartcashExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/SmartcashExtension.java @@ -69,7 +69,7 @@ public class SmartcashExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.SMART.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.SMART.equalsIgnoreCase(cryptoCurrency)) { return new SmartcashAddressValidator(); } return null; @@ -94,7 +94,7 @@ public class SmartcashExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -113,7 +113,7 @@ public class SmartcashExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.SMART); + result.add(Currencies.SMART); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/sources/FixPriceRateSource.java index 3ce3a33..927f485 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.smartcash.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.SMART); + result.add(Currencies.SMART); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.SMART.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.SMART.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/wallets/smartcashd/SmartcashRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/wallets/smartcashd/SmartcashRPCWallet.java index f21d733..ee93e18 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/wallets/smartcashd/SmartcashRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/smartcash/wallets/smartcashd/SmartcashRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.smartcash.wallets.smartcas import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class SmartcashRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(SmartcashRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.SMART; + private static final String CRYPTO_CURRENCY = Currencies.SMART; public SmartcashRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/StartcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/StartcoinExtension.java index 71b34b5..ce584dd 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/StartcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/StartcoinExtension.java @@ -69,7 +69,7 @@ public class StartcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.START.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.START.equalsIgnoreCase(cryptoCurrency)) { return new StartcoinAddressValidator(); } return null; @@ -94,7 +94,7 @@ public class StartcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -113,7 +113,7 @@ public class StartcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.START); + result.add(Currencies.START); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/sources/FixPriceRateSource.java index 79dc72c..7ed5b8b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.startcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.START); + result.add(Currencies.START); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.START.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.START.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/wallets/startcoind/StartcoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/wallets/startcoind/StartcoindRPCWallet.java index d3da974..3623d86 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/wallets/startcoind/StartcoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/startcoin/wallets/startcoind/StartcoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.startcoin.wallets.startcoi import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class StartcoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(StartcoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.START; + private static final String CRYPTO_CURRENCY = Currencies.START; public StartcoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java index 4a73b24..6834554 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java @@ -18,14 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.tokencoin; -import com.generalbytes.batm.server.extensions.ICryptoAddressValidator; -import com.generalbytes.batm.server.extensions.ICurrencies; -import com.generalbytes.batm.server.extensions.IExchange; -import com.generalbytes.batm.server.extensions.IExtension; -import com.generalbytes.batm.server.extensions.IPaperWalletGenerator; -import com.generalbytes.batm.server.extensions.IPaymentProcessor; -import com.generalbytes.batm.server.extensions.IRateSource; -import com.generalbytes.batm.server.extensions.IWallet; +import com.generalbytes.batm.server.extensions.*; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.extra.tokencoin.sources.FixPriceRateSource; import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.paperwallet.TokencoinPaperWalletGenerator; import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.TokenWallet; @@ -68,7 +62,7 @@ public class TKNExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.TKN.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.TKN.equalsIgnoreCase(cryptoCurrency)) { return new TKNAddressValidator(); } return null; @@ -76,7 +70,7 @@ public class TKNExtension implements IExtension{ @Override public IPaperWalletGenerator createPaperWalletGenerator(String cryptoCurrency) { - if (ICurrencies.TKN.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.TKN.equalsIgnoreCase(cryptoCurrency)) { return new TokencoinPaperWalletGenerator(); } return null; @@ -96,7 +90,7 @@ public class TKNExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.EUR; + String preferedFiatCurrency = Currencies.EUR; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -115,7 +109,7 @@ public class TKNExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.TKN); + result.add(Currencies.TKN); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java index f55d548..c5ac56f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java @@ -18,7 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.tokencoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -28,28 +29,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.EUR; + private String preferedFiatCurrency = Currencies.EUR; public FixPriceRateSource(BigDecimal rate, String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.TKN); + result.add(Currencies.TKN); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.TKN.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.TKN.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -58,8 +59,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java index 6bed28e..80aa6b4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java @@ -18,7 +18,8 @@ package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; @@ -49,13 +50,13 @@ public class TokenWallet implements IWallet{ @Override public String getPreferredCryptoCurrency() { - return ICurrencies.TKN; + return Currencies.TKN; } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.TKN); + result.add(Currencies.TKN); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/ViacoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/ViacoinExtension.java index 37eb982..f779b1d 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/ViacoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/ViacoinExtension.java @@ -68,7 +68,7 @@ public class ViacoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency){ - if(ICurrencies.VIA.equalsIgnoreCase(cryptoCurrency)){ + if(Currencies.VIA.equalsIgnoreCase(cryptoCurrency)){ return new ViacoinAddressValidator(); } return null; @@ -83,7 +83,7 @@ public class ViacoinExtension implements IExtension{ public IPaymentProcessor createPaymentProcessor(String paymentProcessorLogin){ return null; } - + @Override public IRateSource createRateSource(String sourceLogin) { if (sourceLogin != null && !sourceLogin.trim().isEmpty()) { @@ -98,13 +98,13 @@ public class ViacoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } return new FixPriceRateSource(rate,preferedFiatCurrency); }else if ("poloniexrs".equalsIgnoreCase(rsType)) { - String preferredFiatCurrency = ICurrencies.USD; + String preferredFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferredFiatCurrency = st.nextToken(); } @@ -118,7 +118,7 @@ public class ViacoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies(){ Set result = new HashSet(); - result.add(ICurrencies.VIA); + result.add(Currencies.VIA); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/FixPriceRateSource.java index a5b814a..0a752ae 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.viacoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,29 +14,29 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate, String preferedFiatCurrency) { this.rate = rate; - if(ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)){ - this.preferedFiatCurrency = ICurrencies.EUR; + if(Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)){ + this.preferedFiatCurrency = Currencies.EUR; } - if(ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)){ - this.preferedFiatCurrency = ICurrencies.USD; + if(Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)){ + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.VIA); + result.add(Currencies.VIA); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency){ - if(ICurrencies.VIA.equalsIgnoreCase(cryptoCurrency)){ + if(Currencies.VIA.equalsIgnoreCase(cryptoCurrency)){ return rate; } return null; @@ -44,8 +45,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies(){ Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/poloniex/PoloniexRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/poloniex/PoloniexRateSource.java index 8e03f05..8c3189b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/poloniex/PoloniexRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/sources/poloniex/PoloniexRateSource.java @@ -17,7 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.viacoin.sources.poloniex; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import com.generalbytes.batm.server.extensions.extra.bitcoin.exchanges.bitfinex.BitfinexExchange; import org.slf4j.Logger; @@ -42,7 +42,7 @@ public class PoloniexRateSource implements IRateSource{ public PoloniexRateSource(String preferedFiatCurrency) { if (preferedFiatCurrency == null) { - preferedFiatCurrency = ICurrencies.USD; + preferedFiatCurrency = Currencies.USD; } this.preferedFiatCurrency = preferedFiatCurrency; btcRs = new BitfinexExchange("***","***"); @@ -62,14 +62,14 @@ public class PoloniexRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.VIA); + result.add(Currencies.VIA); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.VIA.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.VIA.equalsIgnoreCase(cryptoCurrency)) { return null; } String key = cryptoCurrency +"_" + fiatCurrency; @@ -100,7 +100,7 @@ public class PoloniexRateSource implements IRateSource{ } private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { - if (!ICurrencies.VIA.equalsIgnoreCase(cryptoCurrency)) { + if (!Currencies.VIA.equalsIgnoreCase(cryptoCurrency)) { return null; //unsupported currency } OrderBookResponse orderBookResponse = api.returnOrderBook("returnOrderBook", "BTC_VIA", 10000); @@ -122,7 +122,7 @@ public class PoloniexRateSource implements IRateSource{ //System.out.println("tradableLimit = " + tradableLimit);; if (tradableLimit != null) { - BigDecimal btcRate = btcRs.getExchangeRateLast(ICurrencies.BTC, fiatCurrency); + BigDecimal btcRate = btcRs.getExchangeRateLast(Currencies.BTC, fiatCurrency); if (btcRate != null) { return btcRate.multiply(tradableLimit); } @@ -134,7 +134,7 @@ public class PoloniexRateSource implements IRateSource{ } public static void main(String[] args) { - PoloniexRateSource rs = new PoloniexRateSource(ICurrencies.USD); - System.out.println("rs = " + rs.getExchangeRateLast(ICurrencies.VIA,ICurrencies.USD)); + PoloniexRateSource rs = new PoloniexRateSource(Currencies.USD); + System.out.println("rs = " + rs.getExchangeRateLast(Currencies.VIA,Currencies.USD)); } } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/wallets/viacoind/ViacoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/wallets/viacoind/ViacoindRPCWallet.java index 8c5e60f..ddd8946 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/wallets/viacoind/ViacoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/viacoin/wallets/viacoind/ViacoindRPCWallet.java @@ -19,7 +19,8 @@ package com.generalbytes.batm.server.extensions.extra.viacoin.wallets.viacoind; import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,7 @@ import java.util.Set; public class ViacoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(ViacoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.VIA; + private static final String CRYPTO_CURRENCY = Currencies.VIA; public ViacoindRPCWallet(String rpcURL, String accountName){ this.rpcURL = rpcURL; @@ -61,8 +62,8 @@ public class ViacoindRPCWallet implements IWallet{ return null; } - log.info("Viacoind sending coins from " + accountName + " to: " + destinationAddress + " " + amount); - + log.info("Viacoind sending coins from " + accountName + " to: " + destinationAddress + " " + amount); + try { String result = getClient(rpcURL).sendFrom(accountName, destinationAddress, amount.doubleValue()); log.debug("result=" + result); diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/WorldcoinExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/WorldcoinExtension.java index 43d41f2..d3680de 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/WorldcoinExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/WorldcoinExtension.java @@ -76,7 +76,7 @@ public class WorldcoinExtension implements IExtension{ @Override public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) { - if (ICurrencies.WDC.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.WDC.equalsIgnoreCase(cryptoCurrency)) { return new WorldcoinAddressValidator(); } return null; @@ -96,7 +96,7 @@ public class WorldcoinExtension implements IExtension{ if (st.hasMoreTokens()) { return new CryptodiggersRateSource(st.nextToken()); } - return new CryptodiggersRateSource(ICurrencies.USD); + return new CryptodiggersRateSource(Currencies.USD); } else if ("wdcfix".equalsIgnoreCase(exchangeType)) { BigDecimal rate = BigDecimal.ZERO; @@ -106,7 +106,7 @@ public class WorldcoinExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = Currencies.USD; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken().toUpperCase(); } @@ -119,7 +119,7 @@ public class WorldcoinExtension implements IExtension{ @Override public Set getSupportedCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.WDC); + result.add(Currencies.WDC); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/FixPriceRateSource.java index 3c3ae6d..3639787 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/FixPriceRateSource.java @@ -1,6 +1,7 @@ package com.generalbytes.batm.server.extensions.extra.worldcoin.sources; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import java.math.BigDecimal; @@ -13,28 +14,28 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; public FixPriceRateSource(BigDecimal rate,String preferedFiatCurrency) { this.rate = rate; - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.WDC); + result.add(Currencies.WDC); return result; } @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (ICurrencies.WDC.equalsIgnoreCase(cryptoCurrency)) { + if (Currencies.WDC.equalsIgnoreCase(cryptoCurrency)) { return rate; } return null; @@ -43,8 +44,8 @@ public class FixPriceRateSource implements IRateSource { @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } @Override diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/cd/CryptodiggersRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/cd/CryptodiggersRateSource.java index f420287..0c41bd6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/cd/CryptodiggersRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/sources/cd/CryptodiggersRateSource.java @@ -17,13 +17,11 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.worldcoin.sources.cd; -import com.generalbytes.batm.server.extensions.extra.worldcoin.sources.cd.*; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IRateSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; import java.security.NoSuchAlgorithmException; import java.security.KeyManagementException; import si.mazi.rescu.RestProxyFactory; @@ -39,16 +37,16 @@ public class CryptodiggersRateSource implements IRateSource{ private static HashMap rateTimes = new HashMap(); private static final long MAXIMUM_ALLOWED_TIME_OFFSET = 30 * 1000; //30sec - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = Currencies.USD; private ICryptodiggersRateAPI api; public CryptodiggersRateSource(String preferedFiatCurrency) { this(); - if (ICurrencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.EUR; + if (Currencies.EUR.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.EUR; } - if (ICurrencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { - this.preferedFiatCurrency = ICurrencies.USD; + if (Currencies.USD.equalsIgnoreCase(preferedFiatCurrency)) { + this.preferedFiatCurrency = Currencies.USD; } } @@ -72,16 +70,16 @@ public class CryptodiggersRateSource implements IRateSource{ @Override public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) { - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.WDC.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.WDC.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } String key = cryptoCurrency +"_" + fiatCurrency; synchronized (rateAmounts) { - + long now = System.currentTimeMillis(); BigDecimal amount = rateAmounts.get(key); if (amount == null) { @@ -110,16 +108,16 @@ public class CryptodiggersRateSource implements IRateSource{ private BigDecimal getExchangeRateLastSync(String cryptoCurrency, String fiatCurrency) { String cd_fiatCurrency; cd_fiatCurrency="2"; - if(ICurrencies.USD.equalsIgnoreCase(fiatCurrency)){ + if(Currencies.USD.equalsIgnoreCase(fiatCurrency)){ cd_fiatCurrency="2"; } - if(ICurrencies.EUR.equalsIgnoreCase(fiatCurrency)){ + if(Currencies.EUR.equalsIgnoreCase(fiatCurrency)){ cd_fiatCurrency="1"; } - if (!(ICurrencies.BTC.equalsIgnoreCase(cryptoCurrency) || ICurrencies.WDC.equalsIgnoreCase(cryptoCurrency))) { + if (!(Currencies.BTC.equalsIgnoreCase(cryptoCurrency) || Currencies.WDC.equalsIgnoreCase(cryptoCurrency))) { return null; } - if (!(ICurrencies.USD.equalsIgnoreCase(fiatCurrency) || ICurrencies.EUR.equalsIgnoreCase(fiatCurrency))) { + if (!(Currencies.USD.equalsIgnoreCase(fiatCurrency) || Currencies.EUR.equalsIgnoreCase(fiatCurrency))) { return null; } CryptodiggersResponse ticker = api.getTicker("7",cd_fiatCurrency); @@ -132,16 +130,16 @@ public class CryptodiggersRateSource implements IRateSource{ @Override public Set getCryptoCurrencies() { Set result = new HashSet(); - //result.add(ICurrencies.BTC); - result.add(ICurrencies.WDC); + //result.add(Currencies.BTC); + result.add(Currencies.WDC); return result; } @Override public Set getFiatCurrencies() { Set result = new HashSet(); - result.add(ICurrencies.USD); - result.add(ICurrencies.EUR); + result.add(Currencies.USD); + result.add(Currencies.EUR); return result; } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/wallets/worldcoind/WorldcoindRPCWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/wallets/worldcoind/WorldcoindRPCWallet.java index d64935c..fbbe0e6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/wallets/worldcoind/WorldcoindRPCWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/worldcoin/wallets/worldcoind/WorldcoindRPCWallet.java @@ -19,7 +19,7 @@ package com.generalbytes.batm.server.extensions.extra.worldcoin.wallets.worldcoi import com.azazar.bitcoin.jsonrpcclient.BitcoinException; import com.azazar.bitcoin.jsonrpcclient.BitcoinJSONRPCClient; -import com.generalbytes.batm.server.extensions.ICurrencies; +import com.generalbytes.batm.server.extensions.Currencies; import com.generalbytes.batm.server.extensions.IWallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import java.util.Set; public class WorldcoindRPCWallet implements IWallet{ private static final Logger log = LoggerFactory.getLogger(WorldcoindRPCWallet.class); - private static final String CRYPTO_CURRENCY = ICurrencies.WDC; + private static final String CRYPTO_CURRENCY = Currencies.WDC; public WorldcoindRPCWallet(String rpcURL, String accountName) { this.rpcURL = rpcURL; diff --git a/server_extensions_extra/src/main/resources/via.png b/server_extensions_extra/src/main/resources/via.png index 863eae6..a3f5e83 100644 Binary files a/server_extensions_extra/src/main/resources/via.png and b/server_extensions_extra/src/main/resources/via.png differ diff --git a/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java b/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java index de3f958..c705d50 100644 --- a/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java +++ b/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java @@ -404,7 +404,7 @@ public class Tester { System.out.println(" " + fiatCurrency); } System.out.println("Crypto Currencies:"); - String selectedCryptoCurrency = null; + String selectedCryptoCurrency = params; for (String cryptoCurrency : cryptoCurrencies) { if (selectedCryptoCurrency == null) { selectedCryptoCurrency = cryptoCurrency;