chore(app): conversion fixes (evmos#2937)

* conversion fixes * fix: remove chainid subfix * changelog * fix lint changelog --------- Co-authored-by: hanchon <[email protected]>
receivingpotman · Oct 11, 2024 · b523bb1 · b523bb1
1 parent d71f993
commit b523bb1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,7 +53,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (precompiles) [#2929](https://github.com/evmos/evmos/pull/2929) Distribution: scale balance change entries to the statedb journal to support different EVM denom precision.
 - (precompiles) [#2927](https://github.com/evmos/evmos/pull/2927) Erc20: scale balance change entries to the statedb journal to support different EVM denom precision.
 
-
 ### Improvements
 
 - (precompiles) [#2922](https://github.com/evmos/evmos/pull/2922) Add 'VoteWeighted' transaction to gov precompile.
@@ -76,11 +75,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (ante) [#2907](https://github.com/evmos/evmos/pull/2907) Add support for custom base denom decimals in the ante for EVM txs.
 - (rpc) [#2908](https://github.com/evmos/evmos/pull/2908) Refactor JSON-RPC gas prices to support denom with different precision.
 - (app) [#2914](https://github.com/evmos/evmos/pull/2914) Refactor App configurator to abstract `Decimals` type and use validation.
-- (precompiles) [#2926](https://github.com/evmos/evmos/pull/2926) Staking: Add amount scaling on `balanceChange` entry to support different evm denom precision.
-- (config) [#2932](https://github.com/evmos/evmos/pull/2932) Add chains coin info map for app initialization.
+- (app) [#2932](https://github.com/evmos/evmos/pull/2932) Add chains coin info map for app initialization.
 - (precompiles) [#2928](https://github.com/evmos/evmos/pull/2928) Vesting: Add amount scaling on `balanceChange` entry to support different EVM denom precision.
 - (precompiles) [#2926](https://github.com/evmos/evmos/pull/2926) Staking: Add amount scaling on `balanceChange` entry to support different EVM denom precision.
 - (evm) [#2936](https://github.com/evmos/evmos/pull/2936) Add query for EVM config.
+- (app) [#2937](https://github.com/evmos/evmos/pull/2937) Fix conversion on the `CheckTxFee` ante handler and allow zero coins refunds.
 
 ### Bug Fixes
 

diff --git a/app/ante/evm/04_validate.go b/app/ante/evm/04_validate.go
@@ -110,7 +110,7 @@ func CheckTxFee(txFeeInfo *tx.Fee, txFee *big.Int, txGasLimit uint64) error {
 		return nil
 	}
 
-	convertedAmount := sdkmath.NewIntFromBigInt(evmtypes.ConvertAmountTo18DecimalsBigInt(txFee))
+	convertedAmount := sdkmath.NewIntFromBigInt(evmtypes.ConvertAmountFrom18DecimalsBigInt(txFee))
 
 	baseDenom := evmtypes.GetEVMCoinDenom()
 	if !txFeeInfo.Amount.AmountOf(baseDenom).Equal(convertedAmount) {

diff --git a/app/config.go b/app/config.go
@@ -7,6 +7,8 @@
 package app
 
 import (
+	"strings"
+
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/evmos/evmos/v20/app/eips"
@@ -29,7 +31,8 @@ func InitializeAppConfiguration(chainID string) error {
 		return nil
 	}
 
-	coinInfo, found := evmtypes.ChainsCoinInfo[chainID]
+	id := strings.Split(chainID, "-")[0]
+	coinInfo, found := evmtypes.ChainsCoinInfo[id]
 	if !found {
 		// default to mainnet coin info
 		coinInfo = evmtypes.ChainsCoinInfo[utils.MainnetChainID]

diff --git a/x/evm/types/scaling.go b/x/evm/types/scaling.go
@@ -41,6 +41,14 @@ func ConvertAmountTo18DecimalsBigInt(amt *big.Int) *big.Int {
 	return new(big.Int).Mul(amt, evmCoinDecimal.ConversionFactor().BigInt())
 }
 
+// ConvertAmountFrom18DecimalsBigInt convert the given amount into a 18 decimals
+// representation.
+func ConvertAmountFrom18DecimalsBigInt(amt *big.Int) *big.Int {
+	evmCoinDecimal := GetEVMCoinDecimals()
+
+	return new(big.Int).Quo(amt, evmCoinDecimal.ConversionFactor().BigInt())
+}
+
 // ConvertBigIntFrom18DecimalsToLegacyDec converts the given amount into a LegacyDec
 // with the corresponding decimals of the EVM denom.
 func ConvertBigIntFrom18DecimalsToLegacyDec(amt *big.Int) sdkmath.LegacyDec {

diff --git a/x/evm/wrappers/bank.go b/x/evm/wrappers/bank.go
@@ -99,6 +99,9 @@ func (w BankWrapper) SendCoinsFromAccountToModule(ctx context.Context, senderAdd
 // the input, to its original representation.
 func (w BankWrapper) SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, coins sdk.Coins) error {
 	convertedCoins := types.ConvertCoinsFrom18Decimals(coins)
+	if convertedCoins.IsZero() {
+		return nil
+	}
 
 	return w.BankKeeper.SendCoinsFromModuleToAccount(ctx, senderModule, recipientAddr, convertedCoins)
 }