Merge remote-tracking branch 'upstream/develop' into sc/asr-single-root

Author: mslipper

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

@@ -116,6 +116,16 @@ var opcmBlueprintsByVersion = map[string]OPCMBlueprintsByChain{
 		},
 	},
 	"op-contracts/v1.8.0-rc.4": {
+		Mainnet: &OPCMBlueprints{
+			AddressManager:           common.HexToAddress("0x29aA24714c06914d9689e933cae2293C569AfeEa"),
+			Proxy:                    common.HexToAddress("0x3626ebD458c7f34FD98789A373593fF2fc227bA0"),
+			ProxyAdmin:               common.HexToAddress("0x7170678A5CFFb6872606d251B3CcdB27De962631"),
+			L1ChugSplashProxy:        common.HexToAddress("0x538906C8B000D621fd11B7e8642f504dD8730837"),
+			ResolvedDelegateProxy:    common.HexToAddress("0xF12bD34d6a1d26d230240ECEA761f77e2013926E"),
+			AnchorStateRegistry:      common.HexToAddress("0xbA7Be2bEE016568274a4D1E6c852Bb9a99FaAB8B"),
+			PermissionedDisputeGame1: common.HexToAddress("0x596A4334a28056c7943c8bcEf220F38cA5B42dC5"), // updated
+			PermissionedDisputeGame2: common.HexToAddress("0x4E3E5C09B07AAA3fe482F5A1f82a19e91944Fffc"), // updated
+		},
 		Sepolia: &OPCMBlueprints{
 			AddressManager:           common.HexToAddress("0x3125a4cB2179E04203D3Eb2b5784aaef9FD64216"),
 			Proxy:                    common.HexToAddress("0xe650ADb86a0de96e2c434D0a52E7D5B70980D6f1"),
@@ -234,6 +244,11 @@ func ManagerImplementationAddrFor(chainID uint64, tag string) (common.Address, e
 			// Verified against compiled bytecode at:
 			// https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts-v160-artifacts-opcm-redesign-backport
 			return common.HexToAddress("0x9BC0A1eD534BFb31a6Be69e5b767Cba332f14347"), nil
+		case "op-contracts/v1.8.0-rc.4":
+			// Generated using the bootstrap command on 01/23/2025.
+			// Verified against compiled bytecode at:
+			// https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts-v180-blueprints-script
+			return common.HexToAddress("0x5269eed89b0d04d909a0973439e2587e815ba932"), nil
 		default:
 			return common.Address{}, fmt.Errorf("unsupported mainnet tag: %s", tag)
 		}

op-e2e/actions/interop/interop_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-program/client/claim"
 	"github.com/ethereum-optimism/optimism/op-program/client/interop/types"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 
@@ -355,20 +356,35 @@ func TestInteropFaultProofs(gt *testing.T) {
 				t,
 				logger,
 				actors.L1Miner,
-				actors.ChainA.Sequencer.L2Verifier,
-				actors.ChainA.SequencerEngine,
-				actors.ChainA.L2Genesis,
-				chain1End.BlockRef.Number,
 				checkResult,
-				fpHelpers.WithInteropEnabled(),
-				fpHelpers.WithAgreedPrestate(test.agreedClaim),
-				fpHelpers.WithL2Claim(crypto.Keccak256Hash(test.disputedClaim)),
-				fpHelpers.WithL2BlockNumber(endBlockNumA),
+				WithInteropEnabled(actors, test.agreedClaim, crypto.Keccak256Hash(test.disputedClaim), endTimestamp),
 			)
 		})
 	}
 }
 
+func WithInteropEnabled(actors *InteropActors, agreedPrestate []byte, disputedClaim common.Hash, claimTimestamp uint64) fpHelpers.FixtureInputParam {
+	return func(f *fpHelpers.FixtureInputs) {
+		f.InteropEnabled = true
+		f.AgreedPrestate = agreedPrestate
+		f.L2OutputRoot = crypto.Keccak256Hash(agreedPrestate)
+		f.L2Claim = disputedClaim
+		f.L2BlockNumber = claimTimestamp
+
+		// TODO: Remove these once hints all specify the L2 chain ID
+		f.L2ChainID = actors.ChainA.ChainID.ToBig().Uint64()
+		f.L2Head = actors.ChainA.SequencerEngine.L2Chain().CurrentHeader().ParentHash
+
+		for _, chain := range []*Chain{actors.ChainA, actors.ChainB} {
+			f.L2Sources = append(f.L2Sources, &fpHelpers.FaultProofProgramL2Source{
+				Node:        chain.Sequencer.L2Verifier,
+				Engine:      chain.SequencerEngine,
+				ChainConfig: chain.L2Genesis.Config,
+			})
+		}
+	}
+}
+
 type transitionTest struct {
 	name           string
 	startTimestamp uint64

op-e2e/actions/proofs/helpers/env.go

@@ -6,15 +6,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	e2ecfg "github.com/ethereum-optimism/optimism/op-e2e/config"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum-optimism/optimism/op-program/client/boot"
 	"github.com/ethereum/go-ethereum/params"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	"github.com/ethereum-optimism/optimism/op-program/host/config"
-	hostTypes "github.com/ethereum-optimism/optimism/op-program/host/types"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
@@ -152,27 +151,17 @@ func WithL2Claim(claim common.Hash) FixtureInputParam {
 	}
 }
 
-func WithAgreedPrestate(prestate []byte) FixtureInputParam {
-	return func(f *FixtureInputs) {
-		f.AgreedPrestate = prestate
-		f.L2OutputRoot = crypto.Keccak256Hash(prestate)
-	}
-}
-
 func WithL2BlockNumber(num uint64) FixtureInputParam {
 	return func(f *FixtureInputs) {
 		f.L2BlockNumber = num
 	}
 }
 
-func WithInteropEnabled() FixtureInputParam {
-	return func(f *FixtureInputs) {
-		f.InteropEnabled = true
-	}
-}
-
 func (env *L2FaultProofEnv) RunFaultProofProgram(t helpers.Testing, l2ClaimBlockNum uint64, checkResult CheckResult, fixtureInputParams ...FixtureInputParam) {
-	RunFaultProofProgram(t, env.log, env.Miner, env.Sequencer.L2Verifier, env.Engine, env.Sd.L2Cfg, l2ClaimBlockNum, checkResult, fixtureInputParams...)
+	defaultParam := WithPreInteropDefaults(t, l2ClaimBlockNum, env.Sequencer.L2Verifier, env.Engine)
+	combinedParams := []FixtureInputParam{defaultParam}
+	combinedParams = append(combinedParams, fixtureInputParams...)
+	RunFaultProofProgram(t, env.log, env.Miner, checkResult, combinedParams...)
 }
 
 type TestParam func(p *e2eutils.TestParams)
@@ -210,17 +199,17 @@ func NewBatcherCfg(params ...BatcherCfgParam) *helpers.BatcherCfg {
 }
 
 func NewOpProgramCfg(
-	t helpers.Testing,
-	rollupCfg *rollup.Config,
-	l2Genesis *params.ChainConfig,
 	fi *FixtureInputs,
 ) *config.Config {
-	dfault := config.NewConfig(rollupCfg, l2Genesis, fi.L1Head, fi.L2Head, fi.L2OutputRoot, fi.L2Claim, fi.L2BlockNumber)
-
-	if dumpFixtures {
-		dfault.DataDir = t.TempDir()
-		dfault.DataFormat = hostTypes.DataFormatPebble
+	var rollupConfigs []*rollup.Config
+	var chainConfigs []*params.ChainConfig
+	for _, source := range fi.L2Sources {
+		rollupConfigs = append(rollupConfigs, source.Node.RollupCfg)
+		chainConfigs = append(chainConfigs, source.ChainConfig)
 	}
+
+	dfault := config.NewConfig(rollupConfigs, chainConfigs, fi.L1Head, fi.L2Head, fi.L2OutputRoot, fi.L2Claim, fi.L2BlockNumber)
+	dfault.L2ChainID = boot.CustomChainIDIndicator
 	if fi.InteropEnabled {
 		dfault.AgreedPrestate = fi.AgreedPrestate
 	}

op-e2e/actions/proofs/helpers/fixture.go

@@ -1,42 +1,23 @@
 package helpers
 
 import (
-	"encoding/json"
-	"errors"
-	"io/fs"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum-optimism/optimism/op-program/client/claim"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/naoina/toml"
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	dumpFixtures = false
-	fixtureDir   string
+	"github.com/ethereum/go-ethereum/params"
 )
 
-func init() {
-	fixtureDir = os.Getenv("OP_E2E_FPP_FIXTURE_DIR")
-	if fixtureDir != "" {
-		dumpFixtures = true
-	}
-}
-
 type TestFixture struct {
 	Name           string        `toml:"name"`
 	ExpectedStatus uint8         `toml:"expected-status"`
 	Inputs         FixtureInputs `toml:"inputs"`
 }
 
+type FaultProofProgramL2Source struct {
+	Node        *helpers.L2Verifier
+	Engine      *helpers.L2Engine
+	ChainConfig *params.ChainConfig
+}
+
 type FixtureInputs struct {
 	L2BlockNumber  uint64      `toml:"l2-block-number"`
 	L2Claim        common.Hash `toml:"l2-claim"`
@@ -46,93 +27,6 @@ type FixtureInputs struct {
 	L1Head         common.Hash `toml:"l1-head"`
 	AgreedPrestate []byte      `toml:"agreed-prestate"`
 	InteropEnabled bool        `toml:"use-interop"`
-}
-
-// Dumps a `fp-tests` test fixture to disk if the `OP_E2E_FPP_FIXTURE_DIR` environment variable is set.
-//
-// [fp-tests]: https://github.com/ethereum-optimism/fp-tests
-func tryDumpTestFixture(
-	t helpers.Testing,
-	result error,
-	name string,
-	rollupCfg *rollup.Config,
-	l2Genesis *core.Genesis,
-	inputs FixtureInputs,
-	workDir string,
-) {
-	if !dumpFixtures {
-		return
-	}
-
-	name = convertToKebabCase(name)
-
-	var expectedStatus uint8
-	if result == nil {
-		expectedStatus = 0
-	} else if errors.Is(result, claim.ErrClaimNotValid) {
-		expectedStatus = 1
-	} else {
-		expectedStatus = 2
-	}
-
-	fixture := TestFixture{
-		Name:           name,
-		ExpectedStatus: expectedStatus,
-		Inputs:         inputs,
-	}
-
-	fixturePath := filepath.Join(fixtureDir, name)
-
-	err := os.MkdirAll(filepath.Join(fixturePath), fs.ModePerm)
-	require.NoError(t, err, "failed to create fixture dir")
-
-	fixtureFilePath := filepath.Join(fixturePath, "fixture.toml")
-	serFixture, err := toml.Marshal(fixture)
-	require.NoError(t, err, "failed to serialize fixture")
-	require.NoError(t, os.WriteFile(fixtureFilePath, serFixture, fs.ModePerm), "failed to write fixture")
-
-	genesisPath := filepath.Join(fixturePath, "genesis.json")
-	serGenesis, err := l2Genesis.MarshalJSON()
-	require.NoError(t, err, "failed to serialize genesis")
-	require.NoError(t, os.WriteFile(genesisPath, serGenesis, fs.ModePerm), "failed to write genesis")
-
-	rollupPath := filepath.Join(fixturePath, "rollup.json")
-	serRollup, err := json.Marshal(rollupCfg)
-	require.NoError(t, err, "failed to serialize rollup")
-	require.NoError(t, os.WriteFile(rollupPath, serRollup, fs.ModePerm), "failed to write rollup")
-
-	// Copy the witness database into the fixture directory.
-	cmd := exec.Command("cp", "-r", workDir, filepath.Join(fixturePath, "witness-db"))
-	require.NoError(t, cmd.Run(), "Failed to copy witness DB")
-
-	// Compress the genesis file.
-	cmd = exec.Command("zstd", genesisPath)
-	_ = cmd.Run()
-	require.NoError(t, os.Remove(genesisPath), "Failed to remove uncompressed genesis file")
-
-	// Compress the witness database.
-	cmd = exec.Command(
-		"tar",
-		"--zstd",
-		"-cf",
-		filepath.Join(fixturePath, "witness-db.tar.zst"),
-		filepath.Join(fixturePath, "witness-db"),
-	)
-	cmd.Dir = filepath.Join(fixturePath)
-	require.NoError(t, cmd.Run(), "Failed to compress witness DB")
-	require.NoError(t, os.RemoveAll(filepath.Join(fixturePath, "witness-db")), "Failed to remove uncompressed witness DB")
-}
-
-// Convert to lower kebab case for strings containing `/`
-func convertToKebabCase(input string) string {
-	if !strings.Contains(input, "/") {
-		return input
-	}
-
-	// Replace non-alphanumeric characters with underscores
-	re := regexp.MustCompile(`[^a-zA-Z0-9]+`)
-	snake := re.ReplaceAllString(input, "-")
 
-	// Convert to lower case
-	return strings.ToLower(snake)
+	L2Sources []*FaultProofProgramL2Source
 }