Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix error:debug_traceCall API returns not valid json format output #10378

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions polygon/tracer/trace_bor_state_sync_txn.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package tracer

import (
"bytes"
"context"
"time"

Expand Down Expand Up @@ -45,7 +46,9 @@ func TraceBorStateSyncTxnDebugAPI(
}

txCtx := initStateSyncTxContext(blockNum, blockHash)
tracer, streaming, cancel, err := transactions.AssembleTracer(ctx, traceConfig, txCtx.TxHash, stream, callTimeout)
tracerBuffer := bytes.NewBuffer(nil)
tracerStream := jsoniter.NewStream(jsoniter.ConfigDefault, tracerBuffer, 4096)
tracer, streaming, cancel, err := transactions.AssembleTracer(ctx, traceConfig, txCtx.TxHash, tracerStream, callTimeout)
if err != nil {
stream.WriteNil()
return err
Expand All @@ -60,7 +63,7 @@ func TraceBorStateSyncTxnDebugAPI(
return traceBorStateSyncTxn(ctx, ibs, stateWriter, stateReceiverContract, stateSyncEvents, evm, rules, txCtx, refunds)
}

return transactions.ExecuteTraceTx(blockCtx, txCtx, ibs, traceConfig, chainConfig, stream, tracer, streaming, execCb)
return transactions.ExecuteTraceTx(blockCtx, txCtx, ibs, traceConfig, chainConfig, stream, tracerBuffer, tracer, streaming, execCb)
}

func TraceBorStateSyncTxnTraceAPI(
Expand Down
2 changes: 1 addition & 1 deletion turbo/jsonrpc/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func (api *PrivateDebugAPIImpl) TraceCall(ctx context.Context, args ethapi.CallA
}

var stateReader state.StateReader
if config.TxIndex == nil || isLatest {
if config == nil || config.TxIndex == nil || isLatest {
stateReader, err = rpchelper.CreateStateReader(ctx, dbtx, blockNrOrHash, 0, api.filters, api.stateCache, chainConfig.ChainName)
} else {
stateReader, err = rpchelper.CreateHistoryStateReader(dbtx, blockNumber, int(*config.TxIndex), chainConfig.ChainName)
Expand Down
32 changes: 18 additions & 14 deletions turbo/transactions/tracing.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package transactions

import (
"bytes"
"context"
"encoding/hex"
"encoding/json"
Expand Down Expand Up @@ -84,7 +85,9 @@ func TraceTx(
stream *jsoniter.Stream,
callTimeout time.Duration,
) error {
tracer, streaming, cancel, err := AssembleTracer(ctx, config, txCtx.TxHash, stream, callTimeout)
tracerBuffer := bytes.NewBuffer(nil)
tracerStream := jsoniter.NewStream(jsoniter.ConfigDefault, tracerBuffer, 4096)
tracer, streaming, cancel, err := AssembleTracer(ctx, config, txCtx.TxHash, tracerStream, callTimeout)
if err != nil {
stream.WriteNil()
return err
Expand All @@ -97,7 +100,7 @@ func TraceTx(
return core.ApplyMessage(evm, message, gp, refunds, false /* gasBailout */)
}

return ExecuteTraceTx(blockCtx, txCtx, ibs, config, chainConfig, stream, tracer, streaming, execCb)
return ExecuteTraceTx(blockCtx, txCtx, ibs, config, chainConfig, stream, tracerBuffer, tracer, streaming, execCb)
}

func AssembleTracer(
Expand Down Expand Up @@ -152,6 +155,7 @@ func ExecuteTraceTx(
config *tracers.TraceConfig,
chainConfig *chain.Config,
stream *jsoniter.Stream,
tracerBuffer *bytes.Buffer,
tracer vm.EVMLogger,
streaming bool,
execCb func(evm *vm.EVM, refunds bool) (*core.ExecutionResult, error),
Expand All @@ -164,25 +168,25 @@ func ExecuteTraceTx(
refunds = false
}

if streaming {
stream.WriteObjectStart()
stream.WriteObjectField("structLogs")
stream.WriteArrayStart()
}

result, err := execCb(evm, refunds)
if err != nil {
if streaming {
stream.WriteArrayEnd()
stream.WriteObjectEnd()
} else {
stream.WriteNil()
}
stream.WriteNil()
return fmt.Errorf("tracing failed: %w", err)
}

// Depending on the tracer type, format and return the output
if streaming {
stream.WriteObjectStart()
stream.WriteObjectField("structLogs")
stream.WriteArrayStart()

_ = stream.Flush()

oldBuf := stream.Buffer()
stream.SetBuffer(tracerBuffer.Bytes())
_ = stream.Flush()
stream.SetBuffer(oldBuf)

stream.WriteArrayEnd()
stream.WriteMore()
stream.WriteObjectField("gas")
Expand Down
Loading