Skip to content
Draft
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

### Breaking Changes
- eth_createAccessList now returns success result if execution reverted [#9358](https://github.com/hyperledger/besu/pull/9358)

### Upcoming Breaking Changes
- Deprecated CLI options
Expand All @@ -21,6 +22,7 @@
- Ability to enable/disable stack, storage and returnData tracing data in debug_traceStandardBlockToFile and debug_traceStandardBadBlockToFile endpoints [#9183](https://github.com/hyperledger/besu/pull/9183)
- Increase mainnet gas limit to 60M [#9339](https://github.com/hyperledger/besu/pull/9339)
- Update to tuweni 2.7.2 [#9338](https://github.com/hyperledger/besu/pull/9338)
- eth_createAccessList now returns success result if execution reverted [#9358](https://github.com/hyperledger/besu/pull/9358)

### Bug fixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private Object createResponse(
final JsonRpcRequestContext requestContext, final AccessListSimulatorResult result) {
return result
.result()
.map(createResponse(requestContext, result.tracer()))
.map(createResponse(result.tracer()))
.orElseGet(() -> errorResponse(requestContext, RpcErrorType.INTERNAL_ERROR));
}

Expand All @@ -99,11 +99,13 @@ private boolean shouldProcessWithAccessListOverride(
}

private Function<TransactionSimulatorResult, Object> createResponse(
final JsonRpcRequestContext request, final AccessListOperationTracer operationTracer) {
final AccessListOperationTracer operationTracer) {
// access list is created regardless, but include error message if result was not successful
return result ->
result.isSuccessful()
? new CreateAccessListResult(operationTracer.getAccessList(), result.getGasEstimate())
: errorResponse(request, result);
new CreateAccessListResult(
operationTracer.getAccessList(),
result.getGasEstimate(),
result.isSuccessful() ? Optional.empty() : Optional.of("execution reverted"));
}

private AccessListSimulatorResult processTransactionWithAccessListOverride(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,27 @@

import java.util.Collection;
import java.util.List;
import java.util.Optional;

import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonInclude;

public class CreateAccessListResult {
List<AccessListEntry> accessListList;
String gasUsed;
Optional<String> errorMessage;

public CreateAccessListResult(final List<AccessListEntry> accessListEntries, final long gasUsed) {
this(accessListEntries, gasUsed, Optional.empty());
}

public CreateAccessListResult(
final List<AccessListEntry> accessListEntries,
final long gasUsed,
final Optional<String> errorMessage) {
this.accessListList = accessListEntries;
this.gasUsed = Quantity.create(gasUsed);
this.errorMessage = errorMessage;
}

@JsonGetter(value = "accessList")
Expand All @@ -39,4 +50,10 @@ public Collection<AccessListEntry> getAccessList() {
public String getGasUsed() {
return gasUsed;
}

@JsonGetter(value = "error")
@JsonInclude(JsonInclude.Include.NON_ABSENT)
public Optional<String> getErrorMessage() {
return errorMessage;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
Expand Down Expand Up @@ -194,14 +193,16 @@ public void shouldReturnErrorWhenWorldStateIsNotAvailable() {
}

@Test
public void shouldReturnErrorWhenTransactionReverted() {
public void shouldReturnAccessListEvenWhenTransactionReverted() {
final JsonRpcRequestContext request =
ethCreateAccessListRequest(legacyTransactionCallParameter(Wei.ZERO));
mockTransactionSimulatorResult(false, true, 1L, pendingBlockHeader);
mockTransactionSimulatorResult(false, true, MIN_TX_GAS_COST, pendingBlockHeader);

final String errorReason = "0x00";
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, new JsonRpcError(RpcErrorType.REVERT_ERROR, errorReason));
new JsonRpcSuccessResponse(
null,
new CreateAccessListResult(
List.of(), MIN_TX_GAS_COST, Optional.of("execution reverted")));

assertThat(method.response(request)).usingRecursiveComparison().isEqualTo(expectedResponse);
verify(transactionSimulator, times(2))
Expand Down