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

Delete leftPad when capturing the stack before and after a frame execution #6102

Merged
merged 8 commits into from
Nov 9, 2023
Merged

Delete leftPad when capturing the stack before and after a frame execution #6102

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
59c52c5
Delete leftPad when capturing the stack before and after the execution
ahamlat Oct 26, 2023
8950f26
Spotless
ahamlat Oct 29, 2023
a41d5b4
Still use leftPad when displaying the stack in the output (ex. for de…
ahamlat Oct 31, 2023
32b5607
Spotless
ahamlat Oct 31, 2023
bf74307
Fix integration test
ahamlat Nov 1, 2023
a5636a5
Use StringBuilder to left pad the hex representation of a 32 bytes
ahamlat Nov 6, 2023
50e24d0
Merge branch 'main' into optimise-traceBlock-leftPad
ahamlat Nov 7, 2023
da9db21
Merge branch 'main' into optimise-traceBlock-leftPad
ahamlat Nov 9, 2023
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
Prev Previous commit
Next Next commit
Spotless 
Signed-off-by: Ameziane H <ameziane.hamlat@consensys.net>
  • Loading branch information
@ahamlat
ahamlat committed Oct 31, 2023
commit 32b5607a5c3fd06abe71af1af1d0b58d16339bb9
10 changes: 7 additions & 3 deletions ...i/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;

import org.apache.tuweni.bytes.Bytes32;
import org.hyperledger.besu.ethereum.debug.TraceFrame;

import java.util.Arrays;
Expand All @@ -25,8 +24,8 @@
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.apache.tuweni.units.bigints.UInt256;
import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;

@JsonPropertyOrder({"pc", "op", "gas", "gasCost", "depth", "stack", "memory", "storage"})
public class StructLog {
Expand Down Expand Up @@ -55,7 +54,12 @@ public StructLog(final TraceFrame traceFrame) {
stack =
traceFrame
.getStack()
.map(a -> Arrays.stream(a).map(Bytes32::leftPad).map(Bytes::toUnprefixedHexString).toArray(String[]::new))
.map(
a ->
Arrays.stream(a)
.map(Bytes32::leftPad)
.map(Bytes::toUnprefixedHexString)
.toArray(String[]::new))
.orElse(null);
storage = traceFrame.getStorage().map(StructLog::formatStorage).orElse(null);
reason = traceFrame.getRevertReason().map(Bytes::toShortHexString).orElse(null);
Expand Down
Loading