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.

Sign up for GitHub

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

catch rlp exception: debug_traceBlock #7204

Merged
merged 7 commits into from
Jun 25, 2024
Merged

catch rlp exception: debug_traceBlock #7204

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9e0dfc
catch rlp exception: debug_traceBlock
rjnrohit Jun 20, 2024
4a620aa
Merge branch 'master' into rlp_exception
rjnrohit Jun 20, 2024
2d8150d
format files
rjnrohit Jun 20, 2024
06fdb59
handles exception in other debug's
rjnrohit Jun 21, 2024
f7e3877
Merge branch 'master' into rlp_exception
rjnrohit Jun 21, 2024
970ca70
format files
rjnrohit Jun 21, 2024
e42fc25
fix error message
rjnrohit Jun 21, 2024
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
51 changes: 38 additions & 13 deletions src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugRpcModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,25 @@ public ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>> debug_traceBlock(byte
{
using var cancellationTokenSource = new CancellationTokenSource(_traceTimeout);
var cancellationToken = cancellationTokenSource.Token;
var blockTrace = _debugBridge.GetBlockTrace(new Rlp(blockRlp), cancellationToken, options);
try
{
var blockTrace = _debugBridge.GetBlockTrace(new Rlp(blockRlp), cancellationToken, options);

if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for RLP {blockRlp.ToHexString()}", ErrorCodes.ResourceNotFound);
if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for RLP {blockRlp.ToHexString()}", ErrorCodes.ResourceNotFound);

if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlock)} request {blockRlp.ToHexString()}, result: {blockTrace}");
if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlock)} request {blockRlp.ToHexString()}, result: {blockTrace}");

return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
}
catch (RlpException)
{
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Error decoding block rlp: {blockRlp.ToHexString()}", ErrorCodes.InvalidInput);
}
catch (ArgumentNullException)
{
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Couldn't find any block", ErrorCodes.InvalidInput);
}
Comment on lines +178 to +181
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can't happen here as it is RLP

Copy link
Contributor Author

@rjnrohit rjnrohit Jun 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be inside the TraceBlock function

}

public ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>> debug_traceBlockByNumber(BlockParameter blockNumber, GethTraceOptions options = null)
Expand All @@ -176,12 +187,19 @@ public ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>> debug_traceBlockByNum
var cancellationToken = cancellationTokenSource.Token;
var blockTrace = _debugBridge.GetBlockTrace(blockNumber, cancellationToken, options);

if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockNumber}", ErrorCodes.ResourceNotFound);
try
{
if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockNumber}", ErrorCodes.ResourceNotFound);

if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlockByNumber)} request {blockNumber}, result: {blockTrace}");
if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlockByNumber)} request {blockNumber}, result: {blockTrace}");

return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
}
catch (ArgumentNullException)
{
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockNumber}", ErrorCodes.InvalidInput);
}
}

public ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>> debug_traceBlockByHash(Hash256 blockHash, GethTraceOptions options = null)
Expand All @@ -190,12 +208,19 @@ public ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>> debug_traceBlockByHas
var cancellationToken = cancellationTokenSource.Token;
var blockTrace = _debugBridge.GetBlockTrace(new BlockParameter(blockHash), cancellationToken, options);

if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockHash}", ErrorCodes.ResourceNotFound);
try
{
if (blockTrace is null)
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockHash}", ErrorCodes.ResourceNotFound);

if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlockByHash)} request {blockHash}, result: {blockTrace}");
if (_logger.IsTrace) _logger.Trace($"{nameof(debug_traceBlockByHash)} request {blockHash}, result: {blockTrace}");

return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Success(blockTrace);
}
catch (ArgumentNullException)
{
return ResultWrapper<IReadOnlyCollection<GethLikeTxTrace>>.Fail($"Trace is null for block {blockHash}", ErrorCodes.InvalidInput);
}
}

public ResultWrapper<GethLikeTxTrace[]> debug_traceBlockFromFile(string fileName, GethTraceOptions options = null)
Expand Down