Skip to content

Commit c917adc

Browse files
Karl Rannakilrau
Karl Ranna
and
kilrau
authored
feat: change arby config (#740)
* use arby feat/config-defaults branch * feat: change arby config * Update images/utils/launcher/config/testnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * Update images/utils/launcher/config/testnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * Update images/utils/launcher/config/simnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * Update images/utils/launcher/config/mainnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * Update images/utils/launcher/config/simnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * Update images/utils/launcher/config/mainnet.conf Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]> * use master branch of arby * upgrade mainnet arby version to 1.2.3 Co-authored-by: Kilian Rausch | ⚡ OpenDEX ⚡ <[email protected]>
1 parent 9d8a078 commit c917adc

File tree

8 files changed

+55
-38
lines changed

8 files changed

+55
-38
lines changed

‎images/arby/src.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
REPO_URL = "https://github.com/ExchangeUnion/market-maker-tools"
1+
from tools.core import src
2+
3+
4+
class SourceManager(src.SourceManager):
5+
def __init__(self):
6+
super().__init__("https://github.com/ExchangeUnion/market-maker-tools")
7+
8+
def get_build_args(self, version):
9+
revision = self.get_revision(self.src_dir)
10+
return {
11+
"GIT_REVISION": revision[:8]
12+
}
13+
14+
def get_ref(self, version):
15+
if version == "latest":
16+
return "master"
17+
else:
18+
return "v" + version

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@ def parse_command_line_arguments(self):
287287
help="Live CEX"
288288
)
289289
group.add_argument(
290-
"--arby.opendex-base-asset",
290+
"--arby.base-asset",
291291
metavar="<asset>",
292-
help="OpenDEX base asset"
292+
help="Base asset"
293293
)
294294
group.add_argument(
295-
"--arby.opendex-quote-asset",
295+
"--arby.quote-asset",
296296
metavar="<asset>",
297-
help="OpenDEX quote asset"
297+
help="Quote asset"
298298
)
299299
group.add_argument(
300300
"--arby.cex-base-asset",
@@ -712,25 +712,25 @@ def update_arby(self, parsed):
712712
if value:
713713
node["test-centralized-quoteasset-balance"] = value
714714

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"
715+
if "base-asset" in parsed:
716+
if parsed["base-asset"]:
717+
value = parsed["base-asset"]
718+
node["base-asset"] = value
719+
opt = "arby.base_asset"
720720
if hasattr(self.args, opt):
721721
value = getattr(self.args, opt)
722722
if value:
723-
node["opendex-base-asset"] = value
723+
node["base-asset"] = value
724724

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"
725+
if "quote-asset" in parsed:
726+
if parsed["quote-asset"]:
727+
value = parsed["quote-asset"]
728+
node["quote-asset"] = value
729+
opt = "arby.quote_asset"
730730
if hasattr(self.args, opt):
731731
value = getattr(self.args, opt)
732732
if value:
733-
node["opendex-quote-asset"] = value
733+
node["quote-asset"] = value
734734

735735
if "cex-base-asset" in parsed:
736736
if parsed["cex-base-asset"]:

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

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

123123
[arby]
124124
#live-cex="false"
125-
#opendex-base-asset = "BTC"
126-
#opendex-quote-asset = "USDT"
127-
#cex-base-asset = "BTC"
128-
#cex-quote-asset = "USDT"
125+
#base-asset = "BTC"
126+
#quote-asset = "USDT"
127+
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset
128+
#cex-quote-asset = "" # optional - only needs to be specified if centralized exchange quote asset is different from quote-asset
129129
#test-centralized-baseasset-balance = "123"
130130
#test-centralized-quoteasset-balance = "321"
131131
#cex = "binance"

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

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

3636
[arby]
3737
#live-cex="false"
38-
#opendex-base-asset = "BTC"
39-
#opendex-quote-asset = "USDT"
40-
#cex-base-asset = "BTC"
41-
#cex-quote-asset = "USDT"
38+
#base-asset = "BTC"
39+
#quote-asset = "USDT"
40+
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset
41+
#cex-quote-asset = "" # optional - only needs to be specified if centralized exchange quote asset is different from quote-asset
4242
#test-centralized-baseasset-balance = "123"
4343
#test-centralized-quoteasset-balance = "321"
4444
#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.2",
484+
"image": "exchangeunion/arby:1.2.3",
485485
"volumes": [
486486
{
487487
"host": "$data_dir/arby",

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

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

123123
[arby]
124124
#live-cex="false"
125-
#opendex-base-asset = "ETH"
126-
#opendex-quote-asset = "BTC"
127-
#cex-base-asset = "ETH"
128-
#cex-quote-asset = "BTC"
125+
#base-asset = "ETH"
126+
#quote-asset = "BTC"
127+
#cex-base-asset = "" # optional - only needs to be specified if centralized exchange base asset is different from base-asset
128+
#cex-quote-asset = "" # optional - only needs to be specified if centralized exchange quote asset is different from quote-asset
129129
#test-centralized-baseasset-balance = "123"
130130
#test-centralized-quoteasset-balance = "321"
131131
#cex = "binance"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ 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-
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 ""
30+
base_asset = self.node_config["base-asset"] \
31+
if "base-asset" in self.node_config else ""
32+
quote_asset = self.node_config["quote-asset"] \
33+
if "quote-asset" in self.node_config else ""
3434
cex_base_asset = self.node_config["cex-base-asset"] \
3535
if "cex-base-asset" in self.node_config else ""
3636
cex_quote_asset = self.node_config["cex-quote-asset"] \
@@ -49,8 +49,8 @@ def __init__(self, name, ctx):
4949
"DATA_DIR=/root/.arby",
5050
"OPENDEX_CERT_PATH=/root/.xud/tls.cert",
5151
"OPENDEX_RPC_HOST=xud",
52-
f"OPENDEX_BASEASSET={opendex_base_asset}",
53-
f"OPENDEX_QUOTEASSET={opendex_quote_asset}",
52+
f"BASEASSET={base_asset}",
53+
f"QUOTEASSET={quote_asset}",
5454
f"CEX_BASEASSET={cex_base_asset}",
5555
f"CEX_QUOTEASSET={cex_quote_asset}",
5656
f"OPENDEX_RPC_PORT={rpc_port}",

‎setup.sh‎

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

0 commit comments

Comments
 (0)