@algorandfoundation/algokit-utils 10.0.0-alpha.3 → 10.0.0-alpha.31

package/types/composer.js

@@ -1,14 +1,14 @@
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.js');
 const require_constants = require('../packages/common/src/constants.js');
+const require_amount = require('./amount.js');
+const require_config = require('../config.js');
+const require_util = require('../util.js');
+const require_transaction = require('../transaction/transaction.js');
 const require_app_call = require('../packages/transact/src/transactions/app-call.js');
 const require_transaction_type = require('../packages/transact/src/transactions/transaction-type.js');
-const require_transaction = require('../packages/transact/src/transactions/transaction.js');
+const require_transaction$1 = require('../packages/transact/src/transactions/transaction.js');
 const require_signed_transaction = require('../packages/transact/src/transactions/signed-transaction.js');
 const require_signer = require('../packages/transact/src/signer.js');
-const require_amount = require('./amount.js');
-const require_config = require('../config.js');
-const require_util = require('../util.js');
-const require_transaction$1 = require('../transaction/transaction.js');
 const require_app_manager = require('./app-manager.js');
 const require_app_call$1 = require('../transactions/app-call.js');
 const require_asset_transfer = require('../transactions/asset-transfer.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 {
@@ -130,7 +129,7 @@ var TransactionComposer = class TransactionComposer {
 			};
 			case "txn": {
 				const { txn: transaction, signer, maxFee } = txn.data;
-				const clonedTxn = require_transaction.decodeTransaction(require_transaction.encodeTransactionRaw(transaction));
+				const clonedTxn = require_transaction$1.decodeTransaction(require_transaction$1.encodeTransactionRaw(transaction));
 				delete clonedTxn.group;
 				return {
 					type: "txn",
@@ -147,7 +146,7 @@ var TransactionComposer = class TransactionComposer {
 					type: "asyncTxn",
 					data: {
 						txn: txnPromise.then((resolvedTxn) => {
-							const clonedTxn = require_transaction.decodeTransaction(require_transaction.encodeTransactionRaw(resolvedTxn));
+							const clonedTxn = require_transaction$1.decodeTransaction(require_transaction$1.encodeTransactionRaw(resolvedTxn));
 							delete clonedTxn.group;
 							return clonedTxn;
 						}),
@@ -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$1.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$1.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$1.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$1.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,18 +1157,19 @@ 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;
 				default: throw new Error(`Unsupported transaction type: ${ctxn.type}`);
 			}
-			if (transaction.fee === void 0) transaction = require_transaction.assignFee(transaction, {
+			if (transaction.fee === void 0) transaction = require_transaction$1.assignFee(transaction, {
 				feePerByte: suggestedParams.fee,
 				minFee: suggestedParams.minFee,
 				extraFee: ctxn.data.extraFee?.microAlgos,
 				maxFee: ctxn.data.maxFee?.microAlgos
 			});
+			require_transaction$1.validateTransaction(transaction);
 			transactions.push(transaction);
 			if (ctxn.data.signer) {
 				const signer = "signer" in ctxn.data.signer ? ctxn.data.signer.signer : ctxn.data.signer;
@@ -1247,7 +1259,7 @@ var TransactionComposer = class TransactionComposer {
 			if (groupAnalysis.unnamedResourcesAccessed) require_app_call$1.populateGroupResources(transactions, groupAnalysis.unnamedResourcesAccessed);
 		}
 		if (transactions.length > 1) {
-			const groupedTransactions = require_transaction.groupTransactions(transactions);
+			const groupedTransactions = require_transaction$1.groupTransactions(transactions);
 			transactions.forEach((t) => t.group = groupedTransactions[0].group);
 			return transactions;
 		} else return transactions;
@@ -1263,9 +1275,9 @@ var TransactionComposer = class TransactionComposer {
 				if (logicalMaxFee !== void 0) params.fee = logicalMaxFee;
 				else appCallIndexesWithoutMaxFees.push(groupIndex);
 			}
-			return new require_transaction.Transaction(params);
+			return new require_transaction$1.Transaction(params);
 		});
-		if (transactionsToSimulate.length > 1) transactionsToSimulate = require_transaction.groupTransactions(transactionsToSimulate);
+		if (transactionsToSimulate.length > 1) transactionsToSimulate = require_transaction$1.groupTransactions(transactionsToSimulate);
 		if (analysisParams.coverAppCallInnerTransactionFees && appCallIndexesWithoutMaxFees.length > 0) throw new Error(`Please provide a maxFee for each app call transaction when coverAppCallInnerTransactionFees is enabled. Required for transaction ${appCallIndexesWithoutMaxFees.join(", ")}`);
 		const simulateRequest = {
 			txnGroups: [{ txns: transactionsToSimulate.map((txn) => ({
@@ -1292,7 +1304,7 @@ var TransactionComposer = class TransactionComposer {
 			const btxn = transactions[groupIndex];
 			let requiredFeeDelta;
 			if (analysisParams.coverAppCallInnerTransactionFees) {
-				const minTxnFee = require_transaction.calculateFee(btxn, {
+				const minTxnFee = require_transaction$1.calculateFee(btxn, {
 					feePerByte: suggestedParams.fee,
 					minFee: suggestedParams.minFee
 				});
@@ -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 {
@@ -1384,19 +1397,18 @@ var TransactionComposer = class TransactionComposer {
 				},
 				resultOnFailure: true
 			});
-			const group = this.signedTransactions[0].txn.group;
+			const group = this.transactionsWithSigners[0].txn.group;
 			let waitRounds = params?.maxRoundsToWaitForConfirmation;
 			if (waitRounds === void 0) {
 				const firstRound = (await this.getSuggestedParams()).firstValid;
-				const lastRound = this.signedTransactions.reduce((max, txn) => txn.txn.lastValid > max ? txn.txn.lastValid : max, 0n);
+				const lastRound = this.transactionsWithSigners.reduce((max, txn) => txn.txn.lastValid > max ? txn.txn.lastValid : max, 0n);
 				waitRounds = Number(lastRound - firstRound) + 1;
 			}
-			const encodedTxns = require_signed_transaction.encodeSignedTransactions(this.signedTransactions);
-			await this.algod.sendRawTransaction(encodedTxns);
+			await this.algod.sendRawTransaction(this.signedTransactions);
 			if (transactionsToSend.length > 1 && group) require_config.Config.getLogger(params?.suppressLog).verbose(`Group transaction (${buffer.Buffer.from(group).toString("base64")}) sent with ${transactionsToSend.length} transactions`);
 			else require_config.Config.getLogger(params?.suppressLog).verbose(`Sent transaction ID ${transactionsToSend[0].txId()} ${transactionsToSend[0].type} from ${transactionsToSend[0].sender}`);
 			let confirmations = new Array();
-			if (params?.maxRoundsToWaitForConfirmation !== 0) confirmations = await Promise.all(transactionIds.map(async (id) => await require_transaction$1.waitForConfirmation(id, waitRounds, this.algod)));
+			if (params?.maxRoundsToWaitForConfirmation !== 0) confirmations = await Promise.all(transactionIds.map(async (id) => await require_transaction.waitForConfirmation(id, waitRounds, this.algod)));
 			const abiReturns = this.parseAbiReturnValues(confirmations);
 			return {
 				groupId: group ? buffer.Buffer.from(group).toString("base64") : void 0,
@@ -1412,7 +1424,7 @@ var TransactionComposer = class TransactionComposer {
 			if (typeof originalError === "object") err.name = originalError.name;
 			let sentTransactions;
 			if (this.transactionsWithSigners) sentTransactions = this.transactionsWithSigners.map((t) => t.txn);
-			else if (this.rawBuildTransactions) sentTransactions = this.rawBuildTransactions.length > 1 ? require_transaction.groupTransactions(this.rawBuildTransactions) : this.rawBuildTransactions;
+			else if (this.rawBuildTransactions) sentTransactions = this.rawBuildTransactions.length > 1 ? require_transaction$1.groupTransactions(this.rawBuildTransactions) : this.rawBuildTransactions;
 			if (require_config.Config.debug && typeof originalError === "object" && sentTransactions) {
 				err.traces = [];
 				require_config.Config.getLogger(params?.suppressLog).error("Received error executing Transaction Composer and debug flag enabled; attempting simulation to get more information", err);
@@ -1420,7 +1432,7 @@ var TransactionComposer = class TransactionComposer {
 					txn,
 					signer: require_signer.makeEmptyTransactionSigner()
 				}));
-				const signedTransactions = await this.signTransactions(transactionsWithEmptySigners);
+				const signedTransactions = require_signed_transaction.decodeSignedTransactions(await this.signTransactions(transactionsWithEmptySigners));
 				const simulateResponse = await this.algod.simulateTransactions({
 					txnGroups: [{ txns: signedTransactions }],
 					allowEmptySignatures: true,
@@ -1447,7 +1459,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 +1467,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$1.groupTransactions(builtTransactions.transactions) : builtTransactions.transactions).map((txn, index) => ({
 				txn,
 				signer: skipSignatures ? require_signer.makeEmptyTransactionSigner() : builtTransactions.signers.get(index) ?? require_signer.makeEmptyTransactionSigner()
 			}));
@@ -1465,7 +1477,7 @@ var TransactionComposer = class TransactionComposer {
 		}));
 		const transactions = transactionsWithSigner.map((e) => e.txn);
 		const simulateRequest = {
-			txnGroups: [{ txns: await this.signTransactions(transactionsWithSigner) }],
+			txnGroups: [{ txns: require_signed_transaction.decodeSignedTransactions(await this.signTransactions(transactionsWithSigner)) }],
 			...rawOptions,
 			...require_config.Config.debug ? {
 				allowEmptySignatures: true,
@@ -1484,10 +1496,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),
@@ -1527,16 +1539,16 @@ var TransactionComposer = class TransactionComposer {
 		});
 		const signerEntries = Array.from(signerGroups);
 		const signedGroups = await Promise.all(signerEntries.map(([signer, indexes]) => signer(transactions, indexes)));
-		const signedTransactions = new Array(transactionsWithSigners.length);
+		const encodedSignedTransactions = new Array(transactionsWithSigners.length).fill(null);
 		signerEntries.forEach(([, indexes], signerIndex) => {
 			const stxs = signedGroups[signerIndex];
 			indexes.forEach((txIndex, stxIndex) => {
-				signedTransactions[txIndex] = require_signed_transaction.decodeSignedTransaction(stxs[stxIndex]);
+				encodedSignedTransactions[txIndex] = stxs[stxIndex] ?? null;
 			});
 		});
-		const unsignedIndexes = signedTransactions.map((stxn, index) => stxn === void 0 ? index : null).filter((index) => index !== null);
+		const unsignedIndexes = encodedSignedTransactions.map((stxn, index) => stxn == null ? index : null).filter((index) => index !== null);
 		if (unsignedIndexes.length > 0) throw new Error(`Transactions at indexes [${unsignedIndexes.join(", ")}] were not signed`);
-		return signedTransactions;
+		return encodedSignedTransactions;
 	}
 	parseAbiReturnValues(confirmations) {
 		const abiReturns = new Array();
@@ -1544,11 +1556,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;
 	}