Skip to content
This repository was archived by the owner on Mar 5, 2019. It is now read-only.

Commit 642524d

Browse files
authored
chore: remove mainnet checks (#93)
1 parent c2511b1 commit 642524d

File tree

5 files changed

+21
-34
lines changed

5 files changed

+21
-34
lines changed

actions/apps/forger.sh

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,32 @@ forger_start ()
44
{
55
ascii
66

7-
if [[ "$CORE_NETWORK" != "mainnet" ]]; then
8-
heading "Starting Forger..."
7+
heading "Starting Forger..."
98

10-
local bip38=$(jq -r '.bip38 // empty' "$CORE_CONFIG/delegates.json")
9+
local bip38=$(jq -r '.bip38 // empty' "$CORE_CONFIG/delegates.json")
1110

12-
if [[ -z "$bip38" ]]; then
13-
__forger_start_without_bip38
14-
else
15-
__forger_start_with_bip38
16-
fi
17-
18-
forger_status
19-
20-
success "Started Forger!"
11+
if [[ -z "$bip38" ]]; then
12+
__forger_start_without_bip38
2113
else
22-
warning "Forger is disabled!"
14+
__forger_start_with_bip38
2315
fi
16+
17+
forger_status
18+
19+
success "Started Forger!"
2420
}
2521

2622
forger_restart ()
2723
{
2824
ascii
2925

30-
if [[ "$CORE_NETWORK" != "mainnet" ]]; then
31-
heading "Restarting Forger..."
26+
heading "Restarting Forger..."
3227

33-
pm2 restart $commander_ecosystem --only ark-core-forger >> "$commander_log" 2>&1
28+
pm2 restart $commander_ecosystem --only ark-core-forger >> "$commander_log" 2>&1
3429

35-
forger_status
30+
forger_status
3631

37-
success "Restarted Forger!"
38-
else
39-
warning "Forger is disabled!"
40-
fi
32+
success "Restarted Forger!"
4133
}
4234

4335
forger_stop ()

actions/core/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ __core_configure_post ()
8686
{
8787
database_create
8888

89+
lerna clean --yes
8990
lerna bootstrap | tee -a "$commander_log"
9091

9192
# Make sure the git commit hash is not modified by a local yarn.lock
@@ -103,8 +104,7 @@ __core_configure_network ()
103104
select opt in "${validNetworks[@]}"; do
104105
case "$opt" in
105106
"mainnet")
106-
# TODO: switch freezer to master on release date
107-
__core_configure_branch "freezer"
107+
__core_configure_branch "master"
108108
__core_configure_core "mainnet"
109109
__core_configure_commander "mainnet"
110110
__core_configure_environment "mainnet"

actions/core/update.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ core_update ()
4040
git reset --hard | tee -a "$commander_log"
4141
git checkout "$CORE_BRANCH" | tee -a "$commander_log"
4242
git pull | tee -a "$commander_log"
43+
lerna clean --yes
4344
lerna bootstrap
4445

4546
# Make sure the git commit hash is not modified by a local yarn.lock

menus/commander/help.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ menu_manage_commander_help ()
2525
echo
2626

2727
text_yellow " Configure Token Network (N)"
28-
text_white " lets you configure a different custom token network (devnet by default)."
28+
text_white " lets you configure a different custom token network (mainnet by default)."
2929
echo
3030

3131
text_yellow " Configure Explorer Repository (S)"

modules/environment.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ setup_environment ()
5252
touch "$commander_config"
5353

5454
echo "CORE_REPO=https://github.com/ArkEcosystem/core" >> "$commander_config" 2>&1
55-
echo "CORE_BRANCH=develop" >> "$commander_config" 2>&1
55+
echo "CORE_BRANCH=master" >> "$commander_config" 2>&1
5656
echo "CORE_DIR=${HOME}/ark-core" >> "$commander_config" 2>&1
5757
echo "CORE_DATA=${HOME}/.ark" >> "$commander_config" 2>&1
5858
echo "CORE_CONFIG=${HOME}/.ark/config" >> "$commander_config" 2>&1
5959
echo "CORE_TOKEN=ark" >> "$commander_config" 2>&1
60-
echo "CORE_NETWORK=devnet" >> "$commander_config" 2>&1
60+
echo "CORE_NETWORK=mainnet" >> "$commander_config" 2>&1
6161
echo "EXPLORER_REPO=https://github.com/ArkEcosystem/explorer" >> "$commander_config" 2>&1
6262
echo "EXPLORER_DIR=${HOME}/ark-explorer" >> "$commander_config" 2>&1
6363

@@ -77,7 +77,7 @@ setup_environment ()
7777
fi
7878

7979
if ! grep -q "CORE_BRANCH" "${commander_config}"; then
80-
echo "CORE_BRANCH=develop" >> "$commander_config" 2>&1
80+
echo "CORE_BRANCH=master" >> "$commander_config" 2>&1
8181
fi
8282

8383
if ! grep -q "CORE_DIR" "${commander_config}"; then
@@ -97,7 +97,7 @@ setup_environment ()
9797
fi
9898

9999
if ! grep -q "CORE_NETWORK" "${commander_config}"; then
100-
echo "CORE_NETWORK=devnet" >> "$commander_config" 2>&1
100+
echo "CORE_NETWORK=mainnet" >> "$commander_config" 2>&1
101101
fi
102102

103103
if ! grep -q "EXPLORER_REPO" "${commander_config}"; then
@@ -110,12 +110,6 @@ setup_environment ()
110110

111111
. "$commander_config"
112112

113-
if [[ "$CORE_NETWORK" = "mainnet" ]]; then
114-
sed -i -e "s/CORE_BRANCH=$CORE_BRANCH/CORE_BRANCH=freezer/g" "$commander_config"
115-
116-
. "$commander_config"
117-
fi
118-
119113
setup_environment_file
120114
fi
121115
}

0 commit comments

Comments
 (0)