Skip to content

Commit 789333e

Browse files
0xfornax0xfornax
committed
Merge branch 'devnet6'
2 parents cf7c598 + 37d3198 commit 789333e

File tree

4 files changed

+33
-50
lines changed

4 files changed

+33
-50
lines changed

‎shared/services/config/smartnode-config.go‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig {
415415

416416
txWatchUrl: map[config.Network]string{
417417
config.Network_Mainnet: "https://etherscan.io/tx",
418-
config.Network_Devnet: "https://explorer.ephemery.dev/tx",
418+
config.Network_Devnet: "https://hoodi.etherscan.io/tx",
419419
config.Network_Testnet: "https://hoodi.etherscan.io/tx",
420420
},
421421

@@ -426,32 +426,32 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig {
426426
},
427427

428428
chainID: map[config.Network]uint{
429-
config.Network_Mainnet: 1, // Mainnet
430-
config.Network_Devnet: 39438153, // Ephemery
431-
config.Network_Testnet: 560048, // Hoodi
429+
config.Network_Mainnet: 1, // Mainnet
430+
config.Network_Devnet: 560048, // Hoodi
431+
config.Network_Testnet: 560048, // Hoodi
432432
},
433433

434434
storageAddress: map[config.Network]string{
435435
config.Network_Mainnet: "0x1d8f8f00cfa6758d7bE78336684788Fb0ee0Fa46",
436-
config.Network_Devnet: "0xDAef0d5CDEdaE428DC6F07e065996D1B709cfeC5",
436+
config.Network_Devnet: "0x990BC2c12d2a39e5FD92111B98A728bf39742478",
437437
config.Network_Testnet: "0x594Fb75D3dc2DFa0150Ad03F99F97817747dd4E1",
438438
},
439439

440440
rocketSignerRegistryAddress: map[config.Network]string{
441441
config.Network_Mainnet: "0xc1062617d10Ae99E09D941b60746182A87eAB38F",
442-
config.Network_Devnet: "0x54775df9F3Bd25405ecF1072131428A6861784d7",
442+
config.Network_Devnet: "0xE3FbfaD4A11777E6271921E7EC1A5a1345684F4E",
443443
config.Network_Testnet: "0xE3FbfaD4A11777E6271921E7EC1A5a1345684F4E",
444444
},
445445

446446
rplTokenAddress: map[config.Network]string{
447447
config.Network_Mainnet: "0xD33526068D116cE69F19A9ee46F0bd304F21A51f",
448-
config.Network_Devnet: "0x594bA8cBbB5fc650BaB6227F06c62FEa1c8D7aaB",
448+
config.Network_Devnet: "0xce59520Cbaec3B399a5245e72C0F21df791202FE",
449449
config.Network_Testnet: "0x1Cc9cF5586522c6F483E84A19c3C2B0B6d027bF0",
450450
},
451451

452452
rethAddress: map[config.Network]string{
453453
config.Network_Mainnet: "0xae78736Cd615f374D3085123A210448E74Fc6393",
454-
config.Network_Devnet: "0x82B2C5Bb0a2194F9ff25452A7573cc36c7C4d8Ca",
454+
config.Network_Devnet: "0x3aC886F531BEb95f08F73fDb21528BE3c63AA82F",
455455
config.Network_Testnet: "0x7322c24752f79c05FFD1E2a6FCB97020C1C264F1",
456456
},
457457

@@ -532,9 +532,7 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig {
532532
common.HexToAddress("0x594Fb75D3dc2DFa0150Ad03F99F97817747dd4E1"),
533533
common.HexToAddress("0xA805d68b61956BC92d556F2bE6d18747adAeEe82"),
534534
},
535-
config.Network_Devnet: {
536-
common.HexToAddress("0x664dafBbf286959BCB910bf42970E9aA26b336E8"),
537-
},
535+
config.Network_Devnet: {},
538536
config.Network_Testnet: {},
539537
},
540538

@@ -594,25 +592,25 @@ func NewSmartnodeConfig(cfg *RocketPoolConfig) *SmartnodeConfig {
594592

595593
rplTwapPoolAddress: map[config.Network]string{
596594
config.Network_Mainnet: "0xe42318ea3b998e8355a3da364eb9d48ec725eb45",
597-
config.Network_Devnet: "0x347F8cFF6755eb9b21C157A152a2C7e5c8a4558F",
595+
config.Network_Devnet: "0x0ca239d8AC5E49E3203d60eaf86Baa6712E5b454",
598596
config.Network_Testnet: "0x0ca239d8AC5E49E3203d60eaf86Baa6712E5b454",
599597
},
600598

601599
multicallAddress: map[config.Network]string{
602600
config.Network_Mainnet: "0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696",
603-
config.Network_Devnet: "0xF400396052f34A59023Fd47337570ABF3FE52463",
604-
config.Network_Testnet: "0x4866504f62497ee6C98d8ba928321a9C6e89f536",
601+
config.Network_Devnet: "0xc5fA61aA6Ec012d1A2Ea38f31ADAf4D06c8725E7",
602+
config.Network_Testnet: "0xc5fA61aA6Ec012d1A2Ea38f31ADAf4D06c8725E7",
605603
},
606604

607605
balancebatcherAddress: map[config.Network]string{
608606
config.Network_Mainnet: "0xb1f8e55c7f64d203c1400b9d8555d050f94adf39",
609-
config.Network_Devnet: "0xb60A898646427f14661aF64773A6a70753101E5b",
610-
config.Network_Testnet: "0xEE9F0AD34043e3a87e42A4dE091559ee19D7912B",
607+
config.Network_Devnet: "0xB80b500CF68a956b6f149F1C48E8F07EEF4486Ce",
608+
config.Network_Testnet: "0xB80b500CF68a956b6f149F1C48E8F07EEF4486Ce",
611609
},
612610

613611
flashbotsProtectUrl: map[config.Network]string{
614612
config.Network_Mainnet: "https://rpc.flashbots.net/",
615-
config.Network_Devnet: "",
613+
config.Network_Devnet: "https://rpc-hoodi.flashbots.net/",
616614
config.Network_Testnet: "https://rpc-hoodi.flashbots.net/",
617615
},
618616
}

‎shared/services/rocketpool/assets/install/scripts/start-bn.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ if [ "$NETWORK" = "mainnet" ]; then
2626
TEKU_NETWORK="mainnet"
2727
PRYSM_GENESIS_STATE=""
2828
elif [ "$NETWORK" = "devnet" ]; then
29-
. "/devnet/nodevars_env.txt"
30-
LODESTAR_NETWORK="ephemery"
31-
NIMBUS_NETWORK="/devnet"
29+
LH_NETWORK="hoodi"
30+
LODESTAR_NETWORK="hoodi"
31+
NIMBUS_NETWORK="hoodi"
3232
PRYSM_NETWORK="--hoodi"
33-
TEKU_NETWORK="ephemery"
33+
TEKU_NETWORK="hoodi"
3434
elif [ "$NETWORK" = "testnet" ]; then
3535
LH_NETWORK="hoodi"
3636
LODESTAR_NETWORK="hoodi"
@@ -64,7 +64,7 @@ if [ "$CC_CLIENT" = "lighthouse" ]; then
6464
fi
6565

6666
CMD="$PERF_PREFIX /usr/local/bin/lighthouse beacon \
67-
$CMD_LH_NETWORK \
67+
--network $LH_NETWORK \
6868
--port $BN_P2P_PORT \
6969
--discovery-port $BN_P2P_PORT \
7070
--datadir /data \
@@ -127,7 +127,7 @@ if [ "$CC_CLIENT" = "lodestar" ]; then
127127
fi
128128

129129
CMD="$PERF_PREFIX /usr/local/bin/node --max-http-header-size=65536 /usr/app/packages/cli/bin/lodestar beacon \
130-
$CMD_NETWORK \
130+
--network $LODESTAR_NETWORK \
131131
--dataDir /ethclient/lodestar \
132132
--serveHistoricalState \
133133
--port $BN_P2P_PORT \
@@ -253,7 +253,7 @@ if [ "$CC_CLIENT" = "prysm" ]; then
253253

254254
CMD="$PERF_PREFIX /app/cmd/beacon-chain/beacon-chain \
255255
--accept-terms-of-use \
256-
$CMD_NETWORK \
256+
$PRYSM_NETWORK \
257257
$PRYSM_GENESIS_STATE \
258258
--datadir /ethclient/prysm \
259259
--p2p-tcp-port $BN_P2P_PORT \

‎shared/services/rocketpool/assets/install/scripts/start-ec.sh‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ if [ "$NETWORK" = "mainnet" ]; then
3636
BESU_NETWORK="--network=mainnet"
3737
RETH_NETWORK="--chain mainnet"
3838
elif [ "$NETWORK" = "devnet" ]; then
39-
. "/devnet/nodevars_env.txt"
40-
GETH_NETWORK="--networkid 39438153"
41-
RP_NETHERMIND_NETWORK="private"
42-
BESU_NETWORK="--network=ephemery --bootnodes=$BOOTNODE_ENODE_LIST"
43-
RETH_NETWORK="--chain /devnet/genesis.json --bootnodes $BOOTNODE_ENODE_LIST"
39+
GETH_NETWORK="--hoodi"
40+
RP_NETHERMIND_NETWORK="hoodi"
41+
BESU_NETWORK="--network=hoodi"
42+
RETH_NETWORK="--chain hoodi"
4443
elif [ "$NETWORK" = "testnet" ]; then
4544
GETH_NETWORK="--hoodi"
4645
RP_NETHERMIND_NETWORK="hoodi"
@@ -81,10 +80,6 @@ if [ "$CLIENT" = "geth" ]; then
8180
# Run Geth normally
8281
else
8382

84-
if [ "$NETWORK" = "devnet" ]; then
85-
geth init --datadir /ethclient/geth /devnet/genesis.json
86-
fi
87-
8883
CMD="$PERF_PREFIX /usr/local/bin/geth $GETH_NETWORK \
8984
--datadir /ethclient/geth \
9085
--http \
@@ -182,15 +177,8 @@ if [ "$CLIENT" = "nethermind" ]; then
182177
exit 1
183178
fi
184179

185-
if [ "$NETWORK" = "devnet" ]; then
186-
NETWORK_CONFIG="--config /devnet/nethermind-config.json"
187-
else
188-
NETWORK_CONFIG="--config $RP_NETHERMIND_NETWORK \
189-
"
190-
fi
191-
192180
CMD="$PERF_PREFIX $NETHERMIND_BINARY \
193-
$NETWORK_CONFIG \
181+
--config $RP_NETHERMIND_NETWORK \
194182
--data-dir /ethclient/nethermind \
195183
--JsonRpc.Enabled true \
196184
--JsonRpc.Host 0.0.0.0 \
@@ -369,10 +357,6 @@ if [ "$CLIENT" = "reth" ]; then
369357
echo -n "$(head -c 32 /dev/urandom | od -A n -t x1 | tr -d '[:space:]')" > /secrets/jwtsecret
370358
fi
371359

372-
if [ "$NETWORK" = "devnet" ]; then
373-
reth init --datadir /ethclient/geth --chain /devnet/genesis.json
374-
fi
375-
376360
CMD="$PERF_PREFIX /usr/local/bin/reth node $RETH_NETWORK \
377361
--datadir /ethclient/reth \
378362
--http \

‎shared/services/rocketpool/assets/install/scripts/start-vc.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ if [ "$NETWORK" = "mainnet" ]; then
1111
PRYSM_NETWORK="--mainnet"
1212
TEKU_NETWORK="mainnet"
1313
elif [ "$NETWORK" = "devnet" ]; then
14-
LODESTAR_NETWORK="ephemery"
14+
LH_NETWORK="hoodi"
15+
LODESTAR_NETWORK="hoodi"
1516
PRYSM_NETWORK="--hoodi"
16-
TEKU_NETWORK="ephemery"
17+
TEKU_NETWORK="hoodi"
1718
elif [ "$NETWORK" = "testnet" ]; then
1819
LH_NETWORK="hoodi"
1920
LODESTAR_NETWORK="hoodi"
@@ -47,7 +48,7 @@ if [ "$CC_CLIENT" = "lighthouse" ]; then
4748
fi
4849

4950
CMD="/usr/local/bin/lighthouse validator \
50-
$CMD_LH_NETWORK \
51+
--network $LH_NETWORK \
5152
--datadir /validators/lighthouse \
5253
--init-slashing-protection \
5354
--http \
@@ -108,7 +109,7 @@ if [ "$CC_CLIENT" = "lodestar" ]; then
108109
fi
109110

110111
CMD="/usr/app/node_modules/.bin/lodestar validator \
111-
$CMD_NETWORK \
112+
--network $LODESTAR_NETWORK \
112113
--dataDir /validators/lodestar \
113114
--beacon-nodes $CC_URL_STRING \
114115
$FALLBACK_CC_STRING \
@@ -207,7 +208,7 @@ if [ "$CC_CLIENT" = "prysm" ]; then
207208

208209
CMD="/app/cmd/validator/validator \
209210
--accept-terms-of-use \
210-
$CMD_NETWORK \
211+
$PRYSM_NETWORK \
211212
--datadir /validators/prysm-non-hd/direct \
212213
--wallet-dir /validators/prysm-non-hd \
213214
--rpc \

0 commit comments

Comments
 (0)