Merge pull request #5454 from onflow/ramtin/flow-evm-fix-tx-hash-issue

[Flow EVM] fix tx hash bug for direct calls (deposit, withdraw)
onflow · Feb 26, 2024 · c4831ee · c4831ee
2 parents f64ed9e + 05e4140
commit c4831ee
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 15 deletions.
diff --git a/fvm/evm/emulator/emulator.go b/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()
 

diff --git a/fvm/evm/emulator/emulator_test.go b/fvm/evm/emulator/emulator_test.go
@@ -48,9 +48,13 @@ func TestNativeTokenBridging(t *testing.T) {
 			t.Run("mint tokens to the first account", func(t *testing.T) {
 				RunWithNewEmulator(t, backend, rootAddr, func(env *emulator.Emulator) {
 					RunWithNewBlockView(t, env, func(blk types.BlockView) {
-						res, err := blk.DirectCall(types.NewDepositCall(testAccount, originalBalance, nonce))
+						call := types.NewDepositCall(testAccount, originalBalance, nonce)
+						res, err := blk.DirectCall(call)
 						require.NoError(t, err)
 						require.Equal(t, defaultCtx.DirectCallBaseGasUsage, res.GasConsumed)
+						expectedHash, err := call.Hash()
+						require.NoError(t, err)
+						require.Equal(t, expectedHash, res.TxHash)
 						nonce += 1
 					})
 				})
@@ -66,9 +70,13 @@ func TestNativeTokenBridging(t *testing.T) {
 				})
 				RunWithNewEmulator(t, backend, rootAddr, func(env *emulator.Emulator) {
 					RunWithNewBlockView(t, env, func(blk types.BlockView) {
-						res, err := blk.DirectCall(types.NewWithdrawCall(testAccount, amount, nonce))
+						call := types.NewWithdrawCall(testAccount, amount, nonce)
+						res, err := blk.DirectCall(call)
 						require.NoError(t, err)
 						require.Equal(t, defaultCtx.DirectCallBaseGasUsage, res.GasConsumed)
+						expectedHash, err := call.Hash()
+						require.NoError(t, err)
+						require.Equal(t, expectedHash, res.TxHash)
 						nonce += 1
 					})
 				})
@@ -111,16 +119,18 @@ func TestContractInteraction(t *testing.T) {
 			t.Run("deploy contract", func(t *testing.T) {
 				RunWithNewEmulator(t, backend, rootAddr, func(env *emulator.Emulator) {
 					RunWithNewBlockView(t, env, func(blk types.BlockView) {
-						res, err := blk.DirectCall(
-							types.NewDeployCall(
-								testAccount,
-								testContract.ByteCode,
-								math.MaxUint64,
-								amountToBeTransfered,
-								nonce),
-						)
+						call := types.NewDeployCall(
+							testAccount,
+							testContract.ByteCode,
+							math.MaxUint64,
+							amountToBeTransfered,
+							nonce)
+						res, err := blk.DirectCall(call)
 						require.NoError(t, err)
 						contractAddr = res.DeployedContractAddress
+						expectedHash, err := call.Hash()
+						require.NoError(t, err)
+						require.Equal(t, expectedHash, res.TxHash)
 						nonce += 1
 					})
 					RunWithNewReadOnlyBlockView(t, env, func(blk types.ReadOnlyBlockView) {

diff --git a/fvm/evm/types/call.go b/fvm/evm/types/call.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	"fmt"
 	"math/big"
 
 	gethCommon "github.com/ethereum/go-ethereum/common"
@@ -51,6 +52,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) {