Merge pull request #3526 from dessaya/trace-fix

some fixes in jsonrpc debug_traceTransaction

Author: dessaya

packages/evm/jsonrpc/evmchain.go

@@ -24,6 +24,7 @@ import (
 	hivedb "github.com/iotaledger/hive.go/kvstore/database"
 	"github.com/iotaledger/hive.go/logger"
 	"github.com/iotaledger/hive.go/runtime/event"
+
 	"github.com/iotaledger/wasp/packages/evm/evmtypes"
 	"github.com/iotaledger/wasp/packages/evm/evmutil"
 	"github.com/iotaledger/wasp/packages/evm/jsonrpc/jsonrpcindex"
@@ -538,6 +539,14 @@ func (e *EVMChain) BlockTransactionCountByNumber(blockNumber *big.Int) (uint64,
 //nolint:gocyclo
 func (e *EVMChain) Logs(query *ethereum.FilterQuery, params *LogsLimits) ([]*types.Log, error) {
 	e.log.Debugf("Logs(q=%v)", query)
+	if query == nil {
+		query = &ethereum.FilterQuery{}
+	}
+
+	if params == nil {
+		params = &LogsLimits{}
+	}
+
 	logs := make([]*types.Log, 0)
 
 	// single block query
@@ -722,7 +731,11 @@ func (e *EVMChain) traceTransaction(
 	if len(txResults) <= int(txIndex) {
 		return nil, errors.New("tx trace not found in tracer result")
 	}
-	return txResults[int(txIndex)].Result, nil
+	txTrace := txResults[int(txIndex)]
+	if txTrace.Error != "" {
+		return nil, errors.New(txTrace.Error)
+	}
+	return txTrace.Result, nil
 }
 
 func (e *EVMChain) debugTraceBlock(config *tracers.TraceConfig, block *types.Block) (any, error) {

packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go

@@ -610,6 +610,49 @@ func TestRPCTraceTx(t *testing.T) {
 	})
 }
 
+func TestRPCTraceFailedTx(t *testing.T) {
+	env := newSoloTestEnv(t)
+	creator, creatorAddress := env.soloChain.NewEthereumAccountWithL2Funds()
+	creatorL2Balance := env.Balance(creatorAddress)
+	contractABI, err := abi.JSON(strings.NewReader(evmtest.ISCTestContractABI))
+	require.NoError(t, err)
+	_, _, contractAddress := env.DeployEVMContract(creator, contractABI, evmtest.ISCTestContractBytecode)
+
+	tx := types.MustSignNewTx(creator, types.NewEIP155Signer(big.NewInt(int64(env.ChainID))),
+		&types.LegacyTx{
+			Nonce:    env.NonceAt(creatorAddress),
+			To:       &contractAddress,
+			Value:    creatorL2Balance,
+			Gas:      100000000000000,
+			GasPrice: big.NewInt(10000000000),
+			Data:     lo.Must(contractABI.Pack("sendTo", common.Address{0x1}, big.NewInt(1))),
+		})
+
+	_, err = env.SendTransactionAndWait(tx)
+	require.ErrorContains(t, err, "insufficient funds for gas * price + value")
+
+	bi := env.soloChain.GetLatestBlockInfo()
+	require.EqualValues(t, 0, bi.NumSuccessfulRequests)
+
+	t.Run("callTracer", func(t *testing.T) {
+		_, err := env.traceTransactionWithCallTracer(tx.Hash())
+		require.ErrorContains(t, err, "expected exactly one top-level call")
+	})
+
+	t.Run("prestate", func(t *testing.T) {
+		accountMap, err := env.traceTransactionWithPrestate(tx.Hash())
+		// t.Logf("%s", lo.Must(json.MarshalIndent(accountMap, "", "  ")))
+		require.NoError(t, err)
+		require.NotEmpty(t, accountMap)
+
+		diff, err := env.traceTransactionWithPrestateDiff(tx.Hash())
+		// t.Logf("%s", lo.Must(json.MarshalIndent(diff, "", "  ")))
+		require.NoError(t, err)
+		require.NotEmpty(t, diff.Pre)
+		require.Empty(t, diff.Post)
+	})
+}
+
 // Transfer calls produce "fake" Transactions to simulate EVM behavior.
 // They are not real in the sense of being persisted to the blockchain, therefore requires additional checks.
 func TestRPCTraceEVMDeposit(t *testing.T) {

packages/evm/jsonrpc/tracer_call.go

@@ -179,6 +179,9 @@ func (t *callTracer) OnEnter(depth int, typ byte, from common.Address, to common
 	}
 
 	toCopy := to
+	if value == nil {
+		value = new(big.Int)
+	}
 	call := CallFrame{
 		Type:  NewOpCodeJSON(vm.OpCode(typ)),
 		From:  from,
@@ -274,13 +277,15 @@ func (t *callTracer) OnLog(log *types.Log) {
 // error arising from the encoding or forceful termination (via `Stop`).
 func (t *callTracer) GetResult() (json.RawMessage, error) {
 	r := lo.Map(t.txTraces, func(tr *callTxTracer, _ int) TxTraceResult {
-		if len(tr.frames) != 1 {
-			panic("expected exactly 1 top-level call")
-		}
-		return TxTraceResult{
+		ret := TxTraceResult{
 			TxHash: tr.txHash,
-			Result: lo.Must(json.Marshal(tr.frames[0])),
 		}
+		if len(tr.frames) != 1 {
+			ret.Error = "expected exactly one top-level call; tx may be invalid"
+		} else {
+			ret.Result = lo.Must(json.Marshal(tr.frames[0]))
+		}
+		return ret
 	})
 	return json.Marshal(r)
 }