Skip to content

Commit 0a25c3f

Browse files
author
Karl Ranna
authored
feat: arby config assets (#735)
* feat(arby): separate base and quote asset for CEX/DEX * use feat/asset-config branch of arby * fixup! feat(arby): separate base and quote asset for CEX/DEX * Revert "use feat/asset-config branch of arby" This reverts commit 75e9a5d. * feat: upgrade mainnet arby to 1.2.2 * remove defaults for base and quote asset
1 parent 3d1cee1 commit 0a25c3f

File tree

7 files changed

+75
-31
lines changed

7 files changed

+75
-31
lines changed

‎images/utils/launcher/config/config.py‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,24 @@ def parse_command_line_arguments(self):
287287
help="Live CEX"
288288
)
289289
group.add_argument(
290-
"--arby.base-asset",
290+
"--arby.opendex-base-asset",
291291
metavar="<asset>",
292-
help="Base asset"
292+
help="OpenDEX base asset"
293293
)
294294
group.add_argument(
295-
"--arby.quote-asset",
295+
"--arby.opendex-quote-asset",
296296
metavar="<asset>",
297-
help="Quote asset"
297+
help="OpenDEX quote asset"
298+
)
299+
group.add_argument(
300+
"--arby.cex-base-asset",
301+
metavar="<asset>",
302+
help="Centralized exchange base asset"
303+
)
304+
group.add_argument(
305+
"--arby.cex-quote-asset",
306+
metavar="<asset>",
307+
help="Centralized exchange quote asset"
298308
)
299309
group.add_argument(
300310
"--arby.test-centralized-baseasset-balance",
@@ -702,25 +712,45 @@ def update_arby(self, parsed):
702712
if value:
703713
node["test-centralized-quoteasset-balance"] = value
704714

705-
if "base-asset" in parsed:
706-
if parsed["base-asset"]:
707-
value = parsed["base-asset"]
708-
node["base-asset"] = value
709-
opt = "arby.base_asset"
715+
if "opendex-base-asset" in parsed:
716+
if parsed["opendex-base-asset"]:
717+
value = parsed["opendex-base-asset"]
718+
node["opendex-base-asset"] = value
719+
opt = "arby.opendex_base_asset"
720+
if hasattr(self.args, opt):
721+
value = getattr(self.args, opt)
722+
if value:
723+
node["opendex-base-asset"] = value
724+
725+
if "opendex-quote-asset" in parsed:
726+
if parsed["opendex-quote-asset"]:
727+
value = parsed["opendex-quote-asset"]
728+
node["opendex-quote-asset"] = value
729+
opt = "arby.opendex_quote_asset"
730+
if hasattr(self.args, opt):
731+
value = getattr(self.args, opt)
732+
if value:
733+
node["opendex-quote-asset"] = value
734+
735+
if "cex-base-asset" in parsed:
736+
if parsed["cex-base-asset"]:
737+
value = parsed["cex-base-asset"]
738+
node["cex-base-asset"] = value
739+
opt = "arby.cex_base_asset"
710740
if hasattr(self.args, opt):
711741
value = getattr(self.args, opt)
712742
if value:
713-
node["base-asset"] = value
743+
node["cex-base-asset"] = value
714744

715-
if "quote-asset" in parsed:
716-
if parsed["quote-asset"]:
717-
value = parsed["quote-asset"]
718-
node["quote-asset"] = value
719-
opt = "arby.quote_asset"
745+
if "cex-quote-asset" in parsed:
746+
if parsed["cex-quote-asset"]:
747+
value = parsed["cex-quote-asset"]
748+
node["cex-quote-asset"] = value
749+
opt = "arby.cex_quote_asset"
720750
if hasattr(self.args, opt):
721751
value = getattr(self.args, opt)
722752
if value:
723-
node["quote-asset"] = value
753+
node["cex-quote-asset"] = value
724754

725755
if "live-cex" in parsed:
726756
if parsed["live-cex"]:

‎images/utils/launcher/config/mainnet.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@
122122

123123
[arby]
124124
#live-cex="false"
125-
#base-asset = "BTC"
126-
#quote-asset = "USDT"
125+
#opendex-base-asset = "BTC"
126+
#opendex-quote-asset = "USDT"
127+
#cex-base-asset = "BTC"
128+
#cex-quote-asset = "USDT"
127129
#test-centralized-baseasset-balance = "123"
128130
#test-centralized-quoteasset-balance = "321"
129131
#cex = "binance"

‎images/utils/launcher/config/simnet.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535

3636
[arby]
3737
#live-cex="false"
38-
#base-asset = "BTC"
39-
#quote-asset = "USDT"
38+
#opendex-base-asset = "BTC"
39+
#opendex-quote-asset = "USDT"
40+
#cex-base-asset = "BTC"
41+
#cex-quote-asset = "USDT"
4042
#test-centralized-baseasset-balance = "123"
4143
#test-centralized-quoteasset-balance = "321"
4244
#cex = "binance"

‎images/utils/launcher/config/template.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ def __eq__(self, other):
481481
},
482482
"arby": {
483483
"name": "arby",
484-
"image": "exchangeunion/arby:1.2.1",
484+
"image": "exchangeunion/arby:1.2.2",
485485
"volumes": [
486486
{
487487
"host": "$data_dir/arby",

‎images/utils/launcher/config/testnet.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@
122122

123123
[arby]
124124
#live-cex="false"
125-
#base-asset = "ETH"
126-
#quote-asset = "BTC"
125+
#opendex-base-asset = "ETH"
126+
#opendex-quote-asset = "BTC"
127+
#cex-base-asset = "ETH"
128+
#cex-quote-asset = "BTC"
127129
#test-centralized-baseasset-balance = "123"
128130
#test-centralized-quoteasset-balance = "321"
129131
#cex = "binance"

‎images/utils/launcher/node/arby.py‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ def __init__(self, name, ctx):
2727
if "test-centralized-baseasset-balance" in self.node_config else "123"
2828
test_centralized_quoteasset_balance = self.node_config["test-centralized-quoteasset-balance"] \
2929
if "test-centralized-baseasset-balance" in self.node_config else "321"
30-
base_asset = self.node_config["base-asset"] \
31-
if "base-asset" in self.node_config else "BTC"
32-
quote_asset = self.node_config["quote-asset"] \
33-
if "quote-asset" in self.node_config else "USDT"
30+
opendex_base_asset = self.node_config["opendex-base-asset"] \
31+
if "opendex-base-asset" in self.node_config else ""
32+
opendex_quote_asset = self.node_config["opendex-quote-asset"] \
33+
if "opendex-quote-asset" in self.node_config else ""
34+
cex_base_asset = self.node_config["cex-base-asset"] \
35+
if "cex-base-asset" in self.node_config else ""
36+
cex_quote_asset = self.node_config["cex-quote-asset"] \
37+
if "cex-quote-asset" in self.node_config else ""
3438

3539
if self.network == "simnet":
3640
rpc_port = "28886"
@@ -45,8 +49,10 @@ def __init__(self, name, ctx):
4549
"DATA_DIR=/root/.arby",
4650
"OPENDEX_CERT_PATH=/root/.xud/tls.cert",
4751
"OPENDEX_RPC_HOST=xud",
48-
f"BASEASSET={base_asset}",
49-
f"QUOTEASSET={quote_asset}",
52+
f"OPENDEX_BASEASSET={opendex_base_asset}",
53+
f"OPENDEX_QUOTEASSET={opendex_quote_asset}",
54+
f"CEX_BASEASSET={cex_base_asset}",
55+
f"CEX_QUOTEASSET={cex_quote_asset}",
5056
f"OPENDEX_RPC_PORT={rpc_port}",
5157
f'CEX={cex}',
5258
f'CEX_API_SECRET={api_secret}',

‎setup.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ Xud options:
7575
7676
Arby options:
7777
--arby.live-cex [true|false] Production/Demo mode (default: false)
78-
--arby.base-asset <string> Base asset symbol
79-
--arby.quote-asset <string> Quote asset symbol
78+
--arby.opendex-base-asset <string> OpenDEX base asset symbol
79+
--arby.opendex-quote-asset <string> OpenDEX quote asset symbol
80+
--arby.cex-base-asset <string> Centralized exchange base asset symbol
81+
--arby.cex-quote-asset <string> Centralized exchange quote asset symbol
8082
--arby.test-centralized-baseasset-balance CEX base asset balance for demo mode
8183
--arby.test-centralized-quoteasset-balance CEX quote asset balance for demo mode
8284
--arby.cex <string> CEX (binance/kraken)

0 commit comments

Comments
 (0)