Update standard.go for rc.8 (#16505)

* Update standard.go for rc.8

* Update superchain registry with op-contracts/v4.0.0-rc.8

* Update Validator address

* Update registry commit

* op-deployer: Add support for upgrading and validating v4.0.0 (#16048)

* op-deployer: Add support for upgrading to v4.0.0

* simplify versions

* rebase, add validator v4 support

* update address test

* lint

---------

Co-authored-by: Matthew Slipper <[email protected]>

Author: maurelian

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/docker/docker v27.5.1+incompatible
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250603144016-9c45ca7d4508
+	github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250620202749-6b65f330434d
 	github.com/ethereum/go-ethereum v1.15.11
 	github.com/fatih/color v1.18.0
 	github.com/fsnotify/fsnotify v1.9.0

go.sum

@@ -228,8 +228,8 @@ github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
 github.com/ethereum-optimism/op-geth v1.101511.1-0.20250602182422-2ba5f6b747a4 h1:dNSl6HTSLsjQH8644PzLijoeMK0vyeQVEMfYVUTxGf4=
 github.com/ethereum-optimism/op-geth v1.101511.1-0.20250602182422-2ba5f6b747a4/go.mod h1:SkytozVEPtnUeBlquwl0Qv5JKvrN/Y5aqh+VkQo/EOI=
-github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250603144016-9c45ca7d4508 h1:A/3QVFt+Aa9ozpPVXxUTLui8honBjSusAaiCVRbafgs=
-github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250603144016-9c45ca7d4508/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y=
+github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250620202749-6b65f330434d h1:hAgJ89B40bIk7BNHt61Noe3kVQCs9niFli0CeSiJnEY=
+github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250620202749-6b65f330434d/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y=
 github.com/ethereum/c-kzg-4844/v2 v2.1.0 h1:gQropX9YFBhl3g4HYhwE70zq3IHFRgbbNPw0Shwzf5w=
 github.com/ethereum/c-kzg-4844/v2 v2.1.0/go.mod h1:TC48kOKjJKPbN7C++qIgt0TJzZ70QznYR7Ob+WXl57E=
 github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=

op-deployer/pkg/deployer/standard/standard.go

@@ -42,7 +42,7 @@ const (
 	ContractsV170Beta1L2Tag = "op-contracts/v1.7.0-beta.1+l2-contracts"
 	ContractsV200Tag        = "op-contracts/v2.0.0"
 	ContractsV300Tag        = "op-contracts/v3.0.0"
-	ContractsV400Tag        = "op-contracts/v4.0.0-rc.7"
+	ContractsV400Tag        = "op-contracts/v4.0.0-rc.8"
 )
 
 var DisputeAbsolutePrestate = common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c")
@@ -86,8 +86,8 @@ var taggedReleases = map[string]TaggedRelease{
 		ContentHash:   common.HexToHash("147b9fae70608da2975a01be3d98948306f89ba1930af7c917eea41a54d87cdb"),
 	},
 	ContractsV400Tag: {
-		ArtifactsHash: common.HexToHash("da1d9ca1a4ebf80c4842ee3414ef1d13db7d1bb9e1fbbded5a21f28479d7cdf4"),
-		ContentHash:   common.HexToHash("67966a2cb9945e1d9ab40e9c61f499e73cdb31d21b8d29a5a5c909b2b13ecd70"),
+		ArtifactsHash: common.HexToHash("e9c20b45d7f6ad4c83ef9c0d5ba50f18d62493706aec2b556606151879e5b9f1"),
+		ContentHash:   common.HexToHash("8b4f4b0ff67d05dce382e7b7bc0d967cdb9a4d2c88d53d5640b618ac671fb7a0"),
 	},
 }
 

op-deployer/pkg/deployer/upgrade/flags.go

@@ -4,6 +4,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
 	v200 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v2_0_0"
 	v300 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v3_0_0"
+	v400 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v4_0_0"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/urfave/cli/v2"
 )
@@ -40,4 +41,14 @@ var Commands = cli.Commands{
 		}, oplog.CLIFlags(deployer.EnvVarPrefix)...),
 		Action: UpgradeCLI(v300.DefaultUpgrader),
 	},
+	&cli.Command{
+		Name:  "v4.0.0",
+		Usage: "upgrades a chain to version v.0.0",
+		Flags: append([]cli.Flag{
+			deployer.L1RPCURLFlag,
+			ConfigFlag,
+			OverrideArtifactsURLFlag,
+		}, oplog.CLIFlags(deployer.EnvVarPrefix)...),
+		Action: UpgradeCLI(v400.DefaultUpgrader),
+	},
 }

op-deployer/pkg/deployer/upgrade/v4_0_0/upgrade.go

@@ -0,0 +1,25 @@
+// Package v4_0_0 implements the upgrade to v4.0.0 (U16). The interface for the upgrade is identical
+// to the upgrade for v2.0.0 (U13), so all this package does is implement the Upgrader interface and
+// call into the v2.0.0 upgrade.
+package v4_0_0
+
+import (
+	"encoding/json"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	v200 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/upgrade/v2_0_0"
+)
+
+type Upgrader struct {
+}
+
+func (u *Upgrader) Upgrade(host *script.Host, input json.RawMessage) error {
+	return v200.DefaultUpgrader.Upgrade(host, input)
+}
+
+func (u *Upgrader) ArtifactsURL() string {
+	return "tag://" + standard.ContractsV400Tag
+}
+
+var DefaultUpgrader = new(Upgrader)

op-service/testutils/mockrpc/mockrpc.go

@@ -100,6 +100,16 @@ func WithExpectationsFile(t *testing.T, path string) Option {
 	}
 }
 
+func WithOkCall(method string, pm ParamsMatcher, result any) Option {
+	return func(rpc *MockRPC) {
+		rpc.calls = append(rpc.calls, rpcCall{
+			Method:        method,
+			ParamsMatcher: pm,
+			Result:        result,
+		})
+	}
+}
+
 func NewMockRPC(t *testing.T, lgr log.Logger, opts ...Option) *MockRPC {
 	m := &MockRPC{
 		lgr: lgr,

op-validator/cmd/main.go

@@ -3,8 +3,9 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-validator/pkg/validations"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum-optimism/optimism/op-validator/pkg/service"
@@ -31,9 +32,10 @@ func main() {
 			Name:  "validate",
 			Usage: "Run validation for a specific version",
 			Subcommands: []*cli.Command{
-				versionCmd(validations.VersionV180),
-				versionCmd(validations.VersionV200),
-				versionCmd(validations.VersionV300),
+				versionCmd(standard.ContractsV180Tag),
+				versionCmd(standard.ContractsV200Tag),
+				versionCmd(standard.ContractsV300Tag),
+				versionCmd(standard.ContractsV400Tag),
 			},
 		},
 	}
@@ -49,7 +51,7 @@ func main() {
 
 func versionCmd(version string) *cli.Command {
 	return &cli.Command{
-		Name:  version,
+		Name:  strings.Replace(version, "op-contracts/", "", 1),
 		Usage: fmt.Sprintf("Run validation for %s", version),
 		Flags: append(service.ValidateFlags, oplog.CLIFlags(EnvVarPrefix)...),
 		Action: func(cliCtx *cli.Context) error {

op-validator/pkg/service/validate.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum-optimism/optimism/op-validator/pkg/validations"
 	"github.com/ethereum/go-ethereum/log"
@@ -45,10 +47,14 @@ func Validate(ctx context.Context, lgr log.Logger, release string, cfg *Config)
 
 	var validator validations.Validator
 	switch release {
-	case validations.VersionV180:
+	case standard.ContractsV180Tag:
 		validator = validations.NewV180Validator(l1Client)
-	case validations.VersionV200:
+	case standard.ContractsV200Tag:
 		validator = validations.NewV200Validator(l1Client)
+	case standard.ContractsV300Tag:
+		validator = validations.NewV300Validator(l1Client)
+	case standard.ContractsV400Tag:
+		validator = validations.NewV400Validator(l1Client)
 	default:
 		return nil, fmt.Errorf("invalid release: %s", release)
 	}

op-validator/pkg/validations/addresses.go

@@ -3,36 +3,31 @@ package validations
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-)
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
-const (
-	VersionV180 = "v1.8.0"
-	VersionV200 = "v2.0.0"
-	VersionV300 = "v3.0.0"
-	VersionV400 = "v4.0.0"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 var addresses = map[uint64]map[string]common.Address{
 	1: {
 		// Bootstrapped on 03/07/2025 using OP Deployer.
-		VersionV180: common.HexToAddress("0x37fb5b21750d0e08a992350574bd1c24f4bcedf9"),
+		standard.ContractsV180Tag: common.HexToAddress("0x37fb5b21750d0e08a992350574bd1c24f4bcedf9"),
 		// Bootstrapped on 03/07/2025 using OP Deployer.
-		VersionV200: common.HexToAddress("0x12a9e38628e5a5b24d18b1956ed68a24fe4e3dc0"),
+		standard.ContractsV200Tag: common.HexToAddress("0x12a9e38628e5a5b24d18b1956ed68a24fe4e3dc0"),
 		// Bootstrapped on 04/16/2025 using OP Deployer.
-		VersionV300: common.HexToAddress("0xf989Df70FB46c581ba6157Ab335c0833bA60e1f0"),
-		// Bootstrapped on 06/03/2025 using OP Deployer.
-		VersionV400: common.HexToAddress("0x3246b056A3C9B14AA25b75ee133DC3747476DBc5"),
+		standard.ContractsV300Tag: common.HexToAddress("0xf989Df70FB46c581ba6157Ab335c0833bA60e1f0"),
+		// Bootstrapped on 06/19/2025 using OP Deployer.
+		standard.ContractsV400Tag: common.HexToAddress("0xbb43313d206a9b02032c749ca0828a07c962b4b5"),
 	},
 	11155111: {
 		// Bootstrapped on 03/02/2025 using OP Deployer.
-		VersionV180: common.HexToAddress("0x0a5bf8ebb4b177b2dcc6eba933db726a2e2e2b4d"),
+		standard.ContractsV180Tag: common.HexToAddress("0x0a5bf8ebb4b177b2dcc6eba933db726a2e2e2b4d"),
 		// Bootstrapped on 03/02/2025 using OP Deployer.
-		VersionV200: common.HexToAddress("0x37739a6b0a3f1e7429499a4ec4a0685439daff5c"),
+		standard.ContractsV200Tag: common.HexToAddress("0x37739a6b0a3f1e7429499a4ec4a0685439daff5c"),
 		// Bootstrapped on 04/03/2025 using OP Deployer.
-		VersionV300: common.HexToAddress("0x2d56022cb84ce6b961c3b4288ca36386bcd9024c"),
-		// Bootstrapped on 06/03/2025 using OP Deployer.
-		VersionV400: common.HexToAddress("0x3246b056A3C9B14AA25b75ee133DC3747476DBc5"),
+		standard.ContractsV300Tag: common.HexToAddress("0x2d56022cb84ce6b961c3b4288ca36386bcd9024c"),
+		// Bootstrapped on 06/19/2025 using OP Deployer.
+		standard.ContractsV400Tag: common.HexToAddress("0xaaabe70a4198ab9e99e1a22b1afa0a43cc7f2c79"),
 	},
 }
 

op-validator/pkg/validations/addresses_test.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"regexp"
-	"slices"
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 
 	"github.com/ethereum-optimism/superchain-registry/validation"
@@ -19,7 +19,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 )
 
 func TestValidatorAddress(t *testing.T) {
@@ -33,21 +32,21 @@ func TestValidatorAddress(t *testing.T) {
 		{
 			name:        "Valid Sepolia v1.8.0",
 			chainID:     11155111,
-			version:     VersionV180,
+			version:     standard.ContractsV180Tag,
 			want:        common.HexToAddress("0x0a5bf8ebb4b177b2dcc6eba933db726a2e2e2b4d"),
 			expectError: false,
 		},
 		{
 			name:        "Valid Sepolia v2.0.0",
 			chainID:     11155111,
-			version:     VersionV200,
+			version:     standard.ContractsV200Tag,
 			want:        common.HexToAddress("0x37739a6b0a3F1E7429499a4eC4A0685439Daff5C"),
 			expectError: false,
 		},
 		{
 			name:        "Invalid Chain ID",
 			chainID:     999,
-			version:     VersionV180,
+			version:     standard.ContractsV180Tag,
 			want:        common.Address{},
 			expectError: true,
 		},
@@ -85,52 +84,41 @@ func TestAddressValidDeployment(t *testing.T) {
 	}
 }
 
-// Regex to match version strings, removing op-contracts/ prefix and -rc.* suffix
-var cleanVersionRegex = regexp.MustCompile(`^(?:op-contracts/)?(v\d+\.\d+\.\d+)(?:-rc\.\d+)?$`)
-
 func testStandardVersionNetwork(t *testing.T, network string) {
 	var rpcURL string
-	var versions validation.Versions
+	var stdVersDefs validation.Versions
 	var chainID uint64
 	if network == "mainnet" {
 		rpcURL = os.Getenv("MAINNET_RPC_URL")
-		versions = validation.StandardVersionsMainnet
+		stdVersDefs = validation.StandardVersionsMainnet
 		chainID = 1
 	} else if network == "sepolia" {
 		rpcURL = os.Getenv("SEPOLIA_RPC_URL")
-		versions = validation.StandardVersionsSepolia
+		stdVersDefs = validation.StandardVersionsSepolia
 		chainID = 11155111
 	} else {
 		t.Fatalf("Invalid network: %s", network)
 	}
 
 	require.NotEmpty(t, rpcURL, "RPC URL is empty")
 
-	// Use maps.keys to ensure the versions are sorted in descending order.
-	sortedKeys := maps.Keys(versions)
-	slices.Sort(sortedKeys)
-	slices.Reverse(sortedKeys)
-
-	for _, semver := range sortedKeys {
-		// Versions are in descending order, to stop at all versions prior to v1.8.0 since
-		// they don't have validators.
-		if string(semver) == "op-contracts/v1.6.0" {
-			break
-		}
-
-		version := versions[semver]
+	contractVersions := []string{
+		standard.ContractsV180Tag,
+		standard.ContractsV200Tag,
+		standard.ContractsV300Tag,
+		standard.ContractsV400Tag,
+	}
 
-		matches := cleanVersionRegex.FindStringSubmatch(string(semver))
-		require.Len(t, matches, 2, "Invalid version format: %s", semver)
-		cleanVersion := matches[1]
+	for _, semver := range contractVersions {
+		version := stdVersDefs[validation.Semver(semver)]
 
-		address, err := ValidatorAddress(chainID, cleanVersion)
+		address, err := ValidatorAddress(chainID, semver)
 		require.NoError(t, err)
 
 		rpcClient, err := rpc.Dial(rpcURL)
 		require.NoError(t, err)
 
-		t.Run(string(semver), func(t *testing.T) {
+		t.Run(semver, func(t *testing.T) {
 			testStandardVersion(t, address, rpcClient, version)
 		})
 	}

op-validator/pkg/validations/testdata/validations-v180.json

@@ -6,6 +6,8 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -82,9 +84,17 @@ func (v *BaseValidator) Validate(ctx context.Context, input BaseValidatorInput)
 }
 
 func NewV180Validator(client *rpc.Client) *BaseValidator {
-	return newBaseValidator(client, VersionV180)
+	return newBaseValidator(client, standard.ContractsV180Tag)
 }
 
 func NewV200Validator(client *rpc.Client) *BaseValidator {
-	return newBaseValidator(client, VersionV200)
+	return newBaseValidator(client, standard.ContractsV200Tag)
+}
+
+func NewV300Validator(client *rpc.Client) *BaseValidator {
+	return newBaseValidator(client, standard.ContractsV300Tag)
+}
+
+func NewV400Validator(client *rpc.Client) *BaseValidator {
+	return newBaseValidator(client, standard.ContractsV400Tag)
 }