feat(pkg): cherry-pick changes in #334

pkg/rpc/client.go

@@ -3,9 +3,11 @@ package rpc
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/ethclient/gethclient"
@@ -60,30 +62,35 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
 		return nil, err
 	}
 
-	isArchive, err := IsArchiveNode(ctx, l1RPC)
+	taikoL1, err := bindings.NewTaikoL1Client(cfg.TaikoL1Address, l1RPC)
 	if err != nil {
 		return nil, err
 	}
 
-	if !isArchive {
-		return nil, errNotArchiveNode
+	l2RPC, err := DialClientWithBackoff(ctx, cfg.L2Endpoint, cfg.RetryInterval)
+	if err != nil {
+		return nil, err
 	}
 
-	taikoL1, err := bindings.NewTaikoL1Client(cfg.TaikoL1Address, l1RPC)
+	taikoL2, err := bindings.NewTaikoL2Client(cfg.TaikoL2Address, l2RPC)
 	if err != nil {
 		return nil, err
 	}
 
-	l2RPC, err := DialClientWithBackoff(ctx, cfg.L2Endpoint, cfg.RetryInterval)
+	stateVars, err := taikoL1.GetStateVariables(&bind.CallOpts{Context: ctx})
 	if err != nil {
 		return nil, err
 	}
 
-	taikoL2, err := bindings.NewTaikoL2Client(cfg.TaikoL2Address, l2RPC)
+	isArchive, err := IsArchiveNode(ctx, l1RPC, stateVars.GenesisHeight)
 	if err != nil {
 		return nil, err
 	}
 
+	if !isArchive {
+		return nil, fmt.Errorf("error with RPC endpoint: node (%s) must be archive node", cfg.L1Endpoint)
+	}
+
 	l1RawRPC, err := rpc.Dial(cfg.L1Endpoint)
 	if err != nil {
 		return nil, err

pkg/rpc/utils.go

@@ -247,8 +247,8 @@ func StringToBytes32(str string) [32]byte {
 	return b
 }
 
-func IsArchiveNode(ctx context.Context, client *ethclient.Client) (bool, error) {
-	_, err := client.BalanceAt(ctx, zeroAddress, big.NewInt(1))
+func IsArchiveNode(ctx context.Context, client *ethclient.Client, l2GenesisHeight uint64) (bool, error) {
+	_, err := client.BalanceAt(ctx, zeroAddress, new(big.Int).SetUint64(l2GenesisHeight))
 	if err != nil {
 		if strings.Contains(err.Error(), "missing trie node") {
 			return false, nil