-
Notifications
You must be signed in to change notification settings - Fork 879
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com>
- Loading branch information
Showing
19 changed files
with
618 additions
and
91 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
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
188 changes: 188 additions & 0 deletions
188
...c/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.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,188 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * 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 java.util.stream.Collectors.toUnmodifiableList; | ||
|
|
||
| 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.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; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.ImmutableFeeHistoryResult; | ||
| import org.hyperledger.besu.ethereum.api.query.BlockchainQueries; | ||
| import org.hyperledger.besu.ethereum.chain.Blockchain; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeader; | ||
| import org.hyperledger.besu.ethereum.core.Transaction; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.stream.LongStream; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class EthFeeHistory implements JsonRpcMethod { | ||
| private final ProtocolSchedule protocolSchedule; | ||
| private final BlockchainQueries blockchainQueries; | ||
| private final Blockchain blockchain; | ||
|
|
||
| public EthFeeHistory( | ||
| final ProtocolSchedule protocolSchedule, final BlockchainQueries blockchainQueries) { | ||
| this.protocolSchedule = protocolSchedule; | ||
| this.blockchainQueries = blockchainQueries; | ||
| this.blockchain = blockchainQueries.getBlockchain(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return RpcMethod.ETH_FEE_HISTORY.getMethodName(); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonRpcResponse response(final JsonRpcRequestContext request) { | ||
| final Object requestId = request.getRequest().getId(); | ||
|
|
||
| final long blockCount = request.getRequiredParameter(0, Long.class); | ||
| if (blockCount < 1 || blockCount > 1024) { | ||
| return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PARAMS); | ||
| } | ||
| final BlockParameter highestBlock = request.getRequiredParameter(1, BlockParameter.class); | ||
| final Optional<List<Double>> maybeRewardPercentiles = | ||
| request.getOptionalParameter(2, Double[].class).map(Arrays::asList); | ||
|
|
||
| final long chainHeadBlockNumber = blockchain.getChainHeadBlockNumber(); | ||
| final long resolvedHighestBlockNumber = | ||
| highestBlock | ||
| .getNumber() | ||
| .orElse( | ||
| chainHeadBlockNumber /* both latest and pending use the head block until we have pending block support */); | ||
|
|
||
| if (resolvedHighestBlockNumber > chainHeadBlockNumber) { | ||
| return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PARAMS); | ||
| } | ||
|
|
||
| final long oldestBlock = Math.max(0, resolvedHighestBlockNumber - (blockCount - 1)); | ||
|
|
||
| final List<BlockHeader> blockHeaders = | ||
| LongStream.range(oldestBlock, oldestBlock + blockCount) | ||
| .mapToObj(blockchain::getBlockHeader) | ||
| .flatMap(Optional::stream) | ||
| .collect(toUnmodifiableList()); | ||
|
|
||
| // we return the base fees for the blocks requested and 1 more because we can always compute it | ||
| final List<Long> explicitlyRequestedBaseFees = | ||
| blockHeaders.stream() | ||
| .map(blockHeader -> blockHeader.getBaseFee().orElse(0L)) | ||
| .collect(toUnmodifiableList()); | ||
| final long nextBlockNumber = resolvedHighestBlockNumber + 1; | ||
| final Long nextBaseFee = | ||
| blockchain | ||
| .getBlockHeader(nextBlockNumber) | ||
| .map(blockHeader -> blockHeader.getBaseFee().orElse(0L)) | ||
| .orElseGet( | ||
| () -> | ||
| protocolSchedule | ||
| .getByBlockNumber(nextBlockNumber) | ||
| .getEip1559() | ||
| .map( | ||
| eip1559 -> { | ||
| final BlockHeader lastBlockHeader = | ||
| blockHeaders.get(blockHeaders.size() - 1); | ||
| return eip1559.computeBaseFee( | ||
| nextBlockNumber, | ||
| explicitlyRequestedBaseFees.get( | ||
| explicitlyRequestedBaseFees.size() - 1), | ||
| lastBlockHeader.getGasUsed(), | ||
| eip1559.targetGasUsed(lastBlockHeader)); | ||
| }) | ||
| .orElse(0L)); | ||
|
|
||
| final List<Double> gasUsedRatios = | ||
| blockHeaders.stream() | ||
| .map(blockHeader -> blockHeader.getGasUsed() / (double) blockHeader.getGasLimit()) | ||
| .collect(toUnmodifiableList()); | ||
|
|
||
| final Optional<List<List<Long>>> maybeRewards = | ||
| maybeRewardPercentiles.map( | ||
| rewardPercentiles -> | ||
| LongStream.range(oldestBlock, oldestBlock + blockCount) | ||
| .mapToObj(blockchain::getBlockByNumber) | ||
| .flatMap(Optional::stream) | ||
| .map( | ||
| block -> | ||
| computeRewards( | ||
| rewardPercentiles.stream().sorted().collect(toUnmodifiableList()), | ||
| block)) | ||
| .collect(toUnmodifiableList())); | ||
|
|
||
| final ImmutableFeeHistoryResult.Builder feeHistoryResultBuilder = | ||
| ImmutableFeeHistoryResult.builder() | ||
| .oldestBlock(oldestBlock) | ||
| .baseFeePerGas( | ||
| Stream.concat(explicitlyRequestedBaseFees.stream(), Stream.of(nextBaseFee)) | ||
| .collect(toUnmodifiableList())) | ||
| .gasUsedRatio(gasUsedRatios); | ||
| maybeRewards.ifPresent(feeHistoryResultBuilder::reward); | ||
| return new JsonRpcSuccessResponse(requestId, feeHistoryResultBuilder.build()); | ||
| } | ||
|
|
||
| private List<Long> computeRewards( | ||
| final List<Double> rewardPercentiles, final org.hyperledger.besu.ethereum.core.Block block) { | ||
| final List<Transaction> transactions = block.getBody().getTransactions(); | ||
| if (transactions.isEmpty()) { | ||
| // all 0's for empty block | ||
| return LongStream.generate(() -> 0) | ||
| .limit(rewardPercentiles.size()) | ||
| .boxed() | ||
| .collect(toUnmodifiableList()); | ||
| } | ||
|
|
||
| final Optional<Long> baseFee = block.getHeader().getBaseFee(); | ||
| final List<Transaction> transactionsAscendingEffectiveGasFee = | ||
| transactions.stream() | ||
| .sorted( | ||
| Comparator.comparing( | ||
| transaction -> transaction.getEffectivePriorityFeePerGas(baseFee))) | ||
| .collect(toUnmodifiableList()); | ||
|
|
||
| // We need to weight the percentile of rewards by the gas used in the transaction. | ||
| // That's why we're keeping track of the cumulative gas used and checking to see which | ||
| // percentile markers we've passed | ||
| final ArrayList<Long> rewards = new ArrayList<>(); | ||
| int rewardPercentileIndex = 0; | ||
| long gasUsed = 0; | ||
| for (final Transaction transaction : transactionsAscendingEffectiveGasFee) { | ||
|
|
||
| gasUsed += | ||
| blockchainQueries | ||
| .transactionReceiptByTransactionHash(transaction.getHash()) | ||
| .get() | ||
| .getGasUsed(); | ||
|
|
||
| while (rewardPercentileIndex < rewardPercentiles.size() | ||
| && 100.0 * gasUsed / block.getHeader().getGasUsed() | ||
| >= rewardPercentiles.get(rewardPercentileIndex)) { | ||
| rewards.add(transaction.getEffectivePriorityFeePerGas(baseFee)); | ||
| rewardPercentileIndex++; | ||
| } | ||
| } | ||
| return rewards; | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
...ain/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistoryResult.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,40 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * 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.results; | ||
|
|
||
| import java.util.List; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.immutables.value.Value; | ||
|
|
||
| @Value.Immutable | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public interface FeeHistoryResult { | ||
|
|
||
| @JsonProperty("oldestBlock") | ||
| long getOldestBlock(); | ||
|
|
||
| @JsonProperty("baseFeePerGas") | ||
| List<Long> getBaseFeePerGas(); | ||
|
|
||
| @JsonProperty("gasUsedRatio") | ||
| List<Double> getGasUsedRatio(); | ||
|
|
||
| @Nullable | ||
| @JsonProperty("reward") | ||
| List<List<Long>> getReward(); | ||
| } |
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.