@secondlayer/stacks 2.5.1 → 2.6.0

package/dist/src/tools/index.cjs

@@ -1358,14 +1358,6 @@ function getTransactionId(tx) {
   return txid(tx);
 }
 
-// src/actions/public/getNonce.ts
-async function getNonce(client, params) {
-  const data = await client.request(`/v2/accounts/${params.address}`, {
-    method: "GET"
-  });
-  return BigInt(data.nonce);
-}
-
 // src/errors/base.ts
 class BaseError extends Error {
   name = "StacksError";
@@ -1404,6 +1396,14 @@ class BroadcastError extends BaseError {
   }
 }
 
+// src/actions/public/getNonce.ts
+async function getNonce(client, params) {
+  const data = await client.request(`/v2/accounts/${params.address}`, {
+    method: "GET"
+  });
+  return BigInt(data.nonce);
+}
+
 // src/actions/wallet/sendTransaction.ts
 async function sendTransaction(client, params) {
   const hex = bytesToHex(serializeTransaction(params.transaction));
@@ -1424,6 +1424,32 @@ async function sendTransaction(client, params) {
   return { txid: txid2 };
 }
 
+// src/actions/wallet/nonceManager.ts
+async function resolveNonce(client, address) {
+  if (client.nonceManager)
+    return client.nonceManager.consume({ client, address });
+  return getNonce(client, { address });
+}
+function isNonceConflictError(error) {
+  if (!(error instanceof BroadcastError))
+    return false;
+  const haystack = `${error.reason ?? ""} ${error.message}`.toLowerCase();
+  return haystack.includes("nonce");
+}
+async function broadcastWithNonceReset(client, params) {
+  try {
+    const result = await sendTransaction(client, {
+      transaction: params.transaction
+    });
+    return result.txid;
+  } catch (error) {
+    if (client.nonceManager && isNonceConflictError(error)) {
+      await client.nonceManager.reset({ client, address: params.address });
+    }
+    throw error;
+  }
+}
+
 // src/actions/wallet/utils.ts
 function isProviderAccount(account) {
   return account.type === "provider";
@@ -1435,15 +1461,15 @@ async function callContract(client, params) {
   if (!account)
     throw new Error("Account required");
   if (isProviderAccount(account)) {
-    const result2 = await account.provider.request("stx_callContract", {
+    const result = await account.provider.request("stx_callContract", {
       contract: params.contract,
       functionName: params.functionName,
       functionArgs: params.functionArgs ?? []
     });
-    return result2.txid;
+    return result.txid;
   }
   const [contractAddress, contractName] = parseContractId(params.contract);
-  const nonce = params.nonce ?? await getNonce(client, { address: account.address });
+  const nonce = params.nonce ?? await resolveNonce(client, account.address);
   const unsigned = buildContractCall({
     contractAddress,
     contractName,
@@ -1464,8 +1490,10 @@ async function callContract(client, params) {
     }
   }
   const signed = await signTransactionWithAccount(unsigned, account);
-  const result = await sendTransaction(client, { transaction: signed });
-  return result.txid;
+  return broadcastWithNonceReset(client, {
+    transaction: signed,
+    address: account.address
+  });
 }
 
 // src/actions/getContract.ts
@@ -2199,6 +2227,7 @@ var BASE_KEYS = new Set([
   "account",
   "transport",
   "request",
+  "nonceManager",
   "extend"
 ]);
 function bindExtend(base) {
@@ -2221,6 +2250,7 @@ function createClient(config) {
     account: config.account,
     transport,
     request: transport.request,
+    nonceManager: config.nonceManager,
     extend: null
   };
   client.extend = bindExtend(client);
@@ -2720,5 +2750,5 @@ var getNftHoldings = import_ai.tool({
   execute: ({ principal, limit }) => nftHoldings(getDefaultPublicClient(), principal, limit)
 });
 
-//# debugId=C9A44682320EBB2264756E2164756E21
+//# debugId=12A561B079A45D2464756E2164756E21
 //# sourceMappingURL=index.cjs.map