Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Wire up EIP-3860 - Limit and Meter Initcode to shanghaiTime
Used new contractSizeLimit (from shandong) but using PrefixCodeRule instead of CachedInvalidCodeRule since we don't want EOF enabled yet. Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
- Loading branch information
Showing
4 changed files
with
124 additions
and
0 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
48 changes: 48 additions & 0 deletions
48
evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.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,48 @@ | ||
| package org.hyperledger.besu.evm.gascalculator; | ||
| /* | ||
| * Copyright contributors to 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 | ||
| */ | ||
|
|
||
| import static org.hyperledger.besu.evm.internal.Words.clampedAdd; | ||
| import static org.hyperledger.besu.evm.internal.Words.clampedToLong; | ||
|
|
||
| import org.hyperledger.besu.evm.frame.MessageFrame; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes; | ||
|
|
||
| public class ShanghaiGasCalculator extends LondonGasCalculator { | ||
|
|
||
| private static final long INIT_CODE_COST = 2L; | ||
|
|
||
| @Override | ||
| public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreation) { | ||
| long intrinsicGasCost = super.transactionIntrinsicGasCost(payload, isContractCreation); | ||
| if (isContractCreation) { | ||
| return clampedAdd(intrinsicGasCost, calculateInitGasCost(payload.size())); | ||
| } else { | ||
| return intrinsicGasCost; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public long createOperationGasCost(final MessageFrame frame) { | ||
| final long initCodeLength = clampedToLong(frame.getStackItem(2)); | ||
| return clampedAdd(super.createOperationGasCost(frame), calculateInitGasCost(initCodeLength)); | ||
| } | ||
|
|
||
| private static long calculateInitGasCost(final long initCodeLength) { | ||
| final int dataLength = (int) Math.ceil(initCodeLength / 32.0); | ||
| return dataLength * INIT_CODE_COST; | ||
| } | ||
| } |