Merge pull request #5455 from onflow/ramtin/port-of-5454

[Flow EVM] - fix empty tx hash bug for some transactions

fvm/evm/emulator/emulator.go

@@ -113,12 +113,12 @@ func (bl *BlockView) DirectCall(call *types.DirectCall) (*types.Result, error) {
 	}
 	switch call.SubType {
 	case types.DepositCallSubType:
-		return proc.mintTo(call.To, call.Value)
+		return proc.mintTo(call.To, call.Value, txHash)
 	case types.WithdrawCallSubType:
-		return proc.withdrawFrom(call.From, call.Value)
+		return proc.withdrawFrom(call.From, call.Value, txHash)
 	case types.DeployCallSubType:
 		if !call.EmptyToField() {
-			return proc.deployAt(call.From, call.To, call.Data, call.GasLimit, call.Value)
+			return proc.deployAt(call.From, call.To, call.Data, call.GasLimit, call.Value, txHash)
 		}
 		fallthrough
 	default:
@@ -199,11 +199,16 @@ func (proc *procedure) commit() error {
 	return nil
 }
 
-func (proc *procedure) mintTo(address types.Address, amount *big.Int) (*types.Result, error) {
+func (proc *procedure) mintTo(
+	address types.Address,
+	amount *big.Int,
+	txHash gethCommon.Hash,
+) (*types.Result, error) {
 	addr := address.ToCommon()
 	res := &types.Result{
 		GasConsumed: proc.config.DirectCallBaseGasUsage,
 		TxType:      types.DirectCallTxType,
+		TxHash:      txHash,
 	}
 
 	// create account if not exist
@@ -218,12 +223,17 @@ func (proc *procedure) mintTo(address types.Address, amount *big.Int) (*types.Re
 	return res, proc.commit()
 }
 
-func (proc *procedure) withdrawFrom(address types.Address, amount *big.Int) (*types.Result, error) {
+func (proc *procedure) withdrawFrom(
+	address types.Address,
+	amount *big.Int,
+	txHash gethCommon.Hash,
+) (*types.Result, error) {
 
 	addr := address.ToCommon()
 	res := &types.Result{
 		GasConsumed: proc.config.DirectCallBaseGasUsage,
 		TxType:      types.DirectCallTxType,
+		TxHash:      txHash,
 	}
 
 	// check if account exists
@@ -264,13 +274,15 @@ func (proc *procedure) deployAt(
 	data types.Code,
 	gasLimit uint64,
 	value *big.Int,
+	txHash gethCommon.Hash,
 ) (*types.Result, error) {
 	if value.Sign() < 0 {
 		return nil, types.ErrInvalidBalance
 	}
 
 	res := &types.Result{
 		TxType: types.DirectCallTxType,
+		TxHash: txHash,
 	}
 	addr := to.ToCommon()
 

fvm/evm/types/call.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"fmt"
 	"math/big"
 
 	gethCommon "github.com/ethereum/go-ethereum/common"
@@ -47,6 +48,15 @@ type DirectCall struct {
 	Nonce    uint64
 }
 
+// DirectCallFromEncoded constructs a DirectCall from encoded data
+func DirectCallFromEncoded(encoded []byte) (*DirectCall, error) {
+	if encoded[0] != DirectCallTxType {
+		return nil, fmt.Errorf("tx type mismatch")
+	}
+	dc := &DirectCall{}
+	return dc, rlp.DecodeBytes(encoded[1:], dc)
+}
+
 // Encode encodes the direct call it also adds the type
 // as the very first byte, similar to how evm encodes types.
 func (dc *DirectCall) Encode() ([]byte, error) {