Merge pull request #14 from danceratopz/t8n-server-use-v-to-determine…

…-if-tx-is-playback-protected Use v to determine if the transaction is protected Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>
shemnon · Jul 18, 2023 · a9871dd · a9871dd
1 parent 22652c5
commit a9871dd
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java
@@ -135,9 +135,9 @@ protected static List<Transaction> extractTransactions(
             if (txNode.has("to")) {
               builder.to(Address.fromHexString(txNode.get("to").textValue()));
             }
-
-            if (transactionType.requiresChainId()
-                || (txNode.has("protected") && txNode.get("protected").asBoolean(false))) {
+            BigInteger v =
+                Bytes.fromHexStringLenient(txNode.get("v").textValue()).toUnsignedBigInteger();
+            if (transactionType.requiresChainId() || (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0)) {
               // chainid if protected
               builder.chainId(chainId);
             }
@@ -191,14 +191,11 @@ protected static List<Transaction> extractTransactions(
 
               transactions.add(builder.signAndBuild(keys));
             } else {
-              BigInteger v =
-                  Bytes.fromHexStringLenient(txNode.get("v").textValue()).toUnsignedBigInteger();
               if (transactionType == TransactionType.FRONTIER) {
                 if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
                   v =
                       v.subtract(REPLAY_PROTECTED_V_BASE)
                           .subtract(chainId.multiply(BigInteger.TWO));
-                  builder.chainId(chainId);
                 } else {
                   v = v.subtract(REPLAY_UNPROTECTED_V_BASE);
                 }