@algorandfoundation/algokit-utils 10.0.0-alpha.1 → 10.0.0-alpha.11

package/types/composer.mjs

@@ -62,6 +62,9 @@ var TransactionComposer = class TransactionComposer {
 		}
 		return transformedError;
 	}
+	validateReferenceParams(params) {
+		if (params.accessReferences && params.accessReferences.length > 0 && (params.appReferences && params.appReferences.length > 0 || params.assetReferences && params.assetReferences.length > 0 || params.boxReferences && params.boxReferences.length > 0)) throw new Error("Cannot specify both `accessReferences` and reference arrays (`appReferences`, `assetReferences`, `boxReferences`).");
+	}
 	/**
 	* Create a `TransactionComposer`.
 	* @param params The configuration for this composer
@@ -567,6 +570,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
@@ -577,6 +581,7 @@ var TransactionComposer = class TransactionComposer {
 	* ```
 	*/
 	addAppCreate(params) {
+		this.validateReferenceParams(params);
 		this.push({
 			data: params,
 			type: "appCall"
@@ -616,10 +621,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppUpdate(params) {
+		this.validateReferenceParams(params);
 		this.push({
 			data: {
 				...params,
@@ -660,10 +667,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppDelete(params) {
+		this.validateReferenceParams(params);
 		this.push({
 			data: {
 				...params,
@@ -706,10 +715,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppCall(params) {
+		this.validateReferenceParams(params);
 		this.push({
 			data: params,
 			type: "appCall"
@@ -768,10 +779,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppCreateMethodCall(params) {
+		this.validateReferenceParams(params);
 		const txnArgs = extractComposerTransactionsFromAppMethodCallParams(params);
 		this.push(...txnArgs, {
 			data: {
@@ -827,10 +840,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppUpdateMethodCall(params) {
+		this.validateReferenceParams(params);
 		const txnArgs = extractComposerTransactionsFromAppMethodCallParams(params);
 		this.push(...txnArgs, {
 			data: {
@@ -885,10 +900,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppDeleteMethodCall(params) {
+		this.validateReferenceParams(params);
 		const txnArgs = extractComposerTransactionsFromAppMethodCallParams(params);
 		this.push(...txnArgs, {
 			data: {
@@ -943,10 +960,12 @@ 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,
 	*})
 	* ```
 	*/
 	addAppCallMethodCall(params) {
+		this.validateReferenceParams(params);
 		const txnArgs = extractComposerTransactionsFromAppMethodCallParams(params);
 		this.push(...txnArgs, {
 			data: {
@@ -1065,7 +1084,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 Transaction({ ...txn }));
 			const groupAnalysis = (this.composerConfig.coverAppCallInnerTransactionFees || this.composerConfig.populateAppCallResources) && builtTransactions.transactions.some((txn) => txn.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) => {
@@ -1125,7 +1144,7 @@ var TransactionComposer = class TransactionComposer {
 					transaction = buildAssetOptOut(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
 				case "appCall":
-					if (!("appId" in ctxn.data)) transaction = await buildAppCreate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
+					if (ctxn.data.appId === void 0 || ctxn.data.appId === 0) transaction = await buildAppCreate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else if ("approvalProgram" in ctxn.data && "clearStateProgram" in ctxn.data) transaction = await buildAppUpdate(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else transaction = buildAppCall(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
@@ -1133,7 +1152,7 @@ var TransactionComposer = class TransactionComposer {
 					transaction = buildKeyReg(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
 				case "methodCall":
-					if (!("appId" in ctxn.data)) transaction = await buildAppCreateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
+					if (ctxn.data.appId === void 0 || ctxn.data.appId === 0) transaction = await buildAppCreateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else if ("approvalProgram" in ctxn.data && "clearStateProgram" in ctxn.data) transaction = await buildAppUpdateMethodCall(ctxn.data, this.appManager, suggestedParams, defaultValidityWindow);
 					else transaction = await buildAppCallMethodCall(ctxn.data, suggestedParams, defaultValidityWindow);
 					break;
@@ -1301,13 +1320,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 {
@@ -1434,7 +1453,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;
@@ -1531,11 +1550,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 = AppManager.getABIReturn(confirmation, method);
-				if (abiReturn !== void 0) abiReturns.push(abiReturn);
-			}
+			const abiReturn = AppManager.getABIReturn(confirmation, txn.data.method);
+			if (abiReturn !== void 0) abiReturns.push(abiReturn);
 		}
 		return abiReturns;
 	}