Merge branch 'fix/local-gas' of github.com:NibiruChain/nibiru into fi…

…x/local-gas

x/evm/keeper/grpc_query.go

@@ -323,17 +323,25 @@ func (k Keeper) EstimateGasForEvmCallType(
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	chainID := k.EthChainID(ctx)
+	cfg, err := k.GetEVMConfig(ctx, ParseProposerAddr(ctx, req.ProposerAddress), chainID)
+	if err != nil {
+		return nil, grpcstatus.Error(grpccodes.Internal, "failed to load evm config")
+	}
 
 	if req.GasCap < gethparams.TxGas {
 		return nil, grpcstatus.Errorf(grpccodes.InvalidArgument, "gas cap cannot be lower than %d", gethparams.TxGas)
 	}
 
 	var args evm.JsonTxArgs
-	err := json.Unmarshal(req.Args, &args)
+	err = json.Unmarshal(req.Args, &args)
 	if err != nil {
 		return nil, grpcstatus.Error(grpccodes.InvalidArgument, err.Error())
 	}
 
+	// ApplyMessageWithConfig expect correct nonce set in msg
+	nonce := k.GetAccNonce(ctx, args.GetFrom())
+	args.Nonce = (*hexutil.Uint64)(&nonce)
+
 	// Binary search the gas requirement, as it may be higher than the amount used
 	var (
 		lo     = gethparams.TxGas - 1
@@ -361,16 +369,6 @@ func (k Keeper) EstimateGasForEvmCallType(
 	}
 
 	gasCap = hi
-	cfg, err := k.GetEVMConfig(ctx, ParseProposerAddr(ctx, req.ProposerAddress), chainID)
-	if err != nil {
-		return nil, grpcstatus.Error(grpccodes.Internal, "failed to load evm config")
-	}
-
-	// ApplyMessageWithConfig expect correct nonce set in msg
-	nonce := k.GetAccNonce(ctx, args.GetFrom())
-	args.Nonce = (*hexutil.Uint64)(&nonce)
-
-	txConfig := statedb.NewEmptyTxConfig(gethcommon.BytesToHash(ctx.HeaderHash().Bytes()))
 
 	// convert the tx args to an ethereum message
 	msg, err := args.ToMessage(req.GasCap, cfg.BaseFeeWei)
@@ -422,6 +420,7 @@ func (k Keeper) EstimateGasForEvmCallType(
 				WithTransientKVGasConfig(storetypes.GasConfig{})
 		}
 		// pass false to not commit StateDB
+		txConfig := statedb.NewEmptyTxConfig(gethcommon.BytesToHash(ctx.HeaderHash().Bytes()))
 		rsp, _, err = k.ApplyEvmMsg(tmpCtx, msg, nil, false, cfg, txConfig, false)
 		if err != nil {
 			if errors.Is(err, core.ErrIntrinsicGas) {
@@ -438,24 +437,27 @@ func (k Keeper) EstimateGasForEvmCallType(
 		return nil, err
 	}
 
+	// The gas limit is now the highest gas limit that results in an executable transaction
 	// Reject the transaction as invalid if it still fails at the highest allowance
 	if hi == gasCap {
 		failed, result, err := executable(hi)
 		if err != nil {
 			return nil, fmt.Errorf("eth call exec error: %w", err)
 		}
 
-		if failed {
-			if result != nil && result.VmError != vm.ErrOutOfGas.Error() {
-				if result.VmError == vm.ErrExecutionReverted.Error() {
-					return nil, fmt.Errorf("VMError: %w", evm.NewExecErrorWithReason(result.Ret))
-				}
-				return nil, fmt.Errorf("VMError: %s", result.VmError)
+		if failed && result != nil {
+			if result.VmError == vm.ErrExecutionReverted.Error() {
+				return nil, fmt.Errorf("Estimate gas VMError: %w", evm.NewExecErrorWithReason(result.Ret))
+			}
+
+			if result.VmError == vm.ErrOutOfGas.Error() {
+				return nil, fmt.Errorf("gas required exceeds allowance (%d)", gasCap)
 			}
-			// Otherwise, the specified gas cap is too low
-			return nil, fmt.Errorf("gas required exceeds allowance (%d)", gasCap)
+
+			return nil, fmt.Errorf("Estimgate gas VMError: %s", result.VmError)
 		}
 	}
+
 	return &evm.EstimateGasResponse{Gas: hi}, nil
 }