fix: improve ExecuteEVM in VMCall (#888)

PundiAI · Jan 10, 2025 · 5a87334 · 5a87334
1 parent 3f57f1f
commit 5a87334
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/contract/contract.go b/contract/contract.go
@@ -87,7 +87,7 @@ var (
 
 type Caller interface {
 	QueryContract(ctx context.Context, from, contract common.Address, abi abi.ABI, method string, res interface{}, args ...interface{}) error
-	ApplyContract(ctx context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, constructorData ...interface{}) (*evmtypes.MsgEthereumTxResponse, error)
+	ApplyContract(ctx context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, args ...interface{}) (*evmtypes.MsgEthereumTxResponse, error)
 	ExecuteEVM(ctx sdk.Context, from common.Address, contract *common.Address, value *big.Int, gasLimit uint64, data []byte) (*evmtypes.MsgEthereumTxResponse, error)
 }
 

diff --git a/precompiles/vm_caller.go b/precompiles/vm_caller.go
@@ -38,31 +38,28 @@ func (v *VMCall) QueryContract(_ context.Context, from, contract common.Address,
 	return nil
 }
 
-func (v *VMCall) ApplyContract(_ context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, constructorData ...interface{}) (*evmtypes.MsgEthereumTxResponse, error) {
-	data, err := abi.Pack(method, constructorData...)
+func (v *VMCall) ApplyContract(_ context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, args ...interface{}) (*evmtypes.MsgEthereumTxResponse, error) {
+	data, err := abi.Pack(method, args...)
 	if err != nil {
 		return nil, types.ErrABIPack.Wrap(err.Error())
 	}
-	ret, leftoverGas, vmErr := v.evm.Call(vm.AccountRef(from), contract, data, v.maxGas, value)
-	var vmError string
-	if vmErr != nil {
-		vmError = vmErr.Error()
-	}
-	return &evmtypes.MsgEthereumTxResponse{
-		GasUsed: v.maxGas - leftoverGas,
-		VmError: vmError,
-		Ret:     ret,
-	}, nil
+	return v.ExecuteEVM(sdk.Context{}, from, &contract, value, v.maxGas, data)
 }
 
 func (v *VMCall) ExecuteEVM(_ sdk.Context, from common.Address, contract *common.Address, value *big.Int, gasLimit uint64, data []byte) (*evmtypes.MsgEthereumTxResponse, error) {
+	if value == nil {
+		value = big.NewInt(0)
+	}
+	if contract == nil {
+		contract = &common.Address{}
+	}
 	ret, leftoverGas, vmErr := v.evm.Call(vm.AccountRef(from), *contract, data, gasLimit, value)
 	var vmError string
 	if vmErr != nil {
 		vmError = vmErr.Error()
 	}
 	return &evmtypes.MsgEthereumTxResponse{
-		GasUsed: v.maxGas - leftoverGas,
+		GasUsed: gasLimit - leftoverGas,
 		VmError: vmError,
 		Ret:     ret,
 	}, nil

diff --git a/x/evm/keeper/contract_code.go b/x/evm/keeper/contract_code.go
@@ -127,16 +127,16 @@ func (k *Keeper) QueryContract(ctx context.Context, from, contract common.Addres
 }
 
 // ApplyContract apply contract with args
-func (k *Keeper) ApplyContract(ctx context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, constructorData ...interface{}) (*evmtypes.MsgEthereumTxResponse, error) {
-	args, err := abi.Pack(method, constructorData...)
+func (k *Keeper) ApplyContract(ctx context.Context, from, contract common.Address, value *big.Int, abi abi.ABI, method string, args ...interface{}) (*evmtypes.MsgEthereumTxResponse, error) {
+	data, err := abi.Pack(method, args...)
 	if err != nil {
 		return nil, types.ErrABIPack.Wrap(err.Error())
 	}
 	nonce, err := k.accountKeeper.GetSequence(ctx, from.Bytes())
 	if err != nil {
 		return nil, err
 	}
-	resp, err := k.callEvm(sdk.UnwrapSDKContext(ctx), from, &contract, value, nonce, args, true)
+	resp, err := k.callEvm(sdk.UnwrapSDKContext(ctx), from, &contract, value, nonce, data, true)
 	if err != nil {
 		return nil, err
 	}