Skip to content

Commit 307c2e6

Browse files
authored
Update Berachain testnet (#4296)
1 parent a9efee2 commit 307c2e6

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

ethereum/env/.env.berachain.testnet

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# ethereum$ ln -s env/.env.berachain.testnet .env
33

44
# Common config for forge deployment
5-
RPC_URL=https://bartio.rpc.berachain.com/
5+
RPC_URL=https://bepolia.rpc.berachain.com/
66
FORGE_ARGS="--legacy"
77

88
# Wormhole Core Migrations
99
INIT_SIGNERS=["0x13947Bd48b18E53fdAeEe77F3473391aC727C638"]
1010
INIT_CHAIN_ID=39
1111
INIT_GOV_CHAIN_ID=0x1
1212
INIT_GOV_CONTRACT=0x0000000000000000000000000000000000000000000000000000000000000004
13-
INIT_EVM_CHAIN_ID=80084
13+
INIT_EVM_CHAIN_ID=80069
1414

1515
# Bridge Migrations
1616
BRIDGE_INIT_CHAIN_ID=39
1717
BRIDGE_INIT_GOV_CHAIN_ID=0x1
1818
BRIDGE_INIT_GOV_CONTRACT=0x0000000000000000000000000000000000000000000000000000000000000004
1919
# Wrapped BERA: https://docs.berachain.com/developers/deployed-contracts#deployment-contract-addresses
20-
BRIDGE_INIT_WETH=0x7507c1dc16935B82698e4C63f2746A2fCf994dF8
20+
BRIDGE_INIT_WETH=0x6969696969696969696969696969696969696969
2121
BRIDGE_INIT_FINALITY=1

node/pkg/watchers/evm/chain_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ var (
139139
// As of 9/06/2024 Linea supports polling for finalized but not safe.
140140
vaa.ChainIDLinea: {Finalized: true, Safe: false, EvmChainID: 59141, PublicRPC: "https://rpc.sepolia.linea.build"},
141141

142-
vaa.ChainIDBerachain: {Finalized: true, Safe: true, EvmChainID: 80084, PublicRPC: "https://berachain-testnet-rpc.publicnode.com"},
142+
vaa.ChainIDBerachain: {Finalized: true, Safe: true, EvmChainID: 80069, PublicRPC: "https://bepolia.rpc.berachain.com/"},
143143
vaa.ChainIDSeiEVM: {Finalized: true, Safe: true, EvmChainID: 1328, PublicRPC: "https://evm-rpc-testnet.sei-apis.com/"},
144144
// vaa.ChainIDEclipse: Not supported in the guardian.
145145
// vaa.ChainIDBOB: Not supported in the guardian.

node/pkg/watchers/evm/verify_chain_config/verify.go

+26-23
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@ import (
2323
)
2424

2525
var (
26-
envStr = flag.String("env", "both", `Environment to be validated, may be "mainnet", "testnet" or "both", default is "both"`)
26+
envStr = flag.String("env", "both", `Environment to be validated, may be "mainnet", "testnet" or "both", default is "both"`)
27+
chainId = flag.Int("chainId", 0, `An individual chain to be validated, default is all chains`)
2728
)
2829

2930
func main() {
3031
flag.Parse()
3132

3233
if *envStr == "both" {
33-
verifyForEnv(common.MainNet)
34-
verifyForEnv(common.TestNet)
34+
verifyForEnv(common.MainNet, vaa.ChainID(*chainId))
35+
verifyForEnv(common.TestNet, vaa.ChainID(*chainId))
3536
} else {
3637
env, err := common.ParseEnvironment(*envStr)
3738
if err != nil || (env != common.TestNet && env != common.MainNet) {
@@ -43,7 +44,7 @@ func main() {
4344
os.Exit(1)
4445
}
4546

46-
verifyForEnv(env)
47+
verifyForEnv(env, vaa.ChainID(*chainId))
4748
}
4849
}
4950

@@ -52,7 +53,7 @@ type ListEntry struct {
5253
Entry evm.EnvEntry
5354
}
5455

55-
func verifyForEnv(env common.Environment) {
56+
func verifyForEnv(env common.Environment, chainID vaa.ChainID) {
5657
m, err := evm.GetChainConfigMap(env)
5758
if err != nil {
5859
fmt.Printf("Failed to get chain config map for %snet\n", env)
@@ -72,27 +73,29 @@ func verifyForEnv(env common.Environment) {
7273
ctx := context.Background()
7374

7475
for _, entry := range orderedList {
75-
if entry.Entry.PublicRPC == "" {
76-
fmt.Printf("Skipping %v %v because the rpc is null\n", env, entry.ChainID)
77-
} else {
78-
evmChainID, err := evm.QueryEvmChainID(ctx, entry.Entry.PublicRPC)
79-
if err != nil {
80-
fmt.Printf("ERROR: Failed to query EVM chain ID for %v %v: %v\n", env, entry.ChainID, err)
81-
os.Exit(1)
82-
}
76+
if chainID == vaa.ChainIDUnset || entry.ChainID == chainID {
77+
if entry.Entry.PublicRPC == "" {
78+
fmt.Printf("Skipping %v %v because the rpc is null\n", env, entry.ChainID)
79+
} else {
80+
evmChainID, err := evm.QueryEvmChainID(ctx, entry.Entry.PublicRPC)
81+
if err != nil {
82+
fmt.Printf("ERROR: Failed to query EVM chain ID for %v %v: %v\n", env, entry.ChainID, err)
83+
os.Exit(1)
84+
}
8385

84-
if evmChainID != entry.Entry.EvmChainID {
85-
fmt.Printf("ERROR: EVM chain ID mismatch for %v %v: config: %v, actual: %v\n", env, entry.ChainID, entry.Entry.EvmChainID, evmChainID)
86-
os.Exit(1)
87-
}
86+
if evmChainID != entry.Entry.EvmChainID {
87+
fmt.Printf("ERROR: EVM chain ID mismatch for %v %v: config: %v, actual: %v\n", env, entry.ChainID, entry.Entry.EvmChainID, evmChainID)
88+
os.Exit(1)
89+
}
8890

89-
fmt.Printf("EVM chain ID match for %v %v: value: %v\n", env, entry.ChainID, evmChainID)
91+
fmt.Printf("EVM chain ID match for %v %v: value: %v\n", env, entry.ChainID, evmChainID)
9092

91-
if entry.Entry.Finalized || entry.Entry.Safe {
92-
err := verifyFinality(ctx, entry.Entry.PublicRPC, entry.Entry.Finalized, entry.Entry.Safe)
93-
if err != nil {
94-
fmt.Printf("ERROR: failed to verify finality values for %v %v: %v\n", env, entry.ChainID, err)
95-
os.Exit(1)
93+
if entry.Entry.Finalized || entry.Entry.Safe {
94+
err := verifyFinality(ctx, entry.Entry.PublicRPC, entry.Entry.Finalized, entry.Entry.Safe)
95+
if err != nil {
96+
fmt.Printf("ERROR: failed to verify finality values for %v %v: %v\n", env, entry.ChainID, err)
97+
os.Exit(1)
98+
}
9699
}
97100
}
98101
}

0 commit comments

Comments
 (0)