Check tx signature in sendRawTransactionAction

lbc-team · Mar 31, 2021 · 6262f8e · 6262f8e
1 parent f017fa4
commit 6262f8e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/TxPool.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/TxPool.ts
@@ -249,7 +249,11 @@ export class TxPool {
     try {
       return tx.getSenderAddress(); // verifies signature
     } catch (e) {
-      throw new InvalidInputError("Invalid Signature");
+      if (!tx.isSigned()) {
+        throw new InvalidInputError("Invalid Signature");
+      }
+
+      throw new InvalidInputError(e.message);
     }
   }
 

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/modules/eth.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/modules/eth.ts
@@ -890,6 +890,10 @@ export class EthModule {
       throw error;
     }
 
+    if (!tx.isSigned()) {
+      throw new InvalidInputError("Invalid Signature");
+    }
+
     return this._sendTransactionAndReturnHash(tx);
   }
 

diff --git a/packages/hardhat-core/src/internal/hardhat-network/provider/node.ts b/packages/hardhat-core/src/internal/hardhat-network/provider/node.ts
@@ -946,7 +946,7 @@ export class HardhatNode extends EventEmitter {
     try {
       sender = tx.getSenderAddress(); // verifies signature as a side effect
     } catch (e) {
-      throw new InvalidInputError("Invalid Signature");
+      throw new InvalidInputError(e.message);
     }
 
     const senderNonce = await this._txPool.getExecutableNonce(sender);

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth.ts
@@ -3542,7 +3542,6 @@ describe("Eth module", function () {
               // This transaction was obtained with eth_sendTransaction, and its r value was wiped
               "0xf3808501dcd6500083015f9080800082011a80a00dbd1a45b7823be518540ca77afb7178a470b8054281530a6cdfd0ad3328cf96",
             ],
-            // A missing `r` is now treated as unsigned, via the BaseTransaction method "isSigned"
             "Invalid Signature"
           );
         });