op-program: Re-add caching wrapper to oracles.

Increase cache size for l2 blocks.

op-program/client/l2/cache.go

@@ -6,7 +6,9 @@ import (
 	"github.com/hashicorp/golang-lru/v2/simplelru"
 )
 
-const blockCacheSize = 2_000
+// blockCacheSize should be set large enough to handle the pipeline reset process of walking back from L2 head to find
+// the L1 origin that is old enough to start buffering channel data from.
+const blockCacheSize = 3_000
 const nodeCacheSize = 100_000
 const codeCacheSize = 10_000
 

op-program/client/program.go

@@ -43,8 +43,8 @@ func RunProgram(logger log.Logger, preimageOracle io.ReadWriter, preimageHinter
 
 	pClient := preimage.NewOracleClient(preimageOracle)
 	hClient := preimage.NewHintWriter(preimageHinter)
-	l1PreimageOracle := l1.NewPreimageOracle(pClient, hClient)
-	l2PreimageOracle := l2.NewPreimageOracle(pClient, hClient)
+	l1PreimageOracle := l1.NewCachingOracle(l1.NewPreimageOracle(pClient, hClient))
+	l2PreimageOracle := l2.NewCachingOracle(l2.NewPreimageOracle(pClient, hClient))
 
 	bootInfo := NewBootstrapClient(pClient).BootInfo()
 	logger.Info("Program Bootstrapped", "bootInfo", bootInfo)

op-program/host/l1/l1.go

-package l1
-
-import (
-	"context"
-
-	"github.com/ethereum-optimism/optimism/op-node/client"
-	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
-	"github.com/ethereum-optimism/optimism/op-node/sources"
-	cll1 "github.com/ethereum-optimism/optimism/op-program/client/l1"
-	"github.com/ethereum-optimism/optimism/op-program/host/config"
-	"github.com/ethereum-optimism/optimism/op-program/preimage"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-func NewFetchingOracle(ctx context.Context, logger log.Logger, cfg *config.Config) (cll1.Oracle, error) {
-	rpc, err := client.NewRPC(ctx, logger, cfg.L1URL)
-	if err != nil {
-		return nil, err
-	}
-
-	source, err := sources.NewL1Client(rpc, logger, nil, sources.L1ClientDefaultConfig(cfg.Rollup, cfg.L1TrustRPC, cfg.L1RPCKind))
-	if err != nil {
-		return nil, err
-	}
-	return NewFetchingL1Oracle(ctx, logger, source), nil
-}
-
-func NewSource(logger log.Logger, oracle preimage.Oracle, hint preimage.Hinter, l1Head common.Hash) derive.L1Fetcher {
-	l1Oracle := cll1.NewCachingOracle(cll1.NewPreimageOracle(oracle, hint))
-	return cll1.NewOracleL1Client(logger, l1Oracle, l1Head)
-}

op-program/host/l2/l2.go

-package l2
-
-import (
-	"context"
-	"fmt"
-
-	cll2 "github.com/ethereum-optimism/optimism/op-program/client/l2"
-	"github.com/ethereum-optimism/optimism/op-program/host/config"
-	"github.com/ethereum-optimism/optimism/op-program/preimage"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-func NewEngine(logger log.Logger, pre preimage.Oracle, hint preimage.Hinter, cfg *config.Config) (*cll2.OracleEngine, error) {
-	oracle := cll2.NewCachingOracle(cll2.NewPreimageOracle(pre, hint))
-	engineBackend, err := cll2.NewOracleBackedL2Chain(logger, oracle, cfg.L2ChainConfig, cfg.L2Head)
-	if err != nil {
-		return nil, fmt.Errorf("create l2 chain: %w", err)
-	}
-	return cll2.NewOracleEngine(cfg.Rollup, logger, engineBackend), nil
-}
-
-func NewFetchingOracle(ctx context.Context, logger log.Logger, cfg *config.Config) (cll2.Oracle, error) {
-	oracle, err := NewFetchingL2Oracle(ctx, logger, cfg.L2URL, cfg.L2Head)
-	if err != nil {
-		return nil, fmt.Errorf("connect l2 oracle: %w", err)
-	}
-	return oracle, nil
-}