test(evm): grpc_query full coverage

CHANGELOG.md

@@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1889](https://github.com/NibiruChain/nibiru/pull/1889) - feat: implemented basic evm tx methods
 - [#1895](https://github.com/NibiruChain/nibiru/pull/1895) - refactor(geth): Reference go-ethereum as a submodule for easier change tracking with upstream
 - [#1901](https://github.com/NibiruChain/nibiru/pull/1901) - test(evm): more e2e test contracts for edge cases
+- [#1907](https://github.com/NibiruChain/nibiru/pull/1907) - test(evm): grpc_query full coverage
 - [#1909](https://github.com/NibiruChain/nibiru/pull/1909) - chore(evm): set is_london true by default and removed from config
 
 #### Dapp modules: perp, spot, oracle, etc

x/evm/evmtest/eth.go

@@ -40,7 +40,7 @@ func NewEthAccInfo() EthPrivKeyAcc {
 }
 
 func EthAddrToNibiruAddr(ethAddr gethcommon.Address) sdk.AccAddress {
-	return sdk.AccAddress(ethAddr.Bytes())
+	return ethAddr.Bytes()
 }
 
 type EthPrivKeyAcc struct {

x/evm/evmtest/tx.go

@@ -2,24 +2,25 @@
 package evmtest
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/big"
+	"testing"
 
 	gethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	gethcore "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	gethparams "github.com/ethereum/go-ethereum/params"
+	"github.com/stretchr/testify/require"
+
+	srvconfig "github.com/NibiruChain/nibiru/app/server/config"
 
 	"github.com/NibiruChain/nibiru/x/evm"
 )
 
 type GethTxType = uint8
 
-var (
-	GethTxType_LegacyTx     GethTxType = gethcore.LegacyTxType
-	GethTxType_AccessListTx GethTxType = gethcore.AccessListTxType
-	GethTxType_DynamicFeeTx GethTxType = gethcore.DynamicFeeTxType
-)
-
 func NewEthTx(
 	deps *TestDeps, txData gethcore.TxData, nonce uint64,
 ) (ethCoreTx *gethcore.Transaction, err error) {
@@ -131,3 +132,91 @@
 	ethTxMsg.From = deps.Sender.EthAddr.Hex()
 	return ethTxMsg, ethTxMsg.Sign(deps.GethSigner(), deps.Sender.KeyringSigner)
 }
+
+// ExecuteNibiTransfer executes nibi transfer
+func ExecuteNibiTransfer(deps *TestDeps, t *testing.T) *evm.MsgEthereumTx {
+	nonce := deps.StateDB().GetNonce(deps.Sender.EthAddr)
+	recipient := NewEthAccInfo().EthAddr
+
+	txArgs := evm.JsonTxArgs{
+		From:  &deps.Sender.EthAddr,
+		To:    &recipient,
+		Nonce: (*hexutil.Uint64)(&nonce),
+	}
+	ethTxMsg, err := GenerateAndSignEthTxMsg(txArgs, deps)
+	require.NoError(t, err)
+
+	resp, err := deps.Chain.EvmKeeper.EthereumTx(deps.GoCtx(), ethTxMsg)
+	require.NoError(t, err)
+	require.Empty(t, resp.VmError)
+	return ethTxMsg
+}
+
+// ExecuteERC20Transfer deploys contract, executes transfer and returns tx hash
+func ExecuteERC20Transfer(deps *TestDeps, t *testing.T) (*evm.MsgEthereumTx, []*evm.MsgEthereumTx) {
+	// TX 1: Deploy ERC-20 contract
+	contractData := SmartContract_FunToken.Load(t)
+	nonce := deps.StateDB().GetNonce(deps.Sender.EthAddr)
+	txArgs := evm.JsonTxArgs{
+		From:  &deps.Sender.EthAddr,
+		Nonce: (*hexutil.Uint64)(&nonce),
+		Data:  (*hexutil.Bytes)(&contractData.Bytecode),
+	}
+	ethTxMsg, err := GenerateAndSignEthTxMsg(txArgs, deps)
+	require.NoError(t, err)
+
+	resp, err := deps.Chain.EvmKeeper.EthereumTx(deps.GoCtx(), ethTxMsg)
+	require.NoError(t, err)
+	require.Empty(t, resp.VmError)
+
+	// Contract address is deterministic
+	contractAddress := crypto.CreateAddress(deps.Sender.EthAddr, nonce)
+	deps.Chain.Commit()
+	predecessors := []*evm.MsgEthereumTx{
+		ethTxMsg,
+	}
+
+	// TX 2: execute ERC-20 contract transfer
+	input, err := contractData.ABI.Pack(
+		"transfer", NewEthAccInfo().EthAddr, new(big.Int).SetUint64(1000),
+	)
+	require.NoError(t, err)
+	nonce = deps.StateDB().GetNonce(deps.Sender.EthAddr)
+	txArgs = evm.JsonTxArgs{
+		From:  &deps.Sender.EthAddr,
+		To:    &contractAddress,
+		Nonce: (*hexutil.Uint64)(&nonce),
+		Data:  (*hexutil.Bytes)(&input),
+	}
+	ethTxMsg, err = GenerateAndSignEthTxMsg(txArgs, deps)
+	require.NoError(t, err)
+
+	resp, err = deps.Chain.EvmKeeper.EthereumTx(deps.GoCtx(), ethTxMsg)
+	require.NoError(t, err)
+	require.Empty(t, resp.VmError)
+
+	return ethTxMsg, predecessors
+}
+
+// GenerateAndSignEthTxMsg estimates gas, sets gas limit and sings the tx
+func GenerateAndSignEthTxMsg(txArgs evm.JsonTxArgs, deps *TestDeps) (*evm.MsgEthereumTx, error) {
+	estimateArgs, err := json.Marshal(&txArgs)
+	if err != nil {
+		return nil, err
+	}
+	res, err := deps.Chain.EvmKeeper.EstimateGas(deps.GoCtx(), &evm.EthCallRequest{
+		Args:            estimateArgs,
+		GasCap:          srvconfig.DefaultGasCap,
+		ProposerAddress: []byte{},
+		ChainId:         deps.Chain.EvmKeeper.EthChainID(deps.Ctx).Int64(),
+	})
+	if err != nil {
+		return nil, err
+	}
+	txArgs.Gas = (*hexutil.Uint64)(&res.Gas)
+
+	txMsg := txArgs.ToTransaction()
+	gethSigner := deps.Sender.GethSigner(deps.Chain.EvmKeeper.EthChainID(deps.Ctx))
+	keyringSigner := deps.Sender.KeyringSigner
+	return txMsg, txMsg.Sign(gethSigner, keyringSigner)
+}