fix(evm)!: Fungible Token conversions

CHANGELOG.md

@@ -105,6 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1997](https://github.com/NibiruChain/nibiru/pull/1997) - refactor(evm): Remove unnecessary params: "enable_call", "enable_create".
 - [#2000](https://github.com/NibiruChain/nibiru/pull/2000) - refactor(evm): simplify ERC-20 keeper methods
 - [#2001](https://github.com/NibiruChain/nibiru/pull/2001) - refactor(evm): simplify FunToken methods and tests
+- [#2003](https://github.com/NibiruChain/nibiru/pull/2003) - fix(evm): fix FunToken conversions between Cosmos and EVM
 
 #### Dapp modules: perp, spot, oracle, etc
 

proto/eth/evm/v1/events.proto

@@ -1,4 +1,4 @@
 // Copyright (c) 2023-2024 Nibi, Inc.
 syntax = "proto3";
 package eth.evm.v1;
 
@@ -55,8 +55,8 @@
   bool is_made_from_coin = 4;
 }
 
-// SendFunTokenToEvm defines sending fun token to erc20 event.
-message EventSendFunTokenToEvm {
+// ConvertCoinToEvm defines sending fun token to erc20 event.
+message EventConvertCoinToEvm {
   string sender = 1;
   string erc20_contract_address = 2;
   string to_eth_addr = 3;

proto/eth/evm/v1/tx.proto

@@ -13,7 +13,7 @@
 option go_package = "github.com/NibiruChain/nibiru/v2/x/evm";
 
 // Msg defines the evm Msg service.
 service Msg {
   // EthereumTx defines a method submitting Ethereum transactions.
   rpc EthereumTx(MsgEthereumTx) returns (MsgEthereumTxResponse) {
     option (google.api.http).post = "/nibiru/evm/v1/ethereum_tx";
@@ -27,10 +27,10 @@
   // denomination for a bank coin can be given to create the mapping to an ERC20.
   rpc CreateFunToken(MsgCreateFunToken) returns (MsgCreateFunTokenResponse);
 
-  // SendFunTokenToEvm: Sends a coin with a valid "FunToken" mapping to the
+  // ConvertCoinToEvm: Sends a coin with a valid "FunToken" mapping to the
   // given recipient address ("to_eth_addr") in the corresponding ERC20
   // representation.
-  rpc SendFunTokenToEvm(MsgSendFunTokenToEvm) returns (MsgSendFunTokenToEvmResponse);
+  rpc ConvertCoinToEvm(MsgSendFunTokenToEvm) returns (MsgSendFunTokenToEvmResponse);
 }
 
 // MsgEthereumTx encapsulates an Ethereum transaction as an SDK message.

x/evm/cli/tx.go

@@ -27,7 +27,7 @@ func GetTxCmd() *cobra.Command {
 	cmds := []*cobra.Command{
 		CmdCreateFunTokenFromBankCoin(),
 		CmdCreateFunTokenFromERC20(),
-		SendFunTokenToEvm(),
+		ConvertCoinToEvm(),
 	}
 	for _, cmd := range cmds {
 		txCmd.AddCommand(cmd)
@@ -99,8 +99,8 @@ func CmdCreateFunTokenFromERC20() *cobra.Command {
 	return cmd
 }
 
-// SendFunTokenToEvm broadcast MsgSendFunTokenToEvm
-func SendFunTokenToEvm() *cobra.Command {
+// ConvertCoinToEvm broadcast MsgSendFunTokenToEvm
+func ConvertCoinToEvm() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "send-funtoken-to-erc20 [to_eth_addr] [coin] [flags]",
 		Short: `Send bank [coin] to its erc20 representation for the user [to_eth_addr]"`,

x/evm/evmmodule/genesis_test.go

@@ -76,7 +76,7 @@ func (s *Suite) TestExportInitGenesis() {
 	s.Require().NoError(err)
 
 	// Send fungible token coins from bank to evm
-	_, err = deps.EvmKeeper.SendFunTokenToEvm(
+	_, err = deps.EvmKeeper.ConvertCoinToEvm(
 		deps.Ctx,
 		&evm.MsgSendFunTokenToEvm{
 			Sender:    deps.Sender.NibiruAddr.String(),

x/evm/evmtest/erc20.go

@@ -22,7 +22,7 @@ func AssertERC20BalanceEqual(
 ) {
 	actualBalance, err := deps.EvmKeeper.ERC20().BalanceOf(erc20, account, deps.Ctx)
 	assert.NoError(t, err)
-	assert.Zero(t, expectedBalance.Cmp(actualBalance))
+	assert.Zero(t, expectedBalance.Cmp(actualBalance), "expected %s, got %s", expectedBalance, actualBalance)
 }
 
 // CreateFunTokenForBankCoin: Uses the "TestDeps.Sender" account to create a

x/evm/keeper/erc20.go

@@ -55,10 +55,9 @@
 ) (evmResp *evm.MsgEthereumTxResponse, err error) {
 	input, err := e.ABI.Pack("mint", to, amount)
 	if err != nil {
-		return
+		return nil, fmt.Errorf("failed to pack ABI args: %w", err)
 	}
-	commit := true
-	return e.CallContractWithInput(ctx, from, &contract, commit, input)
+	return e.CallContractWithInput(ctx, from, &contract, true, input)
 }
 
 /*
@@ -74,13 +73,23 @@
 func (e erc20Calls) Transfer(
 	contract, from, to gethcommon.Address, amount *big.Int,
 	ctx sdk.Context,
-) (evmResp *evm.MsgEthereumTxResponse, err error) {
+) (out bool, err error) {
 	input, err := e.ABI.Pack("transfer", to, amount)
 	if err != nil {
-		return
+		return false, fmt.Errorf("failed to pack ABI args: %w", err)
 	}
-	commit := true
-	return e.CallContractWithInput(ctx, from, &contract, commit, input)
+	resp, err := e.CallContractWithInput(ctx, from, &contract, true, input)
+	if err != nil {
+		return false, err
+	}
+
+	var erc20Bool ERC20Bool
+	err = e.ABI.UnpackIntoInterface(&erc20Bool, "transfer", resp.Ret)
+	if err != nil {
+		return false, err
+	}
+
+	return erc20Bool.Value, nil
 }
 
 // BalanceOf retrieves the balance of an ERC20 token for a specific account.
@@ -339,31 +348,31 @@
 
 func (k Keeper) LoadERC20BigInt(
 	ctx sdk.Context,
-	erc20Abi *gethabi.ABI,
-	erc20Contract gethcommon.Address,
+	abi *gethabi.ABI,
+	contract gethcommon.Address,
 	methodName string,
 	args ...any,
 ) (out *big.Int, err error) {
-	commit := false
 	res, err := k.CallContract(
 		ctx,
-		erc20Abi,
+		abi,
 		evm.EVM_MODULE_ADDRESS,
-		&erc20Contract,
-		commit,
+		&contract,
+		false,
 		methodName,
 		args...,
 	)
 	if err != nil {
-		return out, err
+		return nil, err
 	}
 
-	erc20Val := new(ERC20BigInt)
-	err = erc20Abi.UnpackIntoInterface(
-		erc20Val, methodName, res.Ret,
+	erc20BigInt := new(ERC20BigInt)
+	err = abi.UnpackIntoInterface(
+		erc20BigInt, methodName, res.Ret,
 	)
 	if err != nil {
-		return out, err
+		return nil, err
 	}
-	return erc20Val.Value, err
+
+	return erc20BigInt.Value, nil
 }