forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add
eth_blobBaseFee (hyperledger#6581)
Signed-off-by: Gabriel-Trintinalia <[email protected]>
- Loading branch information
1 parent
5bf959a
commit bc2eed1
Showing
5 changed files
with
149 additions
and
1 deletion.
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
57 changes: 57 additions & 0 deletions
57
.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlobBaseFee.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,57 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu Contributors. | ||
| * | ||
| * 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.mainnet.feemarket.ExcessBlobGasCalculator.calculateExcessBlobGasForParent; | ||
|
|
||
| import org.hyperledger.besu.datatypes.Wei; | ||
| 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.response.JsonRpcResponse; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; | ||
| import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; | ||
| import org.hyperledger.besu.ethereum.chain.Blockchain; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeader; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; | ||
|
|
||
| public class EthBlobBaseFee implements JsonRpcMethod { | ||
|
|
||
| final Blockchain blockchain; | ||
|
|
||
| private final ProtocolSchedule protocolSchedule; | ||
|
|
||
| public EthBlobBaseFee(final Blockchain blockchain, final ProtocolSchedule protocolSchedule) { | ||
| this.blockchain = blockchain; | ||
| this.protocolSchedule = protocolSchedule; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return RpcMethod.ETH_BLOB_BASE_FEE.getMethodName(); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonRpcResponse response(final JsonRpcRequestContext requestContext) { | ||
| return new JsonRpcSuccessResponse( | ||
| requestContext.getRequest().getId(), Quantity.create(computeNextBlobBaseFee())); | ||
| } | ||
|
|
||
| private Wei computeNextBlobBaseFee() { | ||
| final BlockHeader header = blockchain.getChainHeadHeader(); | ||
| ProtocolSpec spec = protocolSchedule.getForNextBlockHeader(header, header.getTimestamp()); | ||
| return spec.getFeeMarket().blobGasPricePerGas(calculateExcessBlobGasForParent(spec, header)); | ||
| } | ||
| } |
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
87 changes: 87 additions & 0 deletions
87
...t/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlobBaseFeeTest.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,87 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu Contributors. | ||
| * | ||
| * 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.assertj.core.api.Assertions.assertThat; | ||
| import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| 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.JsonRpcSuccessResponse; | ||
| import org.hyperledger.besu.ethereum.chain.MutableBlockchain; | ||
| import org.hyperledger.besu.ethereum.core.Block; | ||
| import org.hyperledger.besu.ethereum.core.BlockDataGenerator; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; | ||
| import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; | ||
| import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; | ||
| import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator; | ||
| import org.hyperledger.besu.evm.gascalculator.GasCalculator; | ||
| import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class EthBlobBaseFeeTest { | ||
| private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator(); | ||
| private MutableBlockchain blockchain; | ||
| private EthBlobBaseFee method; | ||
| private ProtocolSchedule protocolSchedule; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| protocolSchedule = mock(ProtocolSchedule.class); | ||
| Block genesisBlock = blockDataGenerator.genesisBlock(); | ||
| blockchain = createInMemoryBlockchain(genesisBlock); | ||
| blockDataGenerator | ||
| .blockSequence(genesisBlock, 10) | ||
| .forEach(block -> blockchain.appendBlock(block, blockDataGenerator.receipts(block))); | ||
| method = new EthBlobBaseFee(blockchain, protocolSchedule); | ||
| } | ||
|
|
||
| /** Tests that the method returns the expected blob base fee */ | ||
| @Test | ||
| public void shouldReturnBlobBaseFee() { | ||
| configureProtocolSpec(FeeMarket.cancun(5, Optional.empty()), new CancunGasCalculator()); | ||
| assertThat(requestBlobBaseFee().getResult()).isEqualTo("0x1"); | ||
| } | ||
|
|
||
| /** Tests that the method returns zero for forks that do not support blob transactions */ | ||
| @Test | ||
| public void shouldReturnZeroForNonBlobForks() { | ||
| configureProtocolSpec(FeeMarket.london(5, Optional.empty()), new ShanghaiGasCalculator()); | ||
| assertThat(requestBlobBaseFee().getResult()).isEqualTo("0x0"); | ||
| } | ||
|
|
||
| private void configureProtocolSpec( | ||
| final BaseFeeMarket feeMarket, final GasCalculator gasCalculator) { | ||
| ProtocolSpec spec = mock(ProtocolSpec.class); | ||
| when(spec.getFeeMarket()).thenReturn(feeMarket); | ||
| when(spec.getGasCalculator()).thenReturn(gasCalculator); | ||
| when(protocolSchedule.getForNextBlockHeader( | ||
| blockchain.getChainHeadHeader(), blockchain.getChainHeadHeader().getTimestamp())) | ||
| .thenReturn(spec); | ||
| } | ||
|
|
||
| private JsonRpcSuccessResponse requestBlobBaseFee() { | ||
| return (JsonRpcSuccessResponse) | ||
| method.response( | ||
| new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_blobBaseFee", null))); | ||
| } | ||
| } |