From 1ae53e499551fedb9cbb5d5e94615acd9c7ed4da Mon Sep 17 00:00:00 2001 From: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Date: Tue, 31 Dec 2024 16:52:21 -0600 Subject: [PATCH] fix(evm): query of NIBI should use bank state, not the StateDB (#2134) * fix(evm): query of NIBI should use bank state, not the StateDB * chore: changelog --- CHANGELOG.md | 1 + x/evm/keeper/grpc_query.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79d291174..3cb880339 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ payment required based on the effective fee from the tx data. Improve documentation. - [#2125](https://github.com/NibiruChain/nibiru/pull/2125) - feat(evm-precompile):Emit EVM events created to reflect the ABCI events that occur outside the EVM to make sure that block explorers and indexers can find indexed ABCI event information. - [#2129](https://github.com/NibiruChain/nibiru/pull/2129) - fix(evm): issue with infinite recursion in erc20 funtoken contracts +- [#2134](https://github.com/NibiruChain/nibiru/pull/2134) - fix(evm): query of NIBI should use bank state, not the StateDB #### Nibiru EVM | Before Audit 2 - 2024-12-06 diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go index 6c0f005e5..fd71412a1 100644 --- a/x/evm/keeper/grpc_query.go +++ b/x/evm/keeper/grpc_query.go @@ -65,12 +65,13 @@ func (k Keeper) EthAccount( ctx := sdk.UnwrapSDKContext(goCtx) acct := k.GetAccountOrEmpty(ctx, addrEth) + balNative := k.Bank.GetBalance(ctx, addrBech32, evm.EVMBankDenom).Amount.BigInt() return &evm.QueryEthAccountResponse{ EthAddress: addrEth.Hex(), Bech32Address: addrBech32.String(), - Balance: acct.BalanceNative.String(), - BalanceWei: evm.NativeToWei(acct.BalanceNative).String(), + Balance: balNative.String(), + BalanceWei: evm.NativeToWei(balNative).String(), CodeHash: gethcommon.BytesToHash(acct.CodeHash).Hex(), Nonce: acct.Nonce, }, nil