Update nonce calculations

secretkeylabs · Dec 6, 2024 · dc549a0 · dc549a0
1 parent 9a005eb
commit dc549a0
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 14 deletions.
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/src/components/stacks/SignTransactions/mutationFunction.ts b/example/src/components/stacks/SignTransactions/mutationFunction.ts
@@ -6,6 +6,7 @@ import {
   makeUnsignedContractDeploy,
   makeUnsignedSTXTokenTransfer,
   noneCV,
+  StacksTransactionWire,
   standardPrincipalCV,
   uintCV,
 } from '@stacks/transactions';
@@ -40,6 +41,14 @@ export interface MutationFnArgs {
   publicKey: string;
 }
 
+function getLastUsedNonce(transactions: StacksTransactionWire[]) {
+  const lastTransaction = transactions.at(-1);
+
+  if (!lastTransaction) return undefined;
+
+  return lastTransaction.auth.spendingCondition.nonce + 1n;
+}
+
 export async function mutationFunction({
   isPoolAllowContractSelected,
   isPoolDelegateStacksSelected,
@@ -48,7 +57,7 @@ export async function mutationFunction({
   broadcast,
   publicKey,
 }: MutationFnArgs) {
-  const transactions: string[] = [];
+  const transactions: StacksTransactionWire[] = [];
 
   if (isPoolAllowContractSelected) {
     const transaction = await makeUnsignedContractCall({
@@ -57,8 +66,9 @@ export async function mutationFunction({
       functionName: 'allow-contract-caller',
       functionArgs: [contractPrincipalCV(poolContractAddress, poolContractName), noneCV()],
       publicKey,
+      ...(getLastUsedNonce(transactions) && { nonce: getLastUsedNonce(transactions) }),
     });
-    transactions.push(transaction.serialize());
+    transactions.push(transaction);
   }
 
   if (isPoolDelegateStacksSelected) {
@@ -67,16 +77,17 @@ export async function mutationFunction({
       contractName: poolContractName,
       functionName: 'delegate-stx',
       functionArgs: [
-        uintCV(1234567890),
+        uintCV(101_000_000),
         standardPrincipalCV(poolAdminStacksAddress),
         noneCV(),
         noneCV(),
         poxAddressToTuple(poolAdminPoxAddress),
         noneCV(),
       ],
       publicKey,
+      ...(getLastUsedNonce(transactions) && { nonce: getLastUsedNonce(transactions) }),
     });
-    transactions.push(transaction.serialize());
+    transactions.push(transaction);
   }
 
   if (isContractDeploySelected) {
@@ -85,21 +96,23 @@ export async function mutationFunction({
       contractName: `hello-world-${now}`,
       codeBody: helloWorldContractBody,
       publicKey,
+      ...(getLastUsedNonce(transactions) && { nonce: getLastUsedNonce(transactions) }),
     });
-    transactions.push(transaction.serialize());
+    transactions.push(transaction);
   }
 
   if (isTokenTransferSelected) {
     const transaction = await makeUnsignedSTXTokenTransfer({
       recipient: 'SP1VYV2JBF1QPNDSKHBZRAWRC4KQXP8ZSSRNKPJE4', // acc 4
       amount: '100000', // 0.1 STX
       publicKey,
+      ...(getLastUsedNonce(transactions) && { nonce: getLastUsedNonce(transactions) }),
     });
-    transactions.push(transaction.serialize());
+    transactions.push(transaction);
   }
 
   const res = await request('stx_signTransactions', {
-    transactions,
+    transactions: transactions.map((t) => t.serialize()),
     broadcast,
   });