Skip code delegation precompute if recId outside native lib's bounds

Signed-off-by: Simon Dudley <[email protected]>
hyperledger · Jan 31, 2025 · b81026d · b81026d
1 parent aae002a
commit b81026d
Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/CodeDelegationSignature.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/CodeDelegationSignature.java
@@ -45,11 +45,6 @@ public static CodeDelegationSignature create(
       final BigInteger r, final BigInteger s, final byte yParity) {
     checkNotNull(r);
     checkNotNull(s);
-    final byte recId = yParity;
-    if (recId != 0 && recId != 1) {
-      throw new IllegalArgumentException(
-          "Invalid 'recId' value, should be 0 or 1 but got " + recId);
-    }
 
     if (r.compareTo(TWO_POW_256) >= 0) {
       throw new IllegalArgumentException(

diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -412,19 +412,30 @@ private void precomputeAuthorities(final Transaction transaction) {
     int index = 0;
     for (final var codeDelegation : codeDelegations) {
       final var constIndex = index++;
-      mergeCoordinator
-          .getEthScheduler()
-          .scheduleTxWorkerTask(
-              () -> {
-                final var authority = codeDelegation.authorizer();
-                LOG.atTrace()
-                    .setMessage(
-                        "The code delegation authority at index {} for transaction {} is calculated : {}")
-                    .addArgument(constIndex)
-                    .addArgument(transaction::getHash)
-                    .addArgument(authority)
-                    .log();
-              });
+      final byte recId = codeDelegation.signature().getRecId();
+      if (recId < 0 || recId > 3) {
+        LOG.atTrace()
+            .setMessage(
+                "The code delegation authority at index {} for transaction {} is skipped because recId : {}")
+            .addArgument(constIndex)
+            .addArgument(transaction::getHash)
+            .addArgument(recId)
+            .log();
+      } else {
+        mergeCoordinator
+            .getEthScheduler()
+            .scheduleTxWorkerTask(
+                () -> {
+                  final var authority = codeDelegation.authorizer();
+                  LOG.atTrace()
+                      .setMessage(
+                          "The code delegation authority at index {} for transaction {} is calculated : {}")
+                      .addArgument(constIndex)
+                      .addArgument(transaction::getHash)
+                      .addArgument(authority)
+                      .log();
+                });
+      }
     }
   }