@algorandfoundation/algokit-utils 7.0.0-beta.9 → 7.0.1

package/types/composer.mjs

@@ -1,10 +1,9 @@
 import algosdk from 'algosdk';
 import { Config } from '../config.mjs';
-import { performAtomicTransactionComposerSimulate } from '../transaction/perform-atomic-transaction-composer-simulate.mjs';
-import { encodeLease, sendAtomicTransactionComposer } from '../transaction/transaction.mjs';
+import { encodeLease, sendAtomicTransactionComposer, getABIReturnValue } from '../transaction/transaction.mjs';
 import { APP_PAGE_MAX_SIZE } from './app.mjs';
 import { AppManager } from './app-manager.mjs';
-import { EventType } from './async-event-emitter.mjs';
+import { EventType } from './lifecycle-events.mjs';
 import { genesisIdIsLocalNet } from './network-client.mjs';
 
 var AtomicTransactionComposer = algosdk.AtomicTransactionComposer;
@@ -12,10 +11,10 @@ var isTransactionWithSigner = algosdk.isTransactionWithSigner;
 var encodeAddress = algosdk.encodeAddress;
 var modelsv2 = algosdk.modelsv2;
 const MAX_TRANSACTION_GROUP_SIZE = 16;
-/** AlgoKit Composer helps you compose and execute transactions as a transaction group. */
-class AlgoKitComposer {
+/** TransactionComposer helps you compose and execute transactions as a transaction group. */
+class TransactionComposer {
     /**
-     * Create an `AlgoKitComposer`.
+     * Create a `TransactionComposer`.
      * @param params The configuration for this composer
      */
     constructor(params) {
@@ -222,6 +221,15 @@ class AlgoKitComposer {
         this.txns.push({ ...params, type: 'keyReg' });
         return this;
     }
+    /**
+     * Add an offline key registration transaction to the transaction group.
+     * @param params The offline key registration transaction parameters
+     * @returns The composer so you can chain method calls
+     */
+    addOfflineKeyRegistration(params) {
+        this.txns.push({ ...params, type: 'keyReg' });
+        return this;
+    }
     /**
      * Add the transactions within an `AtomicTransactionComposer` to the transaction group.
      * @param atc The `AtomicTransactionComposer` to build transactions from and add to the group
@@ -235,7 +243,7 @@ class AlgoKitComposer {
     buildAtc(atc, processTransaction) {
         const group = atc.buildGroup();
         const txnWithSigners = group.map((ts, idx) => {
-            // Remove underlying group ID from the transaction since it will be re-grouped when this AlgoKitComposer is built
+            // Remove underlying group ID from the transaction since it will be re-grouped when this TransactionComposer is built
             ts.txn.group = undefined;
             // Process transaction if a function is provided
             ts.txn = processTransaction?.(ts.txn, idx) ?? ts.txn;
@@ -292,14 +300,22 @@ class AlgoKitComposer {
      */
     async buildMethodCall(params, suggestedParams, includeSigner) {
         const methodArgs = [];
+        const transactionsForGroup = [];
         const isAbiValue = (x) => {
             if (Array.isArray(x))
                 return x.length == 0 || x.every(isAbiValue);
             return typeof x === 'bigint' || typeof x === 'boolean' || typeof x === 'number' || typeof x === 'string' || x instanceof Uint8Array;
         };
-        for (let i = 0; i < (params.args ?? []).length; i++) {
+        for (let i = (params.args ?? []).length - 1; i >= 0; i--) {
             const arg = params.args[i];
             if (arg === undefined) {
+                // An undefined transaction argument signals that the value will be supplied by a method call argument
+                if (algosdk.abiTypeIsTransaction(params.method.args[i].type) && transactionsForGroup.length > 0) {
+                    // Move the last transaction from the group to the method call arguments to appease algosdk
+                    const placeholderTransaction = transactionsForGroup.splice(-1, 1)[0];
+                    methodArgs.push(placeholderTransaction);
+                    continue;
+                }
                 throw Error(`No value provided for argument ${i + 1} within call to ${params.method.name}`);
             }
             if (isAbiValue(arg)) {
@@ -312,7 +328,10 @@ class AlgoKitComposer {
             }
             if ('method' in arg) {
                 const tempTxnWithSigners = await this.buildMethodCall(arg, suggestedParams, includeSigner);
-                methodArgs.push(...tempTxnWithSigners);
+                // If there is any transaction args, add to the atc
+                // Everything else should be added as method args
+                methodArgs.push(...tempTxnWithSigners.slice(-1)); // Add the method call itself as a method arg
+                transactionsForGroup.push(...tempTxnWithSigners.slice(0, -1).reverse()); // Add any transaction arguments to the atc
                 continue;
             }
             const txn = await arg;
@@ -324,10 +343,11 @@ class AlgoKitComposer {
                             ? params.signer.signer
                             : params.signer
                         : this.getSigner(encodeAddress(txn.from.publicKey))
-                    : AlgoKitComposer.NULL_SIGNER,
+                    : TransactionComposer.NULL_SIGNER,
             });
         }
         const methodAtc = new algosdk.AtomicTransactionComposer();
+        transactionsForGroup.reverse().forEach((txn) => methodAtc.addTransaction(txn));
         const appId = Number('appId' in params ? params.appId : 0n);
         const approvalProgram = 'approvalProgram' in params
             ? typeof params.approvalProgram === 'string'
@@ -357,10 +377,10 @@ class AlgoKitComposer {
                         ? Math.floor((approvalProgram.length + (clearStateProgram?.length ?? 0)) / APP_PAGE_MAX_SIZE)
                         : 0
                 : undefined,
-            numLocalInts: appId === 0 ? ('schema' in params ? params.schema?.localInts ?? 0 : 0) : undefined,
-            numLocalByteSlices: appId === 0 ? ('schema' in params ? params.schema?.localByteSlices ?? 0 : 0) : undefined,
-            numGlobalInts: appId === 0 ? ('schema' in params ? params.schema?.globalInts ?? 0 : 0) : undefined,
-            numGlobalByteSlices: appId === 0 ? ('schema' in params ? params.schema?.globalByteSlices ?? 0 : 0) : undefined,
+            numLocalInts: appId === 0 ? ('schema' in params ? (params.schema?.localInts ?? 0) : 0) : undefined,
+            numLocalByteSlices: appId === 0 ? ('schema' in params ? (params.schema?.localByteSlices ?? 0) : 0) : undefined,
+            numGlobalInts: appId === 0 ? ('schema' in params ? (params.schema?.globalInts ?? 0) : 0) : undefined,
+            numGlobalByteSlices: appId === 0 ? ('schema' in params ? (params.schema?.globalByteSlices ?? 0) : 0) : undefined,
             method: params.method,
             signer: includeSigner
                 ? params.signer
@@ -368,8 +388,8 @@ class AlgoKitComposer {
                         ? params.signer.signer
                         : params.signer
                     : this.getSigner(params.sender)
-                : AlgoKitComposer.NULL_SIGNER,
-            methodArgs: methodArgs,
+                : TransactionComposer.NULL_SIGNER,
+            methodArgs: methodArgs.reverse(),
             // note, lease, and rekeyTo are set in the common build step
             note: undefined,
             lease: undefined,
@@ -482,12 +502,12 @@ class AlgoKitComposer {
             txn = algosdk.makeApplicationCreateTxnFromObject({
                 ...sdkParams,
                 extraPages: 'extraProgramPages' in params
-                    ? params.extraProgramPages ?? Math.floor((approvalProgram.length + clearStateProgram.length) / APP_PAGE_MAX_SIZE)
+                    ? (params.extraProgramPages ?? Math.floor((approvalProgram.length + clearStateProgram.length) / APP_PAGE_MAX_SIZE))
                     : 0,
-                numLocalInts: 'schema' in params ? params.schema?.localInts ?? 0 : 0,
-                numLocalByteSlices: 'schema' in params ? params.schema?.localByteSlices ?? 0 : 0,
-                numGlobalInts: 'schema' in params ? params.schema?.globalInts ?? 0 : 0,
-                numGlobalByteSlices: 'schema' in params ? params.schema?.globalByteSlices ?? 0 : 0,
+                numLocalInts: 'schema' in params ? (params.schema?.localInts ?? 0) : 0,
+                numLocalByteSlices: 'schema' in params ? (params.schema?.localByteSlices ?? 0) : 0,
+                numGlobalInts: 'schema' in params ? (params.schema?.globalInts ?? 0) : 0,
+                numGlobalByteSlices: 'schema' in params ? (params.schema?.globalByteSlices ?? 0) : 0,
                 approvalProgram: approvalProgram,
                 clearProgram: clearStateProgram,
             });
@@ -498,7 +518,32 @@ class AlgoKitComposer {
         return this.commonTxnBuildStep(params, txn, suggestedParams);
     }
     buildKeyReg(params, suggestedParams) {
-        const txn = algosdk.makeKeyRegistrationTxnWithSuggestedParams(params.sender, undefined, params.voteKey, params.selectionKey, Number(params.voteFirst), Number(params.voteLast), Number(params.voteKeyDilution), suggestedParams, undefined, false, params.stateProofKey);
+        let txn;
+        if ('voteKey' in params) {
+            // algosdk throws when voteFirst is 0, so we need to set it to 1, then switch back to 0 after creating the transaction
+            const voteFirst = params.voteFirst === 0n ? 1n : params.voteFirst;
+            txn = algosdk.makeKeyRegistrationTxnWithSuggestedParamsFromObject({
+                from: params.sender,
+                voteKey: params.voteKey,
+                selectionKey: params.selectionKey,
+                voteFirst: Number(voteFirst),
+                voteLast: Number(params.voteLast),
+                voteKeyDilution: Number(params.voteKeyDilution),
+                suggestedParams,
+                nonParticipation: false,
+                stateProofKey: params.stateProofKey,
+            });
+            if (params.voteFirst === 0n) {
+                txn.voteFirst = 0;
+            }
+        }
+        else {
+            txn = algosdk.makeKeyRegistrationTxnWithSuggestedParamsFromObject({
+                from: params.sender,
+                suggestedParams,
+                nonParticipation: params.preventAccountFromEverParticipatingAgain,
+            });
+        }
         return this.commonTxnBuildStep(params, txn, suggestedParams);
     }
     /** Builds all transaction types apart from `txnWithSigner`, `atc` and `methodCall` since those ones can have custom signers that need to be retrieved. */
@@ -565,7 +610,7 @@ class AlgoKitComposer {
                             : [];
                 transactions.push(...transactionsWithSigner.map((ts) => ts.txn));
                 transactionsWithSigner.forEach((ts, idx) => {
-                    if (ts.signer && ts.signer !== AlgoKitComposer.NULL_SIGNER) {
+                    if (ts.signer && ts.signer !== TransactionComposer.NULL_SIGNER) {
                         signers.set(idx, ts.signer);
                     }
                 });
@@ -655,19 +700,17 @@ class AlgoKitComposer {
     async execute(params) {
         return this.send(params);
     }
-    /**
-     * Compose the atomic transaction group and simulate sending it to the network
-     * @returns The simulation result
-     */
     async simulate(options) {
-        const atc = options?.skipSignatures ? new AtomicTransactionComposer() : this.atc;
+        const { skipSignatures = false, ...rawOptions } = options ?? {};
+        const atc = skipSignatures ? new AtomicTransactionComposer() : this.atc;
         // Build the transactions
-        if (options?.skipSignatures) {
-            options.allowEmptySignatures = true;
+        if (skipSignatures) {
+            rawOptions.allowEmptySignatures = true;
+            rawOptions.fixSigners = true;
             // Build transactions uses empty signers
             const transactions = await this.buildTransactions();
             for (const txn of transactions.transactions) {
-                atc.addTransaction({ txn, signer: AlgoKitComposer.NULL_SIGNER });
+                atc.addTransaction({ txn, signer: TransactionComposer.NULL_SIGNER });
             }
             atc['methodCalls'] = transactions.methodCalls;
         }
@@ -675,21 +718,36 @@ class AlgoKitComposer {
             // Build creates real signatures
             await this.build();
         }
-        if (Config.debug && !Config.traceAll) {
-            // Dump the traces to a file for use with AlgoKit AVM debugger
-            // Checks for false on traceAll because it should have been already
-            // executed above
-            const simulateResponse = await performAtomicTransactionComposerSimulate(atc, this.algod);
-            await Config.events.emitAsync(EventType.TxnGroupSimulated, {
-                simulateResponse,
-            });
-        }
-        const { methodResults, simulateResponse } = await atc.simulate(this.algod, new modelsv2.SimulateRequest({ txnGroups: [], ...options }));
-        if (simulateResponse && simulateResponse.txnGroups[0].failedAt) {
-            const error = new Error(`Transaction failed at transaction(s) ${simulateResponse.txnGroups[0].failedAt.join(', ')} in the group. ${simulateResponse.txnGroups.find((x) => x.failureMessage)?.failureMessage}`);
+        const { methodResults, simulateResponse } = await atc.simulate(this.algod, new modelsv2.SimulateRequest({
+            txnGroups: [],
+            ...rawOptions,
+            ...(Config.debug
+                ? {
+                    allowEmptySignatures: true,
+                    fixSigners: true,
+                    allowMoreLogging: true,
+                    execTraceConfig: new modelsv2.SimulateTraceConfig({
+                        enable: true,
+                        scratchChange: true,
+                        stackChange: true,
+                        stateChange: true,
+                    }),
+                }
+                : undefined),
+        }));
+        const failedGroup = simulateResponse?.txnGroups[0];
+        if (failedGroup?.failureMessage) {
+            const errorMessage = `Transaction failed at transaction(s) ${failedGroup.failedAt?.join(', ') || 'unknown'} in the group. ${failedGroup.failureMessage}`;
+            const error = new Error(errorMessage);
+            if (Config.debug) {
+                await Config.events.emitAsync(EventType.TxnGroupSimulated, { simulateResponse });
+            }
             error.simulateResponse = simulateResponse;
             throw error;
         }
+        if (Config.debug && Config.traceAll) {
+            await Config.events.emitAsync(EventType.TxnGroupSimulated, { simulateResponse });
+        }
         const transactions = atc.buildGroup().map((t) => t.txn);
         return {
             confirmations: simulateResponse.txnGroups[0].txnResults.map((t) => t.txnResult),
@@ -697,7 +755,7 @@ class AlgoKitComposer {
             txIds: transactions.map((t) => t.txID()),
             groupId: Buffer.from(transactions[0].group ?? new Uint8Array()).toString('base64'),
             simulateResponse,
-            returns: methodResults.map((m) => m),
+            returns: methodResults.map(getABIReturnValue),
         };
     }
     /**
@@ -714,7 +772,7 @@ class AlgoKitComposer {
     }
 }
 /** Signer used to represent a lack of signer */
-AlgoKitComposer.NULL_SIGNER = algosdk.makeEmptyTransactionSigner();
+TransactionComposer.NULL_SIGNER = algosdk.makeEmptyTransactionSigner();
 
-export { MAX_TRANSACTION_GROUP_SIZE, AlgoKitComposer as default };
+export { MAX_TRANSACTION_GROUP_SIZE, TransactionComposer };
 //# sourceMappingURL=composer.mjs.map