refactor: code cleanup

sarvalabs · Dec 1, 2023 · 2b3018e · 2b3018e
1 parent aeb4438
commit 2b3018e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packages/js-moi-logic/src/logic-base.ts b/packages/js-moi-logic/src/logic-base.ts
@@ -130,10 +130,10 @@ export abstract class LogicBase extends ElementDescriptor {
             params: {
                 sender: this.signer.getAddress(),
                 type: this.getIxType(),
+                nonce: args[1].nonce,
                 fuel_price: args[1].fuelPrice,
                 fuel_limit: args[1].fuelLimit,
                 payload: ixObject.createPayload(),
-                nonce: args[1].nonce
             }
         }
     }

diff --git a/packages/js-moi-signer/src/signer.ts b/packages/js-moi-signer/src/signer.ts
@@ -126,14 +126,12 @@ export abstract class Signer {
      * an error during preparation.
      */
     private async prepareInteraction(ixObject: InteractionObject): Promise<void> {
-        const nonce = await this.getNonce({
-            tesseract_number: -1,
-        });
-
         if (!ixObject.sender) {
             ixObject.sender = this.getAddress();
         }
 
+        const nonce = ixObject.nonce ? ixObject.nonce : await this.getNonce();
+
         // Check the validity of the interaction object
         this.checkInteraction(ixObject, nonce);