Merge pull request hyperledger-web3j#1959 from web3j/issue_1951

add yParity for Geth compatibility
AlphaWallet · Sep 6, 2023 · e4e1dd7 · e4e1dd7
2 parents f6a2aed + efeb2ba
commit e4e1dd7
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 0 deletions.
diff --git a/core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java b/core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java
@@ -673,6 +673,7 @@ public TransactionObject(
                 String r,
                 String s,
                 long v,
+                String yParity,
                 String type,
                 String maxFeePerGas,
                 String maxPriorityFeePerGas,
@@ -696,6 +697,7 @@ public TransactionObject(
                     r,
                     s,
                     v,
+                    yParity,
                     type,
                     maxFeePerGas,
                     maxPriorityFeePerGas,

diff --git a/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java b/core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java
@@ -38,6 +38,7 @@ public class Transaction {
     private String r;
     private String s;
     private long v; // see https://github.com/web3j/web3j/issues/44
+    private String yParity;
     private String type;
     private String maxFeePerGas;
     private String maxPriorityFeePerGas;
@@ -111,6 +112,7 @@ public Transaction(
             String r,
             String s,
             long v,
+            String yParity,
             String type,
             String maxFeePerGas,
             String maxPriorityFeePerGas,
@@ -133,6 +135,7 @@ public Transaction(
         this.r = r;
         this.s = s;
         this.v = v;
+        this.yParity = yParity;
         this.type = type;
         this.maxFeePerGas = maxFeePerGas;
         this.maxPriorityFeePerGas = maxPriorityFeePerGas;
@@ -318,6 +321,14 @@ public void setV(Object v) {
     //        this.v = v;
     //    }
 
+    public String getyParity() {
+        return yParity;
+    }
+
+    public void setyParity(String yParity) {
+        this.yParity = yParity;
+    }
+
     public Long getChainId() {
         if (chainId != null) {
             return Numeric.decodeQuantity(chainId).longValue();
@@ -455,6 +466,11 @@ public boolean equals(Object o) {
         if (getR() != null ? !getR().equals(that.getR()) : that.getR() != null) {
             return false;
         }
+        if (getyParity() != null
+                ? !getyParity().equals(that.getyParity())
+                : that.getyParity() != null) {
+            return false;
+        }
         if (getType() != null ? !getType().equals(that.getType()) : that.getType() != null) {
             return false;
         }
@@ -500,6 +516,7 @@ public int hashCode() {
         result = 31 * result + (getR() != null ? getR().hashCode() : 0);
         result = 31 * result + (getS() != null ? getS().hashCode() : 0);
         result = 31 * result + BigInteger.valueOf(getV()).hashCode();
+        result = 31 * result + (getyParity() != null ? getyParity().hashCode() : 0);
         result = 31 * result + (getType() != null ? getType().hashCode() : 0);
         result = 31 * result + (getMaxFeePerGasRaw() != null ? getMaxFeePerGasRaw().hashCode() : 0);
         result =

diff --git a/core/src/test/java/org/web3j/protocol/core/ResponseTest.java b/core/src/test/java/org/web3j/protocol/core/ResponseTest.java
@@ -1082,6 +1082,79 @@ public void testEthTransaction() {
         assertEquals(ethTransaction.getTransaction().get(), (transaction));
     }
 
+    @Test
+    public void testEthTransactionResponseWithYParity() {
+        buildResponse(
+                "{\n"
+                        + "    \"id\":1,\n"
+                        + "    \"jsonrpc\":\"2.0\",\n"
+                        + "    \"result\": {\n"
+                        + "        \"hash\":\"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b\",\n"
+                        + "        \"nonce\":\"0x\",\n"
+                        + "        \"blockHash\": \"0xbeab0aa2411b7ab17f30a99d3cb9c6ef2fc5426d6ad6fd9e2a26a6aed1d1055b\",\n"
+                        + "        \"blockNumber\": \"0x15df\",\n"
+                        + "        \"chainId\": \"4\",\n"
+                        + "        \"transactionIndex\":  \"0x1\",\n"
+                        + "        \"from\":\"0x407d73d8a49eeb85d32cf465507dd71d507100c1\",\n"
+                        + "        \"to\":\"0x85h43d8a49eeb85d32cf465507dd71d507100c1\",\n"
+                        + "        \"value\":\"0x7f110\",\n"
+                        + "        \"gas\": \"0x7f110\",\n"
+                        + "        \"gasPrice\":\"0x09184e72a000\",\n"
+                        + "        \"input\":\"0x603880600c6000396000f300603880600c6000396000f3603880600c6000396000f360\",\n"
+                        + "        \"creates\":null,\n"
+                        + "        \"publicKey\":\"0x6614d7d7bfe989295821985de0439e868b26ff05f98ae0da0ce5bccc24ea368a083b785323c9fcb405dd4c10a2c95d93312a1b2d68beb24ab4ea7c3c2f7c455b\",\n"
+                        + "        \"raw\":\"0xf8cd83103a048504a817c800830e57e0945927c5cc723c4486f93bf90bad3be8831139499e80b864140f8dd300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000c03905df347aa6490d5a98fbb8d8e49520000000000000000000000000000000000000000000000000000000057d56ee61ba0f115cc4d7516dd430046504e1c888198e0323e8ded016d755f89c226ba3481dca04a2ae8ee49f1100b5c0202b37ed8bacf4caeddebde6b7f77e12e7a55893e9f62\",\n"
+                        + "        \"r\":\"0xf115cc4d7516dd430046504e1c888198e0323e8ded016d755f89c226ba3481dc\",\n"
+                        + "        \"s\":\"0x4a2ae8ee49f1100b5c0202b37ed8bacf4caeddebde6b7f77e12e7a55893e9f62\",\n"
+                        + "        \"v\":\"0\",\n"
+                        + "        \"yParity\":\"1\",\n"
+                        + "    \"accessList\": [{"
+                        + "        \"address\":\"0x408e41876cccdc0f92210600ef50372656052a38\",\n"
+                        + "    \"storageKeys\": ["
+                        + "        \"0x18919546fd5421b0ef1b1b8dfce80500e69f2e28ae34c4d6298172949fa77dcc\",\n"
+                        + "        \"0x4869ff95a61ee1ded0b22e2d0e3f54f3199886a9f361e634132c95164bfc5129\"\n"
+                        + "    ] \n"
+                        + "    }], \n"
+                        + "        \"type\":\"0x0\",\n"
+                        + "        \"maxFeePerGas\": \"0x7f110\",\n"
+                        + "        \"maxPriorityFeePerGas\": \"0x7f110\"\n"
+                        + "  }\n"
+                        + "}");
+        Transaction transaction =
+                new Transaction(
+                        "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
+                        "0x",
+                        "0xbeab0aa2411b7ab17f30a99d3cb9c6ef2fc5426d6ad6fd9e2a26a6aed1d1055b",
+                        "0x15df",
+                        "4",
+                        "0x1",
+                        "0x407d73d8a49eeb85d32cf465507dd71d507100c1",
+                        "0x85h43d8a49eeb85d32cf465507dd71d507100c1",
+                        "0x7f110",
+                        "0x7f110",
+                        "0x09184e72a000",
+                        "0x603880600c6000396000f300603880600c6000396000f3603880600c6000396000f360",
+                        null,
+                        "0x6614d7d7bfe989295821985de0439e868b26ff05f98ae0da0ce5bccc24ea368a083b785323c9fcb405dd4c10a2c95d93312a1b2d68beb24ab4ea7c3c2f7c455b",
+                        "0xf8cd83103a048504a817c800830e57e0945927c5cc723c4486f93bf90bad3be8831139499e80b864140f8dd300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000c03905df347aa6490d5a98fbb8d8e49520000000000000000000000000000000000000000000000000000000057d56ee61ba0f115cc4d7516dd430046504e1c888198e0323e8ded016d755f89c226ba3481dca04a2ae8ee49f1100b5c0202b37ed8bacf4caeddebde6b7f77e12e7a55893e9f62",
+                        "0xf115cc4d7516dd430046504e1c888198e0323e8ded016d755f89c226ba3481dc",
+                        "0x4a2ae8ee49f1100b5c0202b37ed8bacf4caeddebde6b7f77e12e7a55893e9f62",
+                        (byte) 0,
+                        "1",
+                        "0x0",
+                        "0x7f110",
+                        "0x7f110",
+                        Arrays.asList(
+                                new AccessListObject(
+                                        "0x408e41876cccdc0f92210600ef50372656052a38",
+                                        Arrays.asList(
+                                                "0x18919546fd5421b0ef1b1b8dfce80500e69f2e28ae34c4d6298172949fa77dcc",
+                                                "0x4869ff95a61ee1ded0b22e2d0e3f54f3199886a9f361e634132c95164bfc5129"))));
+
+        EthTransaction ethTransaction = deserialiseResponse(EthTransaction.class);
+        assertEquals(ethTransaction.getTransaction().get(), (transaction));
+    }
+
     @Test
     public void testTransactionChainId() {
         Transaction transaction = new Transaction();