Skip to content

Commit 981c632

Browse files
santteegtsantteegt
committed
Merge remote-tracking branch 'origin/main' into feat/hoodi-support
2 parents 5868093 + 03511a3 commit 981c632

File tree

4 files changed

+111
-38
lines changed

4 files changed

+111
-38
lines changed

‎build/rocketpool-start.sh‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,35 @@ 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
"reth.dnp.dappnode.eth")
3538
_EXECUTION_LAYER_HTTP="http://reth.dappnode:8545"
3639
_EXECUTION_LAYER_WS="ws://reth.dappnode:8546"
40+
_EXECUTION_NODE_CLIENT="reth"
3741
;;
3842
"erigon.dnp.dappnode.eth")
3943
_EXECUTION_LAYER_HTTP="http://erigon.dappnode:8545"
4044
_EXECUTION_LAYER_WS="ws://erigon.dappnode:8545"
45+
_EXECUTION_NODE_CLIENT="erigon"
4146
;;
4247
*)
4348
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET Please confirm that the value is correct"
4449
exit 1
4550
;;
4651
esac
4752

48-
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET.
53+
# Assign proper value to _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_HOODI.
4954
case "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET" in
5055
"prysm.dnp.dappnode.eth")
5156
_BEACON_NODE_API_3500="http://beacon-chain.prysm.dappnode:3500"
@@ -79,7 +84,7 @@ case $NETWORK in
7984
esac
8085

8186
;;
82-
"testnet")
87+
"hoodi")
8388
echo "Hoodi network"
8489

8590
# https://github.com/dappnode/DAppNodePackage-SSV-Shifu/blob/775dfbc2190b8c3bc7384a2e4c62d83892071001/build/entrypoint.sh#L3
@@ -88,22 +93,27 @@ case $NETWORK in
8893
"hoodi-geth.dnp.dappnode.eth")
8994
_EXECUTION_LAYER_HTTP="http://hoodi-geth.dappnode:8545"
9095
_EXECUTION_LAYER_WS="ws://hoodi-geth.dappnode:8546"
96+
_EXECUTION_NODE_CLIENT="geth"
9197
;;
9298
"hoodi-nethermind.dnp.dappnode.eth")
9399
_EXECUTION_LAYER_HTTP="http://hoodi-nethermind.dappnode:8545"
94100
_EXECUTION_LAYER_WS="ws://hoodi-nethermind.dappnode:8546"
101+
_EXECUTION_NODE_CLIENT="nethermind"
95102
;;
96103
"hoodi-besu.dnp.dappnode.eth")
97104
_EXECUTION_LAYER_HTTP="http://hoodi-besu.dappnode:8545"
98105
_EXECUTION_LAYER_WS="ws://hoodi-besu.dappnode:8546"
106+
_EXECUTION_NODE_CLIENT="besu"
99107
;;
100108
"hoodi-reth.dnp.dappnode.eth")
101109
_EXECUTION_LAYER_HTTP="http://hoodi-reth.dappnode:8545"
102110
_EXECUTION_LAYER_WS="ws://hoodi-reth.dappnode:8546"
111+
_EXECUTION_NODE_CLIENT="reth"
103112
;;
104113
"hoodi-erigon.dnp.dappnode.eth")
105114
_EXECUTION_LAYER_HTTP="http://hoodi-erigon.dappnode:8545"
106115
_EXECUTION_LAYER_WS="ws://hoodi-erigon.dappnode:8545"
116+
_EXECUTION_NODE_CLIENT="erigon"
107117
;;
108118
*)
109119
echo "Unknown value or unsupported for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_HOODI Please confirm that the value is correct"
@@ -153,21 +163,27 @@ esac
153163

154164
export EXECUTION_LAYER_HTTP=$_EXECUTION_LAYER_HTTP
155165
export EXECUTION_LAYER_WS=$_EXECUTION_LAYER_WS
166+
export EXECUTION_NODE_CLIENT=$_EXECUTION_NODE_CLIENT
156167

157168
export BEACON_NODE_API_3500=$_BEACON_NODE_API_3500
158169
export BEACON_NODE_API_4000=$_BEACON_NODE_API_4000
159170
export BEACON_NODE_CLIENT=$_BEACON_NODE_CLIENT
160171

161172
# For testing porpuses, uncomment the above lines and comment the following ones
162173
# BEACON_NODE_CLIENT="prysm"
174+
# EXECUTION_NODE_CLIENT="geth"
163175

164176
# EXECUTION_LAYER_HTTP="http://hoodi-geth.dappnode:8545"
165177
# EXECUTION_LAYER_WS="ws://hoodi-geth.dappnode:8546"
166178

167179
# BEACON_NODE_API_3500="http://beacon-chain.prysm-hoodi.dappnode:3500"
168180
# BEACON_NODE_API_4000="http://beacon-chain.prysm-hoodi.dappnode:4000"
169181

182+
if [ "$NETWORK" == "hoodi" ]; then
183+
NETWORK="testnet"
184+
fi
170185
NETWORK="${NETWORK}" \
186+
EXECUTION_NODE_CLIENT="${EXECUTION_NODE_CLIENT}" \
171187
BEACON_NODE_CLIENT="${BEACON_NODE_CLIENT}" \
172188
EXECUTION_LAYER_HTTP="${EXECUTION_LAYER_HTTP}" \
173189
EXECUTION_LAYER_WS="${EXECUTION_LAYER_WS}" \
@@ -185,6 +201,11 @@ if [ -f "/rocketpool/data/wallet" ]; then
185201
fi
186202
if [ ! -f /rocketpool/data/password ]; then
187203
echo "${INFO} set-password"
204+
if [ ! -f /.rocketpool/data/password ]; then
205+
mkdir -p /.rocketpool/data
206+
echo "${WALLET_PASSWORD}" > /.rocketpool/data/password
207+
echo "${WALLET_PASSWORD}" > /rocketpool/data/password
208+
fi
188209
/usr/local/bin/rocketpoold --settings /app/rocketpool/user-settings.yml api wallet set-password "${WALLET_PASSWORD}"
189210
fi
190211
echo "${INFO} Initializing Rocketpool service"

‎build/user-settings_template.yml‎

Lines changed: 84 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,37 @@ addons-gww:
66
updateInputTime: "600"
77
updatePixelTime: "60"
88
updateWallTime: "600"
9+
addons-rescue-node:
10+
enabled: "false"
11+
password: ""
12+
username: ""
13+
alertmanager:
14+
alertEnabled_ActiveSyncCommittee: "true"
15+
alertEnabled_BeaconClientSyncComplete: "true"
16+
alertEnabled_ClientSyncStatusBeacon: "true"
17+
alertEnabled_ClientSyncStatusExecution: "true"
18+
alertEnabled_ExecutionClientSyncComplete: "true"
19+
alertEnabled_FeeRecipientChanged: "true"
20+
alertEnabled_LowDiskSpaceCritical: "true"
21+
alertEnabled_LowDiskSpaceWarning: "true"
22+
alertEnabled_MinipoolBalanceDistributed: "true"
23+
alertEnabled_MinipoolBondReduced: "true"
24+
alertEnabled_MinipoolPromoted: "true"
25+
alertEnabled_MinipoolStaked: "true"
26+
alertEnabled_OSUpdatesAvailable: "true"
27+
alertEnabled_RPUpdatesAvailable: "true"
28+
alertEnabled_RecentProposal: "true"
29+
alertEnabled_UpcomingProposal: "true"
30+
alertEnabled_UpcomingSyncCommittee: "true"
31+
containerTag: prom/alertmanager:v0.26.0
32+
discordWebhookURL: ""
33+
enableAlerting: "true"
34+
nativeModeHost: localhost
35+
nativeModePort: "9093"
36+
openPort: closed
37+
port: "9093"
38+
pushoverToken: ""
39+
pushoverUserKey: ""
940
besu:
1041
additionalFlags: ""
1142
containerTag: hyperledger/besu:25.7.0
@@ -22,15 +53,18 @@ consensusCommon:
2253
checkpointSyncUrl: ""
2354
doppelgangerDetection: "true"
2455
graffiti: "from_DAppNode"
25-
openApiPort: "false"
56+
openApiPort: closed
2657
p2pPort: "9001"
58+
suggestedBlockGasLimit: ""
2759
executionCommon:
2860
enginePort: "8551"
2961
ethstatsLabel: ""
3062
ethstatsLogin: ""
3163
httpPort: "8545"
32-
openRpcPorts: "false"
64+
openRpcPorts: closed
3365
p2pPort: "30303"
66+
pruningMode: fullNode
67+
suggestedBlockGasLimit: ""
3468
wsPort: "8546"
3569
exporter:
3670
additionalFlags: ""
@@ -45,30 +79,36 @@ externalLighthouse:
4579
doppelgangerDetection: "true"
4680
graffiti: "from_DAppNode"
4781
httpUrl: ${BEACON_NODE_API_3500}
82+
suggestedBlockGasLimit: ""
4883
externalLodestar:
4984
additionalVcFlags: ""
50-
containerTag: chainsafe/lodestar:v1.32.0
85+
containerTag: chainsafe/lodestar:v1.33.0
5186
doppelgangerDetection: "true"
5287
graffiti: "from_DAppNode"
5388
httpUrl: ${BEACON_NODE_API_3500}
89+
suggestedBlockGasLimit: ""
5490
externalNimbus:
5591
additionalVcFlags: ""
56-
containerTag: statusim/nimbus-validator-client:multiarch-v25.7.0
92+
containerTag: statusim/nimbus-validator-client:multiarch-v25.7.1
5793
doppelgangerDetection: "true"
5894
graffiti: "from_DAppNode"
5995
httpUrl: ${BEACON_NODE_API_3500}
96+
suggestedBlockGasLimit: ""
6097
externalPrysm:
6198
additionalVcFlags: ""
6299
containerTag: gcr.io/offchainlabs/prysm/validator:v6.0.4
63100
doppelgangerDetection: "true"
64101
graffiti: from_DAppNode
65102
httpUrl: ${BEACON_NODE_API_3500}
66103
jsonRpcUrl: ${BEACON_NODE_API_4000}
104+
suggestedBlockGasLimit: ""
67105
externalTeku:
68106
additionalVcFlags: ""
69107
containerTag: consensys/teku:25.7.1
108+
doppelgangerDetection: "true"
70109
graffiti: "from_DAppNode"
71110
httpUrl: ${BEACON_NODE_API_3500}
111+
suggestedBlockGasLimit: ""
72112
fallbackNormal:
73113
ccHttpUrl: ""
74114
ecHttpUrl: ""
@@ -78,44 +118,45 @@ fallbackPrysm:
78118
jsonRpcUrl: ""
79119
geth:
80120
additionalFlags: ""
81-
cache: "256"
82-
containerTag: ethereum/client-go:v1.16.1
121+
containerTag: ethereum/client-go:v1.16.2
122+
evmTimeout: "5"
83123
maxPeers: "50"
84124
usePebble: "false"
85125
archiveMode: "false"
86126
grafana:
87127
containerTag: grafana/grafana:9.5.18
128+
openPort: external
88129
port: "3100"
89130
lighthouse:
90131
additionalBnFlags: ""
91132
additionalVcFlags: ""
92133
containerTag: sigp/lighthouse:v7.1.0
93-
maxPeers: "80"
134+
maxPeers: "100"
135+
p2pQuicPort: "8001"
94136
lodestar:
95137
additionalBnFlags: ""
96138
additionalVcFlags: ""
97-
containerTag: chainsafe/lodestar:v1.32.0
98-
maxPeers: "50"
139+
containerTag: chainsafe/lodestar:v1.33.0
140+
maxPeers: "100"
99141
mevBoost:
100142
additionalFlags: ""
101143
aestusEnabled: "false"
102-
blocknativeEnabled: "false"
103-
bloxRouteEthicalEnabled: "false"
104144
bloxRouteMaxProfitEnabled: "false"
105145
bloxRouteRegulatedEnabled: "false"
146+
btcsOfacEnabled: "false"
106147
containerTag: flashbots/mev-boost:1.9
107-
edenEnabled: "false"
108148
enableRegulatedAllMev: "false"
109-
enableRegulatedNoSandwich: "false"
110149
enableUnregulatedAllMev: "false"
111-
enableUnregulatedNoSandwich: "false"
112150
externalUrl: ""
113151
flashbotsEnabled: "false"
114152
mode: external
115-
openRpcPort: "false"
153+
openRpcPort: closed
116154
port: "18550"
117155
selectionMode: profile
156+
titanGlobalEnabled: "false"
157+
titanRegionalEnabled: "false"
118158
ultrasoundEnabled: "false"
159+
ultrasoundFilteredEnabled: "false"
119160
native:
120161
ccHttpUrl: ${BEACON_NODE_API_3500}
121162
consensusClient: ${BEACON_NODE_CLIENT}
@@ -126,10 +167,13 @@ nethermind:
126167
additionalFlags: ""
127168
additionalModules: ""
128169
additionalUrls: ""
129-
cache: "256"
130-
containerTag: nethermind/nethermind:1.32.3
170+
cache: "2048"
171+
containerTag: nethermind/nethermind:1.32.4
172+
fullPruneMemoryBudget: ""
173+
fullPruningMaxDegreeOfParallelism: "0"
174+
fullPruningThresholdMb: "51200"
131175
maxPeers: "50"
132-
pruneMemSize: "256"
176+
pruneMemSize: ""
133177
reth:
134178
additionalFlags: ""
135179
unsupportedCommonParams: ""
@@ -143,23 +187,30 @@ reth:
143187
nimbus:
144188
additionalBnFlags: ""
145189
additionalVcFlags: ""
146-
bnContainerTag: statusim/nimbus-eth2:multiarch-v25.7.0
147-
containerTag: statusim/nimbus-validator-client:multiarch-v25.7.0
190+
bnContainerTag: statusim/nimbus-eth2:multiarch-v25.7.1
191+
containerTag: statusim/nimbus-validator-client:multiarch-v25.7.1
148192
maxPeers: "160"
149-
pruningMode: archive
193+
pruningMode: prune
150194
prometheus:
151195
additionalFlags: ""
152196
containerTag: prom/prometheus:v2.53.1
153-
openPort: "false"
197+
openPort: closed
154198
port: "9091"
155199
prysm:
156200
additionalBnFlags: ""
157201
additionalVcFlags: ""
158202
bnContainerTag: gcr.io/offchainlabs/prysm/beacon-chain:v6.0.4
159-
maxPeers: "45"
160-
openRpcPort: "false"
203+
maxPeers: "70"
204+
openRpcPort: closed
205+
p2pQuicPort: "8001"
161206
rpcPort: "5053"
162207
vcContainerTag: gcr.io/offchainlabs/prysm/validator:v6.0.4
208+
reth:
209+
additionalFlags: ""
210+
cache: "16384"
211+
containerTag: ghcr.io/paradigmxyz/reth:v1.6.0
212+
maxInboundPeers: "30"
213+
maxPeers: "100"
163214
root:
164215
bnMetricsPort: "9100"
165216
consensusClient: nimbus
@@ -169,38 +220,39 @@ root:
169220
enableMetrics: "true"
170221
enableMevBoost: "true"
171222
enableODaoMetrics: "false"
172-
executionClient: geth
223+
executionClient: ${EXECUTION_NODE_CLIENT}
173224
executionClientMode: external
174225
exporterMetricsPort: "9103"
175226
externalConsensusClient: ${BEACON_NODE_CLIENT}
176-
isNative: "true"
227+
isNative: "false"
177228
nodeMetricsPort: "9102"
178229
reconnectDelay: 60s
179230
rpDir: /app/rocketpool/
180231
useFallbackClients: "false"
181232
vcMetricsPort: "9101"
182-
version: v1.9.1
233+
version: v1.17.2
183234
watchtowerMetricsPort: "9104"
184235
smartnode:
185236
archiveECUrl: ""
186-
balancesModernizationEpoch: "162094"
237+
autoInitVPThreshold: "5"
187238
dataPath: /rocketpool/data
188239
distributeThreshold: "1"
189240
manualMaxFee: "0"
190241
minipoolStakeGasThreshold: "150"
191242
network: ${NETWORK}
243+
priceBalanceSubmissionReferenceTimestamp: "1713420000"
192244
priorityFee: "2"
193245
projectName: rocketpool
246+
rewardsTreeCustomUrl: ""
194247
rewardsTreeMode: download
195-
rplTwapEpoch: "162094"
248+
verifyProposals: "false"
196249
watchtowerMaxFeeOverride: "200"
197250
watchtowerPrioFeeOverride: "3"
198-
web3StorageApiToken: ""
199251
teku:
200252
additionalBnFlags: ""
201253
additionalVcFlags: ""
202254
archiveMode: "false"
203255
containerTag: consensys/teku:25.7.1
204-
jvmHeapSize: "2048"
256+
jvmHeapSize: "0"
205257
maxPeers: "100"
206-
258+
useSlashingProtection: "true"

‎dappnode_package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "rocketpool-testnet.public.dappnode.eth",
3-
"version": "0.2.0",
4-
"upstreamVersion": "v1.17.1",
5-
"upstreamRepo": "rocket-pool/smartnode-install",
3+
"version": "0.1.9",
4+
"upstreamVersion": "v1.17.3",
5+
"upstreamRepo": "rocket-pool/smartnode",
66
"architectures": ["linux/amd64"],
77
"description": "How Rocket Pool Works. Unlike solo stakers, who are required to put 32 ETH up for deposit to create a new validator, Rocket Pool nodes only need to deposit 8/16 ETH per validator. This will be coupled with 16 ETH from the staking pool (which stakers deposited in exchange for rETH) to create a new Ethereum validator. This new validator is called a minipool.",
88
"type": "service",

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
build:
66
context: ./build
77
args:
8-
UPSTREAM_VERSION: v1.17.1
8+
UPSTREAM_VERSION: v1.17.3
99
NETWORK: hoodi
1010
volumes:
1111
- rocketpool-testnet:/rocketpool

0 commit comments

Comments
 (0)