support optional v field

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/09_cancun_get_chainhead.json

@@ -1,5 +1,44 @@
 {
-  "request" : {"jsonrpc":"2.0","id":34,"method":"eth_getBlockByNumber","params":["latest",false]},
-  "response" : {"jsonrpc":"2.0","id":34,"result":{"number":"0x0","hash":"0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000","sha3Uncles":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","transactionsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","stateRoot":"0x11045a28efc7c00a52a201e55b8d4c312971a930432e2b5380c20d2ce217385e","receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","miner":"0x0000000000000000000000000000000000000000","difficulty":"0x0","totalDifficulty":"0x0","extraData":"0x","baseFeePerGas":"0x3b9aca00","size":"0x244","gasLimit":"0x2fefd8","gasUsed":"0x0","timestamp":"0x1234","uncles":[],"transactions":[],"withdrawalsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","withdrawals":[],"blobGasUsed":"0x0","excessBlobGas":"0x0","parentBeaconBlockRoot":"0x0000000000000000000000000000000000000000000000000000000000000000"}},
-  "statusCode" : 200
+  "request": {
+    "jsonrpc": "2.0",
+    "id": 34,
+    "method": "eth_getBlockByNumber",
+    "params": [
+      "latest",
+      false
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 34,
+    "result": {
+      "number": "0x0",
+      "hash": "0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf",
+      "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "nonce": "0x0000000000000000",
+      "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot": "0x11045a28efc7c00a52a201e55b8d4c312971a930432e2b5380c20d2ce217385e",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner": "0x0000000000000000000000000000000000000000",
+      "difficulty": "0x0",
+      "totalDifficulty": "0x0",
+      "extraData": "0x",
+      "baseFeePerGas": "0x3b9aca00",
+      "size": "0x244",
+      "gasLimit": "0x2fefd8",
+      "gasUsed": "0x0",
+      "timestamp": "0x1234",
+      "uncles": [],
+      "transactions": [],
+      "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "withdrawals": [],
+      "blobGasUsed": "0x0",
+      "excessBlobGas": "0x0",
+      "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    }
+  },
+  "statusCode": 200
 }

acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/10_cancun_build_on_genesis.json

@@ -1,5 +1,95 @@
 {
-  "request" : {"jsonrpc":"2.0","id":1,"method":"engine_forkchoiceUpdatedV3","params":[{"headBlockHash":"0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf","safeBlockHash":"0x0000000000000000000000000000000000000000000000000000000000000000","finalizedBlockHash":"0x0000000000000000000000000000000000000000000000000000000000000000"},{"timestamp":"0x1235","prevRandao":"0x31a3b9b03c64172b39b7fa7d35d86eaa0f9cbac30e2abbf9895a32b80ae1cd76","suggestedFeeRecipient":"0x0000000000000000000000000000000000000000","withdrawals":[{"index":"0x1","validatorIndex":"0x0","address":"0x0000000000000000000000000000000000000000","amount":"0x64"},{"index":"0x2","validatorIndex":"0x1","address":"0x0100000000000000000000000000000000000000","amount":"0x64"},{"index":"0x3","validatorIndex":"0x2","address":"0x0200000000000000000000000000000000000000","amount":"0x64"},{"index":"0x4","validatorIndex":"0x3","address":"0x0300000000000000000000000000000000000000","amount":"0x64"},{"index":"0x5","validatorIndex":"0x4","address":"0x0400000000000000000000000000000000000000","amount":"0x64"},{"index":"0x6","validatorIndex":"0x5","address":"0x0500000000000000000000000000000000000000","amount":"0x64"},{"index":"0x7","validatorIndex":"0x6","address":"0x0600000000000000000000000000000000000000","amount":"0x64"},{"index":"0x8","validatorIndex":"0x7","address":"0x0700000000000000000000000000000000000000","amount":"0x64"},{"index":"0x9","validatorIndex":"0x8","address":"0x0800000000000000000000000000000000000000","amount":"0x64"},{"index":"0xa","validatorIndex":"0x9","address":"0x0900000000000000000000000000000000000000","amount":"0x64"}],"parentBeaconBlockRoot":"0x169630f535b4a41330164c6e5c92b1224c0c407f582d407d0ac3d206cd32fd52"}]},
-  "response" : {"jsonrpc":"2.0","id":1,"result":{"payloadStatus":{"status":"VALID","latestValidHash":"0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf","validationError":null},"payloadId":"0x78d3b312ed5adeb5"}},
-  "statusCode" : 200
+  "request": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "engine_forkchoiceUpdatedV3",
+    "params": [
+      {
+        "headBlockHash": "0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf",
+        "safeBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x1235",
+        "prevRandao": "0x31a3b9b03c64172b39b7fa7d35d86eaa0f9cbac30e2abbf9895a32b80ae1cd76",
+        "suggestedFeeRecipient": "0x0000000000000000000000000000000000000000",
+        "withdrawals": [
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0x0000000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x2",
+            "validatorIndex": "0x1",
+            "address": "0x0100000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x3",
+            "validatorIndex": "0x2",
+            "address": "0x0200000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x4",
+            "validatorIndex": "0x3",
+            "address": "0x0300000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x5",
+            "validatorIndex": "0x4",
+            "address": "0x0400000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x6",
+            "validatorIndex": "0x5",
+            "address": "0x0500000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x7",
+            "validatorIndex": "0x6",
+            "address": "0x0600000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x8",
+            "validatorIndex": "0x7",
+            "address": "0x0700000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0x9",
+            "validatorIndex": "0x8",
+            "address": "0x0800000000000000000000000000000000000000",
+            "amount": "0x64"
+          },
+          {
+            "index": "0xa",
+            "validatorIndex": "0x9",
+            "address": "0x0900000000000000000000000000000000000000",
+            "amount": "0x64"
+          }
+        ],
+        "parentBeaconBlockRoot": "0x169630f535b4a41330164c6e5c92b1224c0c407f582d407d0ac3d206cd32fd52"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x33235e7b7a78302cdb54e5ddba66c7ae49b01c1f5498bb00cd0c8ed5206784bf",
+        "validationError": null
+      },
+      "payloadId": "0x78d3b312ed5adeb5"
+    }
+  },
+  "statusCode": 200
 }

acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/11_cancun_tx_count.json

@@ -1,17 +1,18 @@
 {
-  "request" : {
- "jsonrpc":"2.0","method":"txpool_besuStatistics","params":[],"id":1
-
-
-},
-  "response" : {
-    "jsonrpc" : "2.0",
-    "id" : 1,
-    "result" : {
-      "maxSize" : -1,
-      "localCount" : 7,
-      "remoteCount" : 0
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "txpool_besuStatistics",
+    "params": [],
+    "id": 1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "maxSize": -1,
+      "localCount": 7,
+      "remoteCount": 0
     }
   },
-  "statusCode" : 200
+  "statusCode": 200
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java

@@ -487,28 +487,27 @@ public BigInteger getS() {
 
   @Override
   public BigInteger getV() {
-
     final BigInteger recId = BigInteger.valueOf(signature.getRecId());
-
-    if (transactionType != null && transactionType != TransactionType.FRONTIER) {
-      // EIP-2718 typed transaction, use yParity:
-      return null;
-    } else {
+    // Java21 - this can be a switch with a null case, java 17 doesn't support it.
+    if (transactionType == null || transactionType == TransactionType.FRONTIER) {
       return chainId
           .map(bigInteger -> recId.add(REPLAY_PROTECTED_V_BASE).add(TWO.multiply(bigInteger)))
           .orElseGet(() -> recId.add(REPLAY_UNPROTECTED_V_BASE));
+    } else if (transactionType == TransactionType.ACCESS_LIST || transactionType == TransactionType.EIP1559) {
+      return recId;
+    } else {
+      // covers TransactionType.BLOB and future types
+      return null;
     }
   }
 
   @Override
   public BigInteger getYParity() {
-
-    final BigInteger recId = BigInteger.valueOf(signature.getRecId());
-
     if (transactionType != null && transactionType != TransactionType.FRONTIER) {
       // EIP-2718 typed transaction, return yParity:
-      return recId;
+      return BigInteger.valueOf(signature.getRecId());
     } else {
+      // legacy types never return yParity
       return null;
     }
   }