Merge branch 'develop' into blob-archive-client

bedrock-devnet/devnet/__init__.py

@@ -190,27 +190,16 @@ def devnet_l1_genesis(paths):
     log.info('Generating L1 genesis state')
     init_devnet_l1_deploy_config(paths)
 
-    geth = subprocess.Popen([
-        'geth', '--dev', '--http', '--http.api', 'eth,debug',
-        '--verbosity', '4', '--gcmode', 'archive', '--dev.gaslimit', '30000000',
-        '--rpc.allow-unprotected-txs'
-    ])
+    fqn = 'scripts/Deploy.s.sol:Deploy'
+    run_command([
+        'forge', 'script', '--chain-id', '900', fqn, "--sig", "runWithStateDump()"
+    ], env={}, cwd=paths.contracts_bedrock_dir)
 
-    try:
-        forge = ChildProcess(deploy_contracts, paths)
-        forge.start()
-        forge.join()
-        err = forge.get_error()
-        if err:
-            raise Exception(f"Exception occurred in child process: {err}")
-
-        res = debug_dumpBlock('127.0.0.1:8545')
-        response = json.loads(res)
-        allocs = response['result']
-
-        write_json(paths.allocs_path, allocs)
-    finally:
-        geth.terminate()
+    forge_dump = read_json(paths.forge_dump_path)
+    write_json(paths.allocs_path, { "accounts": forge_dump })
+    os.remove(paths.forge_dump_path)
+
+    shutil.copy(paths.l1_deployments_path, paths.addresses_json_path)
 
 def deployL1ContractsForDeploy(paths):
     log.info('Starting L1.')

go.mod

@@ -253,7 +253,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.13.8 => github.com/bnb-chain/op-geth v0.4.0-alpha
+replace github.com/ethereum/go-ethereum v1.13.8 => github.com/bnb-chain/op-geth v0.4.1-0.20240514082730-f8d1c9e18803
 
 replace github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.0.0
 

go.sum

@@ -179,8 +179,8 @@ github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/bnb-chain/greenfield-cometbft v1.0.0 h1:0r6hOJWD/+es0gxP/exKuN/krgXAr3LCn5/XlcgDWr8=
 github.com/bnb-chain/greenfield-cometbft v1.0.0/go.mod h1:f35mk/r5ab6yvzlqEWZt68LfUje68sYgMpVlt2CUYMk=
-github.com/bnb-chain/op-geth v0.4.0-alpha h1:xvbVFmhTCS4HglOD/J0Vg81m+UUVzNawPoVfmEgTas4=
-github.com/bnb-chain/op-geth v0.4.0-alpha/go.mod h1:dkpInaOz3WeP/5lgdL0BOA6mjexUj30tPQU81H1yEHQ=
+github.com/bnb-chain/op-geth v0.4.1-0.20240514082730-f8d1c9e18803 h1:DBJAzHTOzLoRQ04tr22dHjSLW/QclnGsOzp1wo6WoBs=
+github.com/bnb-chain/op-geth v0.4.1-0.20240514082730-f8d1c9e18803/go.mod h1:dkpInaOz3WeP/5lgdL0BOA6mjexUj30tPQU81H1yEHQ=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=

op-batcher/batcher/service.go

@@ -47,9 +47,9 @@ type BatcherConfig struct {
 // BatcherService represents a full batch-submitter instance and its resources,
 // and conforms to the op-service CLI Lifecycle interface.
 type BatcherService struct {
-	Log        log.Logger
-	Metrics    metrics.Metricer
-	L1Client   client.Client
+	Log      log.Logger
+	Metrics  metrics.Metricer
+	L1Client client.Client
 
 	EndpointProvider dial.L2EndpointProvider
 	TxManager        txmgr.TxManager

op-chain-ops/genesis/config.go

@@ -225,6 +225,9 @@ type DeployConfig struct {
 	FundDevAccounts bool `json:"fundDevAccounts"`
 	// opBNB fermat hard fork
 	Fermat *big.Int `json:"fermat,omitempty"`
+	// SnowTimeOffset is the number of seconds after genesis block that snow hard fork activates.
+	// Set it to 0 to activate at genesis. Nil to disable snow fork.
+	SnowTimeOffset *hexutil.Uint64 `json:"snowTimeOffset,omitempty"`
 	// RequiredProtocolVersion indicates the protocol version that
 	// nodes are required to adopt, to stay in sync with the network.
 	RequiredProtocolVersion params.ProtocolVersion `json:"requiredProtocolVersion"`
@@ -553,6 +556,17 @@ func (d *DeployConfig) InteropTime(genesisTime uint64) *uint64 {
 	return &v
 }
 
+func (d *DeployConfig) SnowTime(genesisTime uint64) *uint64 {
+	if d.SnowTimeOffset == nil {
+		return nil
+	}
+	v := uint64(0)
+	if offset := *d.SnowTimeOffset; offset > 0 {
+		v = genesisTime + uint64(offset)
+	}
+	return &v
+}
+
 // RollupConfig converts a DeployConfig to a rollup.Config
 func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHash common.Hash, l2GenesisBlockNumber uint64) (*rollup.Config, error) {
 	if d.OptimismPortalProxy == (common.Address{}) {
@@ -600,6 +614,7 @@ func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHas
 		DAChallengeWindow:      d.DAChallengeWindow,
 		DAResolveWindow:        d.DAResolveWindow,
 		Fermat:                 d.Fermat,
+		SnowTime:               d.SnowTime(l1StartBlock.Time()),
 	}, nil
 }
 

op-challenger/cmd/list_claims.go

@@ -11,6 +11,7 @@ import (
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/urfave/cli/v2"
 )
 
@@ -42,7 +43,7 @@ func ListClaims(ctx *cli.Context) error {
 	}
 	defer l1Client.Close()
 
-	caller := batching.NewMultiCaller(l1Client.Client(), batching.DefaultBatchSize)
+	caller := batching.NewMultiCaller(l1Client.(*ethclient.Client).Client(), batching.DefaultBatchSize)
 	contract, err := contracts.NewFaultDisputeGameContract(gameAddr, caller)
 	if err != nil {
 		return fmt.Errorf("failed to create dispute game bindings: %w", err)

op-challenger/cmd/list_games.go

@@ -14,6 +14,7 @@ import (
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/urfave/cli/v2"
 )
 
@@ -37,7 +38,7 @@ func ListGames(ctx *cli.Context) error {
 	}
 	defer l1Client.Close()
 
-	caller := batching.NewMultiCaller(l1Client.Client(), batching.DefaultBatchSize)
+	caller := batching.NewMultiCaller(l1Client.(*ethclient.Client).Client(), batching.DefaultBatchSize)
 	contract, err := contracts.NewDisputeGameFactoryContract(factoryAddr, caller)
 	if err != nil {
 		return fmt.Errorf("failed to create dispute game bindings: %w", err)

op-challenger/cmd/utils.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr/metrics"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/urfave/cli/v2"
 )
 
@@ -65,7 +66,7 @@ func newClientsFromCLI(ctx *cli.Context) (*batching.MultiCaller, txmgr.TxManager
 	}
 	defer l1Client.Close()
 
-	caller := batching.NewMultiCaller(l1Client.Client(), batching.DefaultBatchSize)
+	caller := batching.NewMultiCaller(l1Client.(*ethclient.Client).Client(), batching.DefaultBatchSize)
 	txMgrConfig := txmgr.ReadCLIConfig(ctx)
 	txMgr, err := txmgr.NewSimpleTxManager("challenger", logger, &metrics.NoopTxMetrics{}, txMgrConfig)
 	if err != nil {

op-challenger/game/service.go

@@ -146,7 +146,7 @@ func (s *Service) initL1Client(ctx context.Context, cfg *config.Config) error {
 	if err != nil {
 		return fmt.Errorf("failed to dial L1: %w", err)
 	}
-	s.l1Client = l1Client
+	s.l1Client = l1Client.(*ethclient.Client)
 	return nil
 }
 

op-challenger/metrics/noop.go

@@ -14,6 +14,8 @@ type NoopMetricsImpl struct {
 	txmetrics.NoopTxMetrics
 }
 
+func (i *NoopMetricsImpl) RecordBlobsNumber(_ int) {}
+
 func (i *NoopMetricsImpl) StartBalanceMetrics(l log.Logger, client *ethclient.Client, account common.Address) io.Closer {
 	return nil
 }

op-conductor/conductor/service.go

@@ -9,6 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/hashicorp/go-multierror"
@@ -123,7 +124,7 @@ func (c *OpConductor) initSequencerControl(ctx context.Context) error {
 	}
 	execCfg := sources.L2ClientDefaultConfig(&c.cfg.RollupCfg, true)
 	// TODO: Add metrics tracer here. tracked by https://github.com/ethereum-optimism/protocol-quest/issues/45
-	exec, err := sources.NewEthClient(ec, c.log, nil, &execCfg.EthClientConfig)
+	exec, err := sources.NewEthClient(ec, c.log, nil, &execCfg.EthClientConfig, false)
 	if err != nil {
 		return errors.Wrap(err, "failed to create geth client")
 	}
@@ -204,7 +205,7 @@ func (oc *OpConductor) initRPCServer(ctx context.Context) error {
 		if err != nil {
 			return errors.Wrap(err, "failed to create execution rpc client")
 		}
-		executionProxy := conductorrpc.NewExecutionProxyBackend(oc.log, oc, execClient)
+		executionProxy := conductorrpc.NewExecutionProxyBackend(oc.log, oc, execClient.(*ethclient.Client))
 		server.AddAPI(rpc.API{
 			Namespace: conductorrpc.ExecutionRPCNamespace,
 			Service:   executionProxy,

op-e2e/actions/fallback_client_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
+	plasma "github.com/ethereum-optimism/optimism/op-plasma"
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
@@ -40,7 +41,7 @@ func setupFallbackClientTest(t Testing, sd *e2eutils.SetupData, log log.Logger,
 	l2Cl, err := sources.NewEngineClient(engine.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
 
-	sequencer := NewL2Sequencer(t, log, l1F, l2Cl, sd.RollupCfg, 0)
+	sequencer := NewL2Sequencer(t, log, l1F, l1F, plasma.Disabled, l2Cl, sd.RollupCfg, 0)
 	return miner, l1_2, l1_3, engine, sequencer, fallbackClient.(*sources.FallbackClient)
 }
 
@@ -50,7 +51,7 @@ func TestL1FallbackClient_SwitchUrl(gt *testing.T) {
 		MaxSequencerDrift:   300,
 		SequencerWindowSize: 200,
 		ChannelTimeout:      120,
-		L1BlockTime:         12,
+		L1BlockTime:         3,
 	}
 	dp := e2eutils.MakeDeployParams(t, p)
 	sd := e2eutils.Setup(t, dp, defaultAlloc)
@@ -87,8 +88,8 @@ func TestL1FallbackClient_SwitchUrl(gt *testing.T) {
 	require.NoError(t, errRpc)
 
 	l2BlockCount := 0
-	for i := 0; i < 6; i++ {
-		miner.ActL1StartBlock(12)(t)
+	for i := 0; i < 8; i++ {
+		miner.ActL1StartBlock(3)(t)
 		miner.ActL1EndBlock(t)
 		newBlock := miner.l1Chain.GetBlockByHash(miner.l1Chain.CurrentBlock().Hash())
 		_, err := l1_2.l1Chain.InsertChain([]*types.Block{newBlock})
@@ -106,12 +107,12 @@ func TestL1FallbackClient_SwitchUrl(gt *testing.T) {
 			makeL2BlockWithAliceTx()
 			//require.Equal(t, uint64(i), sequencer.SyncStatus().UnsafeL2.L1Origin.Number, "no L1 origin change before time matches")
 			l2BlockCount++
-			if l2BlockCount == 23 {
+			if l2BlockCount == 11 {
 				require.Equal(t, 1, fallbackClient.GetCurrentIndex(), "fallback client should switch url to second url")
 				errRpc2 := miner.RPCClient().CallContext(t.Ctx(), nil, "admin_startHTTP", "127.0.0.1", 8545, "*", "eth,net,web3,debug,admin,txpool", "*")
 				require.NoError(t, errRpc2)
 			}
-			if l2BlockCount == 34 {
+			if l2BlockCount == 17 {
 				require.Equal(t, 0, fallbackClient.GetCurrentIndex(), "fallback client should recover url to first url")
 			}
 			time.Sleep(500 * time.Millisecond)

op-e2e/e2eutils/geth/fakeblob.go

@@ -0,0 +1,67 @@
+package geth
+
+import (
+	"context"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	geth "github.com/ethereum/go-ethereum/eth"
+	"github.com/ethereum/go-ethereum/rpc"
+)
+
+type BlobService struct {
+	beacon  Beacon
+	backend *geth.EthAPIBackend
+}
+
+func blobAPIs(beacon Beacon, backend *geth.EthAPIBackend) []rpc.API {
+	// Append all the local APIs and return
+	return []rpc.API{
+		{
+			Namespace: "eth",
+			Service:   NewBlobService(beacon, backend),
+		},
+	}
+}
+
+func NewBlobService(beacon Beacon, backend *geth.EthAPIBackend) *BlobService {
+	return &BlobService{beacon: beacon, backend: backend}
+}
+
+func (b *BlobService) GetBlobSidecars(ctx context.Context, blockNumber rpc.BlockNumber) (*eth.BSCBlobSidecars, error) {
+	//slot := (envelope.ExecutionPayload.Timestamp - f.eth.BlockChain().Genesis().Time()) / f.blockTime
+	header, err := b.backend.HeaderByNumber(ctx, blockNumber)
+	if err != nil {
+		return nil, err
+	}
+	slot := (header.Time - b.backend.Genesis().Time()) / 2
+	bundle, err := b.beacon.LoadBlobsBundle(slot)
+	if err != nil {
+		return nil, err
+	}
+	if len(bundle.Blobs) == 0 {
+		return nil, nil
+	}
+	var sidecars eth.BSCBlobSidecars
+	bn := hexutil.Big(*big.NewInt(blockNumber.Int64()))
+	oneSidecar := eth.BSCBlobSidecar{
+		BlockNumber: &bn,
+		BlockHash:   header.Hash(),
+		TxIndex:     nil,
+		TxHash:      common.Hash{},
+	}
+	blobSize := len(bundle.Blobs)
+	oneSidecar.BSCBlobTxSidecar.Blobs = make([]eth.Blob, blobSize)
+	oneSidecar.BSCBlobTxSidecar.Proofs = make([]eth.Bytes48, blobSize)
+	oneSidecar.BSCBlobTxSidecar.Commitments = make([]eth.Bytes48, blobSize)
+	for i, blob := range bundle.Blobs {
+		copy(oneSidecar.BSCBlobTxSidecar.Blobs[i][:], blob)
+		copy(oneSidecar.BSCBlobTxSidecar.Proofs[i][:], bundle.Proofs[i])
+		copy(oneSidecar.BSCBlobTxSidecar.Commitments[i][:], bundle.Commitments[i])
+	}
+	sidecars = append(sidecars, &oneSidecar)
+
+	return &sidecars, nil
+}

op-e2e/e2eutils/geth/fakepos.go

@@ -23,6 +23,7 @@ import (
 
 type Beacon interface {
 	StoreBlobsBundle(slot uint64, bundle *engine.BlobsBundleV1) error
+	LoadBlobsBundle(slot uint64) (*engine.BlobsBundleV1, error)
 }
 
 // fakePoS is a testing-only utility to attach to Geth,

op-e2e/e2eutils/geth/geth.go

@@ -42,7 +42,7 @@ func InitL1(chainID uint64, blockTime uint64, genesis *core.Genesis, c clock.Clo
 		HTTPModules: []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine"},
 	}
 
-	l1Node, l1Eth, err := createGethNode(false, nodeConfig, ethConfig, opts...)
+	l1Node, l1Eth, err := createGethNode(false, nodeConfig, ethConfig, beaconSrv, opts...)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -98,14 +98,14 @@ func InitL2(name string, l2ChainID *big.Int, genesis *core.Genesis, jwtPath stri
 		},
 	}
 	nodeConfig := defaultNodeConfig(fmt.Sprintf("l2-geth-%v", name), jwtPath)
-	return createGethNode(true, nodeConfig, ethConfig, opts...)
+	return createGethNode(true, nodeConfig, ethConfig, nil, opts...)
 }
 
 // createGethNode creates an in-memory geth node based on the configuration.
 // The private keys are added to the keystore and are unlocked.
 // If the node is l2, catalyst is enabled.
 // The node should be started and then closed when done.
-func createGethNode(l2 bool, nodeCfg *node.Config, ethCfg *ethconfig.Config, opts ...GethOption) (*node.Node, *eth.Ethereum, error) {
+func createGethNode(l2 bool, nodeCfg *node.Config, ethCfg *ethconfig.Config, beacon Beacon, opts ...GethOption) (*node.Node, *eth.Ethereum, error) {
 	for i, opt := range opts {
 		if err := opt(ethCfg, nodeCfg); err != nil {
 			return nil, nil, fmt.Errorf("failed to apply geth option %d: %w", i, err)
@@ -130,6 +130,9 @@ func createGethNode(l2 bool, nodeCfg *node.Config, ethCfg *ethconfig.Config, opt
 	utils.RegisterFilterAPI(n, backend.APIBackend, ethCfg)
 
 	n.RegisterAPIs(tracers.APIs(backend.APIBackend))
+	if beacon != nil {
+		n.RegisterAPIs(blobAPIs(beacon, backend.APIBackend))
+	}
 
 	// Enable catalyst if l2
 	if l2 {

op-e2e/e2eutils/setup.go

@@ -6,6 +6,7 @@ import (
 	"path"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-service/bsc"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core"
@@ -59,6 +60,7 @@ func MakeDeployParams(t require.TestingT, tp *TestParams) *DeployParams {
 	deployConfig.ChannelTimeout = tp.ChannelTimeout
 	deployConfig.L1BlockTime = tp.L1BlockTime
 	deployConfig.UsePlasma = tp.UsePlasma
+	deployConfig.L1GenesisBlockBaseFeePerGas = (*hexutil.Big)(bsc.DefaultBaseFee)
 	ApplyDeployConfigForks(deployConfig)
 
 	require.NoError(t, deployConfig.Check())