test(eth-rpc): more tests

cmd/nibid/cmd/root.go

@@ -17,7 +17,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/client/pruning"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
-	"github.com/cosmos/cosmos-sdk/server"
+	sdkserver "github.com/cosmos/cosmos-sdk/server"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
@@ -48,8 +48,9 @@ func NewRootCmd() (*cobra.Command, app.EncodingConfig) {
 		WithViper("") // In simapp, we don't use any prefix for env variables.
 
 	rootCmd := &cobra.Command{
-		Use:   "nibid",
-		Short: "Nibiru app",
+		Use:     "nibid",
+		Short:   "Nibiru blockchain node CLI",
+		Aliases: []string{"nibiru"},
 		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 			cmd.SetOut(cmd.OutOrStdout())
 			cmd.SetErr(cmd.ErrOrStderr())
@@ -74,7 +75,7 @@ func NewRootCmd() (*cobra.Command, app.EncodingConfig) {
 			customAppTemplate, customAppConfig := initAppConfig()
 			tmCfg := customTendermintConfig()
 
-			return server.InterceptConfigsPreRunHandler(
+			return sdkserver.InterceptConfigsPreRunHandler(
 				cmd,
 				customAppTemplate,
 				customAppConfig,
@@ -147,7 +148,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig app.EncodingConfig) {
 		pruning.PruningCmd(a.newApp),
 	)
 
-	server.AddCommands(rootCmd, app.DefaultNodeHome, a.newApp, a.appExport, addModuleInitFlags)
+	sdkserver.AddCommands(rootCmd, app.DefaultNodeHome, a.newApp, a.appExport, addModuleInitFlags)
 
 	// add keybase, auxiliary RPC, query, and tx child commands
 	rootCmd.AddCommand(
@@ -241,7 +242,7 @@ type appCreator struct {
 
 // newApp is an appCreator
 func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts servertypes.AppOptions) servertypes.Application {
-	baseappOptions := server.DefaultBaseappOptions(appOpts)
+	baseappOptions := sdkserver.DefaultBaseappOptions(appOpts)
 
 	return app.NewNibiruApp(
 		logger, db, traceStore, true,

cmd/nibid/cmd/testnet.go

@@ -45,7 +45,9 @@ var (
 )
 
 // get cmd to initialize all files for tendermint testnet and application
-func testnetCmd(mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator) *cobra.Command {
+func testnetCmd(
+	mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "testnet",
 		Short: "Initialize files for a simapp testnet",

eth/rpc/rpc.go

@@ -31,9 +31,8 @@ const ErrExceedBlockGasLimit = "out of gas in location: block gas meter; gasWant
 
 // ErrStateDBCommit defines the error message when commit after executing EVM
 // transaction, for example transfer native token to a distribution module
-// account 0x93354845030274cD4bf1686Abd60AB28EC52e1a7 using an evm transaction.
-// Note, the transfer amount cannot be set to 0, otherwise this problem will not
-// be triggered.
+// account using an evm transaction. Note, the transfer amount cannot be set to
+// 0, otherwise this problem will not be triggered.
 const ErrStateDBCommit = "failed to commit stateDB"
 
 // RawTxToEthTx returns a evm MsgEthereum transaction from raw tx bytes.

eth/rpc/rpc_test.go

@@ -0,0 +1,73 @@
+// Copyright (c) 2023-2024 Nibi, Inc.
+package rpc_test
+
+import (
+	"testing"
+
+	sdkmath "cosmossdk.io/math"
+	cmt "github.com/cometbft/cometbft/types"
+	"github.com/cosmos/cosmos-sdk/client"
+	gethcore "github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/NibiruChain/nibiru/eth/rpc"
+	"github.com/NibiruChain/nibiru/x/evm/evmtest"
+)
+
+type SuiteRPC struct {
+	suite.Suite
+}
+
+func TestSuiteRPC(t *testing.T) {
+	suite.Run(t, new(SuiteRPC))
+}
+
+func (s *SuiteRPC) TestRawTxToEthTx() {
+	type TestCase struct {
+		tx        cmt.Tx
+		clientCtx client.Context
+		wantErr   string
+	}
+	type TestCaseSetupFn = func() TestCase
+
+	for _, tcSetup := range []TestCaseSetupFn{
+		func() TestCase {
+			_, _, clientCtx := evmtest.NewEthTxMsgAsCmt(s.T())
+			txBz := []byte("tx")
+			return TestCase{
+				tx:        txBz,      // invalid bytes
+				clientCtx: clientCtx, // valid clientCtx
+				wantErr:   "failed to unmarshal JSON",
+			}
+		},
+		func() TestCase {
+			txBz, _, clientCtx := evmtest.NewEthTxMsgAsCmt(s.T())
+			return TestCase{
+				tx:        txBz,      // valid bytes
+				clientCtx: clientCtx, // valid clientCtx
+				wantErr:   "",        // happy
+			}
+		},
+	} {
+		tc := tcSetup()
+		ethTxs, err := rpc.RawTxToEthTx(tc.clientCtx, tc.tx)
+		if tc.wantErr != "" {
+			s.Require().ErrorContains(err, tc.wantErr, "ethTxs: %s", ethTxs)
+			continue
+		}
+		s.Require().NoError(err, "ethTxs: %s", ethTxs)
+	}
+}
+
+func (s *SuiteRPC) TestEthHeaderFromTendermint() {
+	for _, block := range []*cmt.Block{
+		// Some happy path test cases for good measure
+		cmt.MakeBlock(1, []cmt.Tx{}, nil, nil),
+		cmt.MakeBlock(420, []cmt.Tx{}, nil, nil),
+	} {
+		ethHeader := rpc.EthHeaderFromTendermint(
+			block.Header, gethcore.Bloom{}, sdkmath.NewInt(1).BigInt())
+		s.NotNil(ethHeader)
+		s.Equal(block.Header.Height, ethHeader.Number.Int64())
+	}
+}

eth/state_encoder.go

@@ -16,7 +16,7 @@ func BytesToHex(bz []byte) string {
 type EthAddr = ethcommon.Address
 
 // EthHash: (alias) 32 byte Keccak256 hash of arbitrary data.
-type EthHash = ethcommon.Hash
+type EthHash = ethcommon.Hash //revive:disable-line:exported
 
 var (
 	// Implements a `collections.ValueEncoder` for the `[]byte` type

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
-	github.com/holiman/uint256 v1.2.4
+	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.18.0
 	github.com/rakyll/statik v0.1.7