Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename hermez-devnet into hermez-blueberry #33

Merged
merged 1 commit into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
6 changes: 3 additions & 3 deletions core/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ func TestHermezBlockRoots(t *testing.T) {
}
})

t.Run("Hermez Devnet", func(t *testing.T) {
block, _, err := core.GenesisToBlock(core.HermezDevnetGenesisBlock(), "")
t.Run("Hermez Blueberry", func(t *testing.T) {
block, _, err := core.GenesisToBlock(core.HermezBlueberryGenesisBlock(), "")
require.NoError(err)
if block.Root() != params.HermezDevnetGenesisHash {
if block.Root() != params.HermezBlueberryGenesisHash {
t.Errorf("wrong Hermez Testnet genesis state root, got %v, want %v", block.Root(), params.HermezTestnetGenesisHash)
}
})
Expand Down
10 changes: 5 additions & 5 deletions core/genesis_write.go
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,13 @@ func HermezTestnetGenesisBlock() *types.Genesis {
}
}

func HermezDevnetGenesisBlock() *types.Genesis {
func HermezBlueberryGenesisBlock() *types.Genesis {
return &types.Genesis{
Config: params.HermezDevnetChainConfig,
Config: params.HermezBlueberryChainConfig,
Timestamp: 1676996964,
GasLimit: 0x0,
Difficulty: big.NewInt(0x0),
Alloc: readPrealloc("allocs/hermez-devnet.json"),
Alloc: readPrealloc("allocs/hermez-blueberry.json"),
}
}

Expand Down Expand Up @@ -738,8 +738,8 @@ func GenesisBlockByChainName(chain string) *types.Genesis {
return HermezMainnetGenesisBlock()
case networkname.HermezTestnetChainName:
return HermezTestnetGenesisBlock()
case networkname.HermezDevnetChainName:
return HermezDevnetGenesisBlock()
case networkname.HermezBlueberryChainName:
return HermezBlueberryGenesisBlock()
case networkname.HermezCardonaChainName:
return HermezCardonaGenesisBlock()
case networkname.HermezCardonaInternalChainName:
Expand Down
4 changes: 2 additions & 2 deletions hermezconfig-blueberry.yaml.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
datadir : '/Volumes/External/hermez/blueberry'
chain : "hermez-devnet"
chain : "hermez-blueberry"
http : true
private.api.addr : "localhost:9093"
zkevm.l2-chain-id: 1440
Expand All @@ -17,4 +17,4 @@ zkevm.rpc-ratelimit: 250
torrent.port: 42071

externalcl: true
http.api : ["eth","debug","net","trace","web3","erigon","zkevm"]
http.api : ["eth","debug","net","trace","web3","erigon","zkevm"]
16 changes: 8 additions & 8 deletions params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var (
ChiadoGenesisHash = libcommon.HexToHash("0xada44fd8d2ecab8b08f256af07ad3e777f17fb434f8f8e678b312f576212ba9a")
HermezMainnetGenesisHash = libcommon.HexToHash("0x3f86b09b43e3e49a41fc20a07579b79eba044253367817d5c241d23c0e2bc5c9")
HermezTestnetGenesisHash = libcommon.HexToHash("0x13a14c4a8288e782863d7ce916d224546c69dc428fbfa7115a0cc33a27a05b26")
HermezDevnetGenesisHash = libcommon.HexToHash("0x45cff376044a08f8f33f0244d589f2178ea4f4c5234d912daa2ff3c496b17862")
HermezBlueberryGenesisHash = libcommon.HexToHash("0x45cff376044a08f8f33f0244d589f2178ea4f4c5234d912daa2ff3c496b17862")
HermezCardonaGenesisHash = libcommon.HexToHash("0xf1a89745a08cfd1af739b93f960ad89546e3cec2a7babe8607703eb1e4e94b4d")
HermezCardonaInternalGenesisHash = libcommon.HexToHash("0x676657dd8a7dce782f4fe8a97ba794de3ff732b40233fce01da77d1ba1a24ee1")
)
Expand Down Expand Up @@ -141,7 +141,7 @@ var (

HermezTestnetChainConfig = readChainSpec("chainspecs/hermez-testnet.json")

HermezDevnetChainConfig = readChainSpec("chainspecs/hermez-devnet.json")
HermezBlueberryChainConfig = readChainSpec("chainspecs/hermez-blueberry.json")

HermezCardonaChainConfig = readChainSpec("chainspecs/hermez-cardona.json")

Expand Down Expand Up @@ -231,8 +231,8 @@ func ChainConfigByChainName(chain string) *chain.Config {
return HermezMainnetChainConfig
case networkname.HermezTestnetChainName:
return HermezTestnetChainConfig
case networkname.HermezDevnetChainName:
return HermezDevnetChainConfig
case networkname.HermezBlueberryChainName:
return HermezBlueberryChainConfig
case networkname.HermezCardonaChainName:
return HermezCardonaChainConfig
case networkname.HermezCardonaInternalChainName:
Expand Down Expand Up @@ -266,8 +266,8 @@ func GenesisHashByChainName(chain string) *libcommon.Hash {
return &HermezMainnetGenesisHash
case networkname.HermezTestnetChainName:
return &HermezTestnetGenesisHash
case networkname.HermezDevnetChainName:
return &HermezDevnetGenesisHash
case networkname.HermezBlueberryChainName:
return &HermezBlueberryGenesisHash
case networkname.HermezCardonaChainName:
return &HermezCardonaGenesisHash
case networkname.HermezCardonaInternalChainName:
Expand Down Expand Up @@ -301,8 +301,8 @@ func ChainConfigByGenesisHash(genesisHash libcommon.Hash) *chain.Config {
return HermezMainnetChainConfig
case genesisHash == HermezTestnetGenesisHash:
return HermezTestnetChainConfig
case genesisHash == HermezDevnetGenesisHash:
return HermezDevnetChainConfig
case genesisHash == HermezBlueberryGenesisHash:
return HermezBlueberryChainConfig
case genesisHash == HermezCardonaGenesisHash:
return HermezCardonaChainConfig
case genesisHash == HermezCardonaInternalGenesisHash:
Expand Down
4 changes: 2 additions & 2 deletions params/networkname/network_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
ChiadoChainName = "chiado"
HermezMainnetChainName = "hermez-mainnet"
HermezTestnetChainName = "hermez-testnet"
HermezDevnetChainName = "hermez-devnet"
HermezBlueberryChainName = "hermez-blueberry"
HermezCardonaChainName = "hermez-cardona"
HermezCardonaInternalChainName = "hermez-cardona-internal"
)
Expand All @@ -30,7 +30,7 @@ var All = []string{
ChiadoChainName,
HermezMainnetChainName,
HermezTestnetChainName,
HermezDevnetChainName,
HermezBlueberryChainName,
HermezCardonaChainName,
HermezCardonaInternalChainName,
}