Skip to content

Commit 601d421

Browse files
MalteHerrmannMalteHerrmann
committed
avoid using alias for something globally installed
1 parent c2da08b commit 601d421

3 files changed

Lines changed: 75 additions & 79 deletions

File tree

‎local_net/in-place-fork.sh‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22

3-
alias nobled=../build/nobled
3+
BIN=../build/nobled
44

55
cleanup() {
6-
echo "Stopping processes..."
7-
kill "$NOBLED_PID" "$TAIL_PID" "$NOBLED_PID2" 2>/dev/null
8-
exit 0
6+
echo "Stopping processes..."
7+
kill "$NOBLED_PID" "$TAIL_PID" "$NOBLED_PID2" 2>/dev/null
8+
exit 0
99
}
1010
trap cleanup SIGINT SIGTERM
1111

@@ -18,27 +18,27 @@ SNAP_RPC="https://noble-rpc.polkachu.com:443"
1818
UPGRADE_ARG=""
1919

2020
for arg in "$@"; do
21-
case $arg in
22-
-r|--reset)
23-
rm -rf "$HOME1"
24-
;;
25-
-t|--testnet)
26-
CHAINID="grand-1"
27-
PEERS="f2067cc7a23a4b2525f5f98430797b1e5c92e3aa@35.183.110.236:26656,8b22414f37d381a99ba99cd1edc5b884d43b7e53@65.109.23.114:21556"
28-
SNAP_RPC="https://noble-testnet-rpc.polkachu.com:443"
29-
;;
30-
-u|--trigger-testnet-upgrade)
31-
UPGRADE_ARG="$2"
32-
shift
33-
;;
34-
esac
21+
case $arg in
22+
-r | --reset)
23+
rm -rf "$HOME1"
24+
;;
25+
-t | --testnet)
26+
CHAINID="grand-1"
27+
PEERS="f2067cc7a23a4b2525f5f98430797b1e5c92e3aa@35.183.110.236:26656,8b22414f37d381a99ba99cd1edc5b884d43b7e53@65.109.23.114:21556"
28+
SNAP_RPC="https://noble-testnet-rpc.polkachu.com:443"
29+
;;
30+
-u | --trigger-testnet-upgrade)
31+
UPGRADE_ARG="$2"
3532
shift
33+
;;
34+
esac
35+
shift
3636
done
3737

38-
nobled init in-place --chain-id $CHAINID --home $HOME1
38+
$BIN init in-place --chain-id $CHAINID --home $HOME1
3939

40-
LATEST_HEIGHT=$(curl -s $SNAP_RPC/block | jq -r .result.block.header.height); \
41-
BLOCK_HEIGHT=$((LATEST_HEIGHT - 2000)); \
40+
LATEST_HEIGHT=$(curl -s $SNAP_RPC/block | jq -r .result.block.header.height)
41+
BLOCK_HEIGHT=$((LATEST_HEIGHT - 2000))
4242
TRUST_HASH=$(curl -s "$SNAP_RPC/block?height=$BLOCK_HEIGHT" | jq -r .result.block_id.hash)
4343

4444
sed -i.bak -E "
@@ -48,7 +48,7 @@ s|^(trust_height[[:space:]]+=[[:space:]]+).*$|\1$BLOCK_HEIGHT| ;
4848
s|^(trust_hash[[:space:]]+=[[:space:]]+).*$|\1\"$TRUST_HASH\"| ;
4949
s|^persistent_peers *=.*|persistent_peers = \"$PEERS\"|" $HOME1/config/config.toml
5050

51-
nobled start --halt-height $LATEST_HEIGHT --home "$HOME1" > "$HOME1/logs.log" 2>&1 &
51+
$BIN start --halt-height $LATEST_HEIGHT --home "$HOME1" >"$HOME1/logs.log" 2>&1 &
5252
NOBLED_PID=$!
5353

5454
tail -f "$HOME1/logs.log" &
@@ -60,12 +60,12 @@ echo "Node is synced! Preparing for in-place testnet..."
6060
sleep 2
6161

6262
# Create operator address that will control the chain
63-
OPERATOR=$(nobled keys add operator --home $HOME1 --keyring-backend test --output json | jq -r .address)
63+
OPERATOR=$($BIN keys add operator --home $HOME1 --keyring-backend test --output json | jq -r .address)
6464

6565
if [[ -n "$UPGRADE_ARG" ]]; then
66-
printf 'y\n' | nobled in-place-testnet inPlace "$OPERATOR" --trigger-testnet-upgrade "$UPGRADE_ARG" --home "$HOME1" >> "$HOME1/logs.log" 2>&1 &
66+
printf 'y\n' | $BIN in-place-testnet inPlace "$OPERATOR" --trigger-testnet-upgrade "$UPGRADE_ARG" --home "$HOME1" >>"$HOME1/logs.log" 2>&1 &
6767
else
68-
printf 'y\n' | nobled in-place-testnet inPlace "$OPERATOR" --home "$HOME1" >> "$HOME1/logs.log" 2>&1 &
68+
printf 'y\n' | $BIN in-place-testnet inPlace "$OPERATOR" --home "$HOME1" >>"$HOME1/logs.log" 2>&1 &
6969
fi
7070

7171
NOBLED_PID2=$!

‎local_net/multi-val.sh‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
source ./utils.sh
44

5-
alias nobled=../build/nobled
6-
7-
for arg in "$@"
8-
do
9-
case $arg in
10-
-r|--reset)
11-
rm -rf .duke
12-
shift
13-
;;
14-
esac
5+
BIN=../build/nobled
6+
7+
for arg in "$@"; do
8+
case $arg in
9+
-r | --reset)
10+
rm -rf .duke
11+
shift
12+
;;
13+
esac
1514
done
1615

1716
HOME1=.duke/val1
@@ -22,35 +21,35 @@ P2P1=0.0.0.0:26656
2221
P2P2=0.0.0.0:36656
2322
P2P3=0.0.0.0:46656
2423

25-
# if private validator file does not exist, create a new network
24+
# if private validator file does not exist, create a new network
2625
if ! [ -f .duke/data/priv_validator_state.json ]; then
27-
nobled init val1 --chain-id "duke-1" --home $HOME1 &> /dev/null
28-
nobled init val2 --chain-id "duke-1" --home $HOME2 &> /dev/null
29-
nobled init val3 --chain-id "duke-1" --home $HOME3 &> /dev/null
26+
$BIN init val1 --chain-id "duke-1" --home $HOME1 &>/dev/null
27+
$BIN init val2 --chain-id "duke-1" --home $HOME2 &>/dev/null
28+
$BIN init val3 --chain-id "duke-1" --home $HOME3 &>/dev/null
3029

3130
# Create keys
32-
nobled keys add val --keyring-backend test --home $HOME1 &> /dev/null
33-
nobled keys add val --keyring-backend test --home $HOME2 &> /dev/null
34-
nobled keys add val --keyring-backend test --home $HOME3 &> /dev/null
31+
$BIN keys add val --keyring-backend test --home $HOME1 &>/dev/null
32+
$BIN keys add val --keyring-backend test --home $HOME2 &>/dev/null
33+
$BIN keys add val --keyring-backend test --home $HOME3 &>/dev/null
3534

3635
# Add genesis accounts from each validator
37-
nobled genesis add-genesis-account val 1000000ustake --home $HOME1 --keyring-backend test
38-
nobled genesis add-genesis-account val 1000000ustake --home $HOME2 --keyring-backend test
39-
nobled genesis add-genesis-account val 1000000ustake --home $HOME3 --keyring-backend test
36+
$BIN genesis add-genesis-account val 1000000ustake --home $HOME1 --keyring-backend test
37+
$BIN genesis add-genesis-account val 1000000ustake --home $HOME2 --keyring-backend test
38+
$BIN genesis add-genesis-account val 1000000ustake --home $HOME3 --keyring-backend test
4039
# Add genesis accounts to validator 1 who will be collecting genesis
41-
nobled genesis add-genesis-account "$(nobled keys show val -a --keyring-backend test --home $HOME2)" 1000000ustake --home $HOME1
42-
nobled genesis add-genesis-account "$(nobled keys show val -a --keyring-backend test --home $HOME3)" 1000000ustake --home $HOME1
40+
$BIN genesis add-genesis-account "$($BIN keys show val -a --keyring-backend test --home $HOME2)" 1000000ustake --home $HOME1
41+
$BIN genesis add-genesis-account "$($BIN keys show val -a --keyring-backend test --home $HOME3)" 1000000ustake --home $HOME1
4342

4443
# Create genesis transaction's
45-
nobled genesis gentx val 1000000ustake --chain-id "duke-1" --keyring-backend test --home $HOME1
46-
nobled genesis gentx val 1000000ustake --chain-id "duke-1" --output-document $HOME1/config/gentx/val2.json --keyring-backend test --home $HOME2
47-
nobled genesis gentx val 1000000ustake --chain-id "duke-1" --output-document $HOME1/config/gentx/val3.json --keyring-backend test --home $HOME3
44+
$BIN genesis gentx val 1000000ustake --chain-id "duke-1" --keyring-backend test --home $HOME1
45+
$BIN genesis gentx val 1000000ustake --chain-id "duke-1" --output-document $HOME1/config/gentx/val2.json --keyring-backend test --home $HOME2
46+
$BIN genesis gentx val 1000000ustake --chain-id "duke-1" --output-document $HOME1/config/gentx/val3.json --keyring-backend test --home $HOME3
4847

4948
# Collect the gentx and finalize genesis
50-
nobled genesis collect-gentxs --home $HOME1 &> /dev/null
49+
$BIN genesis collect-gentxs --home $HOME1 &>/dev/null
5150

52-
AUTHORITY=$(nobled keys add authority --home $HOME1 --keyring-backend test --output json | jq .address)
53-
nobled genesis add-genesis-account authority 4000000ustake --home $HOME1 --keyring-backend test
51+
AUTHORITY=$($BIN keys add authority --home $HOME1 --keyring-backend test --output json | jq .address)
52+
$BIN genesis add-genesis-account authority 4000000ustake --home $HOME1 --keyring-backend test
5453

5554
update_genesis $HOME1 $AUTHORITY
5655

@@ -69,13 +68,13 @@ if ! [ -f .duke/data/priv_validator_state.json ]; then
6968
fi
7069

7170
# Get persistent peers
72-
NODE_ID1=$(nobled tendermint show-node-id --home "$HOME1")
71+
NODE_ID1=$($BIN tendermint show-node-id --home "$HOME1")
7372
PP1="$NODE_ID1@$P2P1"
7473

75-
NODE_ID2=$(nobled tendermint show-node-id --home "$HOME2")
74+
NODE_ID2=$($BIN tendermint show-node-id --home "$HOME2")
7675
PP2="$NODE_ID2@$P2P2"
7776

78-
NODE_ID3=$(nobled tendermint show-node-id --home "$HOME3")
77+
NODE_ID3=$($BIN tendermint show-node-id --home "$HOME3")
7978
PP3="$NODE_ID3@$P2P3"
8079

8180
# Start tmux session
@@ -87,9 +86,9 @@ tmux split-window -h -t "$SESSION"
8786

8887
# Send start command
8988
# Note: C-m is equivalent to pressing Enter
90-
tmux send-keys -t "$SESSION:0.0" "../build/nobled start --api.enable false --home $HOME1 > $HOME1/logs.log 2>&1 &" C-m
91-
tmux send-keys -t "$SESSION:0.1" "../build/nobled start --api.enable false --rpc.laddr tcp://127.0.0.1:36657 --rpc.pprof_laddr localhost:6061 --grpc.address localhost:9092 --p2p.laddr tcp://$P2P2 --p2p.persistent_peers $PP1,$PP3 --home $HOME2 > $HOME2/logs.log 2>&1 &" C-m
92-
tmux send-keys -t "$SESSION:0.2" "../build/nobled start --api.enable false --rpc.laddr tcp://127.0.0.1:46657 --rpc.pprof_laddr localhost:6062 --grpc.address localhost:9093 --p2p.laddr tcp://$P2P3 --p2p.persistent_peers $PP1,$PP2 --home $HOME3 > $HOME3/logs.log 2>&1 &" C-m
89+
tmux send-keys -t "$SESSION:0.0" "$BIN start --api.enable false --home $HOME1 > $HOME1/logs.log 2>&1 &" C-m
90+
tmux send-keys -t "$SESSION:0.1" "$BIN start --api.enable false --rpc.laddr tcp://127.0.0.1:36657 --rpc.pprof_laddr localhost:6061 --grpc.address localhost:9092 --p2p.laddr tcp://$P2P2 --p2p.persistent_peers $PP1,$PP3 --home $HOME2 > $HOME2/logs.log 2>&1 &" C-m
91+
tmux send-keys -t "$SESSION:0.2" "$BIN start --api.enable false --rpc.laddr tcp://127.0.0.1:46657 --rpc.pprof_laddr localhost:6062 --grpc.address localhost:9093 --p2p.laddr tcp://$P2P3 --p2p.persistent_peers $PP1,$PP2 --home $HOME3 > $HOME3/logs.log 2>&1 &" C-m
9392

9493
# Watch logs
9594
tmux send-keys -t "$SESSION:0.0" "tail -f $HOME1/logs.log" C-m

‎local_net/single-val.sh‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,32 @@
22

33
source ./utils.sh
44

5-
alias nobled=../build/nobled
5+
BIN=../build/nobled
66

77
HOME1=.duke
88

9-
for arg in "$@"
10-
do
11-
case $arg in
12-
-r|--reset)
13-
rm -rf $HOME1
14-
shift
15-
;;
16-
esac
9+
for arg in "$@"; do
10+
case $arg in
11+
-r | --reset)
12+
rm -rf $HOME1
13+
shift
14+
;;
15+
esac
1716
done
1817

19-
20-
2118
if ! [ -f $HOME1/data/priv_validator_state.json ]; then
22-
nobled init validator --chain-id "duke-1" --home $HOME1 &> /dev/null
19+
$BIN init validator --chain-id "duke-1" --home $HOME1 &>/dev/null
2320

24-
nobled keys add validator --home $HOME1 --keyring-backend test &> /dev/null
25-
nobled genesis add-genesis-account validator 1000000ustake --home $HOME1 --keyring-backend test
26-
AUTHORITY=$(nobled keys add authority --home $HOME1 --keyring-backend test --output json | jq .address)
27-
nobled genesis add-genesis-account authority 4000000ustake --home $HOME1 --keyring-backend test
28-
nobled genesis add-genesis-account noble1cyyzpxplxdzkeea7kwsydadg87357qnah9s9cv 1000000uusdc --home $HOME1 --keyring-backend test
21+
$BIN keys add validator --home $HOME1 --keyring-backend test &>/dev/null
22+
$BIN genesis add-genesis-account validator 1000000ustake --home $HOME1 --keyring-backend test
23+
AUTHORITY=$($BIN keys add authority --home $HOME1 --keyring-backend test --output json | jq .address)
24+
$BIN genesis add-genesis-account authority 4000000ustake --home $HOME1 --keyring-backend test
25+
$BIN genesis add-genesis-account noble1cyyzpxplxdzkeea7kwsydadg87357qnah9s9cv 1000000uusdc --home $HOME1 --keyring-backend test
2926

3027
update_genesis $HOME1 $AUTHORITY
3128

32-
nobled genesis gentx validator 1000000ustake --chain-id "duke-1" --home $HOME1 --keyring-backend test &> /dev/null
33-
nobled genesis collect-gentxs --home $HOME1 &> /dev/null
29+
$BIN genesis gentx validator 1000000ustake --chain-id "duke-1" --home $HOME1 --keyring-backend test &>/dev/null
30+
$BIN genesis collect-gentxs --home $HOME1 &>/dev/null
3431
fi
3532

36-
nobled start --home $HOME1
33+
$BIN start --home $HOME1

0 commit comments

Comments
 (0)