Skip to content

Commit dd3dbab

Browse files
mgarciatemgarciate
authored
Merge pull request #130 from dappnode/feature/127_replace_holesky_by_hoodi
Fix #127 Replace holesky by hoodi network
2 parents 4033b6f + 42e6bd2 commit dd3dbab

File tree

7 files changed

+164
-94
lines changed

7 files changed

+164
-94
lines changed

‎build/api/src/AppConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ class AppConfig {
1515
private config: Config;
1616

1717
private constructor() {
18-
const network = shelljs.exec(`echo $NETWORK`).stdout.trim() || "holesky";
18+
const network = shelljs.exec(`echo $NETWORK`).stdout.trim() || "hoodi";
1919
const isMainnet = network === "mainnet";
20-
const w3sSuffix = isMainnet ? "" : "-holesky";
21-
const networkPrefix = isMainnet ? "" : "holesky.";
20+
const w3sSuffix = isMainnet ? "" : "-hoodi";
21+
const networkPrefix = isMainnet ? "" : "hoodi.";
2222
this.config = {
2323
network: network,
2424
brainAPIUrl: `http://brain.web3signer${w3sSuffix}.dappnode:3000`,

‎build/rocketpool-start.sh‎

Lines changed: 59 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,30 @@ case $NETWORK in
2222
"geth.dnp.dappnode.eth")
2323
_EXECUTION_LAYER_HTTP="http://geth.dappnode:8545"
2424
_EXECUTION_LAYER_WS="ws://geth.dappnode:8546"
25+
_EXECUTION_NODE_CLIENT="geth"
2526
;;
2627
"nethermind.public.dappnode.eth")
2728
_EXECUTION_LAYER_HTTP="http://nethermind.public.dappnode:8545"
2829
_EXECUTION_LAYER_WS="ws://nethermind.public.dappnode:8546"
30+
_EXECUTION_NODE_CLIENT="nethermind"
2931
;;
3032
"besu.public.dappnode.eth")
3133
_EXECUTION_LAYER_HTTP="http://besu.public.dappnode:8545"
3234
_EXECUTION_LAYER_WS="ws://besu.public.dappnode:8546"
35+
_EXECUTION_NODE_CLIENT="besu"
3336
;;
3437
"erigon.dnp.dappnode.eth")
3538
_EXECUTION_LAYER_HTTP="http://erigon.dappnode:8545"
3639
_EXECUTION_LAYER_WS="ws://erigon.dappnode:8545"
40+
_EXECUTION_NODE_CLIENT="erigon"
3741
;;
3842
*)
3943
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET Please confirm that the value is correct"
4044
exit 1
4145
;;
4246
esac
4347

44-
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY.
48+
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOODI.
4549
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET" in
4650
"prysm.dnp.dappnode.eth")
4751
_BEACON_NODE_API_3500="http://beacon-chain.prysm.dappnode:3500"
@@ -75,63 +79,67 @@ case $NETWORK in
7579
esac
7680

7781
;;
78-
"holesky")
79-
echo "Holesky network"
82+
"hoodi")
83+
echo "Hoodi network"
8084

8185
# https://github.com/dappnode/DAppNodePackage-SSV-Shifu/blob/775dfbc2190b8c3bc7384a2e4c62d83892071001/build/entrypoint.sh#L3
82-
# Assign proper value to _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOLESKY.
83-
case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOLESKY in
84-
"holesky-geth.dnp.dappnode.eth")
85-
_EXECUTION_LAYER_HTTP="http://holesky-geth.dappnode:8545"
86-
_EXECUTION_LAYER_WS="ws://holesky-geth.dappnode:8546"
86+
# Assign proper value to _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOODI.
87+
case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOODI in
88+
"hoodi-geth.dnp.dappnode.eth")
89+
_EXECUTION_LAYER_HTTP="http://hoodi-geth.dappnode:8545"
90+
_EXECUTION_LAYER_WS="ws://hoodi-geth.dappnode:8546"
91+
_EXECUTION_NODE_CLIENT="geth"
8792
;;
88-
"holesky-nethermind.dnp.dappnode.eth")
89-
_EXECUTION_LAYER_HTTP="http://holesky-nethermind.dappnode:8545"
90-
_EXECUTION_LAYER_WS="ws://holesky-nethermind.dappnode:8546"
93+
"hoodi-nethermind.dnp.dappnode.eth")
94+
_EXECUTION_LAYER_HTTP="http://hoodi-nethermind.dappnode:8545"
95+
_EXECUTION_LAYER_WS="ws://hoodi-nethermind.dappnode:8546"
96+
_EXECUTION_NODE_CLIENT="nethermind"
9197
;;
92-
"holesky-besu.dnp.dappnode.eth")
93-
_EXECUTION_LAYER_HTTP="http://holesky-besu.dappnode:8545"
94-
_EXECUTION_LAYER_WS="ws://holesky-besu.dappnode:8546"
98+
"hoodi-besu.dnp.dappnode.eth")
99+
_EXECUTION_LAYER_HTTP="http://hoodi-besu.dappnode:8545"
100+
_EXECUTION_LAYER_WS="ws://hoodi-besu.dappnode:8546"
101+
_EXECUTION_NODE_CLIENT="besu"
95102
;;
96-
"holesky-erigon.dnp.dappnode.eth")
97-
_EXECUTION_LAYER_HTTP="http://holesky-erigon.dappnode:8545"
98-
_EXECUTION_LAYER_WS="ws://holesky-erigon.dappnode:8545"
103+
"hoodi-erigon.dnp.dappnode.eth")
104+
_EXECUTION_LAYER_HTTP="http://hoodi-erigon.dappnode:8545"
105+
_EXECUTION_LAYER_WS="ws://hoodi-erigon.dappnode:8545"
106+
_EXECUTION_NODE_CLIENT="erigon"
99107
;;
100108
*)
101-
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOLESKY Please confirm that the value is correct"
109+
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOODI Please confirm that the value is correct"
102110
exit 1
103111
;;
104112
esac
105113

106-
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY.
107-
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY" in
108-
"prysm-holesky.dnp.dappnode.eth")
109-
_BEACON_NODE_API_3500="http://beacon-chain.prysm-holesky.dappnode:3500"
110-
_BEACON_NODE_API_4000="http://beacon-chain.prysm-holesky.dappnode:4000"
114+
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOODI.
115+
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOODI" in
116+
"prysm-hoodi.dnp.dappnode.eth")
117+
_BEACON_NODE_API_3500="http://beacon-chain.prysm-hoodi.dappnode:3500"
118+
_BEACON_NODE_API_4000="http://beacon-chain.prysm-hoodi.dappnode:4000"
111119
_BEACON_NODE_CLIENT="prysm"
112120
;;
113-
"teku-holesky.dnp.dappnode.eth")
114-
_BEACON_NODE_API_3500="http://beacon-chain.teku-holesky.dappnode:3500"
115-
_BEACON_NODE_API_4000="http://beacon-chain.teku-holesky.dappnode:4000"
121+
"teku-hoodi.dnp.dappnode.eth")
122+
_BEACON_NODE_API_3500="http://beacon-chain.teku-hoodi.dappnode:3500"
123+
_BEACON_NODE_API_4000="http://beacon-chain.teku-hoodi.dappnode:4000"
116124
_BEACON_NODE_CLIENT="teku"
117125
;;
118-
"lighthouse-holesky.dnp.dappnode.eth")
119-
_BEACON_NODE_API_3500="http://beacon-chain.lighthouse-holesky.dappnode:3500"
120-
_BEACON_NODE_API_4000="http://beacon-chain.lighthouse-holesky.dappnode:4000"
126+
"lighthouse-hoodi.dnp.dappnode.eth")
127+
_BEACON_NODE_API_3500="http://beacon-chain.lighthouse-hoodi.dappnode:3500"
128+
_BEACON_NODE_API_4000="http://beacon-chain.lighthouse-hoodi.dappnode:4000"
121129
_BEACON_NODE_CLIENT="lighthouse"
122130
;;
123-
"nimbus-holesky.dnp.dappnode.eth")
124-
_BEACON_NODE_API_3500="http://beacon-validator.nimbus-holesky.dappnode:4500"
125-
_BEACON_NODE_API_4000="http://beacon-validator.nimbus-holesky.dappnode:4500"
131+
"nimbus-hoodi.dnp.dappnode.eth")
132+
_BEACON_NODE_API_3500="http://beacon-validator.nimbus-hoodi.dappnode:4500"
133+
_BEACON_NODE_API_4000="http://beacon-validator.nimbus-hoodi.dappnode:4500"
126134
_BEACON_NODE_CLIENT="nimbus"
127135
;;
128-
"lodestar-holesky.dnp.dappnode.eth")
129-
_BEACON_NODE_API_3500="http://beacon-chain.lodestar-holesky.dappnode:3500"
130-
_BEACON_NODE_API_4000="http://beacon-chain.lodestar-holesky.dappnode:4000"
136+
"lodestar-hoodi.dnp.dappnode.eth")
137+
_BEACON_NODE_API_3500="http://beacon-chain.lodestar-hoodi.dappnode:3500"
138+
_BEACON_NODE_API_4000="http://beacon-chain.lodestar-hoodi.dappnode:4000"
131139
_BEACON_NODE_CLIENT="lodestar"
132140
;;
133141
*)
134-
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY Please confirm that the value is correct"
142+
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOODI Please confirm that the value is correct"
135143
exit 1
136144
;;
137145
esac
@@ -145,21 +153,27 @@ esac
145153

146154
export EXECUTION_LAYER_HTTP=$_EXECUTION_LAYER_HTTP
147155
export EXECUTION_LAYER_WS=$_EXECUTION_LAYER_WS
156+
export EXECUTION_NODE_CLIENT=$_EXECUTION_NODE_CLIENT
148157

149158
export BEACON_NODE_API_3500=$_BEACON_NODE_API_3500
150159
export BEACON_NODE_API_4000=$_BEACON_NODE_API_4000
151160
export BEACON_NODE_CLIENT=$_BEACON_NODE_CLIENT
152161

153162
# For testing porpuses, uncomment the above lines and comment the following ones
154163
# BEACON_NODE_CLIENT="prysm"
164+
# EXECUTION_NODE_CLIENT="geth"
155165

156-
# EXECUTION_LAYER_HTTP="http://holesky-geth.dappnode:8545"
157-
# EXECUTION_LAYER_WS="ws://holesky-geth.dappnode:8546"
166+
# EXECUTION_LAYER_HTTP="http://hoodi-geth.dappnode:8545"
167+
# EXECUTION_LAYER_WS="ws://hoodi-geth.dappnode:8546"
158168

159-
# BEACON_NODE_API_3500="http://beacon-chain.prysm-holesky.dappnode:3500"
160-
# BEACON_NODE_API_4000="http://beacon-chain.prysm-holesky.dappnode:4000"
169+
# BEACON_NODE_API_3500="http://beacon-chain.prysm-hoodi.dappnode:3500"
170+
# BEACON_NODE_API_4000="http://beacon-chain.prysm-hoodi.dappnode:4000"
161171

172+
if [ "$NETWORK" == "hoodi" ]; then
173+
NETWORK="testnet"
174+
fi
162175
NETWORK="${NETWORK}" \
176+
EXECUTION_NODE_CLIENT="${EXECUTION_NODE_CLIENT}" \
163177
BEACON_NODE_CLIENT="${BEACON_NODE_CLIENT}" \
164178
EXECUTION_LAYER_HTTP="${EXECUTION_LAYER_HTTP}" \
165179
EXECUTION_LAYER_WS="${EXECUTION_LAYER_WS}" \
@@ -177,6 +191,11 @@ if [ -f "/rocketpool/data/wallet" ]; then
177191
fi
178192
if [ ! -f /rocketpool/data/password ]; then
179193
echo "${INFO} set-password"
194+
if [ ! -f /.rocketpool/data/password ]; then
195+
mkdir -p /.rocketpool/data
196+
echo "${WALLET_PASSWORD}" > /.rocketpool/data/password
197+
echo "${WALLET_PASSWORD}" > /rocketpool/data/password
198+
fi
180199
/usr/local/bin/rocketpoold --settings /app/rocketpool/user-settings.yml api wallet set-password "${WALLET_PASSWORD}"
181200
fi
182201
echo "${INFO} Initializing Rocketpool service"

‎build/ui/src/types/AppConfig.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export interface Config {
88
package: string;
99
}
1010

11-
const network = process.env.REACT_APP_NETWORK || "holesky";
11+
const network = process.env.REACT_APP_NETWORK || "hoodi";
1212
const apiBaseUrl = network === "mainnet" ? "http://rocketpool.public.dappnode:3000" : "http://rocketpool-testnet.public.dappnode:3000";
1313
export default apiBaseUrl;

‎build/ui/src/types/Network.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export const networks = ["mainnet", "holesky"] as const;
1+
export const networks = ["mainnet", "hoodi"] as const;
22

33
export type Network = (typeof networks)[number];

0 commit comments

Comments
 (0)