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.

Sign up for GitHub

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

Jump to bottom

7732: Remove datagas related stuff in favour of blobgas #7353

Merged
merged 3 commits into from
Jul 21, 2024
Merged

7732: Remove datagas related stuff in favour of blobgas #7353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
224c812
7732: Remove datagas related stuff in favour of blobgas
Matilda-Clerke Jul 19, 2024
3f32bc6
7732: Apply spotless
Matilda-Clerke Jul 19, 2024
2fb9a5f
Merge branch 'main' into 7732-rename-data-gas-to-blob-gas
Matilda-Clerke Jul 21, 2024
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
2 changes: 1 addition & 1 deletion ...ledger/besu/ethereum/blockcreation/txselection/selectors/BlobSizeTransactionSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* This class extends AbstractTransactionSelector and provides a specific implementation for
* evaluating transactions based on blobs size. It checks if a transaction supports blobs, and if
* so, checks that there is enough remaining data gas in the block to fit the blobs of the tx.
* so, checks that there is enough remaining blob gas in the block to fit the blobs of the tx.
*/
public class BlobSizeTransactionSelector extends AbstractTransactionSelector {
private static final Logger LOG = LoggerFactory.getLogger(BlobSizeTransactionSelector.class);
Expand Down
12 changes: 2 additions & 10 deletions ...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ public ReferenceTestBlockHeader(
@JsonProperty("nonce") final String nonce,
@JsonProperty("withdrawalsRoot") final String withdrawalsRoot,
@JsonProperty("requestsRoot") final String requestsRoot,
@JsonProperty("dataGasUsed")
final String dataGasUsed, // TODO: remove once reference tests have been updated
@JsonProperty("excessDataGas")
final String excessDataGas, // TODO: remove once reference tests have been updated
@JsonProperty("blobGasUsed") final String blobGasUsed,
@JsonProperty("excessBlobGas") final String excessBlobGas,
@JsonProperty("parentBeaconBlockRoot") final String parentBeaconBlockRoot,
Expand All @@ -195,12 +191,8 @@ public ReferenceTestBlockHeader(
Hash.fromHexString(mixHash), // mixHash
Bytes.fromHexStringLenient(nonce).toLong(),
withdrawalsRoot != null ? Hash.fromHexString(withdrawalsRoot) : null,
dataGasUsed != null
? Long.decode(dataGasUsed)
: blobGasUsed != null ? Long.decode(blobGasUsed) : 0,
excessDataGas != null
? BlobGas.fromHexString(excessDataGas)
: excessBlobGas != null ? BlobGas.fromHexString(excessBlobGas) : null,
blobGasUsed != null ? Long.decode(blobGasUsed) : 0,
excessBlobGas != null ? BlobGas.fromHexString(excessBlobGas) : null,
parentBeaconBlockRoot != null ? Bytes32.fromHexString(parentBeaconBlockRoot) : null,
requestsRoot != null ? Hash.fromHexString(requestsRoot) : null,
new BlockHeaderFunctions() {
Expand Down
5 changes: 1 addition & 4 deletions ...main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ public StateTestVersionedTransaction(
@JsonDeserialize(using = StateTestAccessListDeserializer.class) @JsonProperty("accessLists")
final List<List<AccessListEntry>> maybeAccessLists,
@JsonProperty("maxFeePerBlobGas") final String maxFeePerBlobGas,
@JsonProperty("maxFeePerDataGas") final String maxFeePerDataGas,
@JsonProperty("blobVersionedHashes") final List<String> blobVersionedHashes) {

this.nonce = Bytes.fromHexStringLenient(nonce).toLong();
Expand All @@ -123,9 +122,7 @@ public StateTestVersionedTransaction(
this.payloads = parseArray(data, Bytes::fromHexString);
this.maybeAccessLists = Optional.ofNullable(maybeAccessLists);
this.maxFeePerBlobGas =
Optional.ofNullable(maxFeePerBlobGas == null ? maxFeePerDataGas : maxFeePerBlobGas)
.map(Wei::fromHexString)
.orElse(null);
Optional.ofNullable(maxFeePerBlobGas).map(Wei::fromHexString).orElse(null);
this.blobVersionedHashes = blobVersionedHashes;
}

Expand Down
Loading