feat(all): some client optimizations (#376)

Co-authored-by: alexshliu <[email protected]>
Co-authored-by: John Chase <[email protected]>

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
           cache: true
 
       - name: Lint
@@ -52,7 +52,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
           cache: true
           cache-dependency-path: ${{ env.CLIENT_DIR }}/go.sum
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git make
 

bindings/.githead

@@ -1 +1 @@
-c8969b64bbaacf9ec6d239608509424fdc02ee97
+8028a49ea2dfc123b1c818afb722a029d3743e5c

bindings/encoding/input.go

@@ -22,7 +22,7 @@ var (
 			Type: "bytes32",
 		},
 		{
-			Name: "beneficiary",
+			Name: "proposer",
 			Type: "address",
 		},
 		{
@@ -76,7 +76,7 @@ var (
 			Type: "uint32",
 		},
 		{
-			Name: "beneficiary",
+			Name: "proposer",
 			Type: "address",
 		},
 		{

bindings/encoding/input_test.go

@@ -99,7 +99,7 @@ func TestEncodeBlockMetadata(t *testing.T) {
 		Id:                uint64(1),
 		L1Height:          uint64(1),
 		L1Hash:            abcdBytes,
-		Beneficiary:       common.HexToAddress("0x10020FCb72e27650651B05eD2CEcA493bC807Ba4"),
+		Proposer:          common.HexToAddress("0x10020FCb72e27650651B05eD2CEcA493bC807Ba4"),
 		TxListHash:        abcdBytes,
 		TxListByteStart:   big.NewInt(0),
 		TxListByteEnd:     big.NewInt(1000),
@@ -131,7 +131,7 @@ func TestEncodeBlockMetadata(t *testing.T) {
 		Id:              uint64(1),
 		L1Height:        uint64(1),
 		L1Hash:          abcdBytes,
-		Beneficiary:     common.HexToAddress("0x10020FCb72e27650651B05eD2CEcA493bC807Ba4"),
+		Proposer:        common.HexToAddress("0x10020FCb72e27650651B05eD2CEcA493bC807Ba4"),
 		TxListHash:      abcdBytes,
 		TxListByteStart: big.NewInt(0),
 		TxListByteEnd:   big.NewInt(1000),

bindings/encoding/struct.go

@@ -43,7 +43,7 @@ type TaikoL1Evidence struct {
 
 type TaikoL1BlockMetadataInput struct {
 	TxListHash      [32]byte
-	Beneficiary     common.Address
+	Proposer        common.Address
 	TxListByteStart *big.Int
 	TxListByteEnd   *big.Int
 	CacheTxListInfo bool

bindings/encoding/struct_test.go

@@ -1,6 +1,7 @@
 package encoding
 
 import (
+	cryptoRand "crypto/rand"
 	"math/big"
 	"math/rand"
 	"testing"
@@ -33,7 +34,7 @@ var (
 		BaseFee:     new(big.Int).SetUint64(rand.Uint64()),
 	}
 	testMetaInput = TaikoL1BlockMetadataInput{
-		Beneficiary:     common.BytesToAddress(randomHash().Bytes()),
+		Proposer:        common.BytesToAddress(randomHash().Bytes()),
 		TxListHash:      randomHash(),
 		TxListByteStart: common.Big0,
 		TxListByteEnd:   common.Big0,
@@ -49,7 +50,7 @@ var (
 		TxListByteStart:   common.Big0,
 		TxListByteEnd:     common.Big256,
 		GasLimit:          rand.Uint32(),
-		Beneficiary:       common.BytesToAddress(randomHash().Bytes()),
+		Proposer:          common.BytesToAddress(randomHash().Bytes()),
 		DepositsProcessed: []bindings.TaikoDataEthDeposit{},
 	}
 )
@@ -122,7 +123,7 @@ func TestToExecutableData(t *testing.T) {
 // randomHash generates a random blob of data and returns it as a hash.
 func randomHash() common.Hash {
 	var hash common.Hash
-	if n, err := rand.Read(hash[:]); n != common.HashLength || err != nil {
+	if n, err := cryptoRand.Read(hash[:]); n != common.HashLength || err != nil {
 		panic(err)
 	}
 	return hash
@@ -131,7 +132,7 @@ func randomHash() common.Hash {
 // randomBytes generates a random bytes.
 func randomBytes(size int) (b []byte) {
 	b = make([]byte, size)
-	if _, err := rand.Read(b); err != nil {
+	if _, err := cryptoRand.Read(b); err != nil {
 		log.Crit("Generate random bytes error", "error", err)
 	}
 	return

cmd/main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"fmt"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/taikoxyz/taiko-client/cmd/flags"
 	"github.com/taikoxyz/taiko-client/cmd/utils"
@@ -15,10 +13,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
 func main() {
 	app := cli.NewApp()
 

driver/chain_syncer/calldata/syncer.go

@@ -422,11 +422,11 @@ func (s *Syncer) createExecutionPayloads(
 	attributes := &engine.PayloadAttributes{
 		Timestamp:             event.Meta.Timestamp,
 		Random:                event.Meta.MixHash,
-		SuggestedFeeRecipient: event.Meta.Beneficiary,
+		SuggestedFeeRecipient: event.Meta.Proposer,
 		Withdrawals:           withdrawals,
 		BlockMetadata: &engine.BlockMetadata{
 			HighestBlockID: headBlockID,
-			Beneficiary:    event.Meta.Beneficiary,
+			Beneficiary:    event.Meta.Proposer,
 			GasLimit:       uint64(event.Meta.GasLimit) + s.anchorConstructor.GasLimit(),
 			Timestamp:      event.Meta.Timestamp,
 			TxList:         txListBytes,

driver/chain_syncer/calldata/syncer_test.go

@@ -2,7 +2,6 @@ package calldata
 
 import (
 	"context"
-	"fmt"
 	"math/big"
 	"math/rand"
 	"os"
@@ -17,23 +16,18 @@ import (
 	"github.com/taikoxyz/taiko-client/driver/chain_syncer/beaconsync"
 	"github.com/taikoxyz/taiko-client/driver/state"
 	"github.com/taikoxyz/taiko-client/proposer"
-	"github.com/taikoxyz/taiko-client/prover/http"
 	"github.com/taikoxyz/taiko-client/testutils"
 )
 
 type CalldataSyncerTestSuite struct {
 	testutils.ClientTestSuite
-	s      *Syncer
-	p      testutils.Proposer
-	srv    *http.Server
-	cancel context.CancelFunc
+	s *Syncer
+	p testutils.Proposer
 }
 
 func (s *CalldataSyncerTestSuite) SetupTest() {
 	s.ClientTestSuite.SetupTest()
 
-	port := testutils.RandomPort()
-
 	state, err := state.New(context.Background(), s.RpcClient)
 	s.Nil(err)
 
@@ -51,32 +45,27 @@ func (s *CalldataSyncerTestSuite) SetupTest() {
 	l1ProposerPrivKey, err := crypto.ToECDSA(common.Hex2Bytes(os.Getenv("L1_PROPOSER_PRIVATE_KEY")))
 	s.Nil(err)
 	proposeInterval := 1024 * time.Hour // No need to periodically propose transactions list in unit tests
+
 	s.Nil(proposer.InitFromConfig(context.Background(), prop, (&proposer.Config{
-		L1Endpoint:                 os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2Endpoint:                 os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		TaikoL1Address:             common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:             common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress:          common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
-		L1ProposerPrivKey:          l1ProposerPrivKey,
-		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
-		ProposeInterval:            &proposeInterval,
-		MaxProposedTxListsPerEpoch: 1,
-		WaitReceiptTimeout:         10 * time.Second,
-		ProverEndpoints:            []string{fmt.Sprintf("http://localhost:%v", port)},
-		BlockProposalFee:           big.NewInt(1000),
-		BlockProposalFeeIterations: 3,
+		L1Endpoint:                         os.Getenv("L1_NODE_WS_ENDPOINT"),
+		L2Endpoint:                         os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
+		TaikoL1Address:                     common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:                     common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress:                  common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+		L1ProposerPrivKey:                  l1ProposerPrivKey,
+		L2SuggestedFeeRecipient:            common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
+		ProposeInterval:                    &proposeInterval,
+		MaxProposedTxListsPerEpoch:         1,
+		WaitReceiptTimeout:                 10 * time.Second,
+		ProverEndpoints:                    s.ProverEndpoints,
+		BlockProposalFee:                   big.NewInt(1000),
+		BlockProposalFeeIterations:         3,
+		BlockProposalFeeIncreasePercentage: common.Big2,
 	})))
 
-	srv, cancel, err := testutils.HTTPServer(&s.ClientTestSuite, port)
-	s.Nil(err)
-
-	s.srv = srv
-	s.cancel = cancel
-
 	s.p = prop
 }
 func (s *CalldataSyncerTestSuite) TestCancelNewSyncer() {
-	defer s.cancel()
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
 	syncer, err := NewSyncer(
@@ -91,22 +80,19 @@ func (s *CalldataSyncerTestSuite) TestCancelNewSyncer() {
 }
 
 func (s *CalldataSyncerTestSuite) TestProcessL1Blocks() {
-	defer s.cancel()
 	head, err := s.s.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
 	s.Nil(s.s.ProcessL1Blocks(context.Background(), head))
 }
 
 func (s *CalldataSyncerTestSuite) TestProcessL1BlocksReorg() {
-	defer s.cancel()
 	head, err := s.s.rpc.L1.HeaderByNumber(context.Background(), nil)
 	testutils.ProposeAndInsertEmptyBlocks(&s.ClientTestSuite, s.p, s.s)
 	s.Nil(err)
 	s.Nil(s.s.ProcessL1Blocks(context.Background(), head))
 }
 
 func (s *CalldataSyncerTestSuite) TestOnBlockProposed() {
-	defer s.cancel()
 	s.Nil(s.s.onBlockProposed(
 		context.Background(),
 		&bindings.TaikoL1ClientBlockProposed{BlockId: common.Big0},
@@ -120,7 +106,6 @@ func (s *CalldataSyncerTestSuite) TestOnBlockProposed() {
 }
 
 func (s *CalldataSyncerTestSuite) TestInsertNewHead() {
-	defer s.cancel()
 	parent, err := s.s.rpc.L2.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
 	l1Head, err := s.s.rpc.L1.BlockByNumber(context.Background(), nil)
@@ -130,14 +115,14 @@ func (s *CalldataSyncerTestSuite) TestInsertNewHead() {
 		&bindings.TaikoL1ClientBlockProposed{
 			BlockId: common.Big1,
 			Meta: bindings.TaikoDataBlockMetadata{
-				Id:          1,
-				L1Height:    l1Head.NumberU64(),
-				L1Hash:      l1Head.Hash(),
-				Beneficiary: common.BytesToAddress(testutils.RandomBytes(1024)),
-				TxListHash:  testutils.RandomHash(),
-				MixHash:     testutils.RandomHash(),
-				GasLimit:    rand.Uint32(),
-				Timestamp:   uint64(time.Now().Unix()),
+				Id:         1,
+				L1Height:   l1Head.NumberU64(),
+				L1Hash:     l1Head.Hash(),
+				Proposer:   common.BytesToAddress(testutils.RandomBytes(1024)),
+				TxListHash: testutils.RandomHash(),
+				MixHash:    testutils.RandomHash(),
+				GasLimit:   rand.Uint32(),
+				Timestamp:  uint64(time.Now().Unix()),
 			},
 		},
 		parent,
@@ -153,7 +138,6 @@ func (s *CalldataSyncerTestSuite) TestInsertNewHead() {
 }
 
 func (s *CalldataSyncerTestSuite) TestTreasuryIncomeAllAnchors() {
-	defer s.cancel()
 	treasury := common.HexToAddress(os.Getenv("TREASURY"))
 	s.NotZero(treasury.Big().Uint64())
 
@@ -176,7 +160,6 @@ func (s *CalldataSyncerTestSuite) TestTreasuryIncomeAllAnchors() {
 }
 
 func (s *CalldataSyncerTestSuite) TestTreasuryIncome() {
-	defer s.cancel()
 	treasury := common.HexToAddress(os.Getenv("TREASURY"))
 	s.NotZero(treasury.Big().Uint64())