feat: support for optional nonce in logic calls

docs/source/logic.rst

@@ -130,7 +130,8 @@ applications on the MOI network.
         const mnemonic = "mother clarify push liquid ordinary social track ...";
         const provider = new JsonRpcProvider("http://localhost:1600/");
         const wallet = new Wallet(provider);
-        return await wallet.fromMnemonic(mnemonic);
+        await wallet.fromMnemonic(mnemonic);
+        return wallet;
     }
 
     const manifest = { ... }
@@ -265,7 +266,8 @@ Functions
         const mnemonic = "mother clarify push liquid ordinary social track ...";
         const provider = new JsonRpcProvider("http://localhost:1600/");
         const wallet = new Wallet(provider);
-        return await wallet.fromMnemonic(mnemonic);
+        await wallet.fromMnemonic(mnemonic);
+        return wallet;
     }
 
     const logicId = "0x0800007d70c34ed6ec4384c75d469894052647a078b33ac0f08db0d3751c1fce29a49a";

packages/js-moi-logic/README.md

@@ -39,6 +39,7 @@ npm install js-moi-wallet
         const provider = new JsonRpcProvider("http://localhost:1600/");
         const wallet = new Wallet(provider);
         await wallet.fromMnemonic(mnemonic);
+        return wallet;
     }
 
     (async () => {

packages/js-moi-logic/dist/logic-base.js

@@ -103,9 +103,10 @@ class LogicBase extends element_descriptor_1.default {
             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()
+                payload: ixObject.createPayload(),
             }
         };
     }

packages/js-moi-logic/src/logic-base.ts

@@ -130,9 +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()
+                payload: ixObject.createPayload(),
             }
         }
     }

packages/js-moi-signer/dist/signer.d.ts

@@ -1,4 +1,4 @@
-import { AbstractProvider, Options, InteractionResponse, InteractionRequest, InteractionCallResponse, InteractionObject } from "js-moi-providers";
+import { AbstractProvider, InteractionCallResponse, InteractionObject, InteractionRequest, InteractionResponse, Options } from "js-moi-providers";
 import { SigType, SigningAlgorithms } from "../types";
 /**
  * An abstract class representing a signer responsible for cryptographic

packages/js-moi-signer/dist/signer.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
+const js_moi_utils_1 = require("js-moi-utils");
 const ecdsa_1 = __importDefault(require("./ecdsa"));
 const signature_1 = __importDefault(require("./signature"));
-const js_moi_utils_1 = require("js-moi-utils");
 /**
  * An abstract class representing a signer responsible for cryptographic
  * activities like signing and verification.
@@ -62,7 +62,7 @@ class Signer {
      * @param {number | bigint} nonce - The nonce (interaction count) for comparison.
      * @throws {Error} if any of the checks fail, indicating an invalid interaction.
      */
-    checkInteraction(ixObject, nonce) {
+    async checkInteraction(ixObject) {
         if (ixObject.type === undefined || ixObject.type === null) {
             js_moi_utils_1.ErrorUtils.throwError("Interaction type is missing", js_moi_utils_1.ErrorCode.MISSING_ARGUMENT);
         }
@@ -90,6 +90,7 @@ class Signer {
             js_moi_utils_1.ErrorUtils.throwError("Invalid fuel limit", js_moi_utils_1.ErrorCode.INTERACTION_UNDERPRICED);
         }
         if (ixObject.nonce !== undefined || ixObject.nonce !== null) {
+            const nonce = await this.getNonce({ tesseract_number: -1 });
             if (ixObject.nonce < nonce) {
                 js_moi_utils_1.ErrorUtils.throwError("Invalid nonce", js_moi_utils_1.ErrorCode.NONCE_EXPIRED);
             }
@@ -105,14 +106,12 @@ class Signer {
      * an error during preparation.
      */
     async prepareInteraction(ixObject) {
-        const nonce = await this.getNonce();
         if (!ixObject.sender) {
             ixObject.sender = this.getAddress();
         }
-        // Check the validity of the interaction object
-        this.checkInteraction(ixObject, nonce);
-        if (ixObject.nonce !== undefined || ixObject.nonce !== null) {
-            ixObject.nonce = nonce;
+        await this.checkInteraction(ixObject);
+        if (ixObject.nonce != null) {
+            ixObject.nonce = await this.getNonce();
         }
     }
     /**

packages/js-moi-signer/src/signer.ts

@@ -1,8 +1,8 @@
-import { AbstractProvider, Options, InteractionResponse, InteractionRequest, CallorEstimateIxObject, InteractionCallResponse, InteractionObject } from "js-moi-providers";
-import ECDSA_S256 from "./ecdsa";
+import { AbstractProvider, CallorEstimateIxObject, InteractionCallResponse, InteractionObject, InteractionRequest, InteractionResponse, Options } from "js-moi-providers";
+import { ErrorCode, ErrorUtils, IxType, hexToBytes, isValidAddress } from "js-moi-utils";
 import { SigType, SigningAlgorithms } from "../types";
+import ECDSA_S256 from "./ecdsa";
 import Signature from "./signature";
-import { ErrorCode, ErrorUtils, hexToBytes, IxType, isValidAddress } from "js-moi-utils";
 
 /**
  * An abstract class representing a signer responsible for cryptographic 
@@ -74,7 +74,7 @@ export abstract class Signer {
      * @param {number | bigint} nonce - The nonce (interaction count) for comparison.
      * @throws {Error} if any of the checks fail, indicating an invalid interaction.
      */
-    private checkInteraction(ixObject: InteractionObject, nonce: number | bigint): void {
+    private async checkInteraction(ixObject: InteractionObject): Promise<void> {
         if(ixObject.type === undefined || ixObject.type === null) {
             ErrorUtils.throwError("Interaction type is missing", ErrorCode.MISSING_ARGUMENT)
         }
@@ -110,6 +110,7 @@ export abstract class Signer {
         }
 
         if(ixObject.nonce !== undefined || ixObject.nonce !== null) {
+            const nonce = await this.getNonce({ tesseract_number: -1 });
             if(ixObject.nonce < nonce) {
                 ErrorUtils.throwError("Invalid nonce", ErrorCode.NONCE_EXPIRED);
             }
@@ -126,17 +127,14 @@ export abstract class Signer {
      * an error during preparation.
      */
     private async prepareInteraction(ixObject: InteractionObject): Promise<void> {
-        const nonce = await this.getNonce();
-
         if (!ixObject.sender) {
             ixObject.sender = this.getAddress();
         }
-
-        // Check the validity of the interaction object
-        this.checkInteraction(ixObject, nonce);
-
-        if (ixObject.nonce !== undefined || ixObject.nonce !== null) {
-            ixObject.nonce =  nonce;
+
+        await this.checkInteraction(ixObject);
+
+        if (ixObject.nonce != null) {
+            ixObject.nonce = await this.getNonce();
         }
     }