fix cli & error handling

initia-labs · Oct 23, 2024 · ce176da · ce176da
1 parent 53fa495
commit ce176da
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/x/evm/client/cli/tx.go b/x/evm/client/cli/tx.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/hex"
 	"fmt"
 	"math/big"
 	"os"
@@ -38,6 +39,20 @@ func GetTxCmd(ac address.Codec) *cobra.Command {
 	return txCmd
 }
 
+func readContractBinFile(binFile string) ([]byte, error) {
+	contractBz, err := os.ReadFile(binFile)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to read contract file")
+	}
+
+	contractBz, err = hex.DecodeString(string(contractBz))
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to read contract file")
+	}
+
+	return contractBz, nil
+}
+
 func CreateCmd(ac address.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "create [bin-file] --input [input-hex-string] --value [value]",
@@ -64,9 +79,9 @@ $ %s tx evm create ERC20.bin --input 0x1234 --value 100 --from mykey
 				return err
 			}
 
-			contractBz, err := os.ReadFile(args[0])
+			contractBz, err := readContractBinFile(args[0])
 			if err != nil {
-				return errors.Wrap(err, "failed to read contract file")
+				return err
 			}
 
 			input, err := cmd.Flags().GetString(FlagInput)
@@ -133,9 +148,9 @@ $ %s tx evm create2 100 ERC20.bin --input 0x1234 --value 100 --from mykey
 			if err != nil {
 				return errors.Wrap(err, "failed to parse salt")
 			}
-			contractBz, err := os.ReadFile(args[1])
+			contractBz, err := readContractBinFile(args[1])
 			if err != nil {
-				return errors.Wrap(err, "failed to read contract file")
+				return err
 			}
 
 			input, err := cmd.Flags().GetString(FlagInput)

diff --git a/x/evm/keeper/context.go b/x/evm/keeper/context.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"math/big"
 
 	"github.com/holiman/uint256"
@@ -41,6 +42,7 @@ func (k Keeper) computeGasLimit(sdkCtx sdk.Context) uint64 {
 		gasLimit = k.config.ContractSimulationGasLimit
 	}
 
+	fmt.Println("gasLimit", gasLimit)
 	return gasLimit
 }
 
@@ -261,6 +263,11 @@ func (k Keeper) EVMCallWithTracer(ctx context.Context, caller common.Address, co
 		value,
 	)
 
+	// evm sometimes return 0 gasRemaining, but it's not an out of gas error.
+	if gasRemaining == 0 && err != nil && err != vm.ErrOutOfGas {
+		return nil, nil, types.ErrEVMCreateFailed.Wrap(err.Error())
+	}
+
 	// London enforced
 	gasUsed := types.CalGasUsed(gasBalance, gasRemaining, evm.StateDB.GetRefund())
 	sdkCtx.GasMeter().ConsumeGas(gasUsed, "EVM gas consumption")
@@ -358,6 +365,11 @@ func (k Keeper) EVMCreateWithTracer(ctx context.Context, caller common.Address,
 		)
 	}
 
+	// evm sometimes return 0 gasRemaining, but it's not an out of gas error.
+	if gasRemaining == 0 && err != nil && err != vm.ErrOutOfGas {
+		return nil, common.Address{}, nil, types.ErrEVMCreateFailed.Wrap(err.Error())
+	}
+
 	// London enforced
 	gasUsed := types.CalGasUsed(gasBalance, gasRemaining, evm.StateDB.GetRefund())
 	sdkCtx.GasMeter().ConsumeGas(gasUsed, "EVM gas consumption")

diff --git a/x/evm/precompiles/cosmos/contract.go b/x/evm/precompiles/cosmos/contract.go
@@ -139,7 +139,7 @@ func (e CosmosPrecompile) ExtendedRun(caller vm.ContractRef, input []byte, suppl
 			return nil, ctx.GasMeter().GasConsumedToLimit(), types.ErrPrecompileFailed.Wrap(err.Error())
 		}
 	case METHOD_IS_MODULE_ADDRESS:
-		ctx.GasMeter().ConsumeGas(IS_MODULE_ADDRESS_GAS, "is_blocked_address")
+		ctx.GasMeter().ConsumeGas(IS_MODULE_ADDRESS_GAS, "is_module_address")
 
 		var isModuleAddressArguments IsModuleAddressArguments
 		if err := method.Inputs.Copy(&isModuleAddressArguments, args); err != nil {