Remove some dead code (#6861)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
pull/6867/head
Fabio Di Fabio 8 months ago committed by GitHub
parent cf5e3dae98
commit 0307996574
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 48
      ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFee.java
  2. 34
      ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java

@ -1,48 +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.feemarket;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
public class BaseFee {
private final Wei value;
private final Wei delta;
private final Wei minNextValue;
private final Wei maxNextValue;
public BaseFee(final BaseFeeMarket feeMarket, final Wei value) {
this.value = value;
this.delta = value.divide(feeMarket.getBasefeeMaxChangeDenominator());
this.minNextValue = value.subtract(delta);
this.maxNextValue = value.add(delta);
}
public Wei getValue() {
return value;
}
public Wei getDelta() {
return delta;
}
public Wei getMinNextValue() {
return minNextValue;
}
public Wei getMaxNextValue() {
return maxNextValue;
}
}

@ -14,11 +14,9 @@
*/
package org.hyperledger.besu.ethereum.core.feemarket;
import org.hyperledger.besu.datatypes.BlobGas;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.Transaction;
import java.math.BigInteger;
import java.util.Optional;
@FunctionalInterface
@ -44,36 +42,4 @@ public interface TransactionPriceCalculator {
return price;
};
}
// curiously named as in the spec
// https://eips.ethereum.org/EIPS/eip-4844#cryptographic-helpers
private static 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);
}
static TransactionPriceCalculator blobGas(
final int minBlobGasPrice,
final int blobGasPriceUpdateFraction,
final BlobGas excessBlobGas) {
return ((transaction, baseFee) -> {
final var blobGasPrice =
Wei.of(
fakeExponential(
BigInteger.valueOf(minBlobGasPrice),
excessBlobGas.toBigInteger(),
BigInteger.valueOf(blobGasPriceUpdateFraction)));
return blobGasPrice;
});
}
}

Loading…
Cancel
Save