fix ropsten consensus issue (hyperledger#2499)

Signed-off-by: Karim TAAM <[email protected]> Signed-off-by: Ratan Rai Sur <[email protected]>
RatanRSur · Jul 8, 2021 · 1cd6bc8 · 1cd6bc8
1 parent 8cecd33
commit 1cd6bc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559.java
@@ -73,11 +73,6 @@ public long computeBaseFee(
     return baseFee;
   }
 
-  public boolean isValidBaseFee(final long parentBaseFee, final long baseFee) {
-    return Math.abs(baseFee - parentBaseFee)
-        <= Math.max(1, parentBaseFee / feeMarket.getBasefeeMaxChangeDenominator());
-  }
-
   public boolean isEIP1559(final long blockNumber) {
     return blockNumber >= initialForkBlknum;
   }

diff --git a/...besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRule.java b/...besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRule.java
@@ -46,17 +46,18 @@ public boolean validate(final BlockHeader header, final BlockHeader parent) {
       final Long currentBaseFee =
           header.getBaseFee().orElseThrow(EIP1559MissingBaseFeeFromBlockHeader::new);
       final long targetGasUsed = eip1559.targetGasUsed(parent);
-      final long baseFee =
+      final long expectedBaseFee =
           eip1559.computeBaseFee(
               header.getNumber(), parentBaseFee, parent.getGasUsed(), targetGasUsed);
-      if (baseFee != header.getBaseFee().orElseThrow()) {
+      if (expectedBaseFee != currentBaseFee) {
         LOG.info(
             "Invalid block header: basefee {} does not equal expected basefee {}",
             header.getBaseFee().orElseThrow(),
-            baseFee);
+            expectedBaseFee);
         return false;
       }
-      return baseFee == currentBaseFee && eip1559.isValidBaseFee(parentBaseFee, currentBaseFee);
+
+      return true;
     } catch (final EIP1559MissingBaseFeeFromBlockHeader e) {
       LOG.info("Invalid block header: " + e.getMessage());
       return false;