fix(taiko-client): set p2p node, taiko flag, update optimism lib

packages/taiko-client/driver/chain_syncer/blob/blocks_inserter/common.go

@@ -291,8 +291,8 @@ func isBlockPreconfirmed(
 		err = fmt.Errorf("block number mismatch: %d != %d", block.Number(), meta.BlockID)
 		return nil, err
 	}
-	if block.GasLimit() != meta.GasLimit+consensus.AnchorGasLimit {
-		err = fmt.Errorf("gas limit mismatch: %d != %d", block.GasLimit(), meta.GasLimit+consensus.AnchorGasLimit)
+	if block.GasLimit() != meta.GasLimit+consensus.AnchorV3GasLimit {
+		err = fmt.Errorf("gas limit mismatch: %d != %d", block.GasLimit(), meta.GasLimit+consensus.AnchorV3GasLimit)
 		return nil, err
 	}
 	if block.Time() != meta.Timestamp {

packages/taiko-client/driver/driver.go

@@ -119,8 +119,6 @@ func (d *Driver) InitFromConfig(ctx context.Context, cfg *Config) (err error) {
 			d.l2ChainSyncer.BlobSyncer().BlocksInserterPacaya(),
 			d.rpc,
 			d.Config.PreconfBlockServerCheckSig,
-			d.p2pNode,
-			d.p2pSigner,
 		); err != nil {
 			return err
 		}
@@ -132,7 +130,7 @@ func (d *Driver) InitFromConfig(ctx context.Context, cfg *Config) (err error) {
 
 		if d.p2pNode, err = p2p.NewNodeP2P(
 			d.ctx,
-			&rollup.Config{L1ChainID: d.rpc.L1.ChainID, L2ChainID: d.rpc.L2.ChainID},
+			&rollup.Config{L1ChainID: d.rpc.L1.ChainID, L2ChainID: d.rpc.L2.ChainID, Taiko: true},
 			log.Root(),
 			d.p2pSetup,
 			d.preconfBlockServer,
@@ -149,6 +147,11 @@ func (d *Driver) InitFromConfig(ctx context.Context, cfg *Config) (err error) {
 		if d.p2pSigner, err = d.P2PSignerConfigs.SetupSigner(d.ctx); err != nil {
 			return err
 		}
+
+		if d.preconfBlockServer != nil {
+			d.preconfBlockServer.SetP2PNode(d.p2pNode)
+			d.preconfBlockServer.SetP2PSigner(d.p2pSigner)
+		}
 	}
 
 	return nil

packages/taiko-client/driver/driver_test.go

@@ -311,7 +311,7 @@ func (s *DriverTestSuite) TestInsertPreconfBlocks() {
 		err  error
 	)
 	s.d.preconfBlockServer, err = preconfblocks.New(
-		"*", nil, s.d.ChainSyncer().BlobSyncer().BlocksInserterPacaya(), s.RPCClient, true, nil, nil,
+		"*", nil, s.d.ChainSyncer().BlobSyncer().BlocksInserterPacaya(), s.RPCClient, true,
 	)
 	s.Nil(err)
 	go func() { s.NotNil(s.d.preconfBlockServer.Start(port)) }()
@@ -479,7 +479,7 @@ func (s *DriverTestSuite) TestInsertPreconfBlocksNotReorg() {
 		err  error
 	)
 	s.d.preconfBlockServer, err = preconfblocks.New(
-		"*", nil, s.d.ChainSyncer().BlobSyncer().BlocksInserterPacaya(), s.RPCClient, true, nil, nil,
+		"*", nil, s.d.ChainSyncer().BlobSyncer().BlocksInserterPacaya(), s.RPCClient, true,
 	)
 	s.Nil(err)
 	go func() { s.NotNil(s.d.preconfBlockServer.Start(port)) }()

packages/taiko-client/driver/preconf_blocks/api.go

@@ -152,6 +152,8 @@ func (s *PreconfBlockAPIServer) BuildPreconfBlock(c echo.Context) error {
 	// Propagate the preconfirmation block to the P2P network, if the current server
 	// connects to the P2P network.
 	if s.p2pNode != nil {
+		log.Info("Gossiping L2 Payload", "blockID", header.Number.Uint64())
+
 		if err := s.p2pNode.GossipOut().PublishL2Payload(
 			c.Request().Context(),
 			&eth.ExecutionPayloadEnvelope{

packages/taiko-client/driver/preconf_blocks/server.go

@@ -62,8 +62,6 @@ func New(
 	chainSyncer preconfBlockChainSyncer,
 	cli *rpc.Client,
 	checkSig bool,
-	p2pNode *p2p.NodeP2P,
-	p2pSigner p2p.Signer,
 ) (*PreconfBlockAPIServer, error) {
 	protocolConfigs, err := cli.GetProtocolConfigs(nil)
 	if err != nil {
@@ -78,10 +76,8 @@ func New(
 			uint64(rpc.BlobBytes),
 			cli.L2.ChainID,
 		),
-		rpc:       cli,
-		checkSig:  checkSig,
-		p2pNode:   p2pNode,
-		p2pSigner: p2pSigner,
+		rpc:      cli,
+		checkSig: checkSig,
 	}
 
 	server.echo.HideBanner = true
@@ -94,6 +90,14 @@ func New(
 	return server, nil
 }
 
+func (s *PreconfBlockAPIServer) SetP2PNode(p2pNode *p2p.NodeP2P) {
+	s.p2pNode = p2pNode
+}
+
+func (s *PreconfBlockAPIServer) SetP2PSigner(p2pSigner p2p.Signer) {
+	s.p2pSigner = p2pSigner
+}
+
 // LogSkipper implements the `middleware.Skipper` interface.
 func LogSkipper(c echo.Context) bool {
 	switch c.Request().URL.Path {

packages/taiko-client/driver/preconf_blocks/server_test.go

@@ -17,7 +17,7 @@ type PreconfBlockAPIServerTestSuite struct {
 
 func (s *PreconfBlockAPIServerTestSuite) SetupTest() {
 	s.ClientTestSuite.SetupTest()
-	server, err := New("*", nil, nil, s.RPCClient, true, nil, nil)
+	server, err := New("*", nil, nil, s.RPCClient, true)
 	s.Nil(err)
 	s.s = server
 	go func() {