lint fix

zeta-chain · Oct 22, 2024 · ab8dda8 · ab8dda8
1 parent c317bbf
commit ab8dda8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/contrib/rpcimportable/go.mod b/contrib/rpcimportable/go.mod
@@ -11,5 +11,10 @@ replace (
     github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 )
 
+// go-ethereum fork must be used as it removes incompatible pebbledb version
+replace (
+    github.com/ethereum/go-ethereum => github.com/zeta-chain/go-ethereum v1.13.16-0.20241022183758-422c6ef93ccc
+)
+
 // uncomment this for local development/testing/debugging
 // replace github.com/zeta-chain/node => ../..
diff --git a/pkg/proofs/ethereum/proof.go b/pkg/proofs/ethereum/proof.go
@@ -159,18 +159,18 @@ func NewTrie(list types.DerivableList) Trie {
 		// #nosec G115 iterator
 		indexBuf = rlp.AppendUint64(indexBuf[:0], uint64(i))
 		value := encodeForDerive(list, i, valueBuf)
-		hasher.Update(indexBuf, value)
+		_ = hasher.Update(indexBuf, value)
 	}
 	if list.Len() > 0 {
 		indexBuf = rlp.AppendUint64(indexBuf[:0], 0)
 		value := encodeForDerive(list, 0, valueBuf)
-		hasher.Update(indexBuf, value)
+		_ = hasher.Update(indexBuf, value)
 	}
 	for i := 0x80; i < list.Len(); i++ {
 		// #nosec G115 iterator
 		indexBuf = rlp.AppendUint64(indexBuf[:0], uint64(i))
 		value := encodeForDerive(list, i, valueBuf)
-		hasher.Update(indexBuf, value)
+		_ = hasher.Update(indexBuf, value)
 	}
 	return Trie{hasher}
 }
diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go
@@ -28,14 +28,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/common/math"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 	ethermint "github.com/zeta-chain/ethermint/types"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 
-	"github.com/ethereum/go-ethereum/common/math"
 	rpctypes "github.com/zeta-chain/node/rpc/types"
 	"github.com/zeta-chain/node/server/config"
 )

diff --git a/rpc/backend/chain_info.go b/rpc/backend/chain_info.go
@@ -25,6 +25,7 @@ import (
 	tmrpctypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethmath "github.com/ethereum/go-ethereum/common/math"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -33,7 +34,6 @@ import (
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 	feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
 
-	ethmath "github.com/ethereum/go-ethereum/common/math"
 	rpctypes "github.com/zeta-chain/node/rpc/types"
 )
 

diff --git a/rpc/namespaces/ethereum/eth/api.go b/rpc/namespaces/ethereum/eth/api.go
@@ -21,12 +21,12 @@ import (
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethmath "github.com/ethereum/go-ethereum/common/math"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
 	ethermint "github.com/zeta-chain/ethermint/types"
 	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 
-	ethmath "github.com/ethereum/go-ethereum/common/math"
 	"github.com/zeta-chain/node/rpc/backend"
 	rpctypes "github.com/zeta-chain/node/rpc/types"
 )

diff --git a/server/json_rpc.go b/server/json_rpc.go
@@ -20,8 +20,6 @@ import (
 	"net/http"
 	"time"
 
-	"golang.org/x/exp/slog"
-
 	tmlog "github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -31,6 +29,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/rs/cors"
 	ethermint "github.com/zeta-chain/ethermint/types"
+	"golang.org/x/exp/slog"
 
 	"github.com/zeta-chain/node/rpc"
 	"github.com/zeta-chain/node/server/config"
@@ -45,7 +44,7 @@ func (g *gethLogsToTm) Enabled(_ context.Context, _ slog.Level) bool {
 	return true
 }
 
-func (g *gethLogsToTm) Handle(ctx context.Context, record slog.Record) error {
+func (g *gethLogsToTm) Handle(_ context.Context, record slog.Record) error {
 	attrs := g.attrs
 	record.Attrs(func(attr slog.Attr) bool {
 		attrs = append(attrs, attr)
@@ -71,7 +70,7 @@ func (g *gethLogsToTm) WithAttrs(attrs []slog.Attr) slog.Handler {
 	}
 }
 
-func (g *gethLogsToTm) WithGroup(name string) slog.Handler {
+func (g *gethLogsToTm) WithGroup(_ string) slog.Handler {
 	return g
 }