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

fix versionedHashes to blobVersionedHashes #2009

Merged
merged 1 commit into from
Mar 6, 2024
Merged

fix versionedHashes to blobVersionedHashes #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ public TransactionObject(
String maxPriorityFeePerGas,
List<AccessListObject> accessList,
String maxFeePerBlobGas,
List<String> versionedHashes) {
List<String> blobVersionedHashes) {
super(
hash,
nonce,
Expand All @@ -862,7 +862,7 @@ public TransactionObject(
maxPriorityFeePerGas,
accessList,
maxFeePerBlobGas,
versionedHashes);
blobVersionedHashes);
}

@Override
Expand Down
20 changes: 10 additions & 10 deletions core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class Transaction {
private String maxPriorityFeePerGas;
private List<AccessListObject> accessList;
private String maxFeePerBlobGas;
private List<String> versionedHashes;
private List<String> blobVersionedHashes;

public Transaction() {}

Expand Down Expand Up @@ -194,7 +194,7 @@ public Transaction(
this.maxPriorityFeePerGas = maxPriorityFeePerGas;
this.accessList = accessList;
this.maxFeePerBlobGas = maxFeePerBlobGas;
this.versionedHashes = versionedHashes;
this.blobVersionedHashes = versionedHashes;
}

public void setChainId(String chainId) {
Expand Down Expand Up @@ -449,12 +449,12 @@ public void setMaxFeePerBlobGas(String maxFeePerBlobGas) {
this.maxFeePerBlobGas = maxFeePerBlobGas;
}

public List<String> getVersionedHashes() {
return versionedHashes;
public List<String> getBlobVersionedHashes() {
return blobVersionedHashes;
}

public void setVersionedHashes(List<String> versionedHashes) {
this.versionedHashes = versionedHashes;
public void setBlobVersionedHashes(List<String> blobVersionedHashes) {
this.blobVersionedHashes = blobVersionedHashes;
}

@Override
Expand Down Expand Up @@ -565,9 +565,9 @@ public boolean equals(Object o) {
: that.getMaxFeePerBlobGasRaw() != null) {
return false;
}
if (getVersionedHashes() != null
? !getVersionedHashes().equals(that.getVersionedHashes())
: that.getVersionedHashes() != null) {
if (getBlobVersionedHashes() != null
? !getBlobVersionedHashes().equals(that.getBlobVersionedHashes())
: that.getBlobVersionedHashes() != null) {
return false;
}
if (getAccessList() != null
Expand Down Expand Up @@ -615,7 +615,7 @@ public int hashCode() {
+ (getMaxFeePerBlobGasRaw() != null
? getMaxFeePerBlobGasRaw().hashCode()
: 0);
result = 31 * result + (getVersionedHashes() != null ? getVersionedHashes().hashCode() : 0);
result = 31 * result + (getBlobVersionedHashes() != null ? getBlobVersionedHashes().hashCode() : 0);
result = 31 * result + (getAccessList() != null ? getAccessList().hashCode() : 0);
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/org/web3j/protocol/core/ResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ public void testEthBlockFullTransactionsWithBlob() {
+ " \"maxFeePerGas\": \"0x7f110\",\n"
+ " \"maxPriorityFeePerGas\": \"0x7f110\",\n"
+ " \"maxFeePerBlobGas\": \"0x7f110\",\n"
+ " \"versionedHashes\": [\"0x013343644e9aaa7e8673ba3be38b56bb3dfaa57db923797247e5f2e504b721c3\", \"0x01cad19a7fe88d9e14575394847a4a0026fccf292c4ca30ef047e6d03d3a74bb\"]"
+ " \"blobVersionedHashes\": [\"0x013343644e9aaa7e8673ba3be38b56bb3dfaa57db923797247e5f2e504b721c3\", \"0x01cad19a7fe88d9e14575394847a4a0026fccf292c4ca30ef047e6d03d3a74bb\"]"
+ " }], \n"
+ " \"uncles\": [\n"
+ " \"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347\",\n"
Expand Down
Loading