Skip to content

Commit 084453c

Browse files
mgarciatemgarciate
authored
Merge pull request dappnode#94 from dappnode/feature/93_holesky
Fix dappnode#93 Replace prater by holesky
2 parents fa7e14b + 157fcb1 commit 084453c

File tree

8 files changed

+62
-58
lines changed

8 files changed

+62
-58
lines changed

‎build/api/src/AppConfig.ts‎

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

1717
private constructor() {
18-
const network = shelljs.exec(`echo $NETWORK`).stdout.trim() || "prater";
18+
const network = shelljs.exec(`echo $NETWORK`).stdout.trim() || "holesky";
1919
const isMainnet = network === "mainnet";
20-
const w3sSuffix = isMainnet ? "" : "-prater";
21-
const clPrefix = isMainnet ? "" : "prater.";
22-
const elPrefix = isMainnet ? "" : "goerli.";
20+
const w3sSuffix = isMainnet ? "" : "-holesky";
21+
const networkPrefix = isMainnet ? "" : "holesky.";
2322
this.config = {
2423
network: network,
2524
brainAPIUrl: `http://brain.web3signer${w3sSuffix}.dappnode:3000`,
2625
brainUIUrl: `http://brain.web3signer${w3sSuffix}.dappnode`,
2726
w3sUrl: `http://web3signer.web3signer${w3sSuffix}.dappnode:9000`,
28-
rpExplorerUrl: `https://${clPrefix}rocketscan.io`,
29-
explorerUrl: `https://${elPrefix}etherscan.io`,
27+
rpExplorerUrl: `https://${networkPrefix}rocketscan.io`,
28+
explorerUrl: `https://${networkPrefix}etherscan.io`,
3029
package: isMainnet ? `rocketpool.public.dappnode` : `rocketpool-testnet.public.dappnode`,
3130
};
3231
}

‎build/api/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ async function importKey(validatorPubkey: string): Promise<ImportKeyResponseData
102102
keystores: [keystoreJson],
103103
passwords: [password],
104104
tags: ["rocketpool"],
105-
feeRecipients: ["0xd4E96eF8eee8678dBFf4d535E033Ed1a4F7605b7"],
105+
feeRecipients: ["0xa347c391bc8f740caba37672157c8aacd08ac567"],
106106
});
107107
}
108108

‎build/rocketpool-start.sh‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case $NETWORK in
4141
;;
4242
esac
4343

44-
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_PRATER.
44+
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY.
4545
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET" in
4646
"prysm.dnp.dappnode.eth")
4747
_BEACON_NODE_API_3500="http://beacon-chain.prysm.dappnode:3500"
@@ -75,63 +75,63 @@ case $NETWORK in
7575
esac
7676

7777
;;
78-
"prater")
79-
echo "Prater network"
78+
"holesky")
79+
echo "Holesky network"
8080

8181
# https://github.com/dappnode/DAppNodePackage-SSV-Shifu/blob/775dfbc2190b8c3bc7384a2e4c62d83892071001/build/entrypoint.sh#L3
82-
# Assign proper value to _DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER.
83-
case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER in
84-
"goerli-geth.dnp.dappnode.eth")
85-
_EXECUTION_LAYER_HTTP="http://goerli-geth.dappnode:8545"
86-
_EXECUTION_LAYER_WS="ws://goerli-geth.dappnode:8546"
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"
8787
;;
88-
"goerli-nethermind.dnp.dappnode.eth")
89-
_EXECUTION_LAYER_HTTP="http://goerli-nethermind.dappnode:8545"
90-
_EXECUTION_LAYER_WS="ws://goerli-nethermind.dappnode:8546"
88+
"holesky-nethermind.dnp.dappnode.eth")
89+
_EXECUTION_LAYER_HTTP="http://holesky-nethermind.dappnode:8545"
90+
_EXECUTION_LAYER_WS="ws://holesky-nethermind.dappnode:8546"
9191
;;
92-
"goerli-besu.dnp.dappnode.eth")
93-
_EXECUTION_LAYER_HTTP="http://goerli-besu.dappnode:8545"
94-
_EXECUTION_LAYER_WS="ws://goerli-besu.dappnode:8546"
92+
"holesky-besu.dnp.dappnode.eth")
93+
_EXECUTION_LAYER_HTTP="http://holesky-besu.dappnode:8545"
94+
_EXECUTION_LAYER_WS="ws://holesky-besu.dappnode:8546"
9595
;;
96-
"goerli-erigon.dnp.dappnode.eth")
97-
_EXECUTION_LAYER_HTTP="http://goerli-erigon.dappnode:8545"
98-
_EXECUTION_LAYER_WS="ws://goerli-erigon.dappnode:8545"
96+
"holesky-erigon.dnp.dappnode.eth")
97+
_EXECUTION_LAYER_HTTP="http://holesky-erigon.dappnode:8545"
98+
_EXECUTION_LAYER_WS="ws://holesky-erigon.dappnode:8545"
9999
;;
100100
*)
101-
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_PRATER Please confirm that the value is correct"
101+
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOLESKY Please confirm that the value is correct"
102102
exit 1
103103
;;
104104
esac
105105

106-
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_PRATER.
107-
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_PRATER" in
108-
"prysm-prater.dnp.dappnode.eth")
109-
_BEACON_NODE_API_3500="http://beacon-chain.prysm-prater.dappnode:3500"
110-
_BEACON_NODE_API_4000="http://beacon-chain.prysm-prater.dappnode:4000"
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"
111111
_BEACON_NODE_CLIENT="prysm"
112112
;;
113-
"teku-prater.dnp.dappnode.eth")
114-
_BEACON_NODE_API_3500="http://beacon-chain.teku-prater.dappnode:3500"
115-
_BEACON_NODE_API_4000="http://beacon-chain.teku-prater.dappnode:4000"
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"
116116
_BEACON_NODE_CLIENT="teku"
117117
;;
118-
"lighthouse-prater.dnp.dappnode.eth")
119-
_BEACON_NODE_API_3500="http://beacon-chain.lighthouse-prater.dappnode:3500"
120-
_BEACON_NODE_API_4000="http://beacon-chain.lighthouse-prater.dappnode:4000"
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"
121121
_BEACON_NODE_CLIENT="lighthouse"
122122
;;
123-
"nimbus-prater.dnp.dappnode.eth")
124-
_BEACON_NODE_API_3500="http://beacon-validator.nimbus-prater.dappnode:4500"
125-
_BEACON_NODE_API_4000="http://beacon-validator.nimbus-prater.dappnode:4500"
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"
126126
_BEACON_NODE_CLIENT="nimbus"
127127
;;
128-
"lodestar-prater.dnp.dappnode.eth")
129-
_BEACON_NODE_API_3500="http://beacon-chain.lodestar-prater.dappnode:3500"
130-
_BEACON_NODE_API_4000="http://beacon-chain.lodestar-prater.dappnode:4000"
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"
131131
_BEACON_NODE_CLIENT="lodestar"
132132
;;
133133
*)
134-
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_PRATER Please confirm that the value is correct"
134+
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOLESKY Please confirm that the value is correct"
135135
exit 1
136136
;;
137137
esac
@@ -153,11 +153,11 @@ export BEACON_NODE_CLIENT=$_BEACON_NODE_CLIENT
153153
# For testing porpuses, uncomment the above lines and comment the following ones
154154
# BEACON_NODE_CLIENT="prysm"
155155

156-
# EXECUTION_LAYER_HTTP="http://goerli-geth.dappnode:8545"
157-
# EXECUTION_LAYER_WS="ws://goerli-geth.dappnode:8546"
156+
# EXECUTION_LAYER_HTTP="http://holesky-geth.dappnode:8545"
157+
# EXECUTION_LAYER_WS="ws://holesky-geth.dappnode:8546"
158158

159-
# BEACON_NODE_API_3500="http://beacon-chain.prysm-prater.dappnode:3500"
160-
# BEACON_NODE_API_4000="http://beacon-chain.prysm-prater.dappnode:4000"
159+
# BEACON_NODE_API_3500="http://beacon-chain.prysm-holesky.dappnode:3500"
160+
# BEACON_NODE_API_4000="http://beacon-chain.prysm-holesky.dappnode:4000"
161161

162162
NETWORK="${NETWORK}" \
163163
BEACON_NODE_CLIENT="${BEACON_NODE_CLIENT}" \

‎build/ui/src/components/Setup/RequiredBalanceInfo.tsx‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,24 @@ const RequiredBalanceInfo: React.FC<RequiredBalanceInfoProps> = ({
1717
? data?.networkRplPrice?.minPer8EthMinipoolRplStake ?? 0
1818
: data?.networkRplPrice?.minPer16EthMinipoolRplStake ?? 0;
1919

20-
const maxRpl =
21-
minipoolEth === 8
22-
? data?.networkRplPrice?.maxPer8EthMinipoolRplStake ?? 0
23-
: data?.networkRplPrice?.maxPer16EthMinipoolRplStake ?? 0;
20+
const maxRpl = data?.nodeStatus?.maximumRplStake ?? 0;
2421

2522
return (
2623
<Box>
2724
<Typography variant="body1">
2825
1. At least <b>{minipoolEth} ETH + 0.2 ETH</b> (we recommend{" "}
2926
<b>0.5 ETH</b>) for gas costs
3027
<br />
31-
2. Between <b>{Math.ceil(toEther(minRpl))} RPL</b> and{" "}
32-
<b>{Math.ceil(toEther(maxRpl))} RPL</b> for {minipoolEth} ETH minipool
28+
{maxRpl === 0 ? (
29+
<>
30+
2. At least <b>{Math.ceil(toEther(minRpl))} RPL</b> for {minipoolEth} ETH minipool
31+
</>
32+
) : (
33+
<>
34+
2. Between <b>{Math.ceil(toEther(minRpl))} RPL</b> and{" "}
35+
<b>{Math.ceil(toEther(maxRpl))} RPL</b> for {minipoolEth} ETH minipool
36+
</>
37+
)}
3338
</Typography>
3439
</Box>
3540
);

‎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 || "prater";
11+
const network = process.env.REACT_APP_NETWORK || "holesky";
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", "prater"] as const;
1+
export const networks = ["mainnet", "holesky"] as const;
22

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

‎dappnode_package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"globalEnvs": [
1616
{
17-
"envs": ["EXECUTION_CLIENT_PRATER", "CONSENSUS_CLIENT_PRATER"],
17+
"envs": ["EXECUTION_CLIENT_HOLESKY", "CONSENSUS_CLIENT_HOLESKY"],
1818
"services": ["rocketpool-testnet.public.dappnode.eth"]
1919
}
2020
],

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ services:
66
context: ./build
77
args:
88
UPSTREAM_VERSION: v1.10.2
9-
NETWORK: prater
9+
NETWORK: holesky
1010
volumes:
1111
- "rocketpool-testnet:/rocketpool"
1212
environment:
13-
- NETWORK=prater
13+
- NETWORK=holesky
1414
- WALLET_PASSWORD=
1515
- EXTRA_OPTS=
1616
restart: unless-stopped

0 commit comments

Comments
 (0)