Merge remote-tracking branch 'origin/main' into multi_grpc

Author: mmsqe

CHANGELOG.md

@@ -28,6 +28,7 @@
 - [\#774](https://github.com/cosmos/evm/pull/774) Emit proper allowance amount in erc20 event.
 - [\#790](https://github.com/cosmos/evm/pull/790) fix panic in historical query due to missing EvmCoinInfo.
 - [\#800](https://github.com/cosmos/evm/pull/800) Fix denom exponent validation in virtual fee deduct in vm module.
+- [\#816](https://github.com/cosmos/evm/pull/816) Avoid nil pointer when RPC requests execute before evmCoinInfo initialization in PreBlock with defaultEvmCoinInfo fallback.
 
 ## v0.5.0
 

x/vm/keeper/keeper.go

@@ -161,6 +161,7 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
 // WithDefaultEvmCoinInfo set default EvmCoinInfo
 func (k *Keeper) WithDefaultEvmCoinInfo(coinInfo types.EvmCoinInfo) *Keeper {
 	k.defaultEvmCoinInfo = coinInfo
+	types.SetDefaultEvmCoinInfo(coinInfo)
 	return k
 }
 

x/vm/types/denom_config.go

@@ -14,10 +14,29 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+// defaultEvmCoinInfo provides a default configuration to prevent nil pointer dereferences
+// when RPC requests execute before evmCoinInfo is initialized in PreBlock.
+// This is set via SetDefaultEvmCoinInfo from the keeper's defaultEvmCoinInfo field.
+var defaultEvmCoinInfo *EvmCoinInfo
+
+// SetDefaultEvmCoinInfo sets the default EVM coin info to be used as fallback.
+// This should be called during keeper initialization.
+func SetDefaultEvmCoinInfo(coinInfo EvmCoinInfo) {
+	defaultEvmCoinInfo = &coinInfo
+}
+
 // evmCoinInfo hold the information of the coin used in the EVM as gas token. It
 // can only be set via `EVMConfigurator` before starting the app.
 var evmCoinInfo *EvmCoinInfo
 
+// getEvmCoinInfo returns the evmCoinInfo if set, otherwise returns defaultEvmCoinInfo.
+func getEvmCoinInfo() *EvmCoinInfo {
+	if evmCoinInfo == nil {
+		return defaultEvmCoinInfo
+	}
+	return evmCoinInfo
+}
+
 // setEVMCoinDecimals allows to define the decimals used in the representation
 // of the EVM coin.
 func setEVMCoinDecimals(d Decimals) error {
@@ -58,22 +77,22 @@ func setDisplayDenom(displayDenom string) error {
 // GetEVMCoinDecimals returns the decimals used in the representation of the EVM
 // coin.
 func GetEVMCoinDecimals() Decimals {
-	return Decimals(evmCoinInfo.Decimals)
+	return Decimals(getEvmCoinInfo().Decimals)
 }
 
 // GetEVMCoinDenom returns the denom used for the EVM coin.
 func GetEVMCoinDenom() string {
-	return evmCoinInfo.Denom
+	return getEvmCoinInfo().Denom
 }
 
 // GetEVMCoinExtendedDenom returns the extended denom used for the EVM coin.
 func GetEVMCoinExtendedDenom() string {
-	return evmCoinInfo.ExtendedDenom
+	return getEvmCoinInfo().ExtendedDenom
 }
 
 // GetEVMCoinDisplayDenom returns the display denom used for the EVM coin.
 func GetEVMCoinDisplayDenom() string {
-	return evmCoinInfo.DisplayDenom
+	return getEvmCoinInfo().DisplayDenom
 }
 
 // setEVMCoinInfo allows to define denom and decimals of the coin used in the EVM.

x/vm/types/denom_config_testing.go

@@ -18,6 +18,12 @@ import (
 // can only be set via `EVMConfigurator` before starting the app.
 var testingEvmCoinInfo *EvmCoinInfo
 
+// SetDefaultEvmCoinInfo sets the default EVM coin info to be used as fallback.
+// This should be called during keeper initialization.
+func SetDefaultEvmCoinInfo(coinInfo EvmCoinInfo) {
+	testingEvmCoinInfo = &coinInfo
+}
+
 // setEVMCoinDecimals allows to define the decimals used in the representation
 // of the EVM coin.
 func setEVMCoinDecimals(d Decimals) error {