op-chain-ops: Fix validation logic (#4316)

op-chain-ops/genesis/check.go

@@ -42,10 +42,12 @@ func CheckMigratedDB(ldb ethdb.Database) error {
 	if err := CheckPredeploys(db); err != nil {
 		return err
 	}
+	log.Info("checked predeploys")
 
 	if err := CheckLegacyETH(db); err != nil {
 		return err
 	}
+	log.Info("checked legacy eth")
 
 	return nil
 }
@@ -64,24 +66,36 @@ func CheckPredeploys(db vm.StateDB) error {
 			return fmt.Errorf("no code found at predeploy %s", addr)
 		}
 
-		// There must be an implementation
-		impl := db.GetState(addr, ImplementationSlot)
-		implAddr := common.BytesToAddress(impl.Bytes())
-		if implAddr == (common.Address{}) {
-			return fmt.Errorf("no implementation for %s", addr)
-		}
-		implCode := db.GetCode(implAddr)
-		if len(implCode) == 0 {
-			return fmt.Errorf("no code found at predeploy impl %s", addr)
-		}
-
 		// There must be an admin
 		admin := db.GetState(addr, AdminSlot)
 		adminAddr := common.BytesToAddress(admin.Bytes())
-		if adminAddr != predeploys.ProxyAdminAddr {
-			return fmt.Errorf("admin is %s when it should be % for %s", adminAddr, predeploys.ProxyAdminAddr, addr)
+		if addr != predeploys.ProxyAdminAddr && addr != predeploys.GovernanceTokenAddr && adminAddr != predeploys.ProxyAdminAddr {
+			return fmt.Errorf("admin is %s when it should be %s for %s", adminAddr, predeploys.ProxyAdminAddr, addr)
 		}
 	}
+
+	// For each predeploy, check that we've set the implementation correctly when
+	// necessary and that there's code at the implementation.
+	for _, proxyAddr := range predeploys.Predeploys {
+		implAddr, special, err := mapImplementationAddress(proxyAddr)
+		if err != nil {
+			return err
+		}
+
+		if !special {
+			impl := db.GetState(*proxyAddr, ImplementationSlot)
+			implAddr := common.BytesToAddress(impl.Bytes())
+			if implAddr == (common.Address{}) {
+				return fmt.Errorf("no implementation for %s", *proxyAddr)
+			}
+		}
+
+		implCode := db.GetCode(implAddr)
+		if len(implCode) == 0 {
+			return fmt.Errorf("no code found at predeploy impl %s", *proxyAddr)
+		}
+	}
+
 	return nil
 }
 

op-chain-ops/genesis/db_migration.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/ether"
+
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/ether"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis/migration"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/rawdb"

op-chain-ops/genesis/setters.go

@@ -76,20 +76,12 @@ func SetImplementations(db vm.StateDB, storage state.StorageConfig, immutable im
 	for name, address := range predeploys.Predeploys {
 		// Convert the address to the code address unless it is
 		// designed to not be behind a proxy
-		var addr common.Address
-		switch *address {
-		case predeploys.GovernanceTokenAddr:
-			addr = predeploys.GovernanceTokenAddr
-		case predeploys.LegacyERC20ETHAddr:
-			addr = predeploys.LegacyERC20ETHAddr
-		case predeploys.ProxyAdminAddr:
-			addr = predeploys.ProxyAdminAddr
-		default:
-			addr, err = AddressToCodeNamespace(*address)
-			if err != nil {
-				return err
-			}
-			// Set the implementation slot in the predeploy proxy
+		addr, special, err := mapImplementationAddress(address)
+		if err != nil {
+			return err
+		}
+
+		if !special {
 			db.SetState(*address, ImplementationSlot, addr.Hash())
 		}
 
@@ -136,3 +128,23 @@ func SetPrecompileBalances(db vm.StateDB) {
 		db.AddBalance(addr, common.Big1)
 	}
 }
+
+func mapImplementationAddress(addrP *common.Address) (common.Address, bool, error) {
+	var addr common.Address
+	var err error
+	var special bool
+	switch *addrP {
+	case predeploys.GovernanceTokenAddr:
+		addr = predeploys.GovernanceTokenAddr
+		special = true
+	case predeploys.LegacyERC20ETHAddr:
+		addr = predeploys.LegacyERC20ETHAddr
+		special = true
+	case predeploys.ProxyAdminAddr:
+		addr = predeploys.ProxyAdminAddr
+		special = true
+	default:
+		addr, err = AddressToCodeNamespace(*addrP)
+	}
+	return addr, special, err
+}