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

Avoid a cyclic reference while printing EngineExchangeTransitionConfigurationParameter #4357

Merged
merged 7 commits into from
Oct 12, 2022
Merged

Avoid a cyclic reference while printing EngineExchangeTransitionConfigurationParameter #4357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47029e3
avoids a cyclic reference while printing EngineExchangeTransitionConf…
daniellehrner Sep 7, 2022
8d420d8
Merge branch 'main' into fix_EngineExchangeTransitionConfigurationPar…
daniellehrner Oct 10, 2022
97dbe4b
Merge branch 'main' into fix_EngineExchangeTransitionConfigurationPar…
daniellehrner Oct 11, 2022
ccfd992
use Jackson to serialize EngineExchangeTransitionConfigurationParameter
daniellehrner Oct 11, 2022
74cce61
Merge branch 'main' into fix_EngineExchangeTransitionConfigurationPar…
macfarla Oct 12, 2022
bfd7c8c
added CHANGELOG.md entry
daniellehrner Oct 12, 2022
a4e3c47
Merge branch 'main' into fix_EngineExchangeTransitionConfigurationPar…
daniellehrner Oct 12, 2022
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
2 changes: 1 addition & 1 deletion ...u/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
traceLambda(
LOG,
"received transitionConfiguration: {}",
() -> Json.encodePrettily(remoteTransitionConfiguration));
() -> Json.encodePrettily(remoteTransitionConfiguration.toString()));

final Optional<BlockHeader> maybeTerminalPoWBlockHeader =
mergeContextOptional.flatMap(MergeContext::getTerminalPoWBlock);
Expand Down
9 changes: 9 additions & 0 deletions ...ereum/api/jsonrpc/internal/parameters/EngineExchangeTransitionConfigurationParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,13 @@ public Hash getTerminalBlockHash() {
public long getTerminalBlockNumber() {
return terminalBlockNumber;
}

@Override
public String toString() {
return "EngineExchangeTransitionConfigurationParameter{" +
"terminalTotalDifficulty=" + terminalTotalDifficulty.toShortHexString() +
", terminalBlockHash=" + terminalBlockHash.toShortHexString() +
", terminalBlockNumber=" + terminalBlockNumber +
'}';
}
daniellehrner marked this conversation as resolved.
Show resolved Hide resolved
}