client/jsonrpc/arbitrum_nitro.go

@@ -0,0 +1,44 @@
+package jsonrpc
+
+import (
+	"context"
+	"errors"
+	"log/slog"
+	"time"
+
+	"github.com/duneanalytics/blockchain-ingester/models"
+)
+
+type ArbitrumNitroClient struct {
+	rpcClient
+}
+
+var _ BlockchainClient = &ArbitrumNitroClient{}
+
+func NewArbitrumNitroClient(log *slog.Logger, cfg Config) (*ArbitrumNitroClient, error) {
+	rpcClient, err := newClient(log.With("module", "jsonrpc"), cfg)
+	if err != nil {
+		return nil, err
+	}
+	return &ArbitrumNitroClient{*rpcClient}, nil
+}
+
+// BlockByNumber returns the block with the given blockNumber.
+// it uses 3 different methods to get the block:
+//  1. eth_getBlockByNumber
+//  2. debug_traceBlockByNumber with tracer "callTracer"
+//     TODO: this method should be optional
+//  2. call to eth_getTransactionReceipt for each Tx present in the Block
+//
+// We encode the payload in NDJSON, and use a header line to indicate how many Tx are present in the block
+func (c *ArbitrumNitroClient) BlockByNumber(_ context.Context, blockNumber int64) (models.RPCBlock, error) {
+	tStart := time.Now()
+	defer func() {
+		c.log.Debug("BlockByNumber", "blockNumber", blockNumber, "duration", time.Since(tStart))
+	}()
+	// TODO: lets not implement this yet
+	return models.RPCBlock{
+		BlockNumber: blockNumber,
+		Error:       errors.New("not implemented"),
+	}, errors.New("not implemented")
+}

client/jsonrpc/client.go

@@ -37,7 +37,18 @@ type rpcClient struct {
 	wrkPool     *ants.Pool
 }
 
-func NewClient(log *slog.Logger, cfg Config) (*rpcClient, error) { // revive:disable-line:unexported-return
+func NewClient(logger *slog.Logger, cfg Config) (BlockchainClient, error) {
+	switch cfg.EVMStack {
+	case models.OpStack:
+		return NewOpStackClient(logger, cfg)
+	case models.ArbitrumNitro:
+		return NewArbitrumNitroClient(logger, cfg)
+	default:
+		return nil, fmt.Errorf("unsupported EVM stack: %s", cfg.EVMStack)
+	}
+}
+
+func newClient(log *slog.Logger, cfg Config) (*rpcClient, error) { // revive:disable-line:unexported-return
 	client := retryablehttp.NewClient()
 	client.RetryMax = MaxRetries
 	client.Logger = log

client/jsonrpc/models.go

@@ -2,12 +2,15 @@ package jsonrpc
 
 import (
 	"time"
+
+	"github.com/duneanalytics/blockchain-ingester/models"
 )
 
 type Config struct {
 	URL          string
 	PollInterval time.Duration
 	HTTPHeaders  map[string]string
+	EVMStack     models.EVMStack
 	// rpcClient is used in parallel by the ingester to fetch blocks
 	// but it also has internal request concurrency on handling each block
 	// to avoid spawning too many http requests to the RPC node we set here an upper limit

client/jsonrpc/opstack.go

@@ -18,7 +18,7 @@ type OpStackClient struct {
 var _ BlockchainClient = &OpStackClient{}
 
 func NewOpStackClient(log *slog.Logger, cfg Config) (*OpStackClient, error) {
-	rpcClient, err := NewClient(log.With("module", "jsonrpc"), cfg)
+	rpcClient, err := newClient(log.With("module", "jsonrpc"), cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -37,10 +37,7 @@ func NewOpStackClient(log *slog.Logger, cfg Config) (*OpStackClient, error) {
 func (c *OpStackClient) BlockByNumber(ctx context.Context, blockNumber int64) (models.RPCBlock, error) {
 	tStart := time.Now()
 	defer func() {
-		c.log.Debug("BlockByNumber",
-			"blockNumber", blockNumber,
-			"duration", time.Since(tStart),
-		)
+		c.log.Debug("BlockByNumber", "blockNumber", blockNumber, "duration", time.Since(tStart))
 	}()
 	blockNumberHex := fmt.Sprintf("0x%x", blockNumber)
 

cmd/main.go

@@ -85,18 +85,14 @@ func main() {
 		logger.Info("Adding extra HTTP header to RPC requests", "key", key, "value", value)
 		rpcHTTPHeaders[key] = value
 	}
-	switch cfg.RPCStack {
-	case models.OpStack:
-		rpcClient, err = jsonrpc.NewOpStackClient(logger, jsonrpc.Config{
-			URL:         cfg.RPCNode.NodeURL,
-			HTTPHeaders: rpcHTTPHeaders,
-			// real max request concurrency to RPP node
-			// each block requires multiple RPC requests
-			TotalRPCConcurrency: cfg.BlockConcurrency * 4,
-		})
-	default:
-		stdlog.Fatalf("unsupported RPC stack: %s", cfg.RPCStack)
-	}
+	rpcClient, err = jsonrpc.NewClient(logger, jsonrpc.Config{
+		URL:         cfg.RPCNode.NodeURL,
+		HTTPHeaders: rpcHTTPHeaders,
+		EVMStack:    cfg.RPCStack,
+		// real max request concurrency to RPP node
+		// each block requires multiple RPC requests
+		TotalRPCConcurrency: cfg.BlockConcurrency * 4,
+	})
 	if err != nil {
 		stdlog.Fatal(err)
 	}

models/evm.go

@@ -4,7 +4,7 @@ type EVMStack string
 
 const (
 	OpStack       EVMStack = "opstack"
-	ArbitrumNitro EVMStack = "arbitrumnitro"
+	ArbitrumNitro EVMStack = "arbitrum-nitro"
 )
 
 func (e EVMStack) String() string {