@algorandfoundation/algokit-utils 10.0.0-alpha.2 → 10.0.0-alpha.20

package/types/composer.d.ts

@@ -1,4 +1,5 @@
 import { ReadableAddress } from "../packages/common/src/address.js";
+import { Expand } from "../packages/common/src/expand.js";
 import { ABIMethod } from "../packages/abi/src/abi-method.js";
 import { Transaction } from "../packages/transact/src/transactions/transaction.js";
 import { SignedTransaction } from "../packages/transact/src/transactions/signed-transaction.js";
@@ -9,7 +10,6 @@ import { SuggestedParams } from "../packages/algod_client/src/models/suggested-p
 import { AlgodClient } from "../packages/algod_client/src/client.js";
 import { AlgoAmount } from "./amount.js";
 import { AppManager } from "./app-manager.js";
-import { Expand } from "./expand.js";
 import { CommonTransactionParams } from "../transactions/common.js";
 import { AppCallParams, AppCreateParams, AppDeleteParams, AppMethodCallParams, AppUpdateParams, CommonAppCallParams } from "../transactions/app-call.js";
 import { AssetOptInParams, AssetOptOutParams, AssetTransferParams } from "../transactions/asset-transfer.js";
@@ -433,6 +433,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *  // Signer only needed if you want to provide one,
    *  //  generally you'd register it with AlgorandClient
    *  //  against the sender and not need to pass it in
@@ -476,6 +477,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -511,6 +513,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -548,6 +551,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -604,6 +608,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -653,6 +658,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -700,6 +706,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */
@@ -747,6 +754,7 @@ declare class TransactionComposer {
    *  // Max fee doesn't make sense with extraFee AND staticFee
    *  //  already specified, but here for completeness
    *  maxFee: (3000).microAlgo(),
+   *  rejectVersion: 1,
    *})
    * ```
    */

package/types/composer.js

@@ -20,7 +20,6 @@ const require_payment = require('../transactions/payment.js');
 const require_lifecycle_events = require('./lifecycle-events.js');
 const require_network_client = require('./network-client.js');
 let buffer = require("buffer");
-buffer = require_rolldown_runtime.__toESM(buffer);
 
 //#region src/types/composer.ts
 var InvalidErrorTransformerValue = class extends Error {
@@ -207,6 +206,7 @@ var TransactionComposer = class TransactionComposer {
 	*/
 	addTransaction(transaction, signer) {
 		if (transaction.group) throw new Error("Cannot add a transaction to the composer because it is already in a group");
+		require_transaction.validateTransaction(transaction);
 		this.push({
 			data: {
 				txn: transaction,
@@ -572,6 +572,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*  // Signer only needed if you want to provide one,
 	*  //  generally you'd register it with AlgorandClient
 	*  //  against the sender and not need to pass it in
@@ -622,6 +623,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -667,6 +669,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -714,6 +717,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -777,6 +781,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -837,6 +842,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -896,6 +902,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -955,6 +962,7 @@ var TransactionComposer = class TransactionComposer {
 	*  // Max fee doesn't make sense with extraFee AND staticFee
 	*  //  already specified, but here for completeness
 	*  maxFee: (3000).microAlgo(),
+	*  rejectVersion: 1,
 	*})
 	* ```
 	*/
@@ -1078,7 +1086,7 @@ var TransactionComposer = class TransactionComposer {
 		if (!this.transactionsWithSigners) {
 			const suggestedParams = await this.getSuggestedParams();
 			const builtTransactions = await this._buildTransactions(suggestedParams);
-			this.rawBuildTransactions = builtTransactions.transactions;
+			this.rawBuildTransactions = builtTransactions.transactions.map((txn) => new require_transaction.Transaction({ ...txn }));
 			const groupAnalysis = (this.composerConfig.coverAppCallInnerTransactionFees || this.composerConfig.populateAppCallResources) && builtTransactions.transactions.some((txn) => txn.type === require_transaction_type.TransactionType.AppCall) ? await this.analyzeGroupRequirements(builtTransactions.transactions, suggestedParams, this.composerConfig) : void 0;
 			this.populateTransactionAndGroupResources(builtTransactions.transactions, groupAnalysis);
 			this.transactionsWithSigners = builtTransactions.transactions.map((txn, index) => {
@@ -1103,11 +1111,14 @@ var TransactionComposer = class TransactionComposer {
 		const transactions = new Array();
 		let transactionIndex = 0;
 		for (const ctxn of this.txns) if (ctxn.type === "txn") {
+			require_transaction.validateTransaction(ctxn.data.txn);
 			transactions.push(ctxn.data.txn);
 			if (ctxn.data.signer) signers.set(transactionIndex, ctxn.data.signer);
 			transactionIndex++;
 		} else if (ctxn.type === "asyncTxn") {
-			transactions.push(await ctxn.data.txn);
+			const transaction = await ctxn.data.txn;
+			require_transaction.validateTransaction(transaction);
+			transactions.push(transaction);
 			if (ctxn.data.signer) signers.set(transactionIndex, ctxn.data.signer);
 			transactionIndex++;
 		} else {
@@ -1138,7 +1149,7 @@ var TransactionComposer = class TransactionComposer {
 					transaction = require_asset_transfer.buildAssetOptOut(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
 				case "appCall":
-					if (!("appId" in ctxn.data)) transaction = await require_app_call$1.buildAppCreate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
+					if (ctxn.data.appId === void 0 || ctxn.data.appId === 0) transaction = await require_app_call$1.buildAppCreate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else if ("approvalProgram" in ctxn.data && "clearStateProgram" in ctxn.data) transaction = await require_app_call$1.buildAppUpdate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else transaction = require_app_call$1.buildAppCall(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
@@ -1146,7 +1157,7 @@ var TransactionComposer = class TransactionComposer {
 					transaction = require_key_registration.buildKeyReg(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
 				case "methodCall":
-					if (!("appId" in ctxn.data)) transaction = await require_method_call.buildAppCreateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
+					if (ctxn.data.appId === void 0 || ctxn.data.appId === 0) transaction = await require_method_call.buildAppCreateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else if ("approvalProgram" in ctxn.data && "clearStateProgram" in ctxn.data) transaction = await require_method_call.buildAppUpdateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else transaction = await require_method_call.buildAppCallMethodCall(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
@@ -1158,6 +1169,7 @@ var TransactionComposer = class TransactionComposer {
 				extraFee: ctxn.data.extraFee?.microAlgos,
 				maxFee: ctxn.data.maxFee?.microAlgos
 			});
+			require_transaction.validateTransaction(transaction);
 			transactions.push(transaction);
 			if (ctxn.data.signer) {
 				const signer = "signer" in ctxn.data.signer ? ctxn.data.signer.signer : ctxn.data.signer;
@@ -1314,13 +1326,13 @@ var TransactionComposer = class TransactionComposer {
 			sortedResources.assets?.sort(compare);
 			sortedResources.apps?.sort(compare);
 			sortedResources.boxes?.sort((a, b) => {
-				return compare(`${a.app}-${a.name}`, `${b.app}-${b.name}`);
+				return compare(`${a.appId}-${a.name}`, `${b.appId}-${b.name}`);
 			});
 			sortedResources.appLocals?.sort((a, b) => {
-				return compare(`${a.app}-${a.account}`, `${b.app}-${b.account}`);
+				return compare(`${a.appId}-${a.address}`, `${b.appId}-${b.address}`);
 			});
 			sortedResources.assetHoldings?.sort((a, b) => {
-				return compare(`${a.asset}-${a.account}`, `${b.asset}-${b.account}`);
+				return compare(`${a.assetId}-${a.address}`, `${b.assetId}-${b.address}`);
 			});
 		}
 		return {
@@ -1355,11 +1367,12 @@ var TransactionComposer = class TransactionComposer {
 	* ```
 	*/
 	async send(params) {
-		if (this.composerConfig.coverAppCallInnerTransactionFees !== (params?.coverAppCallInnerTransactionFees ?? false) || this.composerConfig.populateAppCallResources !== (params?.populateAppCallResources ?? true)) {
-			this.composerConfig = {
-				coverAppCallInnerTransactionFees: params?.coverAppCallInnerTransactionFees ?? false,
-				populateAppCallResources: params?.populateAppCallResources ?? true
-			};
+		const effectiveConfig = {
+			coverAppCallInnerTransactionFees: params?.coverAppCallInnerTransactionFees ?? this.composerConfig.coverAppCallInnerTransactionFees,
+			populateAppCallResources: params?.populateAppCallResources ?? this.composerConfig.populateAppCallResources
+		};
+		if (this.composerConfig.coverAppCallInnerTransactionFees !== effectiveConfig.coverAppCallInnerTransactionFees || this.composerConfig.populateAppCallResources !== effectiveConfig.populateAppCallResources) {
+			this.composerConfig = effectiveConfig;
 			this.reset();
 		}
 		try {
@@ -1447,7 +1460,7 @@ var TransactionComposer = class TransactionComposer {
 		}
 	}
 	async simulate(options) {
-		const { skipSignatures = false, resultOnFailure = false,...rawOptions } = options ?? {};
+		const { skipSignatures = false, resultOnFailure = false, ...rawOptions } = options ?? {};
 		if (skipSignatures) {
 			rawOptions.allowEmptySignatures = true;
 			rawOptions.fixSigners = true;
@@ -1455,7 +1468,7 @@ var TransactionComposer = class TransactionComposer {
 		let transactionsWithSigner;
 		if (!this.transactionsWithSigners) {
 			const builtTransactions = await this.buildTransactions();
-			transactionsWithSigner = (builtTransactions.transactions.length > 0 ? require_transaction.groupTransactions(builtTransactions.transactions) : builtTransactions.transactions).map((txn, index) => ({
+			transactionsWithSigner = (builtTransactions.transactions.length > 1 ? require_transaction.groupTransactions(builtTransactions.transactions) : builtTransactions.transactions).map((txn, index) => ({
 				txn,
 				signer: skipSignatures ? require_signer.makeEmptyTransactionSigner() : builtTransactions.signers.get(index) ?? require_signer.makeEmptyTransactionSigner()
 			}));
@@ -1484,10 +1497,10 @@ var TransactionComposer = class TransactionComposer {
 		if (simulateResult?.failureMessage && !resultOnFailure) {
 			const errorMessage = `Transaction failed at transaction(s) ${simulateResult.failedAt?.join(", ") || "unknown"} in the group. ${simulateResult.failureMessage}`;
 			const error = new Error(errorMessage);
-			if (require_config.Config.debug) await require_config.Config.events.emitAsync(require_lifecycle_events.EventType.TxnGroupSimulated, { simulateTransaction: simulateResponse });
+			if (require_config.Config.debug) await require_config.Config.events.emitAsync(require_lifecycle_events.EventType.TxnGroupSimulated, { simulateResponse });
 			throw await this.transformError(error);
 		}
-		if (require_config.Config.debug && require_config.Config.traceAll) await require_config.Config.events.emitAsync(require_lifecycle_events.EventType.TxnGroupSimulated, { simulateTransaction: simulateResponse });
+		if (require_config.Config.debug && require_config.Config.traceAll) await require_config.Config.events.emitAsync(require_lifecycle_events.EventType.TxnGroupSimulated, { simulateResponse });
 		const abiReturns = this.parseAbiReturnValues(simulateResult.txnResults.map((t) => t.txnResult));
 		return {
 			confirmations: simulateResult.txnResults.map((t) => t.txnResult),
@@ -1531,7 +1544,9 @@ var TransactionComposer = class TransactionComposer {
 		signerEntries.forEach(([, indexes], signerIndex) => {
 			const stxs = signedGroups[signerIndex];
 			indexes.forEach((txIndex, stxIndex) => {
-				signedTransactions[txIndex] = require_signed_transaction.decodeSignedTransaction(stxs[stxIndex]);
+				const stxn = require_signed_transaction.decodeSignedTransaction(stxs[stxIndex]);
+				require_signed_transaction.validateSignedTransaction(stxn);
+				signedTransactions[txIndex] = stxn;
 			});
 		});
 		const unsignedIndexes = signedTransactions.map((stxn, index) => stxn === void 0 ? index : null).filter((index) => index !== null);
@@ -1544,11 +1559,8 @@ var TransactionComposer = class TransactionComposer {
 			const confirmation = confirmations[i];
 			const txn = this.txns[i];
 			if (txn?.type !== "methodCall") continue;
-			const method = txn.data.method;
-			if (method.returns.type !== "void") {
-				const abiReturn = require_app_manager.AppManager.getABIReturn(confirmation, method);
-				if (abiReturn !== void 0) abiReturns.push(abiReturn);
-			}
+			const abiReturn = require_app_manager.AppManager.getABIReturn(confirmation, txn.data.method);
+			if (abiReturn !== void 0) abiReturns.push(abiReturn);
 		}
 		return abiReturns;
 	}