From 6940191fb025a6caff591e02751637bcd4ba6938 Mon Sep 17 00:00:00 2001 From: budjang Date: Fri, 23 Jun 2017 08:01:30 +0700 Subject: [PATCH 1/6] Adding new exchange BitGrail BitGrail is the only market exchange for XRB besides MERCATOX. Around 58.54% coin being traded in this place. --- .../{MarketExample.java => BitGrail.java} | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) rename dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/{MarketExample.java => BitGrail.java} (69%) diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/MarketExample.java b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java similarity index 69% rename from dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/MarketExample.java rename to dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java index 34ab3464..f4a87d03 100644 --- a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/MarketExample.java +++ b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java @@ -10,30 +10,25 @@ import com.mobnetic.coinguardian.model.currency.Currency; import com.mobnetic.coinguardian.model.currency.VirtualCurrency; -public class MarketExample extends Market { +public class BitGrail extends Market { - private final static String NAME = "Market Example"; - private final static String TTS_NAME = NAME; - private final static String URL = "https://www.marketexample.com/api/%1$s_%2$s/ticker/"; + private final static String NAME = "BitGrail"; + private final static String TTS_NAME = BitGrail; + private final static String URL = "https://bitgrail.com/api/v1/BTC-XRB/ticker"; private final static HashMap CURRENCY_PAIRS = new LinkedHashMap(); static { - CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ - Currency.CNY, - Currency.USD - }); - CURRENCY_PAIRS.put(VirtualCurrency.DOGE, new String[]{ + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ VirtualCurrency.BTC, - Currency.USD }); } - public MarketExample() { + public BitGrail() { super(NAME, TTS_NAME, CURRENCY_PAIRS); } @Override public String getUrl(int requestId, CheckerInfo checkerInfo) { - return String.format(URL, checkerInfo.getCurrencyBase(), checkerInfo.getCurrencyCounter()); + return URL; } @Override @@ -46,4 +41,6 @@ protected void parseTickerFromJsonObject(int requestId, JSONObject jsonObject, T ticker.last = jsonObject.getDouble("last"); ticker.timestamp = jsonObject.getLong("timestamp"); } + + protected String parseErrorFromJsonObject(int requestId, JSONObject jsonObject, CheckerInfo checkerInfo); } From 923a2565824ad5529c3000c1e47553b9617a5dfa Mon Sep 17 00:00:00 2001 From: budjang Date: Wed, 23 Aug 2017 11:06:55 +0700 Subject: [PATCH 2/6] Create BitGrail.java Done making the changes requested. --- .../coinguardian/model/market/BitGrail.java | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java new file mode 100644 index 00000000..695a9fb3 --- /dev/null +++ b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java @@ -0,0 +1,87 @@ +package com.mobnetic.coinguardian.model.market.example; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import org.json.JSONObject; + +import com.mobnetic.coinguardian.model.CheckerInfo; +import com.mobnetic.coinguardian.model.Market; +import com.mobnetic.coinguardian.model.Ticker; +import com.mobnetic.coinguardian.model.currency.Currency; +import com.mobnetic.coinguardian.model.currency.VirtualCurrency; + +public class BitGrail extends Market { + + private final static String NAME = "BitGrail"; + private final static String TTS_NAME = BitGrail; + private final static String URL = "https://bitgrail.com/api/v1/%1$s-%2$s/ticker"; + private final static HashMap CURRENCY_PAIRS = new LinkedHashMap(); + static { + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.XRB, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.ETH, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.CREA, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.BCC, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.DOGE, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.CFT, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.LSK, + }); + CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ + VirtualCurrency.LTC, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.ETH, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.BCC, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.CFT, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.LSK, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.CREA, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.LTC, + }); + CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ + VirtualCurrency.DOGE, + }); + } + + public BitGrail() { + super(NAME, TTS_NAME, CURRENCY_PAIRS); + } + + @Override + public String getUrl(int requestId, CheckerInfo checkerInfo) { + return URL; + } + + @Override + protected void parseTickerFromJsonObject(int requestId, JSONObject jsonObject, Ticker ticker, CheckerInfo checkerInfo) throws Exception { + ticker.bid = jsonObject.getDouble("bid"); + ticker.ask = jsonObject.getDouble("ask"); + ticker.vol = jsonObject.getDouble("volume"); + ticker.high = jsonObject.getDouble("high"); + ticker.low = jsonObject.getDouble("low"); + ticker.last = jsonObject.getDouble("last"); + } + + protected String parseErrorFromJsonObject(int requestId, JSONObject jsonObject, CheckerInfo checkerInfo); +} From add50cb2e3940172ad18b5bd693788483dcfcc54 Mon Sep 17 00:00:00 2001 From: budjang Date: Wed, 23 Aug 2017 11:10:01 +0700 Subject: [PATCH 3/6] Delete BitGrail.java --- .../model/market/example/BitGrail.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java deleted file mode 100644 index f4a87d03..00000000 --- a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/example/BitGrail.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mobnetic.coinguardian.model.market.example; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import org.json.JSONObject; - -import com.mobnetic.coinguardian.model.CheckerInfo; -import com.mobnetic.coinguardian.model.Market; -import com.mobnetic.coinguardian.model.Ticker; -import com.mobnetic.coinguardian.model.currency.Currency; -import com.mobnetic.coinguardian.model.currency.VirtualCurrency; - -public class BitGrail extends Market { - - private final static String NAME = "BitGrail"; - private final static String TTS_NAME = BitGrail; - private final static String URL = "https://bitgrail.com/api/v1/BTC-XRB/ticker"; - private final static HashMap CURRENCY_PAIRS = new LinkedHashMap(); - static { - CURRENCY_PAIRS.put(VirtualCurrency.XRB, new String[]{ - VirtualCurrency.BTC, - }); - } - - public BitGrail() { - super(NAME, TTS_NAME, CURRENCY_PAIRS); - } - - @Override - public String getUrl(int requestId, CheckerInfo checkerInfo) { - return URL; - } - - @Override - protected void parseTickerFromJsonObject(int requestId, JSONObject jsonObject, Ticker ticker, CheckerInfo checkerInfo) throws Exception { - ticker.bid = jsonObject.getDouble("bid"); - ticker.ask = jsonObject.getDouble("ask"); - ticker.vol = jsonObject.getDouble("volume"); - ticker.high = jsonObject.getDouble("high"); - ticker.low = jsonObject.getDouble("low"); - ticker.last = jsonObject.getDouble("last"); - ticker.timestamp = jsonObject.getLong("timestamp"); - } - - protected String parseErrorFromJsonObject(int requestId, JSONObject jsonObject, CheckerInfo checkerInfo); -} From 57808527fc1db0f7012f26bc52ea7a3d0e2299d2 Mon Sep 17 00:00:00 2001 From: budjang Date: Wed, 23 Aug 2017 11:31:20 +0700 Subject: [PATCH 4/6] Update VirtualCurrency.java Add XRB virtual currency for Raiblock --- .../mobnetic/coinguardian/model/currency/VirtualCurrency.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/model/currency/VirtualCurrency.java b/dataModule/src/main/java/com/mobnetic/coinguardian/model/currency/VirtualCurrency.java index 8c8fbd17..8c7bd49b 100644 --- a/dataModule/src/main/java/com/mobnetic/coinguardian/model/currency/VirtualCurrency.java +++ b/dataModule/src/main/java/com/mobnetic/coinguardian/model/currency/VirtualCurrency.java @@ -332,6 +332,7 @@ public class VirtualCurrency { public static final String XNC = "XNC"; public static final String XPM = "XPM"; public static final String XPY = "XPY"; + public static final String XRB = "XRB"; public static final String XRP = "XRP"; public static final String XVN = "XVN"; // VEN public static final String XXL = "XXL"; From 31366d91809986e43cd7212ba79d88ea940c6af8 Mon Sep 17 00:00:00 2001 From: budjang Date: Wed, 23 Aug 2017 11:34:41 +0700 Subject: [PATCH 5/6] Update MarketsConfig.java Add market BitGrail --- .../java/com/mobnetic/coinguardian/config/MarketsConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/config/MarketsConfig.java b/dataModule/src/main/java/com/mobnetic/coinguardian/config/MarketsConfig.java index e0865971..530568aa 100644 --- a/dataModule/src/main/java/com/mobnetic/coinguardian/config/MarketsConfig.java +++ b/dataModule/src/main/java/com/mobnetic/coinguardian/config/MarketsConfig.java @@ -129,5 +129,6 @@ private final static void addMarket(Market market) { addMarket(new Coinone()); addMarket(new Bithumb()); addMarket(new Coinsph()); + addMarket(new BitGrail()); } } From cb9d2ba710324315aed855ca52298598fab3e108 Mon Sep 17 00:00:00 2001 From: budjang Date: Wed, 23 Aug 2017 19:05:12 +0700 Subject: [PATCH 6/6] Update BitGrail.java 1. Does adding space in "String TTS_NAME = BitGrail;" is a mandatory. It seems that that's the way the market name is written. 2. Sorry about that last line. I don't from where it comes. --- .../java/com/mobnetic/coinguardian/model/market/BitGrail.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java index 695a9fb3..bc38570c 100644 --- a/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java +++ b/dataModule/src/main/java/com/mobnetic/coinguardian/model/market/BitGrail.java @@ -13,7 +13,7 @@ public class BitGrail extends Market { private final static String NAME = "BitGrail"; - private final static String TTS_NAME = BitGrail; + private final static String TTS_NAME = Bit Grail; private final static String URL = "https://bitgrail.com/api/v1/%1$s-%2$s/ticker"; private final static HashMap CURRENCY_PAIRS = new LinkedHashMap(); static { @@ -82,6 +82,4 @@ protected void parseTickerFromJsonObject(int requestId, JSONObject jsonObject, T ticker.low = jsonObject.getDouble("low"); ticker.last = jsonObject.getDouble("last"); } - - protected String parseErrorFromJsonObject(int requestId, JSONObject jsonObject, CheckerInfo checkerInfo); }