Skip to content

Commit 7f223b5

Browse files
Karl Rannaraladev
andauthored
feat(arby): add test-mode configuration option (#760)
* feat(arby): add test-mode configuration option This commit deprecates the old `live-cex` configuration value in favour of new `test-mode` option. If both values are set, the `test-mode` option takes precedence over the legacy option. `test-mode` defaults to `false` in mainnet, `true` in other networks. * use branch of arby on mainnet * use latest arby on mainnet, attempt 2 * fixup! feat(arby): add test-mode configuration option * fixup! feat(arby): add test-mode configuration option * fixup! feat(arby): add test-mode configuration option * revert first mainnet change * fix of the first revert * revert of second mainnet change Co-authored-by: raladev <[email protected]>
1 parent 2b2a329 commit 7f223b5

File tree

6 files changed

+38
-8
lines changed

6 files changed

+38
-8
lines changed

images/utils/launcher/config/config.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,12 @@ def parse_command_line_arguments(self):
301301
group.add_argument(
302302
"--arby.live-cex",
303303
metavar="<value>",
304-
help="Live CEX"
304+
help="Live CEX (deprecated)"
305+
)
306+
group.add_argument(
307+
"--arby.test-mode",
308+
metavar="<value>",
309+
help="Whether to issue real orders on the centralized exchange"
305310
)
306311
group.add_argument(
307312
"--arby.base-asset",
@@ -779,6 +784,16 @@ def update_arby(self, parsed):
779784
if value:
780785
node["live-cex"] = value
781786

787+
if "test-mode" in parsed:
788+
if parsed["test-mode"]:
789+
value = parsed["test-mode"]
790+
node["test-mode"] = value
791+
opt = "arby.test_mode"
792+
if hasattr(self.args, opt):
793+
value = getattr(self.args, opt)
794+
if value:
795+
node["test-mode"] = value
796+
782797
if "cex" in parsed:
783798
if parsed["cex"]:
784799
value = parsed["cex"]
@@ -1027,6 +1042,7 @@ def dump_node_attr(node: str, attr: str) -> None:
10271042
dump_node_attr(node, "cex_base_asset")
10281043
dump_node_attr(node, "cex_quote_asset")
10291044
dump_node_attr(node, "live_cex")
1045+
dump_node_attr(node, "test_mode")
10301046
dump_node_attr(node, "cex")
10311047
#dump_node_attr(node, "cex_api_key")
10321048
#dump_node_attr(node, "cex_api_secret")

images/utils/launcher/config/mainnet.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
#expose-ports = ["8885", "8886", "8080"]
122122

123123
[arby]
124-
#live-cex="false"
124+
#test-mode="true"
125125
#base-asset = "BTC"
126126
#quote-asset = "USDT"
127127
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset

images/utils/launcher/config/simnet.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#expose-ports = ["28885", "28886", "28080:8080"]
3535

3636
[arby]
37-
#live-cex="false"
37+
#test-mode="true"
3838
#base-asset = "BTC"
3939
#quote-asset = "USDT"
4040
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset

images/utils/launcher/config/testnet.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
#expose-ports = ["18885", "18886", "18080:8080"]
122122

123123
[arby]
124-
#live-cex="false"
124+
#test-mode="true"
125125
#base-asset = "ETH"
126126
#quote-asset = "BTC"
127127
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset

images/utils/launcher/node/arby.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,22 @@ class Arby(Node):
1313
def __init__(self, name, ctx):
1414
super().__init__(name, ctx)
1515

16-
live_cex = self.node_config["live-cex"] \
17-
if "live-cex" in self.node_config else "false"
16+
if self.network == "mainnet":
17+
default_test_mode = "false"
18+
else:
19+
default_test_mode = "true"
20+
test_mode = default_test_mode
21+
# legacy option (delete after 1st of January 2022)
22+
if "live-cex" in self.node_config:
23+
live_cex = self.node_config["live-cex"]
24+
# we map the legacy live_cex value to the new (opposite) test_mode value
25+
if live_cex is "false":
26+
test_mode = "true"
27+
else:
28+
test_mode = "false"
29+
# new option overwrites the legacy value
30+
if "test-mode" in self.node_config:
31+
test_mode = self.node_config["test-mode"]
1832
cex = self.node_config["cex"] \
1933
if "cex" in self.node_config else "binance"
2034
api_key = self.node_config["cex-api-key"] \
@@ -57,7 +71,7 @@ def __init__(self, name, ctx):
5771
f'CEX={cex}',
5872
f'CEX_API_SECRET={api_secret}',
5973
f'CEX_API_KEY={api_key}',
60-
f'LIVE_CEX={live_cex}',
74+
f'TEST_MODE={test_mode}',
6175
f'MARGIN={margin}',
6276
f'TEST_CENTRALIZED_EXCHANGE_BASEASSET_BALANCE={test_centralized_baseasset_balance}',
6377
f'TEST_CENTRALIZED_EXCHANGE_QUOTEASSET_BALANCE={test_centralized_quoteasset_balance}',

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Xud options:
7474
--xud.preserve-config Preserve xud xud.conf file during updates
7575
7676
Arby options:
77-
--arby.live-cex [true|false] Production/Demo mode (default: false)
77+
--arby.test-mode [true|false] Production/Demo mode (default: true for simnet and testnet; false for mainnet)
7878
--arby.base-asset <string> Base asset symbol
7979
--arby.quote-asset <string> Quote asset symbol
8080
--arby.cex-base-asset <string> Centralized exchange base asset symbol

0 commit comments

Comments
 (0)