-
Notifications
You must be signed in to change notification settings - Fork 867
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into no-sdr-grouping
- Loading branch information
Showing
35 changed files
with
1,818 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...in/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceCall.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; | ||
|
|
||
| import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType.BLOCK_NOT_FOUND; | ||
| import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType.INTERNAL_ERROR; | ||
|
|
||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; | ||
| import org.hyperledger.besu.ethereum.api.query.BlockchainQueries; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeader; | ||
| import org.hyperledger.besu.ethereum.debug.TraceOptions; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
| import org.hyperledger.besu.ethereum.transaction.PreCloseStateHandler; | ||
| import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; | ||
| import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public abstract class AbstractTraceCall extends AbstractTraceByBlock { | ||
| private static final Logger LOG = LoggerFactory.getLogger(AbstractTraceCall.class); | ||
|
|
||
| public AbstractTraceCall( | ||
| final BlockchainQueries blockchainQueries, | ||
| final ProtocolSchedule protocolSchedule, | ||
| final TransactionSimulator transactionSimulator) { | ||
| super(blockchainQueries, protocolSchedule, transactionSimulator); | ||
| } | ||
|
|
||
| @Override | ||
| protected Object resultByBlockNumber( | ||
| final JsonRpcRequestContext requestContext, final long blockNumber) { | ||
| final JsonCallParameter callParams = | ||
| JsonCallParameterUtil.validateAndGetCallParams(requestContext); | ||
| final TraceOptions traceOptions = getTraceOptions(requestContext); | ||
| final String blockNumberString = String.valueOf(blockNumber); | ||
| LOG.atTrace() | ||
| .setMessage("Received RPC rpcName={} callParams={} block={} traceTypes={}") | ||
| .addArgument(this::getName) | ||
| .addArgument(callParams) | ||
| .addArgument(blockNumberString) | ||
| .addArgument(traceOptions) | ||
| .log(); | ||
|
|
||
| final Optional<BlockHeader> maybeBlockHeader = | ||
| blockchainQueriesSupplier.get().getBlockHeaderByNumber(blockNumber); | ||
|
|
||
| if (maybeBlockHeader.isEmpty()) { | ||
| return new JsonRpcErrorResponse(requestContext.getRequest().getId(), BLOCK_NOT_FOUND); | ||
| } | ||
|
|
||
| final DebugOperationTracer tracer = new DebugOperationTracer(traceOptions); | ||
| return transactionSimulator | ||
| .process( | ||
| callParams, | ||
| buildTransactionValidationParams(), | ||
| tracer, | ||
| getSimulatorResultHandler(requestContext, tracer), | ||
| maybeBlockHeader.get()) | ||
| .orElseGet( | ||
| () -> new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR)); | ||
| } | ||
|
|
||
| protected abstract TraceOptions getTraceOptions(final JsonRpcRequestContext requestContext); | ||
|
|
||
| protected abstract PreCloseStateHandler<Object> getSimulatorResultHandler( | ||
| final JsonRpcRequestContext requestContext, final DebugOperationTracer tracer); | ||
| } |
91 changes: 91 additions & 0 deletions
91
.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceCall.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; | ||
|
|
||
| import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType.INTERNAL_ERROR; | ||
|
|
||
| import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; | ||
| 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.results.DebugTraceTransactionResult; | ||
| import org.hyperledger.besu.ethereum.api.query.BlockchainQueries; | ||
| import org.hyperledger.besu.ethereum.debug.TraceOptions; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
| import org.hyperledger.besu.ethereum.transaction.PreCloseStateHandler; | ||
| import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; | ||
| import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class DebugTraceCall extends AbstractTraceCall { | ||
| private static final Logger LOG = LoggerFactory.getLogger(DebugTraceCall.class); | ||
|
|
||
| public DebugTraceCall( | ||
| final BlockchainQueries blockchainQueries, | ||
| final ProtocolSchedule protocolSchedule, | ||
| final TransactionSimulator transactionSimulator) { | ||
| super(blockchainQueries, protocolSchedule, transactionSimulator); | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return RpcMethod.DEBUG_TRACE_CALL.getMethodName(); | ||
| } | ||
|
|
||
| @Override | ||
| protected TraceOptions getTraceOptions(final JsonRpcRequestContext requestContext) { | ||
| return requestContext | ||
| .getOptionalParameter(2, TransactionTraceParams.class) | ||
| .map(TransactionTraceParams::traceOptions) | ||
| .orElse(TraceOptions.DEFAULT); | ||
| } | ||
|
|
||
| @Override | ||
| protected BlockParameter blockParameter(final JsonRpcRequestContext request) { | ||
| final Optional<BlockParameter> maybeBlockParameter = | ||
| request.getOptionalParameter(1, BlockParameter.class); | ||
|
|
||
| return maybeBlockParameter.orElse(BlockParameter.LATEST); | ||
| } | ||
|
|
||
| @Override | ||
| protected PreCloseStateHandler<Object> getSimulatorResultHandler( | ||
| final JsonRpcRequestContext requestContext, final DebugOperationTracer tracer) { | ||
| return (mutableWorldState, maybeSimulatorResult) -> | ||
| maybeSimulatorResult.map( | ||
| result -> { | ||
| if (result.isInvalid()) { | ||
| LOG.error("Invalid simulator result {}", result); | ||
| final JsonRpcError error = | ||
| new JsonRpcError( | ||
| INTERNAL_ERROR, result.getValidationResult().getErrorMessage()); | ||
| return new JsonRpcErrorResponse(requestContext.getRequest().getId(), error); | ||
| } | ||
|
|
||
| final TransactionTrace transactionTrace = | ||
| new TransactionTrace( | ||
| result.getTransaction(), result.getResult(), tracer.getTraceFrames()); | ||
|
|
||
| return new DebugTraceTransactionResult(transactionTrace); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.