Fix more semgrep issues

cmd/retransmitter/retransmit/behaviour.go

@@ -127,8 +127,8 @@ func (a *BehaviourImpl) SpawnKnownPeers(ctx context.Context) {
 }
 
 func (a *BehaviourImpl) errorHandler(p peer.Peer, e error) {
-	_ = p.Close()
 	if p != nil {
+		_ = p.Close()
 		a.activeConnections.Delete(p)
 	}
 }

cmd/wmd/internal/importer.go

@@ -8,11 +8,12 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
+
 	"github.com/wavesplatform/gowaves/cmd/wmd/internal/data"
 	"github.com/wavesplatform/gowaves/cmd/wmd/internal/state"
 	"github.com/wavesplatform/gowaves/pkg/crypto"
 	"github.com/wavesplatform/gowaves/pkg/proto"
-	"go.uber.org/zap"
 )
 
 type Importer struct {
@@ -39,9 +40,9 @@ func (im *Importer) Import(n string) error {
 		return errors.Wrapf(err, "failed to open blockchain file '%s'", n)
 	}
 	defer func() {
-		err = f.Close()
-		if err != nil {
-			zap.S().Errorf("Failed to close blockchain file: %s", err.Error())
+		closeErr := f.Close()
+		if closeErr != nil {
+			zap.S().Errorf("Failed to close blockchain file: %s", closeErr.Error())
 		}
 	}()
 

pkg/api/blocks.go

@@ -2,10 +2,11 @@ package api
 
 import (
 	"github.com/pkg/errors"
+
 	apiErrs "github.com/wavesplatform/gowaves/pkg/api/errors"
 	"github.com/wavesplatform/gowaves/pkg/crypto"
 	"github.com/wavesplatform/gowaves/pkg/proto"
-	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 )
 
 type Score struct {
@@ -157,7 +158,7 @@ func (a *App) BlocksGenerators() (Generators, error) {
 func (a *App) BlockByHeight(height proto.Height) (*proto.Block, error) {
 	block, err := a.state.BlockByHeight(height)
 	if err != nil {
-		if origErr := errors.Cause(err); state.IsInvalidInput(origErr) || state.IsNotFound(origErr) {
+		if origErr := errors.Cause(err); stateerr.IsInvalidInput(origErr) || stateerr.IsNotFound(origErr) {
 			return nil, notFound
 		}
 		return nil, errors.Wrapf(err, "failed to get block by height=%d", height)
@@ -168,7 +169,7 @@ func (a *App) BlockByHeight(height proto.Height) (*proto.Block, error) {
 func (a *App) Block(id proto.BlockID) (*proto.Block, error) {
 	block, err := a.state.Block(id)
 	if err != nil {
-		if origErr := errors.Cause(err); state.IsNotFound(origErr) {
+		if origErr := errors.Cause(err); stateerr.IsNotFound(origErr) {
 			return nil, notFound
 		}
 		return nil, errors.Wrapf(err, "failed to get block by id=%s", id.String())
@@ -179,7 +180,7 @@ func (a *App) Block(id proto.BlockID) (*proto.Block, error) {
 func (a *App) BlockIDToHeight(id proto.BlockID) (proto.Height, error) {
 	height, err := a.state.BlockIDToHeight(id)
 	if err != nil {
-		if origErr := errors.Cause(err); state.IsNotFound(origErr) {
+		if origErr := errors.Cause(err); stateerr.IsNotFound(origErr) {
 			return 0, notFound
 		}
 		return 0, errors.Wrapf(err, "failed to get block height for id=%s", id.String())

pkg/api/eth.go

@@ -2,16 +2,17 @@ package api
 
 import (
 	"github.com/pkg/errors"
+
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/proto/ethabi"
 	"github.com/wavesplatform/gowaves/pkg/ride/serialization"
-	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 )
 
 func (a *App) EthereumDAppMethods(addr proto.WavesAddress) (ethabi.MethodsMap, error) {
 	scriptInfo, err := a.state.ScriptInfoByAccount(proto.NewRecipientFromAddress(addr))
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return ethabi.MethodsMap{}, errors.Wrap(notFound, "script is not found")
 		}
 		return ethabi.MethodsMap{}, err

pkg/api/metamask/service.go

@@ -17,6 +17,7 @@ import (
 	"github.com/wavesplatform/gowaves/pkg/proto/ethabi"
 	"github.com/wavesplatform/gowaves/pkg/services"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 	"github.com/wavesplatform/gowaves/pkg/util/common"
 )
 
@@ -127,7 +128,7 @@ func (s RPCService) Eth_GetBlockByHash(blockIDBytes proto.HexBytes, filterTxObj
 	}
 	_, err = s.nodeRPCApp.State.BlockIDToHeight(blockID)
 	switch {
-	case state.IsNotFound(err):
+	case stateerr.IsNotFound(err):
 		return nil, nil // according to the scala node implementation
 	case err != nil:
 		return nil, errors.Wrapf(err, "failed to fetch heigh of block by blockID %q", blockID.String())
@@ -309,7 +310,7 @@ func (s RPCService) Eth_GetCode(ethAddr proto.EthereumAddress, blockOrTag string
 
 	si, err := s.nodeRPCApp.State.ScriptBasicInfoByAccount(proto.NewRecipientFromAddress(wavesAddr))
 	switch {
-	case state.IsNotFound(err):
+	case stateerr.IsNotFound(err):
 		// account has no script, trying fetch data as asset
 		assetID := proto.AssetID(ethAddr)
 		_, err := s.nodeRPCApp.State.AssetInfo(assetID)
@@ -428,7 +429,7 @@ type GetTransactionReceiptResponse struct {
 func (s RPCService) Eth_GetTransactionReceipt(ethTxID proto.EthereumHash) (*GetTransactionReceiptResponse, error) {
 	txID := crypto.Digest(ethTxID)
 	tx, status, err := s.nodeRPCApp.State.TransactionByIDWithStatus(txID.Bytes())
-	if state.IsNotFound(err) {
+	if stateerr.IsNotFound(err) {
 		zap.S().Debugf("Eth_GetTransactionReceipt: transaction with ID=%q or ethID=%q cannot be found",
 			txID, ethTxID,
 		)
@@ -509,7 +510,7 @@ type GetTransactionByHashResponse struct {
 func (s RPCService) Eth_GetTransactionByHash(ethTxID proto.EthereumHash) (*GetTransactionByHashResponse, error) {
 	txID := crypto.Digest(ethTxID)
 	tx, err := s.nodeRPCApp.State.TransactionByID(txID.Bytes())
-	if state.IsNotFound(err) {
+	if stateerr.IsNotFound(err) {
 		zap.S().Debugf("Eth_GetTransactionByHash: transaction with ID=%q or ethID=%q cannot be found",
 			txID, ethTxID,
 		)

pkg/api/node_api.go

@@ -20,6 +20,7 @@ import (
 	"github.com/wavesplatform/gowaves/pkg/errs"
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 	"github.com/wavesplatform/gowaves/pkg/util/limit_listener"
 )
 
@@ -92,7 +93,7 @@ func (a *NodeApi) TransactionInfo(w http.ResponseWriter, r *http.Request) error
 	tx, err := a.state.TransactionByID(id.Bytes())
 	if err != nil {
 		origErr := errors.Cause(err)
-		if state.IsNotFound(origErr) {
+		if stateerr.IsNotFound(origErr) {
 			return apiErrs.TransactionDoesNotExist
 		}
 		return errors.Wrapf(err,
@@ -150,7 +151,7 @@ func (a *NodeApi) BlocksHeadersAt(w http.ResponseWriter, r *http.Request) error
 	}
 	header, err := a.app.BlocksHeadersAt(h)
 	if err != nil {
-		if state.IsInvalidInput(err) || state.IsNotFound(err) {
+		if stateerr.IsInvalidInput(err) || stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrapf(err, "BlocksHeadersAt: failed to get block header at height %d", h)
@@ -174,7 +175,7 @@ func (a *NodeApi) BlockHeadersID(w http.ResponseWriter, r *http.Request) error {
 	}
 	header, err := a.app.BlocksHeadersByID(id)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrapf(err, "BlockHeadersID: failed to get block header by ID=%q", s)
@@ -320,7 +321,7 @@ func (a *NodeApi) BlocksSnapshotAt(w http.ResponseWriter, r *http.Request) error
 	}
 	blockSnapshot, err := a.state.SnapshotsAtHeight(height)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrapf(err, "BlocksSnapshotAt: failed to get block snapshot at height %d", height)
@@ -523,7 +524,7 @@ func (a *NodeApi) AddrByAlias(w http.ResponseWriter, r *http.Request) error {
 	addr, err := a.app.AddrByAlias(*alias)
 	if err != nil {
 		origErr := errors.Cause(err)
-		if state.IsNotFound(origErr) {
+		if stateerr.IsNotFound(origErr) {
 			return apiErrs.NewAliasDoesNotExistError(alias.String())
 		}
 		return errors.Wrapf(err, "failed to find addr by short alias %q", aliasShort)
@@ -546,7 +547,7 @@ func (a *NodeApi) AliasesByAddr(w http.ResponseWriter, r *http.Request) error {
 
 	aliases, err := a.app.AliasesByAddr(addr)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			aliases = nil
 		} else {
 			return errors.Wrapf(err, "failed to find aliases by addr")
@@ -696,7 +697,7 @@ func (a *NodeApi) RollbackToHeight(w http.ResponseWriter, r *http.Request) error
 	err := a.state.RollbackToHeight(rollbackReq.Height)
 	if err != nil {
 		origErr := errors.Cause(err)
-		if state.IsNotFound(origErr) {
+		if stateerr.IsNotFound(origErr) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrapf(err, "failed to rollback to height %d", rollbackReq.Height)
@@ -811,7 +812,7 @@ func (a *NodeApi) stateHash(w http.ResponseWriter, r *http.Request) error {
 	}
 	stateHashDebug, err := a.stateHashDebug(height)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrap(err, "failed to get state hash debug")
@@ -834,7 +835,7 @@ func (a *NodeApi) stateHashLast(w http.ResponseWriter, _ *http.Request) error {
 	}
 	stateHashDebug, err := a.stateHashDebug(h)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrap(err, "failed to get last state hash")
@@ -857,7 +858,7 @@ func (a *NodeApi) snapshotStateHash(w http.ResponseWriter, r *http.Request) erro
 	}
 	sh, err := a.state.SnapshotStateHashAtHeight(height)
 	if err != nil {
-		if state.IsNotFound(err) {
+		if stateerr.IsNotFound(err) {
 			return apiErrs.BlockDoesNotExist
 		}
 		return errors.Wrapf(err, "failed to get snapshot state hash at height %d", height)

pkg/grpc/server/accounts_api.go

@@ -12,6 +12,7 @@ import (
 	pb "github.com/wavesplatform/gowaves/pkg/grpc/generated/waves"
 	g "github.com/wavesplatform/gowaves/pkg/grpc/generated/waves/node/grpc"
 	"github.com/wavesplatform/gowaves/pkg/proto"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 )
 
 func (s *Server) GetBalances(req *g.BalancesRequest, srv g.AccountsApi_GetBalancesServer) error {
@@ -123,7 +124,7 @@ func (s *Server) GetDataEntries(req *g.DataRequest, srv g.AccountsApi_GetDataEnt
 	if req.Key != "" {
 		entry, err := s.state.RetrieveEntry(rcp, req.Key)
 		if err != nil {
-			if err.Error() == "not found" { // TODO: fix this error message comparison, use errors.Is instead
+			if stateerr.IsNotFound(err) {
 				return nil
 			}
 			return status.Error(codes.NotFound, err.Error())
@@ -139,7 +140,7 @@ func (s *Server) GetDataEntries(req *g.DataRequest, srv g.AccountsApi_GetDataEnt
 	}
 	entries, err := s.state.RetrieveEntries(rcp)
 	if err != nil {
-		if err.Error() == "not found" { // TODO: fix this error message comparison, use errors.Is instead
+		if stateerr.IsNotFound(err) {
 			return nil
 		}
 		return status.Error(codes.Internal, err.Error())

pkg/miner/micro_miner.go

@@ -10,6 +10,7 @@ import (
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/services"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 	"github.com/wavesplatform/gowaves/pkg/types"
 )
 
@@ -88,7 +89,7 @@ func (a *MicroMiner) Micro(minedBlock *proto.Block, rest proto.MiningLimits, key
 			// In the miner we pack transactions from UTX into new block.
 			// We should accept failed transactions here.
 			snapshot, errVal := s.ValidateNextTx(t.T, minedBlock.Timestamp, parentTimestamp, minedBlock.Version, true)
-			if state.IsTxCommitmentError(errVal) {
+			if stateerr.IsTxCommitmentError(errVal) {
 				// This should not happen in practice.
 				// Reset state, tx count, return applied transactions to UTX.
 				s.ResetValidationList()

pkg/miner/utxpool/transaction_bulk_validator.go

@@ -1,10 +1,12 @@
 package utxpool
 
 import (
+	"go.uber.org/zap"
+
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 	"github.com/wavesplatform/gowaves/pkg/types"
-	"go.uber.org/zap"
 )
 
 type BulkValidator interface {
@@ -53,7 +55,7 @@ func (a bulkValidator) validate() ([]*types.TransactionWithBytes, error) {
 				break
 			}
 			_, err := s.ValidateNextTx(t.T, currentTimestamp, lastKnownBlock.Timestamp, lastKnownBlock.Version, false)
-			if state.IsTxCommitmentError(err) {
+			if stateerr.IsTxCommitmentError(err) {
 				// This should not happen in practice.
 				// Reset state, return applied transactions to UTX.
 				s.ResetValidationList()

pkg/node/blocks_applier/blocks_applier.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 )
 
 const maxRollbackDeltaHeight = 100
@@ -32,7 +33,7 @@ func (a *innerBlocksApplier) exists(storage innerState, block *proto.Block) (boo
 	if err == nil {
 		return true, nil
 	}
-	if state.IsNotFound(err) {
+	if stateerr.IsNotFound(err) {
 		return false, nil
 	}
 	return false, err
@@ -102,7 +103,7 @@ func (a *innerBlocksApplier) getParentAndCurrentHeight(
 	if err == nil {
 		return 0, 0, proto.NewInfoMsg(errors.Errorf("first block %s exists", firstBlock.BlockID().String()))
 	}
-	if !state.IsNotFound(err) {
+	if !stateerr.IsNotFound(err) {
 		return 0, 0, errors.Wrap(err, "unknown error")
 	}
 	currentHeight, err := storage.Height()
@@ -240,7 +241,7 @@ func (a *innerBlocksApplier) applyMicro(
 	if err == nil {
 		return 0, errors.Errorf("block '%s' already exist", block.BlockID().String())
 	}
-	if !state.IsNotFound(err) {
+	if !stateerr.IsNotFound(err) {
 		return 0, errors.Wrap(err, "unexpected error")
 	}
 
@@ -290,7 +291,7 @@ func (a *innerBlocksApplier) applyMicroWithSnapshot(
 	if err == nil {
 		return 0, errors.Errorf("block '%s' already exist", block.BlockID().String())
 	}
-	if !state.IsNotFound(err) {
+	if !stateerr.IsNotFound(err) {
 		return 0, errors.Wrap(err, "unexpected error")
 	}
 

pkg/node/blocks_applier/node_mocks.go

@@ -7,10 +7,11 @@ import (
 	"github.com/wavesplatform/gowaves/pkg/proto"
 	"github.com/wavesplatform/gowaves/pkg/settings"
 	"github.com/wavesplatform/gowaves/pkg/state"
+	"github.com/wavesplatform/gowaves/pkg/state/stateerr"
 )
 
-func notFound() state.StateError {
-	return state.NewStateError(state.NotFoundError, proto.ErrNotFound)
+func notFound() stateerr.StateError {
+	return stateerr.NewStateError(stateerr.NotFoundError, proto.ErrNotFound)
 }
 
 type MockStateManager struct {

pkg/proto/transactions_with_proofs.go

@@ -3312,7 +3312,7 @@ func (tx *DataWithProofs) bodyUnmarshalBinary(data []byte) error {
 		var e DataEntry
 		t, err := extractValueType(data)
 		if err != nil {
-			return errors.Errorf("failed to extract type of data entry")
+			return errors.Wrap(err, "failed to extract type of data entry")
 		}
 		switch t {
 		case DataInteger:

pkg/ride/compiler/ast_parser.go

@@ -1682,7 +1682,7 @@ func (p *astParser) ruleGenericTypeHandler(node *node32) s.Type {
 	curNode = skipToNextRule(curNode.next)
 	T := p.ruleTypesHandler(curNode)
 	if T == nil {
-		return T
+		return nil
 	}
 	return s.ListType{Type: T}
 }