Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents eabd6f5 + 5adeb4d commit 794710af2e62d0f10b48d61b355ed4f680ba80ce @langerhans committed Jan 30, 2016
@@ -1,3 +1,3 @@
-6277491E0889942F5C0213A8CA6BA1DA multidoge-0.1.7.dmg
+01914A7C7EB70E92B9230D49252A45C0 multidoge-0.1.7.dmg
E69A81B1E86C7AA72D3B36D0D5FB4218 multidoge-0.1.7-linux.jar
6AF7401318F4E3858933CD841074C3B6 multidoge-0.1.7-windows-setup.exe
View
@@ -777,7 +777,7 @@
<bitcoinj.version>0.10.3-MB-ALICE</bitcoinj.version>
<!-- Version of XChange to use (multiple uses) -->
- <xchange.version>3.1.0</xchange.version>
+ <xchange.version>3.0.0</xchange.version>
<!-- Version of spongycastle to use -->
<sc-light-jdk15on.version>1.47.0.2</sc-light-jdk15on.version>
View
@@ -1,7 +1,7 @@
MultiDoge release notes:
29 Jan 2016: 0.1.7
-+ Update XChange to 3.1.0
++ Update XChange to 3.0.0
+ Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
+ BTC/Fiat exchange rates are provided by BitcoinAverage
+ Updated checkpoints
@@ -1,6 +1,6 @@
MultiDoge release notes:
29 Jan 2016: 0.1.7
-+ Update XChange to 3.1.0
++ Update XChange to 3.0.0
+ Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
+ BTC/Fiat exchange rates are provided by BitcoinAverage
+ Updated checkpoints
@@ -614,11 +614,13 @@ public void run() {
}
// Upgrade path from cryptsy
- if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
- bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
- }
- if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
- bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+ if (bitcoinController != null && bitcoinController.getModel() != null) { // Mac sometimes isn't ready yet...
+ if (ExchangeData.CRYPTS_EXCHANGE_NAME.equals(bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE))) {
+ bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+ }
+ if (ExchangeData.CRYPTS_EXCHANGE_NAME.equals(bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE))) {
+ bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+ }
}
} catch (Exception e) {
// An odd unrecoverable error occurred.
@@ -241,21 +241,14 @@ public void createExchangeObjects(String newExchangeName) {
Exchange exchangeDOGE = ExchangeFactory.INSTANCE.createExchange(PoloniexExchange.class.getName());
if (exchange != null) {
- try {
- exchange.remoteInit();
- exchangeDOGE.remoteInit();
- } catch (IOException e) {
- log.error("Could not contact exchanges for init!");
- return;
- }
// Interested in the public market data feed (no authentication).
marketDataServiceBTC = exchange.getPollingMarketDataService();
marketDataServiceDOGE = exchangeDOGE.getPollingMarketDataService();
log.debug("marketDataServiceBTC = " + marketDataServiceBTC);
// Get the list of available currencies.
- exchangeSymbols = new ArrayList<CurrencyPair>(exchange.getMetaData().getMarketMetaDataMap().keySet());
+ exchangeSymbols = exchange.getMetaData().getCurrencyPairs();
log.debug("exchangeSymbols = " + exchangeSymbols);
if (exchangeSymbols != null) {

0 comments on commit 794710a

Please sign in to comment.