mirror of https://github.com/hyperledger/besu
Gas accounting for EIP-4844 (#4992)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>pull/5135/head
Fabio Di Fabio
2 years ago
committed by
GitHub
parent
28d5702c57
commit
28f2bd4a1a
@ -0,0 +1,31 @@ |
||||
/* |
||||
* 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 |
||||
*/ |
||||
package org.hyperledger.besu.ethereum.mainnet; |
||||
|
||||
import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; |
||||
|
||||
public class CancunTargetingGasLimitCalculator extends LondonTargetingGasLimitCalculator { |
||||
private static final long MAX_DATA_GAS_PER_BLOCK = 1 << 19; |
||||
|
||||
public CancunTargetingGasLimitCalculator( |
||||
final long londonForkBlock, final BaseFeeMarket feeMarket) { |
||||
super(londonForkBlock, feeMarket); |
||||
} |
||||
|
||||
@Override |
||||
public long currentDataGasLimit() { |
||||
return MAX_DATA_GAS_PER_BLOCK; |
||||
} |
||||
} |
||||
@ -0,0 +1,72 @@ |
||||
/* |
||||
* 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 |
||||
*/ |
||||
package org.hyperledger.besu.ethereum.mainnet.feemarket; |
||||
|
||||
import static org.hyperledger.besu.util.Slf4jLambdaHelper.traceLambda; |
||||
|
||||
import org.hyperledger.besu.datatypes.DataGas; |
||||
import org.hyperledger.besu.datatypes.Wei; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.util.Optional; |
||||
|
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
|
||||
public class CancunFeeMarket extends LondonFeeMarket { |
||||
private static final Logger LOG = LoggerFactory.getLogger(CancunFeeMarket.class); |
||||
private static final BigInteger MIN_DATA_GAS_PRICE = BigInteger.ONE; |
||||
private static final BigInteger DATA_GAS_PRICE_UPDATE_FRACTION = BigInteger.valueOf(2225652); |
||||
|
||||
public CancunFeeMarket( |
||||
final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) { |
||||
super(londonForkBlockNumber, baseFeePerGasOverride); |
||||
} |
||||
|
||||
@Override |
||||
public boolean implementsDataFee() { |
||||
return true; |
||||
} |
||||
|
||||
@Override |
||||
public Wei dataPrice(final DataGas excessDataGas) { |
||||
final var dataGasPrice = |
||||
Wei.of( |
||||
fakeExponential( |
||||
MIN_DATA_GAS_PRICE, excessDataGas.toBigInteger(), DATA_GAS_PRICE_UPDATE_FRACTION)); |
||||
traceLambda( |
||||
LOG, |
||||
"parentExcessDataGas: {} dataGasPrice: {}", |
||||
excessDataGas::toShortHexString, |
||||
dataGasPrice::toHexString); |
||||
|
||||
return dataGasPrice; |
||||
} |
||||
|
||||
private BigInteger fakeExponential( |
||||
final BigInteger factor, final BigInteger numerator, final BigInteger denominator) { |
||||
int i = 1; |
||||
BigInteger output = BigInteger.ZERO; |
||||
BigInteger numeratorAccumulator = factor.multiply(denominator); |
||||
while (numeratorAccumulator.signum() > 0) { |
||||
output = output.add(numeratorAccumulator); |
||||
numeratorAccumulator = |
||||
(numeratorAccumulator.multiply(numerator)) |
||||
.divide(denominator.multiply(BigInteger.valueOf(i))); |
||||
++i; |
||||
} |
||||
return output.divide(denominator); |
||||
} |
||||
} |
||||
@ -1,79 +0,0 @@ |
||||
/* |
||||
* 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.core; |
||||
|
||||
import org.hyperledger.besu.crypto.KeyPair; |
||||
import org.hyperledger.besu.crypto.SignatureAlgorithm; |
||||
import org.hyperledger.besu.crypto.SignatureAlgorithmFactory; |
||||
import org.hyperledger.besu.datatypes.Address; |
||||
import org.hyperledger.besu.datatypes.Wei; |
||||
import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; |
||||
import org.hyperledger.besu.ethereum.rlp.RLP; |
||||
import org.hyperledger.besu.evm.AccessListEntry; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.util.List; |
||||
|
||||
import com.google.common.base.Supplier; |
||||
import com.google.common.base.Suppliers; |
||||
import org.apache.tuweni.bytes.Bytes; |
||||
import org.apache.tuweni.bytes.Bytes32; |
||||
import org.junit.Test; |
||||
|
||||
public class TransactionEIP1559Test { |
||||
private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM = |
||||
Suppliers.memoize(SignatureAlgorithmFactory::getInstance); |
||||
|
||||
@Test |
||||
public void buildEip1559Transaction() { |
||||
final List<AccessListEntry> accessListEntries = |
||||
List.of( |
||||
new AccessListEntry( |
||||
Address.fromHexString("0x000000000000000000000000000000000000aaaa"), |
||||
List.of(Bytes32.ZERO))); |
||||
final Transaction tx = |
||||
Transaction.builder() |
||||
.chainId(new BigInteger("1559", 10)) |
||||
.nonce(0) |
||||
.value(Wei.ZERO) |
||||
.gasLimit(30000) |
||||
.maxPriorityFeePerGas(Wei.of(2)) |
||||
.payload(Bytes.EMPTY.trimLeadingZeros()) |
||||
.maxFeePerGas(Wei.of(new BigInteger("5000000000", 10))) |
||||
.gasPrice(null) |
||||
.to(Address.fromHexString("0x000000000000000000000000000000000000aaaa")) |
||||
.accessList(accessListEntries) |
||||
.guessType() |
||||
.signAndBuild( |
||||
keyPair("0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63")); |
||||
final BytesValueRLPOutput out = new BytesValueRLPOutput(); |
||||
tx.writeTo(out); |
||||
System.out.println(out.encoded().toHexString()); |
||||
System.out.println(tx.getUpfrontCost()); |
||||
// final String raw =
|
||||
// "b8a902f8a686796f6c6f7632800285012a05f20082753094000000000000000000000000000000000000aaaa8080f838f794000000000000000000000000000000000000aaaae1a0000000000000000000000000000000000000000000000000000000000000000001a00c1d69648e348fe26155b45de45004f0e4195f6352d8f0935bc93e98a3e2a862a060064e5b9765c0ac74223b0cf49635c59ae0faf82044fd17bcc68a549ade6f95";
|
||||
final String raw = out.encoded().toHexString(); |
||||
final Transaction decoded = Transaction.readFrom(RLP.input(Bytes.fromHexString(raw))); |
||||
System.out.println(decoded); |
||||
System.out.println(decoded.getAccessList().orElseThrow().get(0).getAddressString()); |
||||
System.out.println(decoded.getAccessList().orElseThrow().get(0).getStorageKeysString()); |
||||
} |
||||
|
||||
private static KeyPair keyPair(final String privateKey) { |
||||
final SignatureAlgorithm signatureAlgorithm = SIGNATURE_ALGORITHM.get(); |
||||
return signatureAlgorithm.createKeyPair( |
||||
signatureAlgorithm.createPrivateKey(Bytes32.fromHexString(privateKey))); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue