Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix BFT creating invalid blocks on London when zero base fee is used #5276

Merged
merged 6 commits into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@ workflows:
- acceptanceTests:
requires:
- assemble
- acceptanceTestsNonMainnet:
requires:
- assemble
- buildDocker:
requires:
- assemble
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Upgrade RocksDB version from 7.7.3 to 8.0.0. Besu Team [contributed](https://github.com/facebook/rocksdb/pull/11099) to this release to make disabling checksum verification work.

### Bug Fixes
- Fix QBFT and IBFT unable to propose blocks on London when zeroBaseFee is used [#5276](https://github.com/hyperledger/besu/pull/5276)

### Download Links

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,4 @@ public Wei computeBaseFee(
public ValidationMode baseFeeValidationMode(final long blockNumber) {
return ValidationMode.NONE;
}

@Override
public boolean implementsDataFee() {
return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.hyperledger.besu.crypto.KeyPair;
import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
import org.hyperledger.besu.datatypes.DataGas;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
Expand Down Expand Up @@ -138,4 +139,14 @@ public void isBeforeForkBlockShouldBeFalse() {
assertThat(zeroBaseFeeMarket.isBeforeForkBlock(10)).isFalse();
assertThat(zeroBaseFeeMarket.isBeforeForkBlock(11)).isFalse();
}

@Test
public void implementsDataFeedShouldReturnFalse() {
assertThat(zeroBaseFeeMarket.implementsDataFee()).isFalse();
}

@Test
public void dataPriceShouldReturnsZero() {
assertThat(zeroBaseFeeMarket.dataPrice(DataGas.ONE)).isEqualTo(Wei.ZERO);
}
}