Merge upstream 1.16.1

.cursor/rules/solidity-styles.mdc

@@ -50,6 +50,8 @@ Applies to Solidity files.
   - `minor`: changes that modify bytecode OR expand ABI without breaking existing interface
   - `major`: changes that break existing interface OR modify security model
 
+AI code review tools should NOT comment on the choice of version increment.
+
 ## Dependencies
 - Prefer OpenZeppelin's Upgradeable contracts for basic functionality
 

.github/CODEOWNERS

@@ -31,7 +31,10 @@
 /.cursor/rules/solidity-styles.mdc @ethereum-optimism/contract-reviewers
 
 # Contracts
-/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers #[min:2]
+# We require a minimum of 2 reviewers for all changes to the contracts-bedrock
+# directory unless only markdown files are being changed.
+/packages/contracts-bedrock/**           @ethereum-optimism/contract-reviewers #[min:2]
+/packages/contracts-bedrock/**/*.md      @ethereum-optimism/contract-reviewers
 
 # Security docs
 /docs @ethereum-optimism/evm-safety

.gitmodules

@@ -13,7 +13,7 @@
 [submodule "packages/contracts-bedrock/lib/safe-contracts"]
 	path = packages/contracts-bedrock/lib/safe-contracts
 	url = https://github.com/safe-global/safe-contracts
-	branch = v1.4.0
+	branch = v1.4.1
 [submodule "packages/contracts-bedrock/lib/kontrol-cheatcodes"]
 	path = packages/contracts-bedrock/lib/kontrol-cheatcodes
 	url = https://github.com/runtimeverification/kontrol-cheatcodes

Makefile

@@ -141,6 +141,10 @@ op-dispute-mon: ## Builds op-dispute-mon binary
 	make -C ./op-dispute-mon op-dispute-mon
 .PHONY: op-dispute-mon
 
+op-supernode: ## Builds op-supernode binary
+	just $(JUSTFLAGS) ./op-supernode/op-supernode
+.PHONY: op-supernode
+
 op-program: ## Builds op-program binary
 	make -C ./op-program op-program
 .PHONY: op-program
@@ -224,7 +228,17 @@ TEST_PKGS := \
 	./op-e2e/e2eutils/... \
 	./op-e2e/opgeth/... \
 	./op-e2e/interop/... \
-	./op-e2e/actions/... \
+	./op-e2e/actions/altda \
+	./op-e2e/actions/batcher \
+	./op-e2e/actions/derivation \
+	./op-e2e/actions/helpers \
+	./op-e2e/actions/interop \
+	./op-e2e/actions/proofs \
+	./op-e2e/actions/proposer \
+	./op-e2e/actions/safedb \
+	./op-e2e/actions/sequencer \
+	./op-e2e/actions/sync \
+	./op-e2e/actions/upgrades \
 	./packages/contracts-bedrock/scripts/checks/... \
 	./op-dripper/... \
 	./devnet-sdk/... \
@@ -233,7 +247,8 @@ TEST_PKGS := \
 	./op-deployer/pkg/deployer/artifacts/... \
 	./op-deployer/pkg/deployer/broadcaster/... \
 	./op-deployer/pkg/deployer/clean/... \
-	./op-deployer/pkg/deployer/integration_test/... \
+	./op-deployer/pkg/deployer/integration_test/ \
+	./op-deployer/pkg/deployer/integration_test/cli/... \
 	./op-deployer/pkg/deployer/standard/... \
 	./op-deployer/pkg/deployer/state/... \
 	./op-deployer/pkg/deployer/verify/... \

cannon/Dockerfile.diff

@@ -23,14 +23,14 @@ ARG GIT_DATE
 
 ARG TARGETOS TARGETARCH
 
-FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.5.0-alpha.1 AS cannon-multithreaded64-4
+FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.6.0 AS cannon-multithreaded64-5
 
 FROM --platform=$BUILDPLATFORM builder AS cannon-verify
-COPY --from=cannon-multithreaded64-4 /usr/local/bin/cannon /usr/local/bin/cannon-multithreaded64-4
+COPY --from=cannon-multithreaded64-5 /usr/local/bin/cannon /usr/local/bin/cannon-multithreaded64-5
 
-# Check cannon-multithreaded64-4
-# verify the latest multithreaded VM behavior against multithreaded64-4
-RUN cd cannon && make diff-multithreaded64-4-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-4
+# Check cannon-multithreaded64-5
+# verify the latest multithreaded VM behavior against multithreaded64-5
+RUN cd cannon && make diff-multithreaded64-5-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-5
 RUN --mount=type=cache,target=/root/.cache/go-build cd cannon && \
- make diff-multithreaded64-4-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-4 \
+ make diff-multithreaded64-5-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-5 \
  GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE

cannon/cmd/witness.go

@@ -27,11 +27,12 @@ var (
 )
 
 type response struct {
-	WitnessHash common.Hash   `json:"witnessHash"`
-	Witness     hexutil.Bytes `json:"witness"`
-	Step        uint64        `json:"step"`
-	Exited      bool          `json:"exited"`
-	ExitCode    uint8         `json:"exitCode"`
+	StateVersion factory.StateVersion `json:"stateVersion"`
+	WitnessHash  common.Hash          `json:"witnessHash"`
+	Witness      hexutil.Bytes        `json:"witness"`
+	Step         uint64               `json:"step"`
+	Exited       bool                 `json:"exited"`
+	ExitCode     uint8                `json:"exitCode"`
 }
 
 func Witness(ctx *cli.Context) error {
@@ -48,11 +49,12 @@ func Witness(ctx *cli.Context) error {
 		}
 	}
 	output := response{
-		WitnessHash: h,
-		Witness:     witness,
-		Step:        state.GetStep(),
-		Exited:      state.GetExited(),
-		ExitCode:    state.GetExitCode(),
+		StateVersion: state.Version,
+		WitnessHash:  h,
+		Witness:      witness,
+		Step:         state.GetStep(),
+		Exited:       state.GetExited(),
+		ExitCode:     state.GetExitCode(),
 	}
 	if err := jsonutil.WriteJSON(output, ioutil.ToStdOut()); err != nil {
 		return fmt.Errorf("failed to write response: %w", err)

cannon/mipsevm/versions/version.go

@@ -105,7 +105,7 @@ func GetStateVersionStrings() []string {
 
 // GetCurrentVersion returns the current default version.
 func GetCurrentVersion() StateVersion {
-	return VersionMultiThreaded64_v4
+	return VersionMultiThreaded64_v5
 }
 
 // GetExperimentalVersion returns the newest in-development version of Cannon if it exists, otherwise returns the same

devnet-sdk/descriptors/deployment.go

@@ -58,7 +58,6 @@ type Chain struct {
 
 type L2Chain struct {
 	*Chain
-	L1Addresses  AddressMap     `json:"l1_addresses,omitempty"`
 	L1Wallets    WalletMap      `json:"l1_wallets,omitempty"`
 	RollupConfig *rollup.Config `json:"rollup_config"`
 }

devnet-sdk/shell/env/env_test.go

@@ -138,9 +138,6 @@ func TestGetChain(t *testing.T) {
 							"deployer": common.HexToAddress("0x2345678901234567890123456789012345678901"),
 						},
 					},
-					L1Addresses: descriptors.AddressMap{
-						"deployer": common.HexToAddress("0x2345678901234567890123456789012345678901"),
-					},
 					L1Wallets: descriptors.WalletMap{
 						"deployer": &descriptors.Wallet{
 							Address:    common.HexToAddress("0x2345678901234567890123456789012345678901"),

devnet-sdk/system/chain.go

@@ -224,7 +224,7 @@ func newL2ChainFromDescriptor(d *descriptors.L2Chain) (*l2Chain, error) {
 	// TODO: handle incorrect descriptors better. We could panic here.
 
 	nodes := newNodesFromDescriptor(d.Chain)
-	c := newL2Chain(d.ID, nil, nil, d.Config, AddressMap(d.L1Addresses), AddressMap(d.Addresses), nodes) // Create chain first
+	c := newL2Chain(d.ID, nil, nil, d.Config, AddressMap(d.Addresses), nodes) // Create chain first
 
 	l2Wallets, err := newWalletMapFromDescriptorWalletMap(d.Wallets, c)
 	if err != nil {
@@ -241,23 +241,17 @@ func newL2ChainFromDescriptor(d *descriptors.L2Chain) (*l2Chain, error) {
 	return c, nil
 }
 
-func newL2Chain(chainID string, l1Wallets WalletMap, l2Wallets WalletMap, chainConfig *params.ChainConfig, l1Addresses AddressMap, l2Addresses AddressMap, nodes []Node) *l2Chain {
+func newL2Chain(chainID string, l1Wallets WalletMap, l2Wallets WalletMap, chainConfig *params.ChainConfig, l2Addresses AddressMap, nodes []Node) *l2Chain {
 	chain := &l2Chain{
-		chain:       newChain(chainID, l2Wallets, chainConfig, l2Addresses, nodes),
-		l1Addresses: l1Addresses,
-		l1Wallets:   l1Wallets,
+		chain:     newChain(chainID, l2Wallets, chainConfig, l2Addresses, nodes),
+		l1Wallets: l1Wallets,
 	}
 	return chain
 }
 
 type l2Chain struct {
 	*chain
-	l1Addresses AddressMap
-	l1Wallets   WalletMap
-}
-
-func (c *l2Chain) L1Addresses() AddressMap {
-	return c.l1Addresses
+	l1Wallets WalletMap
 }
 
 func (c *l2Chain) L1Wallets() WalletMap {

devnet-sdk/system/chain_test.go

@@ -111,9 +111,6 @@ func TestL2ChainFromDescriptor(t *testing.T) {
 				"user2": common.HexToAddress("0x1234567890123456789012345678901234567891"),
 			},
 		},
-		L1Addresses: descriptors.AddressMap{
-			"user1": common.HexToAddress("0x1234567890123456789012345678901234567890"),
-		},
 		L1Wallets: descriptors.WalletMap{
 			"user1": &descriptors.Wallet{
 				PrivateKey: "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",

devnet-sdk/system/interfaces.go

@@ -40,8 +40,7 @@ type Chain interface {
 type L2Chain interface {
 	Chain
 
-	// The wallets and addresses below are for use on the L1 chain that this L2Chain instance settles to.
-	L1Addresses() AddressMap
+	// The wallets below are for use on the L1 chain that this L2Chain instance settles to.
 	L1Wallets() WalletMap
 }
 

devnet-sdk/system/system_test.go

@@ -71,9 +71,6 @@ func TestNewSystemFromEnv(t *testing.T) {
 						"defaultl2": common.HexToAddress("0x456"),
 					},
 				},
-				L1Addresses: descriptors.AddressMap{
-					"defaultl1": common.HexToAddress("0x123"),
-				},
 				L1Wallets: descriptors.WalletMap{
 					"default": &descriptors.Wallet{
 						Address:    common.HexToAddress("0x123"),
@@ -142,9 +139,6 @@ func TestSystemFromDevnet(t *testing.T) {
 								"default": testWallet,
 							},
 						},
-						L1Addresses: descriptors.AddressMap{
-							"defaultl1": common.HexToAddress("0x123"),
-						},
 						L1Wallets: descriptors.WalletMap{
 							"default": testWallet,
 						},
@@ -189,9 +183,6 @@ func TestSystemFromDevnet(t *testing.T) {
 								},
 							},
 						},
-						L1Addresses: descriptors.AddressMap{
-							"defaultl1": common.HexToAddress("0x123"),
-						},
 						L1Wallets: descriptors.WalletMap{
 							"default": testWallet,
 						},

devnet-sdk/testing/testlib/validators/forks.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/devnet-sdk/system"
 	"github.com/ethereum-optimism/optimism/devnet-sdk/testing/systest"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-core/forks"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -39,40 +39,40 @@ func getChainConfig(t systest.T, sys system.System, chainIdx uint64) (*params.Ch
 
 // IsForkActivated checks if a specific fork is activated at the given timestamp
 // based on the chain configuration.
-func IsForkActivated(c *params.ChainConfig, forkName rollup.ForkName, timestamp uint64) (bool, error) {
+func IsForkActivated(c *params.ChainConfig, forkName forks.Name, timestamp uint64) (bool, error) {
 	if c == nil {
 		return false, fmt.Errorf("provided chain config is nil")
 	}
 
 	switch forkName {
-	case rollup.Bedrock:
+	case forks.Bedrock:
 		// Bedrock is activated based on block number, not timestamp
 		return true, nil // Assuming bedrock is always active in the context of this validator
-	case rollup.Regolith:
+	case forks.Regolith:
 		return c.IsOptimismRegolith(timestamp), nil
-	case rollup.Canyon:
+	case forks.Canyon:
 		return c.IsOptimismCanyon(timestamp), nil
-	case rollup.Ecotone:
+	case forks.Ecotone:
 		return c.IsOptimismEcotone(timestamp), nil
-	case rollup.Fjord:
+	case forks.Fjord:
 		return c.IsOptimismFjord(timestamp), nil
-	case rollup.Granite:
+	case forks.Granite:
 		return c.IsOptimismGranite(timestamp), nil
-	case rollup.Holocene:
+	case forks.Holocene:
 		return c.IsOptimismHolocene(timestamp), nil
-	case rollup.Isthmus:
+	case forks.Isthmus:
 		return c.IsOptimismIsthmus(timestamp), nil
-	case rollup.Jovian:
+	case forks.Jovian:
 		return c.IsOptimismJovian(timestamp), nil
-	case rollup.Interop:
+	case forks.Interop:
 		return c.IsInterop(timestamp), nil
 	default:
 		return false, fmt.Errorf("unknown fork name: %s", forkName)
 	}
 }
 
 // forkConfigValidator is a helper function that checks if a specific L2 chain meets a fork condition.
-func forkConfigValidator(chainIdx uint64, forkName rollup.ForkName, shouldBeActive bool, forkConfigMarker interface{}) systest.PreconditionValidator {
+func forkConfigValidator(chainIdx uint64, forkName forks.Name, shouldBeActive bool, forkConfigMarker interface{}) systest.PreconditionValidator {
 	return func(t systest.T, sys system.System) (context.Context, error) {
 		chainConfig, timestamp, err := getChainConfig(t, sys, chainIdx)
 		if err != nil {
@@ -105,7 +105,7 @@ type ChainConfigGetter = func(context.Context) *params.ChainConfig
 // AcquireForkConfig returns a ForkConfigGetter and a PreconditionValidator
 // that ensures a ForkConfig is available for the specified L2 chain.
 // The ForkConfig can be used to check if various forks are activated.
-func acquireForkConfig(chainIdx uint64, forkName rollup.ForkName, shouldBeActive bool) (ChainConfigGetter, systest.PreconditionValidator) {
+func acquireForkConfig(chainIdx uint64, forkName forks.Name, shouldBeActive bool) (ChainConfigGetter, systest.PreconditionValidator) {
 	chainConfigMarker := new(byte)
 	validator := forkConfigValidator(chainIdx, forkName, shouldBeActive, chainConfigMarker)
 	return func(ctx context.Context) *params.ChainConfig {
@@ -114,13 +114,13 @@ func acquireForkConfig(chainIdx uint64, forkName rollup.ForkName, shouldBeActive
 }
 
 // RequiresFork returns a validator that ensures a specific L2 chain has a specific fork activated.
-func AcquireL2WithFork(chainIdx uint64, forkName rollup.ForkName) (ChainConfigGetter, systest.PreconditionValidator) {
+func AcquireL2WithFork(chainIdx uint64, forkName forks.Name) (ChainConfigGetter, systest.PreconditionValidator) {
 	return acquireForkConfig(chainIdx, forkName, true)
 }
 
 // RequiresNotFork returns a validator that ensures a specific L2 chain does not
 // have a specific fork activated. Will not work with the interop fork
 // specifically since interop is not an ordered release fork.
-func AcquireL2WithoutFork(chainIdx uint64, forkName rollup.ForkName) (ChainConfigGetter, systest.PreconditionValidator) {
+func AcquireL2WithoutFork(chainIdx uint64, forkName forks.Name) (ChainConfigGetter, systest.PreconditionValidator) {
 	return acquireForkConfig(chainIdx, forkName, false)
 }