feat(arby): add Kraken support (#728)

Karl Ranna · raladev · web-flow · commit fd952604a86d · 2020-09-23T18:37:34.000+03:00
* feat(arby): add Kraken support * Update src.py * revert previous change * switch to fix/kraken-support * Update src.py * Revert "Update src.py" This reverts commit f74f8fc. * return master branch of arby * Update src.py * return master arby branch * remove capitalization from help * remove capitalized latter from default value * remove capitalized letter from simnet conf example * remove capitalized letter from mainnet conf * remove capitalized letter from testnet conf Co-authored-by: raladev <aladev.r@gmail.com>
diff --git a/images/utils/launcher/config/config.py b/images/utils/launcher/config/config.py
@@ -307,14 +307,19 @@ def parse_command_line_arguments(self):
             help="Test centralized quote asset balance"
         )
         group.add_argument(
-            "--arby.binance-api-key",
+            "--arby.cex",
             metavar="<key>",
-            help="Binance API key"
+            help="Centralized Exchange"
         )
         group.add_argument(
-            "--arby.binance-api-secret",
+            "--arby.cex-api-key",
+            metavar="<key>",
+            help="CEX API key"
+        )
+        group.add_argument(
+            "--arby.cex-api-secret",
             metavar="<secret>",
-            help="Binance API secret"
+            help="CEX API secret"
         )
         group.add_argument(
             "--arby.margin",
@@ -727,25 +732,35 @@ def update_arby(self, parsed):
             if value:
                 node["live-cex"] = value
 
-        if "binance-api-key" in parsed:
-            if parsed["binance-api-key"]:
-                value = parsed["binance-api-key"]
-                node["binance-api-key"] = value
-        opt = "arby.binance_api_key"
+        if "cex" in parsed:
+            if parsed["cex"]:
+                value = parsed["cex"]
+                node["cex"] = value
+        opt = "arby.cex"
+        if hasattr(self.args, opt):
+            value = getattr(self.args, opt)
+            if value:
+                node["cex"] = value
+
+        if "cex-api-key" in parsed:
+            if parsed["cex-api-key"]:
+                value = parsed["cex-api-key"]
+                node["cex-api-key"] = value
+        opt = "arby.cex_api_key"
         if hasattr(self.args, opt):
             value = getattr(self.args, opt)
             if value:
-                node["binance-api-key"] = value
+                node["cex-api-key"] = value
 
-        if "binance-api-secret" in parsed:
-            if parsed["binance-api-secret"]:
-                value = parsed["binance-api-secret"]
-                node["binance-api-secret"] = value
-        opt = "arby.binance_api_secret"
+        if "cex-api-secret" in parsed:
+            if parsed["cex-api-secret"]:
+                value = parsed["cex-api-secret"]
+                node["cex-api-secret"] = value
+        opt = "arby.cex_api_secret"
         if hasattr(self.args, opt):
             value = getattr(self.args, opt)
             if value:
-                node["binance-api-secret"] = value
+                node["cex-api-secret"] = value
 
         if "margin" in parsed:
             if parsed["margin"]:
diff --git a/images/utils/launcher/config/mainnet.conf b/images/utils/launcher/config/mainnet.conf
@@ -126,8 +126,9 @@
 #quote-asset = "USDT"
 #test-centralized-baseasset-balance = "123"
 #test-centralized-quoteasset-balance = "321"
-#binance-api-key = "your api key"
-#binance-api-secret = "your api secret"
+#cex = "binance"
+#cex-api-key = "your api key"
+#cex-api-secret = "your api secret"
 #margin = "0.04"
 #disabled = false
 
diff --git a/images/utils/launcher/config/simnet.conf b/images/utils/launcher/config/simnet.conf
@@ -39,8 +39,9 @@
 #quote-asset = "USDT"
 #test-centralized-baseasset-balance = "123"
 #test-centralized-quoteasset-balance = "321"
-#binance-api-key = "your api key"
-#binance-api-secret = "your api secret"
+#cex = "binance"
+#cex-api-key = "your api key"
+#cex-api-secret = "your api secret"
 #margin = "0.04"
 #disabled = false
 
diff --git a/images/utils/launcher/config/template.py b/images/utils/launcher/config/template.py
@@ -481,7 +481,7 @@ def __eq__(self, other):
         },
         "arby": {
             "name": "arby",
-            "image": "exchangeunion/arby:1.1.8",
+            "image": "exchangeunion/arby:1.1.9",
             "volumes": [
                 {
                     "host": "$data_dir/arby",
diff --git a/images/utils/launcher/config/testnet.conf b/images/utils/launcher/config/testnet.conf
@@ -126,8 +126,9 @@
 #quote-asset = "BTC"
 #test-centralized-baseasset-balance = "123"
 #test-centralized-quoteasset-balance = "321"
-#binance-api-key = "your api key"
-#binance-api-secret = "your api secret"
+#cex = "binance"
+#cex-api-key = "your api key"
+#cex-api-secret = "your api secret"
 #margin = "0.04"
 #disabled = false
 
diff --git a/images/utils/launcher/node/arby.py b/images/utils/launcher/node/arby.py
@@ -15,10 +15,12 @@ def __init__(self, name, ctx):
 
         live_cex = self.node_config["live-cex"] \
             if "live-cex" in self.node_config else "false"
-        api_key = self.node_config["binance-api-key"] \
-            if "binance-api-key" in self.node_config else "123"
-        api_secret = self.node_config["binance-api-secret"] \
-            if "binance-api-secret" in self.node_config else "abc"
+        cex = self.node_config["cex"] \
+            if "cex" in self.node_config else "binance"
+        api_key = self.node_config["cex-api-key"] \
+            if "cex-api-key" in self.node_config else "123"
+        api_secret = self.node_config["cex-api-secret"] \
+            if "cex-api-secret" in self.node_config else "abc"
         margin = self.node_config["margin"] \
             if "margin" in self.node_config else "0.04"
         test_centralized_baseasset_balance = self.node_config["test-centralized-baseasset-balance"] \
@@ -46,8 +48,9 @@ def __init__(self, name, ctx):
             f"BASEASSET={base_asset}",
             f"QUOTEASSET={quote_asset}",
             f"OPENDEX_RPC_PORT={rpc_port}",
-            f'BINANCE_API_SECRET={api_secret}',
-            f'BINANCE_API_KEY={api_key}',
+            f'CEX={cex}',
+            f'CEX_API_SECRET={api_secret}',
+            f'CEX_API_KEY={api_key}',
             f'LIVE_CEX={live_cex}',
             f'MARGIN={margin}',
             f'TEST_CENTRALIZED_EXCHANGE_BASEASSET_BALANCE={test_centralized_baseasset_balance}',
diff --git a/setup.sh b/setup.sh
@@ -79,8 +79,9 @@ Arby options:
     --arby.quote-asset <string>                 Quote asset symbol
     --arby.test-centralized-baseasset-balance   CEX base asset balance for demo mode
     --arby.test-centralized-quoteasset-balance  CEX quote asset balance for demo mode
-    --arby.binance-api-key <string>             Binance API key
-    --arby.binance-api-secret <string>          Binance API secret
+    --arby.cex <string>                         CEX (binance/kraken)
+    --arby.cex-api-key <string>                 CEX API key
+    --arby.cex-api-secret <string>              CEX API secret
     --arby.margin <double>                      Trade margin
     --arby.disabled [true|false]                Enable/Disable arby service
 

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ def __eq__(self, other):`
`481`	`481`	`},`
`482`	`482`	`"arby": {`
`483`	`483`	`"name": "arby",`
`484`		`- "image": "exchangeunion/arby:1.1.8",`
	`484`	`+ "image": "exchangeunion/arby:1.1.9",`
`485`	`485`	`"volumes": [`
`486`	`486`	`{`
`487`	`487`	`"host": "$data_dir/arby",`