Fix: mempool URL (#941)

.github/workflows/tests_master.yml

@@ -12,7 +12,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.45.2
+          version: v1.49.0
           args: --timeout=2m --go=1.18
   test:
     name: Tests

.github/workflows/tests_pr.yml

@@ -13,7 +13,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.45.2
+          version: v1.49.0
           args: --timeout=2m --go=1.18
   test:
     name: Tests

.golangci.yml

@@ -6,8 +6,7 @@ linters:
     - govet
     - prealloc
     - unconvert
-    - deadcode
-    - varcheck
+    - unused
     - errcheck
     - ineffassign
     - containedctx

cmd/api/handlers/bigmap.go

@@ -189,7 +189,6 @@ func GetBigMapKeys() gin.HandlerFunc {
 			return
 		}
 
-		var states []bigmapdiff.BigMapState
 		keys, err := ctx.BigMapDiffs.Keys(bigmapdiff.GetContext{
 			Ptr:      &req.Ptr,
 			Size:     pageReq.Size,
@@ -201,14 +200,13 @@ func GetBigMapKeys() gin.HandlerFunc {
 		if handleError(c, ctx.Storage, err, 0) {
 			return
 		}
-		states = keys
 
 		symLink, err := getCurrentSymLink(ctx.Blocks)
 		if handleError(c, ctx.Storage, err, 0) {
 			return
 		}
 
-		response, err := prepareBigMapKeys(ctx, states, symLink)
+		response, err := prepareBigMapKeys(ctx, keys, symLink)
 		if handleError(c, ctx.Storage, err, 0) {
 			return
 		}
@@ -511,11 +509,10 @@ func prepareKey(itemKey types.Bytes, bigMapType *ast.BigMap) (key *ast.MiguelNod
 		case int64:
 			keyString = fmt.Sprintf("%d", t)
 		default:
-			keyString = fmt.Sprintf("%v", t)
+			keyString, err = formatter.MichelineToMichelsonInline(string(itemKey))
 		}
 	}
 
-	keyString, err = formatter.MichelineToMichelsonInline(string(itemKey))
 	return
 }
 

cmd/api/handlers/fork.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	stdJSON "encoding/json"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/baking-bad/bcdhub/internal/bcd/ast"
@@ -85,7 +84,7 @@ func CodeFromMichelson() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		ctx := c.MustGet("contexts").(config.Contexts)
 
-		body, err := ioutil.ReadAll(io.LimitReader(c.Request.Body, 1024*1024))
+		body, err := io.ReadAll(io.LimitReader(c.Request.Body, 1024*1024))
 		if handleError(c, ctx.Any().Storage, err, http.StatusBadRequest) {
 			return
 		}

cmd/api/handlers/requests.go

@@ -138,16 +138,6 @@ func (req getByNetwork) NetworkID() types.Network {
 	return types.NewNetwork(req.Network)
 }
 
-type getTokensByVersion struct {
-	Network string `uri:"network" binding:"required,network" example:"mainnet"`
-	Version string `uri:"faversion" binding:"required,faversion" example:"fa2"`
-}
-
-// NetworkID -
-func (req getTokensByVersion) NetworkID() types.Network {
-	return types.NewNetwork(req.Network)
-}
-
 type bigMapSearchRequest struct {
 	pageableRequest
 	MaxLevel *int64 `form:"max_level,omitempty" binding:"omitempty,gt_int64_ptr=MinLevel"`

cmd/indexer/indexer/initializer.go

@@ -2,12 +2,9 @@ package indexer
 
 import (
 	"context"
-	"time"
 
 	"github.com/baking-bad/bcdhub/internal/models"
-	"github.com/baking-bad/bcdhub/internal/models/account"
 	"github.com/baking-bad/bcdhub/internal/models/types"
-	"github.com/baking-bad/bcdhub/internal/tzkt"
 	"github.com/go-pg/pg/v10"
 )
 
@@ -32,32 +29,3 @@ func (initializer Initializer) Init(ctx context.Context) error {
 
 	return createStartIndices(initializer.db)
 }
-
-func (initializer *Initializer) getAliases(ctx context.Context) error {
-	if initializer.tzktURI == "" {
-		return nil
-	}
-
-	accounts, err := tzkt.NewTzKT(initializer.tzktURI, 10*time.Second).GetAliases()
-	if err != nil {
-		return err
-	}
-
-	return initializer.db.RunInTransaction(ctx, func(tx *pg.Tx) error {
-		for address, alias := range accounts {
-			acc := account.Account{
-				Address: address,
-				Type:    types.NewAccountType(address),
-				Alias:   alias,
-			}
-
-			if _, err := initializer.db.Model(&acc).
-				OnConflict("(address) DO NOTHING").
-				Insert(); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	})
-}

configs/development.yml

@@ -24,11 +24,11 @@ services:
   mainnet:
     mempool: https://mempool.dipdup.net/v1/graphql
   ghostnet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
   jakartanet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
   kathmandunet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
 
 storage:
   pg: 

configs/production.yml

@@ -25,11 +25,11 @@ services:
   mainnet:
     mempool: https://mempool.dipdup.net/v1/graphql
   ghostnet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
   jakartanet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
   kathmandunet:
-    mempool: https://mempool.dipdup.net/v1/graphql
+    mempool: https://mempool.test.dipdup.net/v1/graphql
 
 storage:
   pg: 

internal/bcd/formatter/error/formatter_error_test.go

@@ -3,7 +3,7 @@ package formattererror
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/tidwall/gjson"
@@ -29,18 +29,18 @@ func TestLocateContractError(t *testing.T) {
 		t.Run(c, func(t *testing.T) {
 			dirpath := fmt.Sprintf("formatter_error_tests/%v/", c)
 
-			data, err := ioutil.ReadFile(dirpath + "code.json")
+			data, err := os.ReadFile(dirpath + "code.json")
 			if err != nil {
-				t.Errorf("error in ioutil.ReadFile(%v%v): %v", dirpath, "code.json", err)
+				t.Errorf("error in os.ReadFile(%v%v): %v", dirpath, "code.json", err)
 			}
 
 			if !gjson.Valid(string(data)) {
 				t.Error("invalid json")
 			}
 
-			results, err := ioutil.ReadFile(dirpath + "results.json")
+			results, err := os.ReadFile(dirpath + "results.json")
 			if err != nil {
-				t.Errorf("error in ioutil.ReadFile(%v%v): %v", dirpath, "results.json", err)
+				t.Errorf("error in os.ReadFile(%v%v): %v", dirpath, "results.json", err)
 			}
 
 			var res Results

internal/bcd/formatter/formatter_test.go

@@ -2,7 +2,7 @@ package formatter
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 	"testing"
@@ -102,9 +102,9 @@ func TestMichelineToMichelson(t *testing.T) {
 		t.Run(tt, func(t *testing.T) {
 			jsonFile := fmt.Sprintf("./formatter_tests/%v/code_%v.json", tt, tt[:6])
 
-			data, err := ioutil.ReadFile(jsonFile)
+			data, err := os.ReadFile(jsonFile)
 			if err != nil {
-				t.Error("ioutil.ReadFile code.json error:", err)
+				t.Error("os.ReadFile code.json error:", err)
 			}
 
 			if !gjson.Valid(string(data)) {
@@ -118,9 +118,9 @@ func TestMichelineToMichelson(t *testing.T) {
 			}
 
 			tzFile := fmt.Sprintf("./formatter_tests/%v/code_%v.tz", tt, tt[:6])
-			expected, err := ioutil.ReadFile(tzFile)
+			expected, err := os.ReadFile(tzFile)
 			if err != nil {
-				t.Error("ioutil.ReadFile code.tz error:", err)
+				t.Error("os.ReadFile code.tz error:", err)
 			}
 
 			re := regexp.MustCompile(`\n\s*`)

internal/bcd/translator/converter.go

@@ -1,7 +1,7 @@
 package translator
 
 import (
-	"io/ioutil"
+	"os"
 	"regexp"
 
 	"github.com/baking-bad/bcdhub/internal/logger"
@@ -82,7 +82,7 @@ func (c Converter) trace() {
 }
 
 func readFileToString(filename string) (string, error) {
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return "", err
 	}

internal/bcd/translator/converter_test.go

@@ -2,16 +2,16 @@ package translator
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConverter_FromFile(t *testing.T) {
-	files, err := ioutil.ReadDir("./tests/")
+	files, err := os.ReadDir("./tests/")
 	if err != nil {
-		t.Errorf("ioutil.ReadDir(./tests/) error = %v", err)
+		t.Errorf("os.ReadDir(./tests/) error = %v", err)
 		return
 	}
 
@@ -28,9 +28,9 @@ func TestConverter_FromFile(t *testing.T) {
 
 		t.Run(file.Name(), func(t *testing.T) {
 			resultFilename := fmt.Sprintf("tests/%s/code.json", file.Name())
-			resultBytes, err := ioutil.ReadFile(resultFilename)
+			resultBytes, err := os.ReadFile(resultFilename)
 			if err != nil {
-				t.Errorf("ioutil.ReadFile() error = %v", err)
+				t.Errorf("os.ReadFile() error = %v", err)
 				return
 			}
 

internal/config/config.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 
@@ -216,7 +215,7 @@ func LoadConfig(filename string) (Config, error) {
 		return config, fmt.Errorf("you have to provide configuration filename")
 	}
 
-	src, err := ioutil.ReadFile(filename)
+	src, err := os.ReadFile(filename)
 	if err != nil {
 		return config, fmt.Errorf("reading file %s error: %w", filename, err)
 	}

internal/models/types/null.go

@@ -4,17 +4,7 @@ import "database/sql/driver"
 
 // NullString represents a string that may be null.
 // NullString implements the Scanner interface so
-// it can be used as a scan destination:
-//
-//  var s NullString
-//  err := db.QueryRow("SELECT name FROM foo WHERE id=?", id).Scan(&s)
-//  ...
-//  if s.Valid {
-//     // use s.Str
-//  } else {
-//     // NULL value
-//  }
-//
+// it can be used as a scan destination
 type NullString struct {
 	Str   string
 	Valid bool // Valid is true if Str is not NULL

internal/noderpc/rpc.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	stdJSON "encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"strconv"
@@ -38,7 +38,6 @@ type NodeRPC struct {
 	client  *http.Client
 
 	timeout    time.Duration
-	cacheDir   string
 	userAgent  string
 	retryCount int
 	rateLimit  *rate.Limiter
@@ -97,7 +96,7 @@ func (rpc *NodeRPC) checkStatusCode(resp *http.Response, checkStatusCode bool) e
 		return NewNodeUnavailiableError(rpc.baseURL, resp.StatusCode)
 	case checkStatusCode:
 		invalidResponseErr := newInvalidNodeResponse()
-		data, err := ioutil.ReadAll(resp.Body)
+		data, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return err
 		}
@@ -188,10 +187,10 @@ func (rpc *NodeRPC) getRaw(ctx context.Context, uri string) ([]byte, error) {
 	if err := rpc.checkStatusCode(resp, true); err != nil {
 		return nil, errors.Wrapf(err, "%s (%s)", ErrNodeRPCError, uri)
 	}
-	return ioutil.ReadAll(resp.Body)
+	return io.ReadAll(resp.Body)
 }
 
-//nolint
+// nolint
 func (rpc *NodeRPC) post(ctx context.Context, uri string, data interface{}, checkStatusCode bool, response interface{}) error {
 	resp, err := rpc.makePostRequest(ctx, uri, data)
 	if err != nil {

internal/parsers/operations/operation_group_test.go

@@ -3,7 +3,7 @@ package operations
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 	"time"
 
@@ -2176,7 +2176,7 @@ func TestGroup_Parse(t *testing.T) {
 					DoAndReturn(
 						func(_ context.Context, address string, level int64) ([]byte, error) {
 							storageFile := fmt.Sprintf("./data/rpc/script/storage/%s_%d.json", address, level)
-							return ioutil.ReadFile(storageFile)
+							return os.ReadFile(storageFile)
 						},
 					).
 					AnyTimes()