fix Transaction.getChainId when v=27 must return null

hyperledger-web3j · Dec 20, 2024 · 8774b65 · 8774b65
1 parent d952334
commit 8774b65
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/core/src/test/java/org/web3j/protocol/core/ResponseTest.java b/core/src/test/java/org/web3j/protocol/core/ResponseTest.java
@@ -1181,6 +1181,21 @@ void testTransactionChainId() {
         Transaction transaction = new Transaction();
         transaction.setV(0x25);
         assertEquals(transaction.getChainId(), (1L));
+
+        Transaction transaction2 = new Transaction();
+        transaction2.setV(0x24);
+        assertEquals(transaction2.getChainId(), (0L));
+    }
+
+    @Test
+    void testTransactionWithoutChainId() {
+        Transaction transaction1 = new Transaction();
+        transaction1.setV(0x1b); // 27
+        assertEquals(transaction1.getChainId(), null);
+
+        Transaction transaction2 = new Transaction();
+        transaction2.setV(0x1c); // 28
+        assertEquals(transaction2.getChainId(), null);
     }
 
     @Test

diff --git a/crypto/src/main/java/org/web3j/crypto/TransactionUtils.java b/crypto/src/main/java/org/web3j/crypto/TransactionUtils.java
@@ -77,9 +77,9 @@ public static String generateTransactionHashHexEncoded(
      * @param v recovery identifier
      * @return Chain id
      */
-    public static long deriveChainId(long v) {
+    public static Long deriveChainId(long v) {
         if (v == LOWER_REAL_V || v == (LOWER_REAL_V + 1)) {
-            return 0L;
+            return null;
         }
         return (v - CHAIN_ID_INC) / 2;
     }

diff --git a/crypto/src/test/java/org/web3j/crypto/TransactionUtilsTest.java b/crypto/src/test/java/org/web3j/crypto/TransactionUtilsTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.web3j.crypto.TransactionUtils.generateTransactionHashHexEncoded;
 
 public class TransactionUtilsTest {
@@ -60,10 +61,10 @@ void deriveChainIdWhenLegacySignature() {
         long v1 = 27;
         long v2 = 28;
 
-        long chainId_1 = TransactionUtils.deriveChainId(v1);
-        long chainId_2 = TransactionUtils.deriveChainId(v2);
+        Long chainId_1 = TransactionUtils.deriveChainId(v1);
+        Long chainId_2 = TransactionUtils.deriveChainId(v2);
 
-        assertEquals(0, chainId_1);
-        assertEquals(0, chainId_2);
+        assertNull(chainId_1);
+        assertNull(chainId_2);
     }
 }