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

package/transactions/method-call.js

@@ -82,68 +82,58 @@ const isAbiValue = (x) => {
 	return typeof x === "bigint" || typeof x === "boolean" || typeof x === "number" || typeof x === "string" || x instanceof Uint8Array || x instanceof require_address.Address;
 };
 /**
-* Populate reference arrays from processed ABI method call arguments
+* Prepares method arguments for ABI encoding by building reference arrays and
+* replacing reference-type arguments (account, asset, application) with their indices.
 */
-function populateMethodArgsIntoReferenceArrays(sender, appId, method, methodArgs, accountReferences, appReferences, assetReferences) {
-	const accounts = accountReferences ?? [];
-	const assets = assetReferences ?? [];
-	const apps = appReferences ?? [];
-	methodArgs.forEach((arg, i) => {
-		const argType = method.args[i].type;
-		if (require_abi_method.argTypeIsReference(argType)) switch (argType) {
-			case "account":
-				if (typeof arg === "string" && arg !== sender.toString() && !accounts.some((a) => a.toString() === arg)) accounts.push(require_address.getAddress(arg));
-				break;
-			case "asset":
-				if (typeof arg === "bigint" && !assets.includes(arg)) assets.push(arg);
-				break;
-			case "application":
-				if (typeof arg === "bigint" && arg !== appId && !apps.includes(arg)) apps.push(arg);
-				break;
-		}
-	});
+function prepareArgsForEncoding(sender, appId, method, methodArgs, accountReferences, appReferences, assetReferences) {
+	const accounts = [...accountReferences ?? []];
+	const assets = [...assetReferences ?? []];
+	const apps = [...appReferences ?? []];
 	return {
 		accountReferences: accounts,
 		appReferences: apps,
-		assetReferences: assets
-	};
-}
-/**
-* Calculate array index for ABI reference values
-*/
-function calculateMethodArgReferenceArrayIndex(refValue, referenceType, sender, appId, accountReferences, appReferences, assetReferences) {
-	switch (referenceType) {
-		case "account":
-			if (typeof refValue === "string") {
-				if (refValue === sender.toString()) return 0;
-				const index = accountReferences.findIndex((a) => a.toString() === refValue);
-				if (index === -1) throw new Error(`Account ${refValue} not found in reference array`);
-				return index + 1;
-			}
-			throw new Error("Account reference must be a string");
-		case "asset":
-			if (typeof refValue === "bigint") {
-				const index = assetReferences.indexOf(refValue);
-				if (index === -1) throw new Error(`Asset ${refValue} not found in reference array`);
-				return index;
+		assetReferences: assets,
+		updatedArgs: methodArgs.map((arg, i) => {
+			const argType = method.args[i].type;
+			if (!require_abi_method.argTypeIsReference(argType)) return arg;
+			switch (argType) {
+				case "account": {
+					let addr;
+					if (typeof arg === "string") addr = require_address.getAddress(arg);
+					else if (arg instanceof Uint8Array) addr = new require_address.Address(arg);
+					else throw new Error("Invalid value for account");
+					if (sender.equals(addr)) return 0;
+					const existing = accounts.findIndex((a) => a.equals(addr)) + 1;
+					if (existing) return existing;
+					accounts.push(addr);
+					return accounts.length;
+				}
+				case "asset": {
+					if (typeof arg !== "bigint") throw new Error("Invalid value for asset");
+					const existing = assets.findIndex((a) => a === arg);
+					if (existing === -1) {
+						assets.push(arg);
+						return assets.length - 1;
+					}
+					return existing;
+				}
+				case "application": {
+					if (typeof arg !== "bigint") throw new Error("Invalid value for application");
+					if (arg === appId) return 0;
+					const existing = apps.findIndex((a) => a === arg) + 1;
+					if (existing) return existing;
+					apps.push(arg);
+					return apps.length;
+				}
 			}
-			throw new Error("Asset reference must be a bigint");
-		case "application":
-			if (typeof refValue === "bigint") {
-				if (refValue === appId) return 0;
-				const index = appReferences.indexOf(refValue);
-				if (index === -1) throw new Error(`Application ${refValue} not found in reference array`);
-				return index + 1;
-			}
-			throw new Error("Application reference must be a bigint");
-		default: throw new Error(`Unknown reference type: ${referenceType}`);
-	}
+		})
+	};
 }
 /**
 * Encode ABI method arguments with tuple packing support
 * Ports the logic from the Rust encode_method_arguments function
 */
-function encodeMethodArguments(method, args, sender, appId, accountReferences, appReferences, assetReferences) {
+function encodeMethodArguments(method, args) {
 	const encodedArgs = new Array();
 	encodedArgs.push(method.getSelector());
 	const abiTypes = new Array();
@@ -153,10 +143,9 @@ function encodeMethodArguments(method, args, sender, appId, accountReferences, a
 		const argValue = args[i];
 		if (require_abi_method.argTypeIsTransaction(methodArg.type)) {} else if (require_abi_method.argTypeIsReference(methodArg.type)) {
 			const referenceType = methodArg.type;
-			if (typeof argValue === "string" || typeof argValue === "bigint") {
-				const foreignIndex = calculateMethodArgReferenceArrayIndex(argValue, referenceType, sender, appId, accountReferences, appReferences, assetReferences);
+			if (typeof argValue === "number") {
 				abiTypes.push(new require_abi_type.ABIUintType(8));
-				abiValues.push(foreignIndex);
+				abiValues.push(argValue);
 			} else throw new Error(`Invalid reference value for ${referenceType}: ${argValue}`);
 		} else if (argValue !== void 0) {
 			abiTypes.push(methodArg.type);
@@ -198,12 +187,12 @@ function encodeArgsWithTuplePacking(abiTypes, abiValues) {
 	return encodedArgs;
 }
 /**
-* Common method call building logic
+* Builds encoded ABI method arguments and resolves reference arrays
 */
-function buildMethodCallCommon(params, commonData) {
-	const { accountReferences, appReferences, assetReferences } = populateMethodArgsIntoReferenceArrays(commonData.sender, params.appId, params.method, params.args ?? [], params.accountReferences, params.appReferences, params.assetReferences);
+function buildMethodCallArgsAndReferences(params) {
+	const { accountReferences, appReferences, assetReferences, updatedArgs } = prepareArgsForEncoding(params.sender, params.appId, params.method, params.args ?? [], params.accountReferences, params.appReferences, params.assetReferences);
 	return {
-		args: encodeMethodArguments(params.method, params.args, commonData.sender, params.appId, accountReferences, appReferences, assetReferences),
+		args: encodeMethodArguments(params.method, updatedArgs),
 		accountReferences,
 		appReferences,
 		assetReferences
@@ -223,14 +212,15 @@ const buildAppCreateMethodCall = async (params, appManager, suggestedParams, def
 	} : void 0;
 	const extraProgramPages = params.extraProgramPages !== void 0 ? params.extraProgramPages : require_util.calculateExtraProgramPages(approvalProgram, clearStateProgram);
 	const accountReferences = params.accountReferences?.map((a) => require_address.getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: 0n,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new require_transaction.Transaction({
 		...commonData,
@@ -243,11 +233,11 @@ const buildAppCreateMethodCall = async (params, appManager, suggestedParams, def
 			globalStateSchema,
 			localStateSchema,
 			extraProgramPages,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => require_address.getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(require_app_manager.AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion
@@ -259,14 +249,15 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 	const approvalProgram = typeof params.approvalProgram === "string" ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes : params.approvalProgram;
 	const clearStateProgram = typeof params.clearStateProgram === "string" ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes : params.clearStateProgram;
 	const accountReferences = params.accountReferences?.map((a) => require_address.getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: params.appId,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new require_transaction.Transaction({
 		...commonData,
@@ -276,11 +267,11 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 			onComplete: require_app_call.OnApplicationComplete.UpdateApplication,
 			approvalProgram,
 			clearStateProgram,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => require_address.getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(require_app_manager.AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion
@@ -290,14 +281,15 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 const buildAppCallMethodCall = async (params, suggestedParams, defaultValidityWindow) => {
 	const commonData = require_common.buildTransactionCommonData(params, suggestedParams, defaultValidityWindow);
 	const accountReferences = params.accountReferences?.map((a) => require_address.getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: params.appId,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new require_transaction.Transaction({
 		...commonData,
@@ -305,11 +297,11 @@ const buildAppCallMethodCall = async (params, suggestedParams, defaultValidityWi
 		appCall: {
 			appId: params.appId,
 			onComplete: params.onComplete ?? require_app_call.OnApplicationComplete.NoOp,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => require_address.getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(require_app_manager.AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion

package/transactions/method-call.js.map

@@ -1 +1 @@
-{"version":3,"file":"method-call.js","names":["Address","argTypeIsReference","getAddress","argTypeIsTransaction","ABIUintType","encodedArgs: Uint8Array[]","ABITupleType","buildTransactionCommonData","calculateExtraProgramPages","Transaction","TransactionType","OnApplicationComplete","AppManager"],"sources":["../../src/transactions/method-call.ts"],"sourcesContent":["import {\n  ABIMethod,\n  ABIReferenceType,\n  ABITupleType,\n  ABIType,\n  ABIUintType,\n  ABIValue,\n  argTypeIsReference,\n  argTypeIsTransaction,\n} from '@algorandfoundation/algokit-abi'\nimport { SuggestedParams } from '@algorandfoundation/algokit-algod-client'\nimport { Address, getAddress } from '@algorandfoundation/algokit-common'\nimport { OnApplicationComplete, Transaction, TransactionSigner, TransactionType } from '@algorandfoundation/algokit-transact'\nimport { TransactionWithSigner } from '../transaction'\nimport { AlgoAmount } from '../types/amount'\nimport { AppManager } from '../types/app-manager'\nimport { Expand } from '../types/expand'\nimport { calculateExtraProgramPages } from '../util'\nimport { AppCreateParams, AppDeleteParams, AppMethodCallParams, AppUpdateParams } from './app-call'\nimport { TransactionCommonData, buildTransactionCommonData } from './common'\n\nconst ARGS_TUPLE_PACKING_THRESHOLD = 14 // 14+ args trigger tuple packing, excluding the method selector\n\n/** Parameters to define an ABI method call create transaction. */\nexport type AppCreateMethodCall = Expand<AppMethodCall<AppCreateParams>>\n/** Parameters to define an ABI method call update transaction. */\nexport type AppUpdateMethodCall = Expand<AppMethodCall<AppUpdateParams>>\n/** Parameters to define an ABI method call delete transaction. */\nexport type AppDeleteMethodCall = Expand<AppMethodCall<AppDeleteParams>>\n/** Parameters to define an ABI method call transaction. */\nexport type AppCallMethodCall = Expand<AppMethodCall<AppMethodCallParams>>\n\nexport type ProcessedAppCreateMethodCall = Expand<\n  Omit<AppCreateMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\nexport type ProcessedAppUpdateMethodCall = Expand<\n  Omit<AppUpdateMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\nexport type ProcessedAppCallMethodCall = Expand<\n  Omit<AppCallMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\n/** Types that can be used to define a transaction argument for an ABI call transaction. */\nexport type AppMethodCallTransactionArgument =\n  // The following should match the partial `args` types from `AppMethodCall<T>` below\n  | TransactionWithSigner\n  | Transaction\n  | Promise<Transaction>\n  | AppMethodCall<AppCreateParams>\n  | AppMethodCall<AppUpdateParams>\n  | AppMethodCall<AppMethodCallParams>\n\n/** Parameters to define an ABI method call. */\nexport type AppMethodCall<T> = Expand<Omit<T, 'args'>> & {\n  /** The ABI method to call */\n  method: ABIMethod\n  /** Arguments to the ABI method, either:\n   * * An ABI value\n   * * A transaction with explicit signer\n   * * A transaction (where the signer will be automatically assigned)\n   * * An unawaited transaction (e.g. from algorand.createTransaction.{transactionType}())\n   * * Another method call (via method call params object)\n   * * undefined (this represents a placeholder transaction argument that is fulfilled by another method call argument)\n   */\n  args?: (\n    | ABIValue\n    // The following should match the above `AppMethodCallTransactionArgument` type above\n    | TransactionWithSigner\n    | Transaction\n    | Promise<Transaction>\n    | AppMethodCall<AppCreateParams>\n    | AppMethodCall<AppUpdateParams>\n    | AppMethodCall<AppMethodCallParams>\n    | undefined\n  )[]\n}\n\ntype AppMethodCallArgs = AppMethodCall<unknown>['args']\ntype AppMethodCallArg = NonNullable<AppMethodCallArgs>[number]\n\nexport type AsyncTransactionParams = {\n  txn: Promise<Transaction>\n  signer?: TransactionSigner\n  maxFee?: AlgoAmount\n}\n\nexport type TransactionParams = {\n  txn: Transaction\n  signer?: TransactionSigner\n  maxFee?: AlgoAmount\n}\n\ntype ExtractedMethodCallTransactionArg =\n  | { data: TransactionParams; type: 'txn' }\n  | {\n      data: AsyncTransactionParams\n      type: 'asyncTxn'\n    }\n  | { data: ProcessedAppCallMethodCall | ProcessedAppCreateMethodCall | ProcessedAppUpdateMethodCall; type: 'methodCall' }\n\nexport function extractComposerTransactionsFromAppMethodCallParams(\n  params: AppCallMethodCall | AppCreateMethodCall | AppUpdateMethodCall | AppDeleteMethodCall,\n  parentSigner?: TransactionSigner,\n): ExtractedMethodCallTransactionArg[] {\n  const composerTransactions = new Array<ExtractedMethodCallTransactionArg>()\n  const methodCallArgs = params.args\n  if (!methodCallArgs) return []\n\n  // Extract signer from params, falling back to parentSigner\n  const currentSigner = params.signer ? ('signer' in params.signer ? params.signer.signer : params.signer) : parentSigner\n\n  for (let i = 0; i < methodCallArgs.length; i++) {\n    const arg = methodCallArgs[i]\n\n    if (arg === undefined) {\n      // is a transaction or default value placeholder, do nothing\n      continue\n    }\n    if (isAbiValue(arg)) {\n      // if is ABI value, also ignore\n      continue\n    }\n\n    if (isTransactionWithSignerArg(arg)) {\n      composerTransactions.push({\n        data: {\n          txn: arg.txn,\n          signer: arg.signer,\n        },\n        type: 'txn',\n      })\n\n      continue\n    }\n    if (isAppCallMethodCallArg(arg)) {\n      // Recursively extract nested method call transactions, passing the nested call itself and current signer as parent\n      const nestedComposerTransactions = extractComposerTransactionsFromAppMethodCallParams(arg, currentSigner)\n      composerTransactions.push(...nestedComposerTransactions)\n      composerTransactions.push({\n        data: {\n          ...arg,\n          signer: arg.signer ?? currentSigner,\n          args: processAppMethodCallArgs(arg.args),\n        },\n        type: 'methodCall',\n      } satisfies ExtractedMethodCallTransactionArg)\n\n      continue\n    }\n    if (arg instanceof Promise) {\n      composerTransactions.push({\n        data: {\n          txn: arg,\n          signer: currentSigner,\n        },\n        type: 'asyncTxn',\n      })\n      continue\n    }\n\n    composerTransactions.push({\n      data: {\n        txn: Promise.resolve(arg),\n        signer: currentSigner,\n      },\n      type: 'asyncTxn',\n    })\n  }\n\n  return composerTransactions\n}\n\nexport function processAppMethodCallArgs(args: AppMethodCallArg[] | undefined): (ABIValue | undefined)[] | undefined {\n  if (args === undefined) return undefined\n\n  return args.map((arg) => {\n    if (arg === undefined) {\n      // Handle explicit placeholders (either transaction or default value)\n      return undefined\n    } else if (!isAbiValue(arg)) {\n      // If the arg is not an ABIValue, it's must be a transaction, set to undefined\n      // transaction arguments should be flattened out and added into the composer during the add process\n      return undefined\n    }\n    return arg\n  })\n}\n\nfunction isTransactionWithSignerArg(arg: AppMethodCallArg): arg is TransactionWithSigner {\n  return typeof arg === 'object' && arg !== undefined && 'txn' in arg && 'signer' in arg\n}\n\nfunction isAppCallMethodCallArg(\n  arg: AppMethodCallArg,\n): arg is AppMethodCall<AppCreateParams> | AppMethodCall<AppUpdateParams> | AppMethodCall<AppMethodCallParams> {\n  return typeof arg === 'object' && arg !== undefined && 'method' in arg\n}\n\nconst isAbiValue = (x: unknown): x is ABIValue => {\n  if (Array.isArray(x)) return x.length == 0 || x.every(isAbiValue)\n\n  // If x is a POJO literal\n  if (Object.getPrototypeOf(x) === Object.getPrototypeOf({})) {\n    return Object.values(x as object).every(isAbiValue)\n  }\n\n  return (\n    typeof x === 'bigint' ||\n    typeof x === 'boolean' ||\n    typeof x === 'number' ||\n    typeof x === 'string' ||\n    x instanceof Uint8Array ||\n    x instanceof Address\n  )\n}\n\n/**\n * Populate reference arrays from processed ABI method call arguments\n */\nfunction populateMethodArgsIntoReferenceArrays(\n  sender: Address,\n  appId: bigint,\n  method: ABIMethod,\n  methodArgs: AppMethodCallArg[],\n  accountReferences?: Address[],\n  appReferences?: bigint[],\n  assetReferences?: bigint[],\n): { accountReferences: Address[]; appReferences: bigint[]; assetReferences: bigint[] } {\n  const accounts = accountReferences ?? []\n  const assets = assetReferences ?? []\n  const apps = appReferences ?? []\n\n  methodArgs.forEach((arg, i) => {\n    const argType = method.args[i].type\n    if (argTypeIsReference(argType)) {\n      switch (argType) {\n        case 'account':\n          if (typeof arg === 'string' && arg !== sender.toString() && !accounts.some((a) => a.toString() === arg)) {\n            accounts.push(getAddress(arg))\n          }\n          break\n        case 'asset':\n          if (typeof arg === 'bigint' && !assets.includes(arg)) {\n            assets.push(arg)\n          }\n          break\n        case 'application':\n          if (typeof arg === 'bigint' && arg !== appId && !apps.includes(arg)) {\n            apps.push(arg)\n          }\n          break\n      }\n    }\n  })\n\n  return { accountReferences: accounts, appReferences: apps, assetReferences: assets }\n}\n\n/**\n * Calculate array index for ABI reference values\n */\nfunction calculateMethodArgReferenceArrayIndex(\n  refValue: string | bigint,\n  referenceType: ABIReferenceType,\n  sender: Address,\n  appId: bigint,\n  accountReferences: Address[],\n  appReferences: bigint[],\n  assetReferences: bigint[],\n): number {\n  switch (referenceType) {\n    case 'account':\n      if (typeof refValue === 'string') {\n        // If address is the same as sender, use index 0\n        if (refValue === sender.toString()) return 0\n        const index = accountReferences.findIndex((a) => a.toString() === refValue)\n        if (index === -1) throw new Error(`Account ${refValue} not found in reference array`)\n        return index + 1\n      }\n      throw new Error('Account reference must be a string')\n    case 'asset':\n      if (typeof refValue === 'bigint') {\n        const index = assetReferences.indexOf(refValue)\n        if (index === -1) throw new Error(`Asset ${refValue} not found in reference array`)\n        return index\n      }\n      throw new Error('Asset reference must be a bigint')\n    case 'application':\n      if (typeof refValue === 'bigint') {\n        // If app ID is the same as the current app, use index 0\n        if (refValue === appId) return 0\n        const index = appReferences.indexOf(refValue)\n        if (index === -1) throw new Error(`Application ${refValue} not found in reference array`)\n        return index + 1\n      }\n      throw new Error('Application reference must be a bigint')\n    default:\n      throw new Error(`Unknown reference type: ${referenceType}`)\n  }\n}\n\n/**\n * Encode ABI method arguments with tuple packing support\n * Ports the logic from the Rust encode_method_arguments function\n */\nfunction encodeMethodArguments(\n  method: ABIMethod,\n  args: (ABIValue | undefined)[],\n  sender: Address,\n  appId: bigint,\n  accountReferences: Address[],\n  appReferences: bigint[],\n  assetReferences: bigint[],\n): Uint8Array[] {\n  const encodedArgs = new Array<Uint8Array>()\n\n  // Insert method selector at the front\n  encodedArgs.push(method.getSelector())\n\n  // Get ABI types for non-transaction arguments\n  const abiTypes = new Array<ABIType>()\n  const abiValues = new Array<ABIValue>()\n\n  // Process each method argument\n  for (let i = 0; i < method.args.length; i++) {\n    const methodArg = method.args[i]\n    const argValue = args[i]\n\n    if (argTypeIsTransaction(methodArg.type)) {\n      // Transaction arguments are not ABI encoded - they're handled separately\n    } else if (argTypeIsReference(methodArg.type)) {\n      // Reference types are encoded as uint8 indexes\n      const referenceType = methodArg.type\n      if (typeof argValue === 'string' || typeof argValue === 'bigint') {\n        const foreignIndex = calculateMethodArgReferenceArrayIndex(\n          argValue,\n          referenceType,\n          sender,\n          appId,\n          accountReferences,\n          appReferences,\n          assetReferences,\n        )\n\n        abiTypes.push(new ABIUintType(8))\n        abiValues.push(foreignIndex)\n      } else {\n        throw new Error(`Invalid reference value for ${referenceType}: ${argValue}`)\n      }\n    } else if (argValue !== undefined) {\n      // Regular ABI value\n      abiTypes.push(methodArg.type)\n      // it's safe to cast to ABIValue here because the abiType must be ABIValue\n      abiValues.push(argValue as ABIValue)\n    }\n\n    // Skip undefined values (transaction placeholders)\n  }\n\n  if (abiValues.length !== abiTypes.length) {\n    throw new Error('Mismatch in length of non-transaction arguments')\n  }\n\n  // Apply ARC-4 tuple packing for methods with more than 14 arguments\n  // 14 instead of 15 in the ARC-4 because the first argument (method selector) is added separately\n  if (abiTypes.length > ARGS_TUPLE_PACKING_THRESHOLD) {\n    encodedArgs.push(...encodeArgsWithTuplePacking(abiTypes, abiValues))\n  } else {\n    encodedArgs.push(...encodeArgsIndividually(abiTypes, abiValues))\n  }\n\n  return encodedArgs\n}\n\n/**\n * Encode individual ABI values\n */\nfunction encodeArgsIndividually(abiTypes: ABIType[], abiValues: ABIValue[]): Uint8Array[] {\n  const encodedArgs: Uint8Array[] = []\n\n  for (let i = 0; i < abiTypes.length; i++) {\n    const abiType = abiTypes[i]\n    const abiValue = abiValues[i]\n    const encoded = abiType.encode(abiValue)\n    encodedArgs.push(encoded)\n  }\n\n  return encodedArgs\n}\n\n/**\n * Encode ABI values with tuple packing for methods with many arguments\n */\nfunction encodeArgsWithTuplePacking(abiTypes: ABIType[], abiValues: ABIValue[]): Uint8Array[] {\n  const encodedArgs: Uint8Array[] = []\n\n  // Encode first 14 arguments individually\n  const first14AbiTypes = abiTypes.slice(0, ARGS_TUPLE_PACKING_THRESHOLD)\n  const first14AbiValues = abiValues.slice(0, ARGS_TUPLE_PACKING_THRESHOLD)\n  encodedArgs.push(...encodeArgsIndividually(first14AbiTypes, first14AbiValues))\n\n  // Pack remaining arguments into tuple at position 15\n  const remainingAbiTypes = abiTypes.slice(ARGS_TUPLE_PACKING_THRESHOLD)\n  const remainingAbiValues = abiValues.slice(ARGS_TUPLE_PACKING_THRESHOLD)\n\n  if (remainingAbiTypes.length > 0) {\n    const tupleType = new ABITupleType(remainingAbiTypes)\n    const tupleValue = remainingAbiValues\n    const tupleEncoded = tupleType.encode(tupleValue)\n    encodedArgs.push(tupleEncoded)\n  }\n\n  return encodedArgs\n}\n\n/**\n * Common method call building logic\n */\nfunction buildMethodCallCommon(\n  params: {\n    appId: bigint\n    method: ABIMethod\n    args: (ABIValue | undefined)[]\n    accountReferences?: Address[]\n    appReferences?: bigint[]\n    assetReferences?: bigint[]\n  },\n  commonData: TransactionCommonData,\n): { args: Uint8Array[]; accountReferences: Address[]; appReferences: bigint[]; assetReferences: bigint[] } {\n  const { accountReferences, appReferences, assetReferences } = populateMethodArgsIntoReferenceArrays(\n    commonData.sender,\n    params.appId,\n    params.method,\n    params.args ?? [],\n    params.accountReferences,\n    params.appReferences,\n    params.assetReferences,\n  )\n\n  const encodedArgs = encodeMethodArguments(\n    params.method,\n    params.args,\n    commonData.sender,\n    params.appId,\n    accountReferences,\n    appReferences,\n    assetReferences,\n  )\n\n  return {\n    args: encodedArgs,\n    accountReferences,\n    appReferences,\n    assetReferences,\n  }\n}\n\nexport const buildAppCreateMethodCall = async (\n  params: ProcessedAppCreateMethodCall,\n  appManager: AppManager,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const approvalProgram =\n    typeof params.approvalProgram === 'string'\n      ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes\n      : params.approvalProgram\n  const clearStateProgram =\n    typeof params.clearStateProgram === 'string'\n      ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes\n      : params.clearStateProgram\n  const globalStateSchema =\n    params.schema?.globalByteSlices !== undefined || params.schema?.globalInts !== undefined\n      ? {\n          numByteSlices: params.schema?.globalByteSlices ?? 0,\n          numUints: params.schema?.globalInts ?? 0,\n        }\n      : undefined\n  const localStateSchema =\n    params.schema?.localByteSlices !== undefined || params.schema?.localInts !== undefined\n      ? {\n          numByteSlices: params.schema?.localByteSlices ?? 0,\n          numUints: params.schema?.localInts ?? 0,\n        }\n      : undefined\n  const extraProgramPages =\n    params.extraProgramPages !== undefined ? params.extraProgramPages : calculateExtraProgramPages(approvalProgram!, clearStateProgram!)\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const common = buildMethodCallCommon(\n    {\n      appId: 0n,\n      method: params.method,\n      args: params.args ?? [],\n      accountReferences: accountReferences,\n      appReferences: params.appReferences,\n      assetReferences: params.assetReferences,\n    },\n    commonData,\n  )\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: 0n,\n      onComplete: params.onComplete ?? OnApplicationComplete.NoOp,\n      approvalProgram: approvalProgram,\n      clearStateProgram: clearStateProgram,\n      globalStateSchema: globalStateSchema,\n      localStateSchema: localStateSchema,\n      extraProgramPages: extraProgramPages,\n      args: common.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: params.accountReferences?.map((a) => getAddress(a)),\n            appReferences: params.appReferences,\n            assetReferences: params.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n\nexport const buildAppUpdateMethodCall = async (\n  params: ProcessedAppUpdateMethodCall,\n  appManager: AppManager,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const approvalProgram =\n    typeof params.approvalProgram === 'string'\n      ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes\n      : params.approvalProgram\n  const clearStateProgram =\n    typeof params.clearStateProgram === 'string'\n      ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes\n      : params.clearStateProgram\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const common = buildMethodCallCommon(\n    {\n      appId: params.appId,\n      method: params.method,\n      args: params.args ?? [],\n      accountReferences: accountReferences,\n      appReferences: params.appReferences,\n      assetReferences: params.assetReferences,\n    },\n    commonData,\n  )\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: params.appId,\n      onComplete: OnApplicationComplete.UpdateApplication,\n      approvalProgram: approvalProgram,\n      clearStateProgram: clearStateProgram,\n      args: common.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: params.accountReferences?.map((a) => getAddress(a)),\n            appReferences: params.appReferences,\n            assetReferences: params.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n\nexport const buildAppCallMethodCall = async (\n  params: ProcessedAppCallMethodCall,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const common = buildMethodCallCommon(\n    {\n      appId: params.appId,\n      method: params.method,\n      args: params.args ?? [],\n      accountReferences: accountReferences,\n      appReferences: params.appReferences,\n      assetReferences: params.assetReferences,\n    },\n    commonData,\n  )\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: params.appId,\n      onComplete: params.onComplete ?? OnApplicationComplete.NoOp,\n      args: common.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: params.accountReferences?.map((a) => getAddress(a)),\n            appReferences: params.appReferences,\n            assetReferences: params.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n"],"mappings":"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"}
+{"version":3,"file":"method-call.js","names":["Address","argTypeIsReference","addr: Address","getAddress","argTypeIsTransaction","ABIUintType","encodedArgs: Uint8Array[]","ABITupleType","buildTransactionCommonData","calculateExtraProgramPages","Transaction","TransactionType","OnApplicationComplete","AppManager"],"sources":["../../src/transactions/method-call.ts"],"sourcesContent":["import {\n  ABIMethod,\n  ABITupleType,\n  ABIType,\n  ABIUintType,\n  ABIValue,\n  argTypeIsReference,\n  argTypeIsTransaction,\n} from '@algorandfoundation/algokit-abi'\nimport { SuggestedParams } from '@algorandfoundation/algokit-algod-client'\nimport { Address, getAddress } from '@algorandfoundation/algokit-common'\nimport { OnApplicationComplete, Transaction, TransactionSigner, TransactionType } from '@algorandfoundation/algokit-transact'\nimport { TransactionWithSigner } from '../transaction'\nimport { AlgoAmount } from '../types/amount'\nimport { AppManager } from '../types/app-manager'\nimport { Expand } from '../types/expand'\nimport { calculateExtraProgramPages } from '../util'\nimport { AppCreateParams, AppDeleteParams, AppMethodCallParams, AppUpdateParams } from './app-call'\nimport { buildTransactionCommonData } from './common'\n\nconst ARGS_TUPLE_PACKING_THRESHOLD = 14 // 14+ args trigger tuple packing, excluding the method selector\n\n/** Parameters to define an ABI method call create transaction. */\nexport type AppCreateMethodCall = Expand<AppMethodCall<AppCreateParams>>\n/** Parameters to define an ABI method call update transaction. */\nexport type AppUpdateMethodCall = Expand<AppMethodCall<AppUpdateParams>>\n/** Parameters to define an ABI method call delete transaction. */\nexport type AppDeleteMethodCall = Expand<AppMethodCall<AppDeleteParams>>\n/** Parameters to define an ABI method call transaction. */\nexport type AppCallMethodCall = Expand<AppMethodCall<AppMethodCallParams>>\n\nexport type ProcessedAppCreateMethodCall = Expand<\n  Omit<AppCreateMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\nexport type ProcessedAppUpdateMethodCall = Expand<\n  Omit<AppUpdateMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\nexport type ProcessedAppCallMethodCall = Expand<\n  Omit<AppCallMethodCall, 'args'> & {\n    args?: (ABIValue | undefined)[]\n  }\n>\n\n/** Types that can be used to define a transaction argument for an ABI call transaction. */\nexport type AppMethodCallTransactionArgument =\n  // The following should match the partial `args` types from `AppMethodCall<T>` below\n  | TransactionWithSigner\n  | Transaction\n  | Promise<Transaction>\n  | AppMethodCall<AppCreateParams>\n  | AppMethodCall<AppUpdateParams>\n  | AppMethodCall<AppMethodCallParams>\n\n/** Parameters to define an ABI method call. */\nexport type AppMethodCall<T> = Expand<Omit<T, 'args'>> & {\n  /** The ABI method to call */\n  method: ABIMethod\n  /** Arguments to the ABI method, either:\n   * * An ABI value\n   * * A transaction with explicit signer\n   * * A transaction (where the signer will be automatically assigned)\n   * * An unawaited transaction (e.g. from algorand.createTransaction.{transactionType}())\n   * * Another method call (via method call params object)\n   * * undefined (this represents a placeholder transaction argument that is fulfilled by another method call argument)\n   */\n  args?: (\n    | ABIValue\n    // The following should match the above `AppMethodCallTransactionArgument` type above\n    | TransactionWithSigner\n    | Transaction\n    | Promise<Transaction>\n    | AppMethodCall<AppCreateParams>\n    | AppMethodCall<AppUpdateParams>\n    | AppMethodCall<AppMethodCallParams>\n    | undefined\n  )[]\n}\n\ntype AppMethodCallArgs = AppMethodCall<unknown>['args']\ntype AppMethodCallArg = NonNullable<AppMethodCallArgs>[number]\n\nexport type AsyncTransactionParams = {\n  txn: Promise<Transaction>\n  signer?: TransactionSigner\n  maxFee?: AlgoAmount\n}\n\nexport type TransactionParams = {\n  txn: Transaction\n  signer?: TransactionSigner\n  maxFee?: AlgoAmount\n}\n\ntype ExtractedMethodCallTransactionArg =\n  | { data: TransactionParams; type: 'txn' }\n  | {\n      data: AsyncTransactionParams\n      type: 'asyncTxn'\n    }\n  | { data: ProcessedAppCallMethodCall | ProcessedAppCreateMethodCall | ProcessedAppUpdateMethodCall; type: 'methodCall' }\n\nexport function extractComposerTransactionsFromAppMethodCallParams(\n  params: AppCallMethodCall | AppCreateMethodCall | AppUpdateMethodCall | AppDeleteMethodCall,\n  parentSigner?: TransactionSigner,\n): ExtractedMethodCallTransactionArg[] {\n  const composerTransactions = new Array<ExtractedMethodCallTransactionArg>()\n  const methodCallArgs = params.args\n  if (!methodCallArgs) return []\n\n  // Extract signer from params, falling back to parentSigner\n  const currentSigner = params.signer ? ('signer' in params.signer ? params.signer.signer : params.signer) : parentSigner\n\n  for (let i = 0; i < methodCallArgs.length; i++) {\n    const arg = methodCallArgs[i]\n\n    if (arg === undefined) {\n      // is a transaction or default value placeholder, do nothing\n      continue\n    }\n    if (isAbiValue(arg)) {\n      // if is ABI value, also ignore\n      continue\n    }\n\n    if (isTransactionWithSignerArg(arg)) {\n      composerTransactions.push({\n        data: {\n          txn: arg.txn,\n          signer: arg.signer,\n        },\n        type: 'txn',\n      })\n\n      continue\n    }\n    if (isAppCallMethodCallArg(arg)) {\n      // Recursively extract nested method call transactions, passing the nested call itself and current signer as parent\n      const nestedComposerTransactions = extractComposerTransactionsFromAppMethodCallParams(arg, currentSigner)\n      composerTransactions.push(...nestedComposerTransactions)\n      composerTransactions.push({\n        data: {\n          ...arg,\n          signer: arg.signer ?? currentSigner,\n          args: processAppMethodCallArgs(arg.args),\n        },\n        type: 'methodCall',\n      } satisfies ExtractedMethodCallTransactionArg)\n\n      continue\n    }\n    if (arg instanceof Promise) {\n      composerTransactions.push({\n        data: {\n          txn: arg,\n          signer: currentSigner,\n        },\n        type: 'asyncTxn',\n      })\n      continue\n    }\n\n    composerTransactions.push({\n      data: {\n        txn: Promise.resolve(arg),\n        signer: currentSigner,\n      },\n      type: 'asyncTxn',\n    })\n  }\n\n  return composerTransactions\n}\n\nexport function processAppMethodCallArgs(args: AppMethodCallArg[] | undefined): (ABIValue | undefined)[] | undefined {\n  if (args === undefined) return undefined\n\n  return args.map((arg) => {\n    if (arg === undefined) {\n      // Handle explicit placeholders (either transaction or default value)\n      return undefined\n    } else if (!isAbiValue(arg)) {\n      // If the arg is not an ABIValue, it's must be a transaction, set to undefined\n      // transaction arguments should be flattened out and added into the composer during the add process\n      return undefined\n    }\n    return arg\n  })\n}\n\nfunction isTransactionWithSignerArg(arg: AppMethodCallArg): arg is TransactionWithSigner {\n  return typeof arg === 'object' && arg !== undefined && 'txn' in arg && 'signer' in arg\n}\n\nfunction isAppCallMethodCallArg(\n  arg: AppMethodCallArg,\n): arg is AppMethodCall<AppCreateParams> | AppMethodCall<AppUpdateParams> | AppMethodCall<AppMethodCallParams> {\n  return typeof arg === 'object' && arg !== undefined && 'method' in arg\n}\n\nconst isAbiValue = (x: unknown): x is ABIValue => {\n  if (Array.isArray(x)) return x.length == 0 || x.every(isAbiValue)\n\n  // If x is a POJO literal\n  if (Object.getPrototypeOf(x) === Object.getPrototypeOf({})) {\n    return Object.values(x as object).every(isAbiValue)\n  }\n\n  return (\n    typeof x === 'bigint' ||\n    typeof x === 'boolean' ||\n    typeof x === 'number' ||\n    typeof x === 'string' ||\n    x instanceof Uint8Array ||\n    x instanceof Address\n  )\n}\n\n/**\n * Prepares method arguments for ABI encoding by building reference arrays and\n * replacing reference-type arguments (account, asset, application) with their indices.\n */\nfunction prepareArgsForEncoding(\n  sender: Address,\n  appId: bigint,\n  method: ABIMethod,\n  methodArgs: (ABIValue | undefined)[],\n  accountReferences?: Address[],\n  appReferences?: bigint[],\n  assetReferences?: bigint[],\n): { accountReferences: Address[]; appReferences: bigint[]; assetReferences: bigint[]; updatedArgs: (ABIValue | undefined)[] } {\n  const accounts = [...(accountReferences ?? [])]\n  const assets = [...(assetReferences ?? [])]\n  const apps = [...(appReferences ?? [])]\n\n  const updatedArgs = methodArgs.map((arg, i) => {\n    const argType = method.args[i].type\n    if (!argTypeIsReference(argType)) {\n      return arg\n    }\n    switch (argType) {\n      case 'account': {\n        let addr: Address\n        if (typeof arg === 'string') {\n          addr = getAddress(arg)\n        } else if (arg instanceof Uint8Array) {\n          addr = new Address(arg)\n        } else {\n          throw new Error('Invalid value for account')\n        }\n\n        if (sender.equals(addr)) {\n          return 0\n        }\n\n        const existing = accounts.findIndex((a) => a.equals(addr)) + 1\n        if (existing) return existing\n\n        accounts.push(addr)\n        return accounts.length\n      }\n      case 'asset': {\n        if (typeof arg !== 'bigint') {\n          throw new Error('Invalid value for asset')\n        }\n\n        const existing = assets.findIndex((a) => a === arg)\n        if (existing === -1) {\n          assets.push(arg)\n          return assets.length - 1\n        }\n\n        return existing\n      }\n      case 'application': {\n        if (typeof arg !== 'bigint') {\n          throw new Error('Invalid value for application')\n        }\n\n        if (arg === appId) return 0\n\n        const existing = apps.findIndex((a) => a === arg) + 1\n        if (existing) return existing\n\n        apps.push(arg)\n        return apps.length\n      }\n    }\n  })\n\n  return { accountReferences: accounts, appReferences: apps, assetReferences: assets, updatedArgs }\n}\n\n/**\n * Encode ABI method arguments with tuple packing support\n * Ports the logic from the Rust encode_method_arguments function\n */\nfunction encodeMethodArguments(method: ABIMethod, args: (ABIValue | undefined)[]): Uint8Array[] {\n  const encodedArgs = new Array<Uint8Array>()\n\n  // Insert method selector at the front\n  encodedArgs.push(method.getSelector())\n\n  // Get ABI types for non-transaction arguments\n  const abiTypes = new Array<ABIType>()\n  const abiValues = new Array<ABIValue>()\n\n  // Process each method argument\n  for (let i = 0; i < method.args.length; i++) {\n    const methodArg = method.args[i]\n    const argValue = args[i]\n\n    if (argTypeIsTransaction(methodArg.type)) {\n      // Transaction arguments are not ABI encoded - they're handled separately\n    } else if (argTypeIsReference(methodArg.type)) {\n      // Reference types are encoded as uint8 indexes\n      const referenceType = methodArg.type\n      if (typeof argValue === 'number') {\n        abiTypes.push(new ABIUintType(8))\n        abiValues.push(argValue)\n      } else {\n        throw new Error(`Invalid reference value for ${referenceType}: ${argValue}`)\n      }\n    } else if (argValue !== undefined) {\n      // Regular ABI value\n      abiTypes.push(methodArg.type)\n      // it's safe to cast to ABIValue here because the abiType must be ABIValue\n      abiValues.push(argValue as ABIValue)\n    }\n\n    // Skip undefined values (transaction placeholders)\n  }\n\n  if (abiValues.length !== abiTypes.length) {\n    throw new Error('Mismatch in length of non-transaction arguments')\n  }\n\n  // Apply ARC-4 tuple packing for methods with more than 14 arguments\n  // 14 instead of 15 in the ARC-4 because the first argument (method selector) is added separately\n  if (abiTypes.length > ARGS_TUPLE_PACKING_THRESHOLD) {\n    encodedArgs.push(...encodeArgsWithTuplePacking(abiTypes, abiValues))\n  } else {\n    encodedArgs.push(...encodeArgsIndividually(abiTypes, abiValues))\n  }\n\n  return encodedArgs\n}\n\n/**\n * Encode individual ABI values\n */\nfunction encodeArgsIndividually(abiTypes: ABIType[], abiValues: ABIValue[]): Uint8Array[] {\n  const encodedArgs: Uint8Array[] = []\n\n  for (let i = 0; i < abiTypes.length; i++) {\n    const abiType = abiTypes[i]\n    const abiValue = abiValues[i]\n    const encoded = abiType.encode(abiValue)\n    encodedArgs.push(encoded)\n  }\n\n  return encodedArgs\n}\n\n/**\n * Encode ABI values with tuple packing for methods with many arguments\n */\nfunction encodeArgsWithTuplePacking(abiTypes: ABIType[], abiValues: ABIValue[]): Uint8Array[] {\n  const encodedArgs: Uint8Array[] = []\n\n  // Encode first 14 arguments individually\n  const first14AbiTypes = abiTypes.slice(0, ARGS_TUPLE_PACKING_THRESHOLD)\n  const first14AbiValues = abiValues.slice(0, ARGS_TUPLE_PACKING_THRESHOLD)\n  encodedArgs.push(...encodeArgsIndividually(first14AbiTypes, first14AbiValues))\n\n  // Pack remaining arguments into tuple at position 15\n  const remainingAbiTypes = abiTypes.slice(ARGS_TUPLE_PACKING_THRESHOLD)\n  const remainingAbiValues = abiValues.slice(ARGS_TUPLE_PACKING_THRESHOLD)\n\n  if (remainingAbiTypes.length > 0) {\n    const tupleType = new ABITupleType(remainingAbiTypes)\n    const tupleValue = remainingAbiValues\n    const tupleEncoded = tupleType.encode(tupleValue)\n    encodedArgs.push(tupleEncoded)\n  }\n\n  return encodedArgs\n}\n\n/**\n * Builds encoded ABI method arguments and resolves reference arrays\n */\nfunction buildMethodCallArgsAndReferences(params: {\n  sender: Address\n  appId: bigint\n  method: ABIMethod\n  args: (ABIValue | undefined)[]\n  accountReferences?: Address[]\n  appReferences?: bigint[]\n  assetReferences?: bigint[]\n}): { args: Uint8Array[]; accountReferences: Address[]; appReferences: bigint[]; assetReferences: bigint[] } {\n  const { accountReferences, appReferences, assetReferences, updatedArgs } = prepareArgsForEncoding(\n    params.sender,\n    params.appId,\n    params.method,\n    params.args ?? [],\n    params.accountReferences,\n    params.appReferences,\n    params.assetReferences,\n  )\n\n  const encodedArgs = encodeMethodArguments(params.method, updatedArgs)\n\n  return {\n    args: encodedArgs,\n    accountReferences,\n    appReferences,\n    assetReferences,\n  }\n}\n\nexport const buildAppCreateMethodCall = async (\n  params: ProcessedAppCreateMethodCall,\n  appManager: AppManager,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const approvalProgram =\n    typeof params.approvalProgram === 'string'\n      ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes\n      : params.approvalProgram\n  const clearStateProgram =\n    typeof params.clearStateProgram === 'string'\n      ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes\n      : params.clearStateProgram\n  const globalStateSchema =\n    params.schema?.globalByteSlices !== undefined || params.schema?.globalInts !== undefined\n      ? {\n          numByteSlices: params.schema?.globalByteSlices ?? 0,\n          numUints: params.schema?.globalInts ?? 0,\n        }\n      : undefined\n  const localStateSchema =\n    params.schema?.localByteSlices !== undefined || params.schema?.localInts !== undefined\n      ? {\n          numByteSlices: params.schema?.localByteSlices ?? 0,\n          numUints: params.schema?.localInts ?? 0,\n        }\n      : undefined\n  const extraProgramPages =\n    params.extraProgramPages !== undefined ? params.extraProgramPages : calculateExtraProgramPages(approvalProgram!, clearStateProgram!)\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const argsAndReferences = buildMethodCallArgsAndReferences({\n    sender: commonData.sender,\n    appId: 0n,\n    method: params.method,\n    args: params.args ?? [],\n    accountReferences: accountReferences,\n    appReferences: params.appReferences,\n    assetReferences: params.assetReferences,\n  })\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: 0n,\n      onComplete: params.onComplete ?? OnApplicationComplete.NoOp,\n      approvalProgram: approvalProgram,\n      clearStateProgram: clearStateProgram,\n      globalStateSchema: globalStateSchema,\n      localStateSchema: localStateSchema,\n      extraProgramPages: extraProgramPages,\n      args: argsAndReferences.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: argsAndReferences.accountReferences,\n            appReferences: argsAndReferences.appReferences,\n            assetReferences: argsAndReferences.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n\nexport const buildAppUpdateMethodCall = async (\n  params: ProcessedAppUpdateMethodCall,\n  appManager: AppManager,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const approvalProgram =\n    typeof params.approvalProgram === 'string'\n      ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes\n      : params.approvalProgram\n  const clearStateProgram =\n    typeof params.clearStateProgram === 'string'\n      ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes\n      : params.clearStateProgram\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const argsAndReferences = buildMethodCallArgsAndReferences({\n    sender: commonData.sender,\n    appId: params.appId,\n    method: params.method,\n    args: params.args ?? [],\n    accountReferences: accountReferences,\n    appReferences: params.appReferences,\n    assetReferences: params.assetReferences,\n  })\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: params.appId,\n      onComplete: OnApplicationComplete.UpdateApplication,\n      approvalProgram: approvalProgram,\n      clearStateProgram: clearStateProgram,\n      args: argsAndReferences.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: argsAndReferences.accountReferences,\n            appReferences: argsAndReferences.appReferences,\n            assetReferences: argsAndReferences.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n\nexport const buildAppCallMethodCall = async (\n  params: ProcessedAppCallMethodCall,\n  suggestedParams: SuggestedParams,\n  defaultValidityWindow: bigint,\n): Promise<Transaction> => {\n  const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow)\n  const accountReferences = params.accountReferences?.map((a) => getAddress(a))\n  const argsAndReferences = buildMethodCallArgsAndReferences({\n    sender: commonData.sender,\n    appId: params.appId,\n    method: params.method,\n    args: params.args ?? [],\n    accountReferences: accountReferences,\n    appReferences: params.appReferences,\n    assetReferences: params.assetReferences,\n  })\n\n  // If accessReferences is provided, we should not pass legacy foreign arrays\n  const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0\n\n  return new Transaction({\n    ...commonData,\n    type: TransactionType.AppCall,\n    appCall: {\n      appId: params.appId,\n      onComplete: params.onComplete ?? OnApplicationComplete.NoOp,\n      args: argsAndReferences.args,\n      ...(hasAccessReferences\n        ? { accessReferences: params.accessReferences }\n        : {\n            accountReferences: argsAndReferences.accountReferences,\n            appReferences: argsAndReferences.appReferences,\n            assetReferences: argsAndReferences.assetReferences,\n            boxReferences: params.boxReferences?.map(AppManager.getBoxReference),\n          }),\n      rejectVersion: params.rejectVersion,\n    },\n  })\n}\n"],"mappings":"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"}

package/transactions/method-call.mjs

@@ -82,68 +82,58 @@ const isAbiValue = (x) => {
 	return typeof x === "bigint" || typeof x === "boolean" || typeof x === "number" || typeof x === "string" || x instanceof Uint8Array || x instanceof Address;
 };
 /**
-* Populate reference arrays from processed ABI method call arguments
+* Prepares method arguments for ABI encoding by building reference arrays and
+* replacing reference-type arguments (account, asset, application) with their indices.
 */
-function populateMethodArgsIntoReferenceArrays(sender, appId, method, methodArgs, accountReferences, appReferences, assetReferences) {
-	const accounts = accountReferences ?? [];
-	const assets = assetReferences ?? [];
-	const apps = appReferences ?? [];
-	methodArgs.forEach((arg, i) => {
-		const argType = method.args[i].type;
-		if (argTypeIsReference(argType)) switch (argType) {
-			case "account":
-				if (typeof arg === "string" && arg !== sender.toString() && !accounts.some((a) => a.toString() === arg)) accounts.push(getAddress(arg));
-				break;
-			case "asset":
-				if (typeof arg === "bigint" && !assets.includes(arg)) assets.push(arg);
-				break;
-			case "application":
-				if (typeof arg === "bigint" && arg !== appId && !apps.includes(arg)) apps.push(arg);
-				break;
-		}
-	});
+function prepareArgsForEncoding(sender, appId, method, methodArgs, accountReferences, appReferences, assetReferences) {
+	const accounts = [...accountReferences ?? []];
+	const assets = [...assetReferences ?? []];
+	const apps = [...appReferences ?? []];
 	return {
 		accountReferences: accounts,
 		appReferences: apps,
-		assetReferences: assets
-	};
-}
-/**
-* Calculate array index for ABI reference values
-*/
-function calculateMethodArgReferenceArrayIndex(refValue, referenceType, sender, appId, accountReferences, appReferences, assetReferences) {
-	switch (referenceType) {
-		case "account":
-			if (typeof refValue === "string") {
-				if (refValue === sender.toString()) return 0;
-				const index = accountReferences.findIndex((a) => a.toString() === refValue);
-				if (index === -1) throw new Error(`Account ${refValue} not found in reference array`);
-				return index + 1;
-			}
-			throw new Error("Account reference must be a string");
-		case "asset":
-			if (typeof refValue === "bigint") {
-				const index = assetReferences.indexOf(refValue);
-				if (index === -1) throw new Error(`Asset ${refValue} not found in reference array`);
-				return index;
+		assetReferences: assets,
+		updatedArgs: methodArgs.map((arg, i) => {
+			const argType = method.args[i].type;
+			if (!argTypeIsReference(argType)) return arg;
+			switch (argType) {
+				case "account": {
+					let addr;
+					if (typeof arg === "string") addr = getAddress(arg);
+					else if (arg instanceof Uint8Array) addr = new Address(arg);
+					else throw new Error("Invalid value for account");
+					if (sender.equals(addr)) return 0;
+					const existing = accounts.findIndex((a) => a.equals(addr)) + 1;
+					if (existing) return existing;
+					accounts.push(addr);
+					return accounts.length;
+				}
+				case "asset": {
+					if (typeof arg !== "bigint") throw new Error("Invalid value for asset");
+					const existing = assets.findIndex((a) => a === arg);
+					if (existing === -1) {
+						assets.push(arg);
+						return assets.length - 1;
+					}
+					return existing;
+				}
+				case "application": {
+					if (typeof arg !== "bigint") throw new Error("Invalid value for application");
+					if (arg === appId) return 0;
+					const existing = apps.findIndex((a) => a === arg) + 1;
+					if (existing) return existing;
+					apps.push(arg);
+					return apps.length;
+				}
 			}
-			throw new Error("Asset reference must be a bigint");
-		case "application":
-			if (typeof refValue === "bigint") {
-				if (refValue === appId) return 0;
-				const index = appReferences.indexOf(refValue);
-				if (index === -1) throw new Error(`Application ${refValue} not found in reference array`);
-				return index + 1;
-			}
-			throw new Error("Application reference must be a bigint");
-		default: throw new Error(`Unknown reference type: ${referenceType}`);
-	}
+		})
+	};
 }
 /**
 * Encode ABI method arguments with tuple packing support
 * Ports the logic from the Rust encode_method_arguments function
 */
-function encodeMethodArguments(method, args, sender, appId, accountReferences, appReferences, assetReferences) {
+function encodeMethodArguments(method, args) {
 	const encodedArgs = new Array();
 	encodedArgs.push(method.getSelector());
 	const abiTypes = new Array();
@@ -153,10 +143,9 @@ function encodeMethodArguments(method, args, sender, appId, accountReferences, a
 		const argValue = args[i];
 		if (argTypeIsTransaction(methodArg.type)) {} else if (argTypeIsReference(methodArg.type)) {
 			const referenceType = methodArg.type;
-			if (typeof argValue === "string" || typeof argValue === "bigint") {
-				const foreignIndex = calculateMethodArgReferenceArrayIndex(argValue, referenceType, sender, appId, accountReferences, appReferences, assetReferences);
+			if (typeof argValue === "number") {
 				abiTypes.push(new ABIUintType(8));
-				abiValues.push(foreignIndex);
+				abiValues.push(argValue);
 			} else throw new Error(`Invalid reference value for ${referenceType}: ${argValue}`);
 		} else if (argValue !== void 0) {
 			abiTypes.push(methodArg.type);
@@ -198,12 +187,12 @@ function encodeArgsWithTuplePacking(abiTypes, abiValues) {
 	return encodedArgs;
 }
 /**
-* Common method call building logic
+* Builds encoded ABI method arguments and resolves reference arrays
 */
-function buildMethodCallCommon(params, commonData) {
-	const { accountReferences, appReferences, assetReferences } = populateMethodArgsIntoReferenceArrays(commonData.sender, params.appId, params.method, params.args ?? [], params.accountReferences, params.appReferences, params.assetReferences);
+function buildMethodCallArgsAndReferences(params) {
+	const { accountReferences, appReferences, assetReferences, updatedArgs } = prepareArgsForEncoding(params.sender, params.appId, params.method, params.args ?? [], params.accountReferences, params.appReferences, params.assetReferences);
 	return {
-		args: encodeMethodArguments(params.method, params.args, commonData.sender, params.appId, accountReferences, appReferences, assetReferences),
+		args: encodeMethodArguments(params.method, updatedArgs),
 		accountReferences,
 		appReferences,
 		assetReferences
@@ -223,14 +212,15 @@ const buildAppCreateMethodCall = async (params, appManager, suggestedParams, def
 	} : void 0;
 	const extraProgramPages = params.extraProgramPages !== void 0 ? params.extraProgramPages : calculateExtraProgramPages(approvalProgram, clearStateProgram);
 	const accountReferences = params.accountReferences?.map((a) => getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: 0n,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new Transaction({
 		...commonData,
@@ -243,11 +233,11 @@ const buildAppCreateMethodCall = async (params, appManager, suggestedParams, def
 			globalStateSchema,
 			localStateSchema,
 			extraProgramPages,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion
@@ -259,14 +249,15 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 	const approvalProgram = typeof params.approvalProgram === "string" ? (await appManager.compileTeal(params.approvalProgram)).compiledBase64ToBytes : params.approvalProgram;
 	const clearStateProgram = typeof params.clearStateProgram === "string" ? (await appManager.compileTeal(params.clearStateProgram)).compiledBase64ToBytes : params.clearStateProgram;
 	const accountReferences = params.accountReferences?.map((a) => getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: params.appId,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new Transaction({
 		...commonData,
@@ -276,11 +267,11 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 			onComplete: OnApplicationComplete.UpdateApplication,
 			approvalProgram,
 			clearStateProgram,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion
@@ -290,14 +281,15 @@ const buildAppUpdateMethodCall = async (params, appManager, suggestedParams, def
 const buildAppCallMethodCall = async (params, suggestedParams, defaultValidityWindow) => {
 	const commonData = buildTransactionCommonData(params, suggestedParams, defaultValidityWindow);
 	const accountReferences = params.accountReferences?.map((a) => getAddress(a));
-	const common = buildMethodCallCommon({
+	const argsAndReferences = buildMethodCallArgsAndReferences({
+		sender: commonData.sender,
 		appId: params.appId,
 		method: params.method,
 		args: params.args ?? [],
 		accountReferences,
 		appReferences: params.appReferences,
 		assetReferences: params.assetReferences
-	}, commonData);
+	});
 	const hasAccessReferences = params.accessReferences && params.accessReferences.length > 0;
 	return new Transaction({
 		...commonData,
@@ -305,11 +297,11 @@ const buildAppCallMethodCall = async (params, suggestedParams, defaultValidityWi
 		appCall: {
 			appId: params.appId,
 			onComplete: params.onComplete ?? OnApplicationComplete.NoOp,
-			args: common.args,
+			args: argsAndReferences.args,
 			...hasAccessReferences ? { accessReferences: params.accessReferences } : {
-				accountReferences: params.accountReferences?.map((a) => getAddress(a)),
-				appReferences: params.appReferences,
-				assetReferences: params.assetReferences,
+				accountReferences: argsAndReferences.accountReferences,
+				appReferences: argsAndReferences.appReferences,
+				assetReferences: argsAndReferences.assetReferences,
 				boxReferences: params.boxReferences?.map(AppManager.getBoxReference)
 			},
 			rejectVersion: params.rejectVersion