feat(evm): Combine both account queries into "/eth.evm.v1.Query/EthAccount", accepting both nibi-prefixed Bech32 addresses and Ethereum-type hexadecimal addresses as input.

CHANGELOG.md

@@ -93,8 +93,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1973](https://github.com/NibiruChain/nibiru/pull/1973) - chore(appconst): Add chain IDs ending in "3" to the "knownEthChainIDMap". This makes it possible to use devnet 3 and testnet 3.
 - [#1976](https://github.com/NibiruChain/nibiru/pull/1976) - refactor(evm): unique chain ids for all networks
 - [#1977](https://github.com/NibiruChain/nibiru/pull/1977) - fix(localnet): rolled back change of evm validator address with cosmos derivation path
-- [#1981](https://github.com/NibiruChain/nibiru/pull/1981) - fix(evm): remove isCheckTx() short circuit on `AnteDecVerifyEthAcc`
 - [#1979](https://github.com/NibiruChain/nibiru/pull/1979) -refactor(db): use pebbledb as the default db in integration tests
+- [#1981](https://github.com/NibiruChain/nibiru/pull/1981) - fix(evm): remove isCheckTx() short circuit on `AnteDecVerifyEthAcc`
+- [#1985](https://github.com/NibiruChain/nibiru/pull/1985) - feat(evm)!: Use atto denomination for the wei units in the EVM so that NIBI is "ether" to clients. Only micronibi (unibi) amounts can be transferred. All clients follow the constraint equation, 1 ether == 1 NIBI == 10^6 unibi == 10^18 wei. 
+- [#1986](https://github.com/NibiruChain/nibiru/pull/1986) - feat(evm): Combine both account queries into "/eth.evm.v1.Query/EthAccount", accepting both nibi-prefixed Bech32 addresses and Ethereum-type hexadecimal addresses as input.
 
 #### Dapp modules: perp, spot, oracle, etc
 

app/evmante/evmante_can_transfer.go

@@ -87,10 +87,12 @@ func (ctd CanTransferDecorator) AnteHandle(
 		// NOTE: here the gas consumed is from the context with the infinite gas meter
 		if coreMsg.Value().Sign() > 0 &&
 			!evmInstance.Context.CanTransfer(stateDB, coreMsg.From(), coreMsg.Value()) {
+			balanceWei := stateDB.GetBalance(coreMsg.From())
 			return ctx, errors.Wrapf(
 				errortypes.ErrInsufficientFunds,
-				"failed to transfer %s from address %s using the EVM block context transfer function",
+				"failed to transfer %s wei (balance=%s) from address %s using the EVM block context transfer function",
 				coreMsg.Value(),
+				balanceWei,
 				coreMsg.From(),
 			)
 		}

app/evmante/evmante_can_transfer_test.go

@@ -1,12 +1,11 @@
 package evmante_test
 
 import (
-	"math/big"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/NibiruChain/nibiru/app/evmante"
 	"github.com/NibiruChain/nibiru/eth"
+	"github.com/NibiruChain/nibiru/x/common/testutil/testapp"
 	"github.com/NibiruChain/nibiru/x/evm/evmtest"
 	"github.com/NibiruChain/nibiru/x/evm/statedb"
 )
@@ -22,7 +21,14 @@ func (s *TestSuite) TestCanTransferDecorator() {
 		{
 			name: "happy: signed tx, sufficient funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
-				sdb.AddBalance(deps.Sender.EthAddr, big.NewInt(100))
+				s.NoError(
+					testapp.FundAccount(
+						deps.Chain.BankKeeper,
+						deps.Ctx,
+						deps.Sender.NibiruAddr,
+						sdk.NewCoins(sdk.NewInt64Coin(eth.EthBaseDenom, 100)),
+					),
+				)
 			},
 			txSetup: func(deps *evmtest.TestDeps) sdk.FeeTx {
 				txMsg := evmtest.HappyTransferTx(deps, 0)

app/evmante/evmante_gas_consume_test.go

@@ -25,7 +25,7 @@ func (s *TestSuite) TestAnteDecEthGasConsume() {
 			name: "happy: sender with funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				gasLimit := happyGasLimit()
-				balance := new(big.Int).Add(gasLimit, big.NewInt(100))
+				balance := evm.NativeToWei(new(big.Int).Add(gasLimit, big.NewInt(100)))
 				sdb.AddBalance(deps.Sender.EthAddr, balance)
 			},
 			txSetup:      evmtest.HappyCreateContractTx,
@@ -46,7 +46,7 @@ func (s *TestSuite) TestAnteDecEthGasConsume() {
 			name: "sad: out of gas",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				gasLimit := happyGasLimit()
-				balance := new(big.Int).Add(gasLimit, big.NewInt(100))
+				balance := evm.NativeToWei(new(big.Int).Add(gasLimit, big.NewInt(100)))
 				sdb.AddBalance(deps.Sender.EthAddr, balance)
 			},
 			txSetup:      evmtest.HappyCreateContractTx,

app/evmante/evmante_handler_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/NibiruChain/nibiru/app/ante"
 	"github.com/NibiruChain/nibiru/app/evmante"
 	"github.com/NibiruChain/nibiru/eth"
+	"github.com/NibiruChain/nibiru/x/evm"
 	"github.com/NibiruChain/nibiru/x/evm/evmtest"
 	"github.com/NibiruChain/nibiru/x/evm/statedb"
 )
@@ -26,16 +27,18 @@ func (s *TestSuite) TestAnteHandlerEVM() {
 		{
 			name: "happy: signed tx, sufficient funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
+				balanceMicronibi := new(big.Int).Add(evmtest.GasLimitCreateContract(), big.NewInt(100))
 				sdb.AddBalance(
 					deps.Sender.EthAddr,
-					new(big.Int).Add(evmtest.GasLimitCreateContract(), big.NewInt(100)),
+					evm.NativeToWei(balanceMicronibi),
 				)
 			},
 			ctxSetup: func(deps *evmtest.TestDeps) {
 				gasPrice := sdk.NewInt64Coin("unibi", 1)
+				maxGasMicronibi := new(big.Int).Add(evmtest.GasLimitCreateContract(), big.NewInt(100))
 				cp := &tmproto.ConsensusParams{
 					Block: &tmproto.BlockParams{
-						MaxGas: new(big.Int).Add(evmtest.GasLimitCreateContract(), big.NewInt(100)).Int64(),
+						MaxGas: evm.NativeToWei(maxGasMicronibi).Int64(),
 					},
 				}
 				deps.Ctx = deps.Ctx.

app/evmante/evmante_verify_eth_acc.go

@@ -3,7 +3,6 @@ package evmante
 
 import (
 	"cosmossdk.io/errors"
-	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	gethcommon "github.com/ethereum/go-ethereum/common"
@@ -69,7 +68,9 @@ func (anteDec AnteDecVerifyEthAcc) AnteHandle(
 				"the sender is not EOA: address %s, codeHash <%s>", fromAddr, acct.CodeHash)
 		}
 
-		if err := keeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(acct.Balance), txData); err != nil {
+		if err := keeper.CheckSenderBalance(
+			evm.NativeToWei(acct.BalanceEvmDenom), txData,
+		); err != nil {
 			return ctx, errors.Wrap(err, "failed to check sender balance")
 		}
 	}

app/evmante/evmante_verify_eth_acc_test.go

@@ -21,7 +21,7 @@ func (s *TestSuite) TestAnteDecoratorVerifyEthAcc_CheckTx() {
 		{
 			name: "happy: sender with funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
-				sdb.AddBalance(deps.Sender.EthAddr, happyGasLimit())
+				sdb.AddBalance(deps.Sender.EthAddr, evm.NativeToWei(happyGasLimit()))
 			},
 			txSetup: evmtest.HappyCreateContractTx,
 			wantErr: "",

eth/eth_account.go

@@ -7,10 +7,19 @@
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	"github.com/ethereum/go-ethereum/common"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
+func EthAddrToNibiruAddr(ethAddr gethcommon.Address) sdk.AccAddress {
+	return ethAddr.Bytes()
+}
+
+func NibiruAddrToEthAddr(nibiruAddr sdk.AccAddress) gethcommon.Address {
+	return gethcommon.BytesToAddress(nibiruAddr.Bytes())
+}
+
 var (
 	_ authtypes.AccountI                 = (*EthAccount)(nil)
 	_ EthAccountI                        = (*EthAccount)(nil)
@@ -32,11 +41,11 @@
 type EthAccountI interface { //revive:disable-line:exported
 	authtypes.AccountI
 	// EthAddress returns the ethereum Address representation of the AccAddress
-	EthAddress() common.Address
+	EthAddress() gethcommon.Address
 	// CodeHash is the keccak256 hash of the contract code (if any)
-	GetCodeHash() common.Hash
+	GetCodeHash() gethcommon.Hash
 	// SetCodeHash sets the code hash to the account fields
-	SetCodeHash(code common.Hash) error
+	SetCodeHash(code gethcommon.Hash) error
 	// Type returns the type of Ethereum Account (EOA or Contract)
 	Type() EthAccType
 }
@@ -46,23 +55,23 @@
 }
 
 // EthAddress returns the account address ethereum format.
-func (acc EthAccount) EthAddress() common.Address {
-	return common.BytesToAddress(acc.GetAddress().Bytes())
+func (acc EthAccount) EthAddress() gethcommon.Address {
+	return gethcommon.BytesToAddress(acc.GetAddress().Bytes())
 }
 
-func (acc EthAccount) GetCodeHash() common.Hash {
-	return common.HexToHash(acc.CodeHash)
+func (acc EthAccount) GetCodeHash() gethcommon.Hash {
+	return gethcommon.HexToHash(acc.CodeHash)
 }
 
-func (acc *EthAccount) SetCodeHash(codeHash common.Hash) error {
+func (acc *EthAccount) SetCodeHash(codeHash gethcommon.Hash) error {
 	acc.CodeHash = codeHash.Hex()
 	return nil
 }
 
 // Type returns the type of Ethereum Account (EOA or Contract)
 func (acc EthAccount) Type() EthAccType {
 	if bytes.Equal(
-		emptyCodeHash, common.HexToHash(acc.CodeHash).Bytes(),
+		emptyCodeHash, gethcommon.HexToHash(acc.CodeHash).Bytes(),
 	) {
 		return EthAccType_EOA
 	}
@@ -79,6 +88,6 @@
 func ProtoBaseAccount() authtypes.AccountI {
 	return &EthAccount{
 		BaseAccount: &authtypes.BaseAccount{},
-		CodeHash:    common.BytesToHash(emptyCodeHash).String(),
+		CodeHash:    gethcommon.BytesToHash(emptyCodeHash).String(),
 	}
 }

eth/eth_account_test.go

@@ -0,0 +1,40 @@
+package eth_test
+
+import (
+	"github.com/NibiruChain/nibiru/eth"
+	"github.com/NibiruChain/nibiru/x/evm/evmtest"
+)
+
+func (s *Suite) TestEthAddrToNibiruAddr() {
+	accInfo := evmtest.NewEthAccInfo()
+	s.Equal(
+		accInfo.EthAddr,
+		eth.NibiruAddrToEthAddr(accInfo.NibiruAddr),
+	)
+	s.Equal(
+		accInfo.NibiruAddr,
+		eth.EthAddrToNibiruAddr(accInfo.EthAddr),
+	)
+
+	s.T().Log("unit operation - hex -> nibi -> hex")
+	{
+		addr := evmtest.NewEthAccInfo().NibiruAddr
+		s.Equal(
+			addr,
+			eth.EthAddrToNibiruAddr(
+				eth.NibiruAddrToEthAddr(addr),
+			),
+		)
+	}
+
+	s.T().Log("unit operation - nibi -> hex -> nibi")
+	{
+		addr := evmtest.NewEthAccInfo().EthAddr
+		s.Equal(
+			addr,
+			eth.NibiruAddrToEthAddr(
+				eth.EthAddrToNibiruAddr(addr),
+			),
+		)
+	}
+}

eth/rpc/backend/account_info.go

@@ -111,7 +111,7 @@ func (b *Backend) GetProof(
 		return nil, err
 	}
 
-	balance, ok := sdkmath.NewIntFromString(res.Balance)
+	balance, ok := sdkmath.NewIntFromString(res.BalanceWei)
 	if !ok {
 		return nil, errors.New("invalid balance")
 	}
@@ -152,7 +152,10 @@ func (b *Backend) GetStorageAt(address common.Address, key string, blockNrOrHash
 }
 
 // GetBalance returns the provided account's balance up to the provided block number.
-func (b *Backend) GetBalance(address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (*hexutil.Big, error) {
+func (b *Backend) GetBalance(
+	address common.Address,
+	blockNrOrHash rpc.BlockNumberOrHash,
+) (*hexutil.Big, error) {
 	blockNum, err := b.BlockNumberFromTendermint(blockNrOrHash)
 	if err != nil {
 		return nil, err
@@ -172,9 +175,9 @@ func (b *Backend) GetBalance(address common.Address, blockNrOrHash rpc.BlockNumb
 		return nil, err
 	}
 
-	val, ok := sdkmath.NewIntFromString(res.Balance)
+	val, ok := sdkmath.NewIntFromString(res.BalanceWei)
 	if !ok {
-		return nil, errors.New("invalid balance")
+		return nil, fmt.Errorf("invalid balance: %s", res.BalanceWei)
 	}
 
 	// balance can only be negative in case of pruned node

eth/rpc/backend/evm_query_client_test.go

@@ -289,9 +289,9 @@ func RegisterAccount(
 ) {
 	queryClient.On("EthAccount", rpc.NewContextWithHeight(height), &evm.QueryEthAccountRequest{Address: addr.String()}).
 		Return(&evm.QueryEthAccountResponse{
-			Balance:  "0",
-			CodeHash: "",
-			Nonce:    0,
+			BalanceWei: "0",
+			CodeHash:   "",
+			Nonce:      0,
 		},
 			nil,
 		)
@@ -302,21 +302,21 @@ func RegisterBalance(
 	queryClient *mocks.EVMQueryClient, addr common.Address, height int64,
 ) {
 	queryClient.On("Balance", rpc.NewContextWithHeight(height), &evm.QueryBalanceRequest{Address: addr.String()}).
-		Return(&evm.QueryBalanceResponse{Balance: "1"}, nil)
+		Return(&evm.QueryBalanceResponse{BalanceWei: "1"}, nil)
 }
 
 func RegisterBalanceInvalid(
 	queryClient *mocks.EVMQueryClient, addr common.Address, height int64,
 ) {
 	queryClient.On("Balance", rpc.NewContextWithHeight(height), &evm.QueryBalanceRequest{Address: addr.String()}).
-		Return(&evm.QueryBalanceResponse{Balance: "invalid"}, nil)
+		Return(&evm.QueryBalanceResponse{BalanceWei: "invalid"}, nil)
 }
 
 func RegisterBalanceNegative(
 	queryClient *mocks.EVMQueryClient, addr common.Address, height int64,
 ) {
 	queryClient.On("Balance", rpc.NewContextWithHeight(height), &evm.QueryBalanceRequest{Address: addr.String()}).
-		Return(&evm.QueryBalanceResponse{Balance: "-1"}, nil)
+		Return(&evm.QueryBalanceResponse{BalanceWei: "-1"}, nil)
 }
 
 func RegisterBalanceError(