Fix: transactionObjectValidator to ignore nonce

JoinColony · Dec 27, 2023 · d1c5eee · d1c5eee
1 parent eccdfb7
commit d1c5eee
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/packages/@purser/core/__tests__/helpers/transactionObjectValidator.test.ts b/packages/@purser/core/__tests__/helpers/transactionObjectValidator.test.ts
@@ -111,10 +111,6 @@ describe('`Core` Module', () => {
         'chainId',
         TRANSACTION.CHAIN_ID,
       );
-      expect(validatedTransactionObject).toHaveProperty(
-        'nonce',
-        TRANSACTION.NONCE,
-      );
       expect(validatedTransactionObject.value.toString()).toEqual(
         TRANSACTION.VALUE,
       );
@@ -164,5 +160,39 @@ describe('`Core` Module', () => {
       expect(addressValidator).not.toHaveBeenCalled();
       expect(addressValidator).not.toHaveBeenCalledWith(to);
     });
+    test('Validates nonce, only if one was provided', async () => {
+      transactionObjectValidator({
+        gasPrice,
+        gasLimit,
+        chainId,
+        value,
+        inputData,
+      });
+      /*
+       * Validates gas price and gas limit
+       */
+      expect(bigNumberValidator).toHaveBeenCalled();
+      expect(bigNumberValidator).toHaveBeenCalledWith(gasPrice);
+      expect(bigNumberValidator).toHaveBeenCalledWith(gasLimit);
+      /*
+       * Validates the chain Id
+       */
+      expect(safeIntegerValidator).toHaveBeenCalled();
+      expect(safeIntegerValidator).toHaveBeenCalledWith(chainId);
+      /*
+       * Validates the transaction value
+       */
+      expect(bigNumberValidator).toHaveBeenCalled();
+      expect(bigNumberValidator).toHaveBeenCalledWith(value);
+      /*
+       * Validates the transaction input data
+       */
+      expect(hexSequenceValidator).toHaveBeenCalled();
+      expect(hexSequenceValidator).toHaveBeenCalledWith(inputData);
+      /*
+       * Doesn't validates the nonce, since it wasn't provided
+       */
+      expect(safeIntegerValidator).not.toHaveBeenCalledWith(nonce);
+    });
   });
 });
diff --git a/packages/@purser/core/src/constants.ts b/packages/@purser/core/src/constants.ts
@@ -101,7 +101,6 @@ export const TRANSACTION = {
   CHAIN_ID: 1,
   GAS_PRICE: '9000000000', // 9 Gwei
   GAS_LIMIT: '21000',
-  NONCE: 0,
   VALUE: '0',
   INPUT_DATA: '',
 };

diff --git a/packages/@purser/core/src/helpers.ts b/packages/@purser/core/src/helpers.ts
@@ -211,7 +211,7 @@ export const transactionObjectValidator = ({
   chainId = TRANSACTION.CHAIN_ID,
   gasPrice = bigNumber(TRANSACTION.GAS_PRICE),
   gasLimit = bigNumber(TRANSACTION.GAS_LIMIT),
-  nonce = TRANSACTION.NONCE,
+  nonce,
   to,
   value = bigNumber(TRANSACTION.VALUE),
   inputData = TRANSACTION.INPUT_DATA,
@@ -228,10 +228,13 @@ export const transactionObjectValidator = ({
    * Check if the chain id value is valid (a positive, safe integer)
    */
   safeIntegerValidator(chainId);
-  /*
-   * Check if the nonce value is valid (a positive, safe integer)
-   */
-  safeIntegerValidator(nonce);
+  if (nonce) {
+    /*
+     * Only check if the nonce value is valid (a positive, safe integer),
+     * if one was provided in the initial transaction object
+     */
+    safeIntegerValidator(nonce);
+  }
   /*
    * Only check if the address (`to` prop) is in the correct
    * format, if one was provided in the initial transaction object

diff --git a/packages/@purser/core/src/types.ts b/packages/@purser/core/src/types.ts
@@ -33,7 +33,7 @@ export interface TransactionObjectType {
   chainId: number;
   gasPrice: ExtendedBN;
   gasLimit: ExtendedBN;
-  nonce: number;
+  nonce?: number;
   value: ExtendedBN;
   inputData: string;
 }