chore: update gno version (#41)

* Update gno version

* Swap to context.Background()

Author: zivkovicmilos

client/batch.go

@@ -1,20 +1,21 @@
 package client
 
 import (
+	"context"
 	"fmt"
 
 	rpcClient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
 )
 
 // Batch is the wrapper for HTTP batch requests
 type Batch struct {
-	batch *rpcClient.BatchHTTP
+	batch *rpcClient.RPCBatch
 }
 
 // AddBlockRequest adds a new block request (block fetch) to the batch
 func (b *Batch) AddBlockRequest(blockNum uint64) error {
 	bn := int64(blockNum)
-	if _, err := b.batch.Block(&bn); err != nil {
+	if err := b.batch.Block(&bn); err != nil {
 		return fmt.Errorf("unable to add block request, %w", err)
 	}
 
@@ -24,16 +25,16 @@ func (b *Batch) AddBlockRequest(blockNum uint64) error {
 // AddBlockResultsRequest adds a new block results request (block results fetch) to the batch
 func (b *Batch) AddBlockResultsRequest(blockNum uint64) error {
 	bn := int64(blockNum)
-	if _, err := b.batch.BlockResults(&bn); err != nil {
+	if err := b.batch.BlockResults(&bn); err != nil {
 		return fmt.Errorf("unable to add block results request, %w", err)
 	}
 
 	return nil
 }
 
 // Execute sends the batch off for processing by the node
-func (b *Batch) Execute() ([]any, error) {
-	return b.batch.Send()
+func (b *Batch) Execute(ctx context.Context) ([]any, error) {
+	return b.batch.Send(ctx)
 }
 
 // Count returns the number of requests in the batch

client/http.go

@@ -11,14 +11,19 @@ import (
 
 // Client is the TM2 HTTP client
 type Client struct {
-	client *rpcClient.HTTP
+	client *rpcClient.RPCClient
 }
 
 // NewClient creates a new TM2 HTTP client
-func NewClient(remote string) *Client {
-	return &Client{
-		client: rpcClient.NewHTTP(remote, ""),
+func NewClient(remote string) (*Client, error) {
+	client, err := rpcClient.NewHTTPClient(remote)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create HTTP client, %w", err)
 	}
+
+	return &Client{
+		client: client,
+	}, nil
 }
 
 // CreateBatch creates a new request batch

client/types/types.go

@@ -1,5 +1,7 @@
 package types
 
+import "context"
+
 // Batch defines the interface for the client batch
 type Batch interface {
 	// AddBlockRequest adds a new block request (block fetch) to the batch
@@ -9,7 +11,7 @@ type Batch interface {
 	AddBlockResultsRequest(uint64) error
 
 	// Execute sends the batch off for processing by the node
-	Execute() ([]any, error)
+	Execute(context.Context) ([]any, error)
 
 	// Count returns the number of requests in the batch
 	Count() int

cmd/start.go

@@ -133,18 +133,24 @@ func (c *startCfg) exec(ctx context.Context) error {
 	}
 
 	defer func() {
-		if err := db.Close(); err != nil {
-			logger.Error("unable to gracefully close DB", zap.Error(err))
+		if closeErr := db.Close(); closeErr != nil {
+			logger.Error("unable to gracefully close DB", zap.Error(closeErr))
 		}
 	}()
 
 	// Create an Event Manager instance
 	em := events.NewManager()
 
+	// Create a TM2 client
+	tm2Client, err := client.NewClient(c.remote)
+	if err != nil {
+		return fmt.Errorf("unable to create client, %w", err)
+	}
+
 	// Create the fetcher service
 	f := fetch.New(
 		db,
-		client.NewClient(c.remote),
+		tm2Client,
 		em,
 		fetch.WithLogger(
 			logger.Named("fetcher"),

fetch/fetch_test.go

@@ -122,7 +122,7 @@ func TestFetcher_FetchTransactions_Valid_FullBlocks(t *testing.T) {
 			mockClient = &mockClient{
 				createBatchFn: func() clientTypes.Batch {
 					return &mockBatch{
-						executeFn: func() ([]any, error) {
+						executeFn: func(_ context.Context) ([]any, error) {
 							// Force an error
 							return nil, errors.New("something is flaky")
 						},
@@ -279,7 +279,7 @@ func TestFetcher_FetchTransactions_Valid_FullBlocks(t *testing.T) {
 			mockClient = &mockClient{
 				createBatchFn: func() clientTypes.Batch {
 					return &mockBatch{
-						executeFn: func() ([]any, error) {
+						executeFn: func(_ context.Context) ([]any, error) {
 							results := make([]any, len(batch))
 							copy(results, batch)
 
@@ -445,7 +445,7 @@ func TestFetcher_FetchTransactions_Valid_EmptyBlocks(t *testing.T) {
 			mockClient = &mockClient{
 				createBatchFn: func() clientTypes.Batch {
 					return &mockBatch{
-						executeFn: func() ([]any, error) {
+						executeFn: func(_ context.Context) ([]any, error) {
 							// Force an error
 							return nil, errors.New("something is flaky")
 						},
@@ -553,7 +553,7 @@ func TestFetcher_FetchTransactions_Valid_EmptyBlocks(t *testing.T) {
 			mockClient = &mockClient{
 				createBatchFn: func() clientTypes.Batch {
 					return &mockBatch{
-						executeFn: func() ([]any, error) {
+						executeFn: func(_ context.Context) ([]any, error) {
 							results := make([]any, len(batch))
 							copy(results, batch)
 
@@ -671,7 +671,7 @@ func TestFetcher_InvalidBlocks(t *testing.T) {
 		mockClient = &mockClient{
 			createBatchFn: func() clientTypes.Batch {
 				return &mockBatch{
-					executeFn: func() ([]any, error) {
+					executeFn: func(_ context.Context) ([]any, error) {
 						// Force an error
 						return nil, errors.New("something is flaky")
 					},

fetch/mocks_test.go

@@ -1,6 +1,8 @@
 package fetch
 
 import (
+	"context"
+
 	core_types "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types"
 
 	clientTypes "github.com/gnolang/tx-indexer/client/types"
@@ -58,7 +60,7 @@ func (m *mockClient) CreateBatch() clientTypes.Batch {
 type (
 	addBlockRequestDelegate        func(uint64) error
 	addBlockResultsRequestDelegate func(uint64) error
-	executeDelegate                func() ([]any, error)
+	executeDelegate                func(context.Context) ([]any, error)
 	countDelegate                  func() int
 )
 
@@ -85,9 +87,9 @@ func (m *mockBatch) AddBlockResultsRequest(num uint64) error {
 	return nil
 }
 
-func (m *mockBatch) Execute() ([]any, error) {
+func (m *mockBatch) Execute(ctx context.Context) ([]any, error) {
 	if m.executeFn != nil {
-		return m.executeFn()
+		return m.executeFn(ctx)
 	}
 
 	return nil, nil

fetch/worker.go

@@ -79,7 +79,7 @@ func getBlocksFromBatch(chunkRange chunkRange, client Client) ([]*types.Block, e
 	}
 
 	// Get the block results
-	blocksRaw, err := batch.Execute()
+	blocksRaw, err := batch.Execute(context.Background())
 	if err != nil {
 		// Try to fetch sequentially
 		return getBlocksSequentially(chunkRange, client)
@@ -155,7 +155,7 @@ func getTxResultFromBatch(blocks []*types.Block, client Client) ([][]*types.TxRe
 	}
 
 	// Get the block results
-	blockResultsRaw, err := batch.Execute()
+	blockResultsRaw, err := batch.Execute(context.Background())
 	if err != nil {
 		// Try to fetch sequentially
 		return getTxResultsSequentially(blocks, client)

go.mod

@@ -5,7 +5,9 @@ go 1.21
 require (
 	github.com/99designs/gqlgen v0.17.45
 	github.com/cockroachdb/pebble v1.1.0
+	github.com/gnolang/gno v0.0.0-20240429120125-3832b1312d7d
 	github.com/go-chi/chi/v5 v5.0.12
+	github.com/go-chi/httprate v0.9.0
 	github.com/google/uuid v1.6.0
 	github.com/madz-lab/insertion-queue v0.0.0-20230520191346-295d3348f63a
 	github.com/olahol/melody v1.2.0
@@ -22,7 +24,9 @@ require (
 	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/cockroachdb/errors v1.11.1 // indirect
@@ -31,57 +35,50 @@ require (
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgraph-io/badger/v3 v3.2103.4 // indirect
-	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
 	github.com/getsentry/sentry-go v0.27.0 // indirect
-	github.com/gnolang/goleveldb v0.0.9 // indirect
+	github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/linxGnu/grocksdb v1.8.5 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.18.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/rs/cors v1.10.1 // indirect
+	github.com/rs/xid v1.5.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sosodev/duration v1.2.0 // indirect
-	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	github.com/urfave/cli/v2 v2.27.1 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.etcd.io/bbolt v1.3.8 // indirect
-	go.opencensus.io v0.22.5 // indirect
-	golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
+	go.opentelemetry.io/otel v1.25.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0 // indirect
+	go.opentelemetry.io/otel/metric v1.25.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.25.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
+	go.opentelemetry.io/otel/trace v1.25.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.19.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
-
-require (
-	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
-	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/gnolang/gno v0.0.0-20231215125729-9262c1a8f949
-	github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216 // indirect
-	github.com/go-chi/httprate v0.9.0
-	golang.org/x/crypto v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/grpc v1.63.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )