Merge branch 'main' into add-comments-tests

taikoxyz · Aug 8, 2023 · c804c3e · c804c3e
2 parents 85b2a9d + ffe2f90
commit c804c3e
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 118 deletions.
diff --git a/cmd/flags/prover.go b/cmd/flags/prover.go
@@ -97,7 +97,7 @@ var (
 		Name:     "prover.proveUnassignedBlocks",
 		Usage:    "Whether you want to prove unassigned blocks, or only work on assigned proofs",
 		Category: proverCategory,
-		Value:    true,
+		Value:    false,
 	}
 )
 

diff --git a/driver/anchor_tx_constructor/anchor_tx_constructor.go b/driver/anchor_tx_constructor/anchor_tx_constructor.go
@@ -102,6 +102,8 @@ func (c *AnchorTxConstructor) transactOpts(
 		return nil, err
 	}
 
+	log.Info("Golden touch account nonce", "nonce", nonce)
+
 	return &bind.TransactOpts{
 		From: c.goldenTouchAddress,
 		Signer: func(address common.Address, tx *types.Transaction) (*types.Transaction, error) {

diff --git a/pkg/rpc/client.go b/pkg/rpc/client.go
@@ -58,19 +58,23 @@ type ClientConfig struct {
 
 // NewClient initializes all RPC clients used by Taiko client softwares.
 func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
-	l1EthClient, err := DialClientWithBackoff(ctx, cfg.L1Endpoint, cfg.RetryInterval)
+	ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
+	defer cancel()
+
+	l1EthClient, err := DialClientWithBackoff(ctxWithTimeout, cfg.L1Endpoint, cfg.RetryInterval)
 	if err != nil {
 		return nil, err
 	}
 
-	l2EthClient, err := DialClientWithBackoff(ctx, cfg.L2Endpoint, cfg.RetryInterval)
+	l2EthClient, err := DialClientWithBackoff(ctxWithTimeout, cfg.L2Endpoint, cfg.RetryInterval)
 	if err != nil {
 		return nil, err
 	}
 
-	var l1RPC *EthClient
-	var l2RPC *EthClient
-
+	var (
+		l1RPC *EthClient
+		l2RPC *EthClient
+	)
 	if cfg.Timeout != nil {
 		l1RPC = NewEthClientWithTimeout(l1EthClient, *cfg.Timeout)
 		l2RPC = NewEthClientWithTimeout(l2EthClient, *cfg.Timeout)
@@ -97,12 +101,12 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 		return nil, err
 	}
 
-	stateVars, err := taikoL1.GetStateVariables(&bind.CallOpts{Context: ctx})
+	stateVars, err := taikoL1.GetStateVariables(&bind.CallOpts{Context: ctxWithTimeout})
 	if err != nil {
 		return nil, err
 	}
 
-	isArchive, err := IsArchiveNode(ctx, l1RPC, stateVars.GenesisHeight)
+	isArchive, err := IsArchiveNode(ctxWithTimeout, l1RPC, stateVars.GenesisHeight)
 	if err != nil {
 		return nil, err
 	}
@@ -121,12 +125,12 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 		return nil, err
 	}
 
-	l1ChainID, err := l1RPC.ChainID(ctx)
+	l1ChainID, err := l1RPC.ChainID(ctxWithTimeout)
 	if err != nil {
 		return nil, err
 	}
 
-	l2ChainID, err := l2RPC.ChainID(ctx)
+	l2ChainID, err := l2RPC.ChainID(ctxWithTimeout)
 	if err != nil {
 		return nil, err
 	}
@@ -136,7 +140,7 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 	var l2AuthRPC *EngineClient
 	if len(cfg.L2EngineEndpoint) != 0 && len(cfg.JwtSecret) != 0 {
 		if l2AuthRPC, err = DialEngineClientWithBackoff(
-			ctx,
+			ctxWithTimeout,
 			cfg.L2EngineEndpoint,
 			cfg.JwtSecret,
 			cfg.RetryInterval,
@@ -147,8 +151,7 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 
 	var l2CheckPoint *EthClient
 	if len(cfg.L2CheckPoint) != 0 {
-		l2CheckPointEthClient, err := DialClientWithBackoff(ctx, cfg.L2CheckPoint, cfg.RetryInterval)
-
+		l2CheckPointEthClient, err := DialClientWithBackoff(ctxWithTimeout, cfg.L2CheckPoint, cfg.RetryInterval)
 		if err != nil {
 			return nil, err
 		}
@@ -176,7 +179,7 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 		L2ChainID:         l2ChainID,
 	}
 
-	if err := client.ensureGenesisMatched(ctx); err != nil {
+	if err := client.ensureGenesisMatched(ctxWithTimeout); err != nil {
 		return nil, err
 	}
 

diff --git a/pkg/rpc/dial.go b/pkg/rpc/dial.go
@@ -20,7 +20,10 @@ func DialClientWithBackoff(ctx context.Context, url string, retryInterval time.D
 	var client *ethclient.Client
 	if err := backoff.Retry(
 		func() (err error) {
-			client, err = ethclient.DialContext(ctx, url)
+			ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
+			defer cancel()
+
+			client, err = ethclient.DialContext(ctxWithTimeout, url)
 			if err != nil {
 				log.Error("Dial ethclient error", "url", url, "error", err)
 			}
@@ -45,7 +48,10 @@ func DialEngineClientWithBackoff(
 	var engineClient *EngineClient
 	if err := backoff.Retry(
 		func() (err error) {
-			client, err := DialEngineClient(ctx, url, jwtSecret)
+			ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
+			defer cancel()
+
+			client, err := DialEngineClient(ctxWithTimeout, url, jwtSecret)
 			if err != nil {
 				log.Error("Dial engine client error", "url", url, "error", err)
 				return err
@@ -65,6 +71,9 @@ func DialEngineClientWithBackoff(
 // DialEngineClient initializes an RPC connection with authentication headers.
 // Taken from https://github.com/prysmaticlabs/prysm/blob/v2.1.4/beacon-chain/execution/rpc_connection.go#L151
 func DialEngineClient(ctx context.Context, endpointUrl string, jwtSecret string) (*rpc.Client, error) {
+	ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
+	defer cancel()
+
 	endpoint := network.Endpoint{
 		Url: endpointUrl,
 		Auth: network.AuthorizationData{
@@ -81,12 +90,12 @@ func DialEngineClient(ctx context.Context, endpointUrl string, jwtSecret string)
 	}
 	switch u.Scheme {
 	case "http", "https":
-		client, err = rpc.DialOptions(ctx, endpoint.Url, rpc.WithHTTPClient(endpoint.HttpClient()))
+		client, err = rpc.DialOptions(ctxWithTimeout, endpoint.Url, rpc.WithHTTPClient(endpoint.HttpClient()))
 		if err != nil {
 			return nil, err
 		}
 	case "":
-		client, err = rpc.DialIPC(ctx, endpoint.Url)
+		client, err = rpc.DialIPC(ctxWithTimeout, endpoint.Url)
 		if err != nil {
 			return nil, err
 		}