fix: nil pointer deref in eip1559

+ EVM Bond denom change to INJ
InjectiveLabs · Oct 11, 2024 · a74261a · a74261a
1 parent 7a7579f
commit a74261a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/types/coin.go b/types/coin.go
@@ -31,7 +31,7 @@ const (
 	// - Governance parameters: denomination used for spam prevention in proposal deposits
 	// - Crisis parameters: constant fee denomination used for spam prevention to check broken invariant
 	// - EVM parameters: denomination used for running EVM state transitions in Ethermint.
-	AttoPhoton string = "aphoton"
+	AttoPhoton string = "inj"
 
 	// BaseDenomUnit defines the base denomination unit for Photons.
 	// 1 photon = 1x10^{BaseDenomUnit} aphoton

diff --git a/x/feemarket/keeper/eip1559.go b/x/feemarket/keeper/eip1559.go
@@ -58,7 +58,7 @@ func (k Keeper) CalculateBaseFee(ctx sdk.Context) *big.Int {
 	gasLimit := new(big.Int).SetUint64(math.MaxUint64)
 
 	// NOTE: a MaxGas equal to -1 means that block gas is unlimited
-	if consParams.Block == nil || consParams.Block.MaxGas <= -1 {
+	if consParams.Block != nil && consParams.Block.MaxGas > -1 {
 		gasLimit = big.NewInt(consParams.Block.MaxGas)
 	}