Skip to content

Commit b54cfa4

Browse files
NickSneoNickSneo
authored
Merge pull request #2006 from web3j/nicks/blobBaseFee
Calculate baseFeePerBlobGas value
2 parents b109355 + ede5e8b commit b54cfa4

File tree

11 files changed

+531
-13
lines changed

11 files changed

+531
-13
lines changed

‎core/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ dependencies {
1818
"org.java-websocket:Java-WebSocket:$javaWebSocketVersion",
1919
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
2020
"org.slf4j:slf4j-api:$slf4jVersion",
21-
"io.github.adraffy:ens-normalize:$ensAdraffyVersion"
21+
"io.github.adraffy:ens-normalize:$ensAdraffyVersion",
22+
"io.tmio:tuweni-bytes:$tuweniVersion",
23+
"io.tmio:tuweni-units:$tuweniVersion"
2224
testImplementation project(path: ':crypto', configuration: 'testArtifacts'),
2325
"nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion",
2426
"ch.qos.logback:logback-classic:$logbackVersion"

‎core/src/main/java/org/web3j/protocol/Web3j.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
import java.util.concurrent.ScheduledExecutorService;
1616

1717
import org.web3j.protocol.core.Batcher;
18+
import org.web3j.protocol.core.BlobFee;
1819
import org.web3j.protocol.core.Ethereum;
1920
import org.web3j.protocol.core.JsonRpc2_0Web3j;
2021
import org.web3j.protocol.rx.Web3jRx;
2122

2223
/** JSON-RPC Request object building factory. */
23-
public interface Web3j extends Ethereum, Web3jRx, Batcher {
24+
public interface Web3j extends Ethereum, Web3jRx, Batcher, BlobFee {
2425

2526
/**
2627
* Construct a new Web3j instance.

‎core/src/main/java/org/web3j/protocol/core/BlobFee.java

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright 2024 Web3 Labs Ltd.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
5+
* the License. You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
10+
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
11+
* specific language governing permissions and limitations under the License.
12+
*/
13+
package org.web3j.protocol.core;
14+
15+
import java.math.BigInteger;
16+
17+
public interface BlobFee {
18+
/**
19+
* Calculating Base Fee per Blob Gas
20+
*
21+
* @return baseFee value.
22+
*/
23+
BigInteger ethGetBaseFeePerBlobGas();
24+
}

‎core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java

+30
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@
9999
public class JsonRpc2_0Web3j implements Web3j {
100100

101101
public static final int DEFAULT_BLOCK_TIME = 15 * 1000;
102+
private static final BigInteger MIN_BLOB_BASE_FEE = new BigInteger("1");
103+
private static final BigInteger BLOB_BASE_FEE_UPDATE_FRACTION = new BigInteger("3338477");
102104

103105
protected final Web3jService web3jService;
104106
private final JsonRpc2_0Rx web3jRx;
@@ -876,4 +878,32 @@ public void shutdown() {
876878
public BatchRequest newBatch() {
877879
return new BatchRequest(web3jService);
878880
}
881+
882+
@Override
883+
public BigInteger ethGetBaseFeePerBlobGas() {
884+
try {
885+
EthBlock ethBlock =
886+
web3jService.send(
887+
ethGetBlockByNumber(DefaultBlockParameter.valueOf("latest"), false),
888+
EthBlock.class);
889+
return fakeExponential(ethBlock.getBlock().getExcessBlobGas());
890+
} catch (Exception e) {
891+
throw new RuntimeException("Failed to get baseFeePerBlobGas value: ", e);
892+
}
893+
}
894+
895+
private static BigInteger fakeExponential(BigInteger numerator) {
896+
BigInteger i = BigInteger.ONE;
897+
BigInteger output = BigInteger.ZERO;
898+
BigInteger numeratorAccum = MIN_BLOB_BASE_FEE.multiply(BLOB_BASE_FEE_UPDATE_FRACTION);
899+
while (numeratorAccum.compareTo(BigInteger.ZERO) > 0) {
900+
output = output.add(numeratorAccum);
901+
numeratorAccum =
902+
numeratorAccum
903+
.multiply(numerator)
904+
.divide(BLOB_BASE_FEE_UPDATE_FRACTION.multiply(i));
905+
i = i.add(BigInteger.ONE);
906+
}
907+
return output.divide(BLOB_BASE_FEE_UPDATE_FRACTION);
908+
}
879909
}

‎core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java

+161
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,68 @@ public static class Block {
8484
private String baseFeePerGas;
8585
private String withdrawalsRoot;
8686
private List<Withdrawal> withdrawals;
87+
private String blobGasUsed;
88+
private String excessBlobGas;
8789

8890
public Block() {}
8991

92+
public Block(
93+
String number,
94+
String hash,
95+
String parentHash,
96+
String nonce,
97+
String sha3Uncles,
98+
String logsBloom,
99+
String transactionsRoot,
100+
String stateRoot,
101+
String receiptsRoot,
102+
String author,
103+
String miner,
104+
String mixHash,
105+
String difficulty,
106+
String totalDifficulty,
107+
String extraData,
108+
String size,
109+
String gasLimit,
110+
String gasUsed,
111+
String timestamp,
112+
List<TransactionResult> transactions,
113+
List<String> uncles,
114+
List<String> sealFields,
115+
String baseFeePerGas,
116+
String withdrawalsRoot,
117+
List<Withdrawal> withdrawals,
118+
String blobGasUsed,
119+
String excessBlobGas) {
120+
this.number = number;
121+
this.hash = hash;
122+
this.parentHash = parentHash;
123+
this.nonce = nonce;
124+
this.sha3Uncles = sha3Uncles;
125+
this.logsBloom = logsBloom;
126+
this.transactionsRoot = transactionsRoot;
127+
this.stateRoot = stateRoot;
128+
this.receiptsRoot = receiptsRoot;
129+
this.author = author;
130+
this.miner = miner;
131+
this.mixHash = mixHash;
132+
this.difficulty = difficulty;
133+
this.totalDifficulty = totalDifficulty;
134+
this.extraData = extraData;
135+
this.size = size;
136+
this.gasLimit = gasLimit;
137+
this.gasUsed = gasUsed;
138+
this.timestamp = timestamp;
139+
this.transactions = transactions;
140+
this.uncles = uncles;
141+
this.sealFields = sealFields;
142+
this.baseFeePerGas = baseFeePerGas;
143+
this.withdrawalsRoot = withdrawalsRoot;
144+
this.withdrawals = withdrawals;
145+
this.blobGasUsed = blobGasUsed;
146+
this.excessBlobGas = excessBlobGas;
147+
}
148+
90149
public Block(
91150
String number,
92151
String hash,
@@ -377,6 +436,34 @@ public void setWithdrawals(List<Withdrawal> withdrawals) {
377436
this.withdrawals = withdrawals;
378437
}
379438

439+
public BigInteger getBlobGasUsed() {
440+
if (blobGasUsed == null) return BigInteger.ZERO;
441+
return Numeric.decodeQuantity(blobGasUsed);
442+
}
443+
444+
public String getBlobGasUsedRaw() {
445+
if (blobGasUsed == null) return "0";
446+
return blobGasUsed;
447+
}
448+
449+
public void setBlobGasUsed(String blobGasUsed) {
450+
this.blobGasUsed = blobGasUsed;
451+
}
452+
453+
public BigInteger getExcessBlobGas() {
454+
if (excessBlobGas == null) return BigInteger.ZERO;
455+
return Numeric.decodeQuantity(excessBlobGas);
456+
}
457+
458+
public String getExcessBlobGasRaw() {
459+
if (excessBlobGas == null) return "0";
460+
return excessBlobGas;
461+
}
462+
463+
public void setExcessBlobGas(String excessBlobGas) {
464+
this.excessBlobGas = excessBlobGas;
465+
}
466+
380467
@Override
381468
public boolean equals(Object o) {
382469
if (this == o) {
@@ -504,6 +591,18 @@ public boolean equals(Object o) {
504591
return false;
505592
}
506593

594+
if (getBlobGasUsedRaw() != null
595+
? !getBlobGasUsedRaw().equals(block.getBlobGasUsedRaw())
596+
: block.getBlobGasUsedRaw() != null) {
597+
return false;
598+
}
599+
600+
if (getExcessBlobGasRaw() != null
601+
? !getExcessBlobGasRaw().equals(block.getExcessBlobGasRaw())
602+
: block.getExcessBlobGasRaw() != null) {
603+
return false;
604+
}
605+
507606
if (getWithdrawalsRoot() != null
508607
? !getWithdrawalsRoot().equals(block.getWithdrawalsRoot())
509608
: block.getWithdrawalsRoot() != null) {
@@ -556,6 +655,14 @@ public int hashCode() {
556655
31 * result
557656
+ (getWithdrawalsRoot() != null ? getWithdrawalsRoot().hashCode() : 0);
558657
result = 31 * result + (getWithdrawals() != null ? getWithdrawals().hashCode() : 0);
658+
result =
659+
31 * result
660+
+ (getBlobGasUsedRaw() != null ? getBlobGasUsedRaw().hashCode() : 0);
661+
result =
662+
31 * result
663+
+ (getExcessBlobGasRaw() != null
664+
? getExcessBlobGasRaw().hashCode()
665+
: 0);
559666
return result;
560667
}
561668
}
@@ -704,6 +811,60 @@ public TransactionObject(
704811
accessList);
705812
}
706813

814+
public TransactionObject(
815+
String hash,
816+
String nonce,
817+
String blockHash,
818+
String blockNumber,
819+
String chainId,
820+
String transactionIndex,
821+
String from,
822+
String to,
823+
String value,
824+
String gasPrice,
825+
String gas,
826+
String input,
827+
String creates,
828+
String publicKey,
829+
String raw,
830+
String r,
831+
String s,
832+
long v,
833+
String yParity,
834+
String type,
835+
String maxFeePerGas,
836+
String maxPriorityFeePerGas,
837+
List<AccessListObject> accessList,
838+
String maxFeePerBlobGas,
839+
List<String> versionedHashes) {
840+
super(
841+
hash,
842+
nonce,
843+
blockHash,
844+
blockNumber,
845+
chainId,
846+
transactionIndex,
847+
from,
848+
to,
849+
value,
850+
gas,
851+
gasPrice,
852+
input,
853+
creates,
854+
publicKey,
855+
raw,
856+
r,
857+
s,
858+
v,
859+
yParity,
860+
type,
861+
maxFeePerGas,
862+
maxPriorityFeePerGas,
863+
accessList,
864+
maxFeePerBlobGas,
865+
versionedHashes);
866+
}
867+
707868
@Override
708869
public Transaction get() {
709870
return this;

0 commit comments

Comments
 (0)