forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
switch to hex integers for eth_feeHistory (hyperledger#2517)
Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com>
- Loading branch information
Showing
6 changed files
with
121 additions
and
79 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
76 changes: 76 additions & 0 deletions
76
.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistory.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,76 @@ | ||
| /* | ||
| * 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 static java.util.stream.Collectors.toUnmodifiableList; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.immutables.value.Value; | ||
|
|
||
| @Value.Immutable | ||
| public interface FeeHistory { | ||
|
|
||
| long getOldestBlock(); | ||
|
|
||
| List<Long> getBaseFeePerGas(); | ||
|
|
||
| List<Double> getGasUsedRatio(); | ||
|
|
||
| Optional<List<List<Long>>> getReward(); | ||
|
|
||
| @Value.Immutable | ||
| @Value.Style(allParameters = true) | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| interface FeeHistoryResult { | ||
| @JsonProperty("oldestBlock") | ||
| String getOldestBlock(); | ||
|
|
||
| @JsonProperty("baseFeePerGas") | ||
| List<String> getBaseFeePerGas(); | ||
|
|
||
| @JsonProperty("gasUsedRatio") | ||
| List<Double> getGasUsedRatio(); | ||
|
|
||
| @Nullable | ||
| @JsonProperty("reward") | ||
| List<List<String>> getReward(); | ||
|
|
||
| static FeeHistoryResult from(final FeeHistory feeHistory) { | ||
| return ImmutableFeeHistoryResult.of( | ||
| Quantity.create(feeHistory.getOldestBlock()), | ||
| feeHistory.getBaseFeePerGas().stream() | ||
| .map(Quantity::create) | ||
| .collect(toUnmodifiableList()), | ||
| feeHistory.getGasUsedRatio(), | ||
| feeHistory | ||
| .getReward() | ||
| .map( | ||
| outerList -> | ||
| outerList.stream() | ||
| .map( | ||
| innerList -> | ||
| innerList.stream() | ||
| .map(Quantity::create) | ||
| .collect(toUnmodifiableList())) | ||
| .collect(toUnmodifiableList())) | ||
| .orElse(null)); | ||
| } | ||
| } | ||
| } |
40 changes: 0 additions & 40 deletions
40
...ain/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistoryResult.java
This file was deleted.
Oops, something went wrong.
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