refactor

cmd/geth/README.md

@@ -24,7 +24,7 @@ nohup ./build/bin/geth --datadir=${OP_DATA_DIR} --gcmode=archive migrate --state
 
 ## verifyMigration
 ```
-geth verifyMigrate --chaindata=${erigon_chaindata_path} --datadir=${op_data_dir} --standalone-smt=true
+geth verifyMigrate --chaindata=${ERIGON_CHAINDATA_DIR} --datadir=${OP_DATA_DIR} --standalone-smt=true
 ```
 
 ## unit test

cmd/geth/chaincmd.go

@@ -985,7 +985,6 @@ func verifyGenesisInternal(ctx *cli.Context, alloc types.GenesisAlloc, blockNumb
 	// Collect results
 	var verifiedCount int64
 	var errorCount int64
-	var ignoredCount int64
 
 	// Process results as they come in
 	for result := range resultChan {
@@ -1021,13 +1020,12 @@ func verifyGenesisInternal(ctx *cli.Context, alloc types.GenesisAlloc, blockNumb
 	if errorCount == 0 {
 		log.Info("✅ Genesis verification successful",
 			"accounts_verified", verifiedCount,
-			"accounts_ignored", ignoredCount,
 			"elapsed", common.PrettyDuration(time.Since(start)))
 	} else {
 		log.Error("❌ Genesis verification failed",
 			"errors", errorCount,
 			"accounts_verified", verifiedCount,
-			"accounts_ignored", ignoredCount)
+			"accounts_ignored")
 		return fmt.Errorf("verification failed with %d errors", errorCount)
 	}
 

core/erigonStorageLayout.go

@@ -45,3 +45,11 @@ func GetExecutorSlot(account common.Address) (common.Hash, common.Hash) {
 	executorRoleId := common.HexToHash("0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63")
 	return roleLayout(executorRoleId, account)
 }
+
+func CalculateBatchInboxAddr(chainID common.Hash) common.Address {
+	versionByte := byte(0x00)
+	var out common.Address
+	out[0] = versionByte
+	copy(out[1:], keccak256.Hash(chainID[:])[:19])
+	return out
+}

core/erigonStorageLayout_test.go

@@ -1,6 +1,8 @@
 package core
 
 import (
+	"github.com/stretchr/testify/assert"
+	"math/big"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -29,3 +31,10 @@ func TestGetExecutorSlot_Deterministic(t *testing.T) {
 		t.Errorf("ADMIN_SLOT should be equal to zero")
 	}
 }
+
+func TestCalculateBatchInboxAddr(t *testing.T) {
+	chainId := LeftPadBytes(big.NewInt(196).Bytes(), 32)
+	chainIdHash := common.BytesToHash(chainId)
+	addr := CalculateBatchInboxAddr(chainIdHash)
+	assert.Equal(t, "0x002bdE9b0c0857AEE2cFFDea6b8723eAF5989449", addr.Hex())
+}