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

) Co-authored-by: David <[email protected]>
taikoxyz · Feb 14, 2025 · 245b7ce · 245b7ce
1 parent 0ea6104
commit 245b7ce
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -320,7 +320,7 @@ require (
 
 replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0
 
-replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20250205084634-ae44cf8bc8e2
+replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c
 
 replace github.com/uber/jaeger-client-go => github.com/uber/jaeger-client-go v2.25.0+incompatible
 

diff --git a/go.sum b/go.sum
@@ -886,8 +886,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDd
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3KeuJXK7hff2n7bpMIhONPJwpcA5w=
 github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ=
-github.com/taikoxyz/optimism v0.0.0-20250205084634-ae44cf8bc8e2 h1:iCyJ5rMAZdDpDrzYQvk4U/l9zrkDKDsnVGx/gz1rXv0=
-github.com/taikoxyz/optimism v0.0.0-20250205084634-ae44cf8bc8e2/go.mod h1:V0VCkKtCzuaJH6qcL75SRcbdlakM9LhurMEJUhO6VXA=
+github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c h1:LlZlD7Z4NZXa2dToHOefKOy67Ej1o3T+9Gicd/6Pgsk=
+github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c/go.mod h1:V0VCkKtCzuaJH6qcL75SRcbdlakM9LhurMEJUhO6VXA=
 github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0 h1:LEn6wBmEIJVH4RgAEb7ORbJMt9ajgvsmtgatxlqlO8E=
 github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=

diff --git a/packages/taiko-client/bindings/pacaya/gen_taiko_inbox.go b/packages/taiko-client/bindings/pacaya/gen_taiko_inbox.go
diff --git a/packages/taiko-client/driver/chain_syncer/blob/blocks_inserter/common.go b/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 {

diff --git a/packages/taiko-client/driver/driver.go b/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

diff --git a/packages/taiko-client/driver/driver_test.go b/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)) }()

diff --git a/packages/taiko-client/driver/preconf_blocks/api.go b/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(), "time", header.Time)
+
 		if err := s.p2pNode.GossipOut().PublishL2Payload(
 			c.Request().Context(),
 			&eth.ExecutionPayloadEnvelope{

diff --git a/packages/taiko-client/driver/preconf_blocks/server.go b/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 {

diff --git a/packages/taiko-client/driver/preconf_blocks/server_test.go b/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() {