BTCPrivate
/
batm_public
mirror of https://github.com/BTCPrivate/batm_public.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaces ICurrencies with Currencies use.

This commit is contained in:
Noah 2018-05-15 20:26:19 -04:00
parent ea1edb1956
commit 8f670b159d
5 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java
View File

@ -75,6 +75,7 @@ public class Currencies {
crypto.add(VIA);
crypto.add(DEX);
crypto.add(DASH);
crypto.add(DGB);
crypto.add(DOGE);
crypto.add(FLASH);
crypto.add(MAX);

12
server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/digibyte/DigiByteExtension.java
View File

@ -17,8 +17,8 @@
************************************************************************************/
package com.generalbytes.batm.server.extensions.extra.digibyte;
import com.generalbytes.batm.server.extensions.Currencies;
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;
@ -29,6 +29,7 @@ import com.generalbytes.batm.server.extensions.extra.digibyte.sources.FixPriceRa
import com.generalbytes.batm.server.extensions.extra.digibyte.sources.livecoin.LiveCoinRateSource;
import com.generalbytes.batm.server.extensions.extra.digibyte.wallets.digibyted.DigiByteRPCWallet;
import com.generalbytes.batm.server.extensions.watchlist.IWatchList;
import java.math.BigDecimal;
import java.util.HashSet;
import java.util.Set;
@ -77,14 +78,13 @@ public class DigiByteExtension implements IExtension {
return new DigiByteRPCWallet(rpcURL, accountName);
}
}
}
return null;
}
@Override
public ICryptoAddressValidator createAddressValidator(String cryptoCurrency) {
if (ICurrencies.DGB.equalsIgnoreCase(cryptoCurrency)) {
if (Currencies.DGB.equalsIgnoreCase(cryptoCurrency)) {
return new DigiByteAddressValidator();
}
return null;
@ -108,13 +108,13 @@ public class DigiByteExtension 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 ("livecoin".equalsIgnoreCase(exchangeType)) {
String preferedFiatCurrency = ICurrencies.USD;
String preferedFiatCurrency = Currencies.USD;
if (st.hasMoreTokens()) {
preferedFiatCurrency = st.nextToken().toUpperCase();
}
@ -127,7 +127,7 @@ public class DigiByteExtension implements IExtension {
@Override
public Set<String> getSupportedCryptoCurrencies() {
Set<String> result = new HashSet<String>();
result.add(ICurrencies.DGB);
result.add(Currencies.DGB);
return result;
}

27
server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/digibyte/sources/FixPriceRateSource.java
View File

@ -1,7 +1,8 @@
package com.generalbytes.batm.server.extensions.extra.digibyte.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;
import java.util.HashSet;
import java.util.Set;
@ -13,31 +14,31 @@ 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;
}
if (ICurrencies.CAD.equalsIgnoreCase(preferedFiatCurrency)) {
this.preferedFiatCurrency = ICurrencies.CAD;
if (Currencies.CAD.equalsIgnoreCase(preferedFiatCurrency)) {
this.preferedFiatCurrency = Currencies.CAD;
}
}
@Override
public Set<String> getCryptoCurrencies() {
Set<String> result = new HashSet<String>();
result.add(ICurrencies.DGB);
result.add(Currencies.DGB);
return result;
}
@Override
public BigDecimal getExchangeRateLast(String cryptoCurrency, String fiatCurrency) {
if (ICurrencies.DGB.equalsIgnoreCase(cryptoCurrency)) {
if (Currencies.DGB.equalsIgnoreCase(cryptoCurrency)) {
return rate;
}
return null;
@ -46,9 +47,9 @@ public class FixPriceRateSource implements IRateSource {
@Override
public Set<String> getFiatCurrencies() {
Set<String> result = new HashSet<String>();
result.add(ICurrencies.CAD);
result.add(ICurrencies.USD);
result.add(ICurrencies.EUR);
result.add(Currencies.CAD);
result.add(Currencies.USD);
result.add(Currencies.EUR);
return result;
}

24
server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/digibyte/sources/livecoin/LiveCoinRateSource.java
View File

@ -1,24 +1,26 @@
package com.generalbytes.batm.server.extensions.extra.digibyte.sources.livecoin;
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;
import java.util.HashSet;
import java.util.Set;
import si.mazi.rescu.RestProxyFactory;
public class LiveCoinRateSource implements IRateSource {
private ILiveCoinAPI api;
private String preferredFiatCurrency = ICurrencies.USD;
private String preferredFiatCurrency = Currencies.USD;
public LiveCoinRateSource(String preferedFiatCurrency) {
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;
}
api = RestProxyFactory.createProxy(ILiveCoinAPI.class, "https://api.livecoin.net");
}
@ -27,15 +29,15 @@ public class LiveCoinRateSource implements IRateSource {
@Override
public Set<String> getCryptoCurrencies() {
Set<String> result = new HashSet<String>();
result.add(ICurrencies.DGB);
result.add(Currencies.DGB);
return result;
}
@Override
public Set<String> getFiatCurrencies() {
Set<String> result = new HashSet<String>();
result.add(ICurrencies.USD);
result.add(ICurrencies.EUR);
result.add(Currencies.USD);
result.add(Currencies.EUR);
return result;
}
@ -45,10 +47,10 @@ public class LiveCoinRateSource implements IRateSource {
return null;
}
//Grab the last dgb rate in btc
LiveCoinTicker dgbBtc = api.getTicker(ICurrencies.DGB + "/" + ICurrencies.BTC);
LiveCoinTicker dgbBtc = api.getTicker(Currencies.DGB + "/" + Currencies.BTC);
//Grab the last btc rate in the selected fiat currency
LiveCoinTicker btcFiat = api.getTicker(ICurrencies.BTC + "/" + fiatCurrency);
LiveCoinTicker btcFiat = api.getTicker(Currencies.BTC + "/" + fiatCurrency);
BigDecimal lastDgbPriceInBtc = dgbBtc.getLast();
BigDecimal lastBtcPriceInFiat = btcFiat.getLast();

10
server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/digibyte/wallets/digibyted/DigiByteRPCWallet.java
View File

@ -19,20 +19,22 @@ package com.generalbytes.batm.server.extensions.extra.digibyte.wallets.digibyted
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;
import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DigiByteRPCWallet implements IWallet {
private static final Logger log = LoggerFactory.getLogger(DigiByteRPCWallet.class);
private static final String CRYPTO_CURRENCY = ICurrencies.DGB;
private static final String CRYPTO_CURRENCY = Currencies.DGB;
public DigiByteRPCWallet(String rpcURL, String accountName) {
this.rpcURL = rpcURL;