Espresso 4: e2e tests

.circleci/continue/main.yml

@@ -1792,6 +1792,11 @@ jobs:
           enable-mise-cache: true
       - attach_workspace:
           at: .
+      # Pin the solc set to match contracts-bedrock-build. op-deployer tests run
+      # `forge script` against the embedded artifact bundle; if forge auto-detects a
+      # newer solc than the bundle was built with (floating ^0.8.0 pragmas), it
+      # recompiles and breaks the "must not recompile" assertions.
+      - install-solc-compilers
       - restore_cache:
           key: go-tests-v2-{{ checksum "go.mod" }}
       - run:

.gitmodules

@@ -32,3 +32,9 @@
 [submodule "packages/contracts-bedrock/lib/superchain-registry"]
 	path = packages/contracts-bedrock/lib/superchain-registry
 	url = https://github.com/ethereum-optimism/superchain-registry
+[submodule "packages/contracts-bedrock/lib/espresso-tee-contracts"]
+	path = packages/contracts-bedrock/lib/espresso-tee-contracts
+	url = https://github.com/EspressoSystems/espresso-tee-contracts
+[submodule "packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable-v5"]
+	path = packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable-v5
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

espresso/cli.go

@@ -0,0 +1,306 @@
+package espresso
+
+import (
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+	"time"
+
+	op "github.com/EspressoSystems/espresso-streamers/op"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/urfave/cli/v2"
+
+	espressoClient "github.com/EspressoSystems/espresso-network/sdks/go/client"
+	espressoLightClient "github.com/EspressoSystems/espresso-network/sdks/go/light-client"
+)
+
+// espressoFlags returns the flag names for espresso
+func espressoFlags(v string) string {
+	return "espresso." + v
+}
+
+func espressoEnvs(envprefix, v string) []string {
+	return []string{envprefix + "_ESPRESSO_" + v}
+}
+
+// Default values for batch submission receipt verification tuning.
+// Defined here so that both the CLI flag defaults and the batcher logic
+// can reference a single source of truth.
+//
+// Note: DefaultBatchAuthLookbackWindow lives in constants.go (mips64-clean
+// build target shared with the derivation pipeline).
+const (
+	DefaultVerifyReceiptMaxBlocks        uint64        = 5
+	DefaultVerifyReceiptSafetyTimeout    time.Duration = 5 * time.Minute
+	DefaultVerifyReceiptRetryDelay       time.Duration = 100 * time.Millisecond
+	DefaultMaxInFlightRequestsToEspresso               = 128
+)
+
+var (
+	EnabledFlagName                    = espressoFlags("enabled")
+	PollIntervalFlagName               = espressoFlags("poll-interval")
+	QueryServiceUrlsFlagName           = espressoFlags("urls")
+	LightClientAddrFlagName            = espressoFlags("light-client-addr")
+	L1UrlFlagName                      = espressoFlags("l1-url")
+	TestingBatcherPrivateKeyFlagName   = espressoFlags("testing-batcher-private-key")
+	CaffeinationHeightEspresso         = espressoFlags("origin-height-espresso")
+	CaffeinationHeightL2               = espressoFlags("origin-height-l2")
+	NamespaceFlagName                  = espressoFlags("namespace")
+	RollupL1UrlFlagName                = espressoFlags("rollup-l1-url")
+	AttestationServiceFlagName         = espressoFlags("espresso-attestation-service")
+	BatchAuthenticatorAddrFlagName     = espressoFlags("batch-authenticator-addr")
+	VerifyReceiptMaxBlocksFlagName     = espressoFlags("verify-receipt-max-blocks")
+	VerifyReceiptSafetyTimeoutFlagName = espressoFlags("verify-receipt-safety-timeout")
+	VerifyReceiptRetryDelayFlagName    = espressoFlags("verify-receipt-retry-delay")
+)
+
+func CLIFlags(envPrefix string, category string) []cli.Flag {
+	return []cli.Flag{
+		&cli.BoolFlag{
+			Name:     EnabledFlagName,
+			Usage:    "Enable Espresso mode",
+			Value:    false,
+			EnvVars:  espressoEnvs(envPrefix, "ENABLED"),
+			Category: category,
+		},
+		&cli.DurationFlag{
+			Name:     PollIntervalFlagName,
+			Usage:    "Polling interval for Espresso queries",
+			Value:    250 * time.Millisecond,
+			EnvVars:  espressoEnvs(envPrefix, "POLL_INTERVAL"),
+			Category: category,
+		},
+		&cli.StringSliceFlag{
+			Name:     QueryServiceUrlsFlagName,
+			Usage:    "Comma-separated list of Espresso query service URLs",
+			EnvVars:  espressoEnvs(envPrefix, "URLS"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     LightClientAddrFlagName,
+			Usage:    "Address of the Espresso light client",
+			EnvVars:  espressoEnvs(envPrefix, "LIGHT_CLIENT_ADDR"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     L1UrlFlagName,
+			Usage:    "L1 RPC URL Espresso contracts are deployed on",
+			EnvVars:  espressoEnvs(envPrefix, "L1_URL"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     TestingBatcherPrivateKeyFlagName,
+			Usage:    "Pre-approved batcher ephemeral key (testing only)",
+			EnvVars:  espressoEnvs(envPrefix, "TESTING_BATCHER_PRIVATE_KEY"),
+			Category: category,
+		},
+		&cli.Uint64Flag{
+			Name:     CaffeinationHeightEspresso,
+			Usage:    "Espresso transactions below this height will not be considered",
+			EnvVars:  espressoEnvs(envPrefix, "ORIGIN_HEIGHT_ESPRESSO"),
+			Category: category,
+		},
+		&cli.Uint64Flag{
+			Name: CaffeinationHeightL2,
+			Usage: "L2 batch position at which the Espresso streamer starts emitting batches. " +
+				"Operational parameter for restarting batchers mid-chain. " +
+				"When zero, the streamer falls back to its internal default. " +
+				"Independent of the EspressoTime hardfork, which gates derivation semantics.",
+			Value:    0,
+			EnvVars:  espressoEnvs(envPrefix, "ORIGIN_HEIGHT_L2"),
+			Category: category,
+		},
+		&cli.Uint64Flag{
+			Name:     NamespaceFlagName,
+			Usage:    "Namespace of Espresso transactions",
+			EnvVars:  espressoEnvs(envPrefix, "NAMESPACE"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     RollupL1UrlFlagName,
+			Usage:    "RPC URL of L1 backing the Rollup we're streaming for",
+			EnvVars:  espressoEnvs(envPrefix, "ROLLUP_L1_URL"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     AttestationServiceFlagName,
+			Usage:    "URL of the Espresso attestation service",
+			EnvVars:  espressoEnvs(envPrefix, "ESPRESSO_ATTESTATION_SERVICE"),
+			Category: category,
+		},
+		&cli.StringFlag{
+			Name:     BatchAuthenticatorAddrFlagName,
+			Usage:    "Address of the Batch Authenticator contract",
+			EnvVars:  espressoEnvs(envPrefix, "BATCH_AUTHENTICATOR_ADDR"),
+			Category: category,
+		},
+		&cli.Uint64Flag{
+			Name:     VerifyReceiptMaxBlocksFlagName,
+			Usage:    "Number of HotShot blocks to wait for a submitted transaction to become queryable before re-submitting",
+			Value:    DefaultVerifyReceiptMaxBlocks,
+			EnvVars:  espressoEnvs(envPrefix, "VERIFY_RECEIPT_MAX_BLOCKS"),
+			Category: category,
+		},
+		&cli.DurationFlag{
+			Name:     VerifyReceiptSafetyTimeoutFlagName,
+			Usage:    "Wall-clock backstop for receipt verification; re-submits the transaction if this duration is exceeded",
+			Value:    DefaultVerifyReceiptSafetyTimeout,
+			EnvVars:  espressoEnvs(envPrefix, "VERIFY_RECEIPT_SAFETY_TIMEOUT"),
+			Category: category,
+		},
+		&cli.DurationFlag{
+			Name:     VerifyReceiptRetryDelayFlagName,
+			Usage:    "Delay between receipt verification retries",
+			Value:    DefaultVerifyReceiptRetryDelay,
+			EnvVars:  espressoEnvs(envPrefix, "VERIFY_RECEIPT_RETRY_DELAY"),
+			Category: category,
+		},
+		// Note: --espresso.fallback-auth-lead-time is registered by the
+		// fallback batcher in op-batcher/flags/flags.go; it is read by both
+		// the fallback and the TEE batcher paths.
+	}
+}
+
+type CLIConfig struct {
+	Enabled                    bool
+	PollInterval               time.Duration
+	QueryServiceURLs           []string
+	LightClientAddr            common.Address
+	BatchAuthenticatorAddr     common.Address
+	L1URL                      string
+	RollupL1URL                string
+	TestingBatcherPrivateKey   *ecdsa.PrivateKey
+	Namespace                  uint64
+	CaffeinationHeightEspresso uint64
+	CaffeinationHeightL2       uint64
+	EspressoAttestationService string
+
+	// Batch submission receipt verification tuning
+	VerifyReceiptMaxBlocks     uint64
+	VerifyReceiptSafetyTimeout time.Duration
+	VerifyReceiptRetryDelay    time.Duration
+
+	// Non directly configurable option
+	allowEmptyAttestationService bool `json:"-"`
+}
+
+// AllowEmptyAttestationService allows the attestation service URL to be
+// empty. This is set explicitly from a public method, and isn't derivable
+// from serialization or any other form other than this method.  This allows
+// this setting to be configured via the code, but not externally.
+func (c *CLIConfig) AllowEmptyAttestationService() {
+	c.allowEmptyAttestationService = true
+}
+
+func (c CLIConfig) Check() error {
+	if c.Enabled {
+		// Check required fields when Espresso is enabled
+		if len(c.QueryServiceURLs) == 0 {
+			return fmt.Errorf("query service URLs are required when Espresso is enabled")
+		}
+		if c.LightClientAddr == (common.Address{}) {
+			return fmt.Errorf("light client address is required when Espresso is enabled")
+		}
+		if c.L1URL == "" {
+			return fmt.Errorf("L1 URL is required when Espresso is enabled")
+		}
+		if c.RollupL1URL == "" {
+			return fmt.Errorf("rollup L1 URL is required when Espresso is enabled")
+		}
+		if c.Namespace == 0 {
+			return fmt.Errorf("namespace is required when Espresso is enabled")
+		}
+		if !c.allowEmptyAttestationService && c.EspressoAttestationService == "" {
+			return fmt.Errorf("attestation service URL is required when Espresso is enabled")
+		}
+		if c.VerifyReceiptMaxBlocks == 0 {
+			return fmt.Errorf("verify-receipt-max-blocks must be > 0")
+		}
+		if c.VerifyReceiptSafetyTimeout <= 0 {
+			return fmt.Errorf("verify-receipt-safety-timeout must be > 0")
+		}
+		if c.VerifyReceiptRetryDelay <= 0 {
+			return fmt.Errorf("verify-receipt-retry-delay must be > 0")
+		}
+	}
+	return nil
+}
+
+func ReadCLIConfig(c *cli.Context) CLIConfig {
+	config := CLIConfig{
+		Enabled:                    c.Bool(EnabledFlagName),
+		PollInterval:               c.Duration(PollIntervalFlagName),
+		L1URL:                      c.String(L1UrlFlagName),
+		RollupL1URL:                c.String(RollupL1UrlFlagName),
+		Namespace:                  c.Uint64(NamespaceFlagName),
+		CaffeinationHeightEspresso: c.Uint64(CaffeinationHeightEspresso),
+		CaffeinationHeightL2:       c.Uint64(CaffeinationHeightL2),
+		EspressoAttestationService: c.String(AttestationServiceFlagName),
+		VerifyReceiptMaxBlocks:     c.Uint64(VerifyReceiptMaxBlocksFlagName),
+		VerifyReceiptSafetyTimeout: c.Duration(VerifyReceiptSafetyTimeoutFlagName),
+		VerifyReceiptRetryDelay:    c.Duration(VerifyReceiptRetryDelayFlagName),
+	}
+
+	config.QueryServiceURLs = c.StringSlice(QueryServiceUrlsFlagName)
+
+	addrStr := c.String(LightClientAddrFlagName)
+	config.LightClientAddr = common.HexToAddress(addrStr)
+
+	batchAuthenticatorAddrStr := c.String(BatchAuthenticatorAddrFlagName)
+	config.BatchAuthenticatorAddr = common.HexToAddress(batchAuthenticatorAddrStr)
+
+	pkStr := c.String(TestingBatcherPrivateKeyFlagName)
+	pkStr = strings.TrimPrefix(pkStr, "0x")
+	pk, err := crypto.HexToECDSA(pkStr)
+	if err == nil {
+		config.TestingBatcherPrivateKey = pk
+	}
+
+	return config
+}
+
+func BatchStreamerFromCLIConfig[B op.Batch](
+	cfg CLIConfig,
+	log log.Logger,
+	unmarshalBatch func([]byte) (*B, error),
+) (*op.BatchStreamer[B], error) {
+	if !cfg.Enabled {
+		return nil, fmt.Errorf("espresso is not enabled")
+	}
+
+	l1Client, err := ethclient.Dial(cfg.L1URL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to dial L1 RPC at %s: %w", cfg.L1URL, err)
+	}
+
+	RollupL1Client, err := ethclient.Dial(cfg.RollupL1URL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to dial Rollup L1 RPC at %s: %w", cfg.RollupL1URL, err)
+	}
+
+	urlZero := cfg.QueryServiceURLs[0]
+	espressoClient := espressoClient.NewClient(urlZero)
+
+	espressoLightClient, err := espressoLightClient.NewLightclientCaller(cfg.LightClientAddr, l1Client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create Espresso light client")
+	}
+
+	return op.NewEspressoStreamer(
+		cfg.Namespace,
+		NewAdaptL1BlockRefClient(l1Client),
+		NewAdaptL1BlockRefClient(RollupL1Client),
+		espressoClient,
+		espressoLightClient,
+		log,
+		unmarshalBatch,
+		cfg.CaffeinationHeightEspresso,
+		cfg.CaffeinationHeightL2,
+		cfg.BatchAuthenticatorAddr,
+		false,
+	)
+}