algosdk 3.4.0 → 3.5.1

package/dist/types/composer.d.ts

@@ -3,7 +3,7 @@ import { AlgodClient } from './client/v2/algod/algod.js';
 import { SimulateRequest, PendingTransactionResponse, SimulateResponse } from './client/v2/algod/models/types.js';
 import { Address } from './encoding/address.js';
 import { TransactionSigner, TransactionWithSigner } from './signer.js';
-import { BoxReference, OnApplicationComplete, SuggestedParams } from './types/transactions/base.js';
+import { BoxReference, OnApplicationComplete, ResourceReference, SuggestedParams } from './types/transactions/base.js';
 export type ABIArgument = ABIValue | TransactionWithSigner;
 /** Represents the output from a successful ABI method call. */
 export interface ABIResult {
@@ -76,7 +76,7 @@ export declare class AtomicTransactionComposer {
      * causes the current group to exceed MAX_GROUP_SIZE, or if the provided arguments are invalid
      * for the given method.
      */
-    addMethodCall({ appID, method, methodArgs, sender, suggestedParams, onComplete, approvalProgram, clearProgram, numGlobalInts, numGlobalByteSlices, numLocalInts, numLocalByteSlices, extraPages, appAccounts, appForeignApps, appForeignAssets, boxes, note, lease, rekeyTo, signer, }: {
+    addMethodCall({ appID, method, methodArgs, sender, suggestedParams, onComplete, approvalProgram, clearProgram, numGlobalInts, numGlobalByteSlices, numLocalInts, numLocalByteSlices, extraPages, appAccounts, appForeignApps, appForeignAssets, boxes, access, note, lease, rekeyTo, rejectVersion, signer, }: {
         /** The ID of the smart contract to call. Set this to 0 to indicate an application creation call. */
         appID: number | bigint;
         /** The method to call on the smart contract */
@@ -111,12 +111,16 @@ export declare class AtomicTransactionComposer {
         appForeignAssets?: Array<number | bigint>;
         /** The box references for this application call */
         boxes?: BoxReference[];
+        /** The resource references for this application call */
+        access?: ResourceReference[];
         /** The note value for this application call */
         note?: Uint8Array;
         /** The lease value for this application call */
         lease?: Uint8Array;
         /** If provided, the address that the sender will be rekeyed to at the conclusion of this application call */
         rekeyTo?: string | Address;
+        /** The lowest application version for which this transaction should immediately fail. 0 indicates that no version check should be performed. */
+        rejectVersion?: number | bigint;
         /** A transaction signer that can authorize this application call from sender */
         signer: TransactionSigner;
     }): void;

package/dist/types/logicsig.d.ts

@@ -20,6 +20,7 @@ export declare class LogicSig implements encoding.Encodable {
     args: Uint8Array[];
     sig?: Uint8Array;
     msig?: EncodedMultisig;
+    lmsig?: EncodedMultisig;
     constructor(program: Uint8Array, programArgs?: Array<Uint8Array> | null);
     getEncodingSchema(): encoding.Schema;
     toEncodingData(): Map<string, unknown>;
@@ -46,6 +47,7 @@ export declare class LogicSig implements encoding.Encodable {
      */
     appendToMultisig(secretKey: Uint8Array): void;
     signProgram(secretKey: Uint8Array): Uint8Array;
+    signProgramMultisig(secretKey: Uint8Array, msig: EncodedMultisig): Uint8Array;
     singleSignMultisig(secretKey: Uint8Array, msig: EncodedMultisig): [sig: Uint8Array, index: number];
     toByte(): Uint8Array;
     static fromByte(encoded: ArrayLike<any>): LogicSig;

package/dist/types/makeTxn.d.ts

@@ -1,5 +1,5 @@
 import { Transaction } from './transaction.js';
-import { SuggestedParams, PaymentTransactionParams, KeyRegistrationTransactionParams, AssetConfigurationTransactionParams, AssetTransferTransactionParams, AssetFreezeTransactionParams, ApplicationCallTransactionParams } from './types/transactions/base.js';
+import { SuggestedParams, PaymentTransactionParams, KeyRegistrationTransactionParams, AssetConfigurationTransactionParams, AssetTransferTransactionParams, AssetFreezeTransactionParams, ApplicationCallTransactionParams, ApplicationCallReferenceParams } from './types/transactions/base.js';
 import { Address } from './encoding/address.js';
 /** Contains parameters common to every transaction type */
 export interface CommonTransactionParams {
@@ -120,46 +120,46 @@ export declare function makeAssetTransferTxnWithSuggestedParamsFromObject({ send
  *
  * @param options - Application call transaction parameters
  */
-export declare function makeApplicationCallTxnFromObject({ sender, appIndex, onComplete, appArgs, accounts, foreignApps, foreignAssets, boxes, approvalProgram, clearProgram, numLocalInts, numLocalByteSlices, numGlobalInts, numGlobalByteSlices, extraPages, note, lease, rekeyTo, suggestedParams, }: ApplicationCallTransactionParams & CommonTransactionParams): Transaction;
+export declare function makeApplicationCallTxnFromObject({ sender, appIndex, onComplete, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, approvalProgram, clearProgram, numLocalInts, numLocalByteSlices, numGlobalInts, numGlobalByteSlices, extraPages, rejectVersion, note, lease, rekeyTo, suggestedParams, }: ApplicationCallTransactionParams & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that will create an application.
  *
  * @param options - Application creation transaction parameters
  */
-export declare function makeApplicationCreateTxnFromObject({ sender, onComplete, appArgs, accounts, foreignApps, foreignAssets, boxes, approvalProgram, clearProgram, numLocalInts, numLocalByteSlices, numGlobalInts, numGlobalByteSlices, extraPages, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'appIndex' | 'approvalProgram' | 'clearProgram'> & Required<Pick<ApplicationCallTransactionParams, 'approvalProgram' | 'clearProgram'>> & CommonTransactionParams): Transaction;
+export declare function makeApplicationCreateTxnFromObject({ sender, onComplete, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, approvalProgram, clearProgram, numLocalInts, numLocalByteSlices, numGlobalInts, numGlobalByteSlices, extraPages, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'appIndex' | 'approvalProgram' | 'clearProgram'> & Required<Pick<ApplicationCallTransactionParams, 'approvalProgram' | 'clearProgram'>> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that changes an application's approval and clear programs
  *
  * @param options - Application update transaction parameters
  */
-export declare function makeApplicationUpdateTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, approvalProgram, clearProgram, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & Required<Pick<ApplicationCallTransactionParams, 'approvalProgram' | 'clearProgram'>> & CommonTransactionParams): Transaction;
+export declare function makeApplicationUpdateTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, approvalProgram, clearProgram, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & Required<Pick<ApplicationCallTransactionParams, 'approvalProgram' | 'clearProgram'>> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that deletes an application
  *
  * @param options - Application deletion transaction parameters
  */
-export declare function makeApplicationDeleteTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams): Transaction;
+export declare function makeApplicationDeleteTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that opts in to use an application
  *
  * @param options - Application opt-in transaction parameters
  */
-export declare function makeApplicationOptInTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams): Transaction;
+export declare function makeApplicationOptInTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that closes out a user's state in an application
  *
  * @param options - Application close-out transaction parameters
  */
-export declare function makeApplicationCloseOutTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams): Transaction;
+export declare function makeApplicationCloseOutTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that clears a user's state in an application
  *
  * @param options - Application clear state transaction parameters
  */
-export declare function makeApplicationClearStateTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams): Transaction;
+export declare function makeApplicationClearStateTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;
 /**
  * Make a transaction that just calls an application, doing nothing on completion
  *
  * @param options - Application no-op transaction parameters
  */
-export declare function makeApplicationNoOpTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams): Transaction;
+export declare function makeApplicationNoOpTxnFromObject({ sender, appIndex, appArgs, accounts, foreignApps, foreignAssets, boxes, convertToAccess, holdings, locals, access, note, lease, rekeyTo, suggestedParams, }: Omit<ApplicationCallTransactionParams, 'onComplete' | 'numLocalInts' | 'numLocalByteSlices' | 'numGlobalInts' | 'numGlobalByteSlices' | 'extraPages' | 'approvalProgram' | 'clearProgram'> & CommonTransactionParams & ApplicationCallReferenceParams): Transaction;

package/dist/types/transaction.d.ts

@@ -8,6 +8,22 @@ export interface TransactionBoxReference {
     readonly appIndex: bigint;
     readonly name: Uint8Array;
 }
+export interface TransactionHoldingReference {
+    readonly assetIndex: bigint;
+    readonly address: Address;
+}
+export interface TransactionLocalsReference {
+    readonly appIndex: bigint;
+    readonly address: Address;
+}
+export interface TransactionResourceReference {
+    readonly address?: Readonly<Address>;
+    readonly appIndex?: Readonly<bigint>;
+    readonly assetIndex?: Readonly<bigint>;
+    readonly holding?: Readonly<TransactionHoldingReference>;
+    readonly locals?: Readonly<TransactionLocalsReference>;
+    readonly box?: Readonly<TransactionBoxReference>;
+}
 export interface PaymentTransactionFields {
     readonly receiver: Address;
     readonly amount: bigint;
@@ -63,6 +79,8 @@ export interface ApplicationTransactionFields {
     readonly foreignApps: ReadonlyArray<bigint>;
     readonly foreignAssets: ReadonlyArray<bigint>;
     readonly boxes: ReadonlyArray<TransactionBoxReference>;
+    readonly access: ReadonlyArray<TransactionResourceReference>;
+    readonly rejectVersion: number;
 }
 export interface StateProofTransactionFields {
     readonly stateProofType: number;

package/dist/types/types/transactions/base.d.ts

@@ -134,6 +134,73 @@ export interface BoxReference {
      */
     name: Uint8Array;
 }
+/**
+ * A grouping of the asset index and address of the account
+ */
+export interface HoldingReference {
+    /**
+     * The asset index of the holding
+     */
+    assetIndex: number | bigint;
+    /**
+     * The address of the account holding the asset
+     */
+    address: string | Address;
+}
+/** A grouping of the application index and address of the account
+ */
+export interface LocalsReference {
+    /**
+     * The application index of the local state
+     */
+    appIndex: number | bigint;
+    /**
+     * The address of the account holding the local state
+     */
+    address: string | Address;
+}
+/**
+ * Parameters for resource references in application transactions
+ */
+export interface ApplicationCallReferenceParams {
+    /**
+     * A grouping of the asset index and address of the account
+     */
+    holdings?: HoldingReference[];
+    /** A grouping of the application index and address of the account
+     */
+    locals?: LocalsReference[];
+    /**
+     * If true, use the foreign accounts, apps, assets, boxes, holdings, and locals fields to construct the access list
+     */
+    convertToAccess?: boolean;
+}
+export interface ResourceReference {
+    /**
+     * Address string, any additional accounts to supply to the application
+     */
+    address?: string | Address;
+    /**
+     * Asset index uniquely specifying the asset
+     */
+    assetIndex?: number | bigint;
+    /**
+     * A unique application ID
+     */
+    appIndex?: number | bigint;
+    /**
+     * Holding definition: asset ID and account address
+     */
+    holding?: HoldingReference;
+    /**
+     * Local state definition: application ID and account address
+     */
+    locals?: LocalsReference;
+    /**
+     * Box definition: application ID and a name of the box
+     */
+    box?: BoxReference;
+}
 /**
  * Contains payment transaction parameters.
  *
@@ -361,6 +428,15 @@ export interface ApplicationCallTransactionParams {
      * A grouping of the app ID and name of the box in an Uint8Array
      */
     boxes?: BoxReference[];
+    /**
+     * Resources accessed by the application
+     */
+    access?: ResourceReference[];
+    /**
+     * The lowest application version for which this transaction should immediately fail.
+     * 0 indicates that no version check should be performed.
+     */
+    rejectVersion?: number | bigint;
 }
 /**
  * Contains state proof transaction parameters.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "algosdk",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "description": "The official JavaScript SDK for Algorand",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/appAccess.ts

@@ -0,0 +1,298 @@
+import { Address } from './encoding/address.js';
+import {
+  BoxReference,
+  HoldingReference,
+  LocalsReference,
+  ResourceReference,
+} from './types/transactions/base.js';
+import { ensureSafeUnsignedInteger } from './utils/utils.js';
+
+/**
+ * resourceReferencesToEncodingData translates an array of ResourceReferences into an array of encoding data
+ * maps.
+ */
+export function resourceReferencesToEncodingData(
+  appIndex: bigint,
+  references: ReadonlyArray<ResourceReference>
+): Array<Map<string, unknown>> {
+  const accessList: Array<Map<string, unknown>> = [];
+
+  function ensure(target: ResourceReference): number {
+    for (let idx = 0; idx < accessList.length; idx++) {
+      const a = accessList[idx];
+      if (
+        a.get('d') === target.address &&
+        a.get('s') === target.assetIndex &&
+        a.get('p') === target.appIndex
+      ) {
+        return idx + 1; // 1-based index
+      }
+    }
+    if (target.address) {
+      accessList.push(new Map<string, unknown>([['d', target.address]]));
+    }
+    if (target.assetIndex) {
+      accessList.push(new Map<string, unknown>([['s', target.assetIndex]]));
+    }
+    if (target.appIndex) {
+      accessList.push(new Map<string, unknown>([['p', target.appIndex]]));
+    }
+    return accessList.length; // length is 1-based position of new element
+  }
+
+  const zeroAddr = Address.zeroAddress();
+  for (const rr of references) {
+    if (rr.address || rr.assetIndex || rr.appIndex) {
+      ensure(rr);
+      continue;
+    }
+
+    if (rr.holding) {
+      const h = rr.holding;
+      let addrIdx = 0;
+      if (h.address && !(h.address as Address).equals(zeroAddr)) {
+        addrIdx = ensure({ address: h.address });
+      }
+      const assetIdx = ensure({ assetIndex: h.assetIndex });
+      accessList.push(
+        new Map<string, unknown>([
+          [
+            'h',
+            new Map<string, unknown>([
+              ['d', addrIdx],
+              ['s', assetIdx],
+            ]),
+          ],
+        ])
+      );
+      continue;
+    }
+    if (rr.locals) {
+      const l = rr.locals;
+      let addrIdx = 0;
+      if (l.address && !(l.address as Address).equals(zeroAddr)) {
+        addrIdx = ensure({ address: l.address });
+      }
+      let appIdx = 0;
+      if (l.appIndex && BigInt(l.appIndex) !== appIndex) {
+        appIdx = ensure({ appIndex: l.appIndex });
+      }
+      accessList.push(
+        new Map<string, unknown>([
+          [
+            'l',
+            new Map<string, unknown>([
+              ['d', addrIdx],
+              ['p', appIdx],
+            ]),
+          ],
+        ])
+      );
+      continue;
+    }
+    if (rr.box) {
+      const b = rr.box;
+      let appIdx = 0;
+      if (b.appIndex && BigInt(b.appIndex) !== appIndex) {
+        appIdx = ensure({ appIndex: b.appIndex });
+      }
+      accessList.push(
+        new Map<string, unknown>([
+          [
+            'b',
+            new Map<string, unknown>([
+              ['i', appIdx],
+              ['n', b.name],
+            ]),
+          ],
+        ])
+      );
+    }
+  }
+  return accessList;
+}
+
+export function convertIndicesToResourceReferences(
+  accessList: Array<Map<string, unknown>>
+): Array<ResourceReference> {
+  const references: Array<ResourceReference> = [];
+  for (const item of accessList) {
+    const address = item.get('d') as Address | undefined;
+    const assetIndex = item.get('s') as bigint | undefined;
+    const appIndex = item.get('p') as bigint | undefined;
+    if (address) {
+      references.push({ address });
+      continue;
+    }
+    if (assetIndex) {
+      references.push({ assetIndex });
+      continue;
+    }
+    if (appIndex) {
+      references.push({ appIndex });
+      continue;
+    }
+    const holding = item.get('h') as Map<string, unknown> | undefined;
+    if (holding) {
+      const hAddressIndex = ensureSafeUnsignedInteger(holding.get('d') ?? 0);
+      const hAssetIndex = ensureSafeUnsignedInteger(holding.get('s'));
+      if (!hAssetIndex) {
+        throw new Error(`Holding missing asset index: ${holding}`);
+      }
+      const hAddress =
+        hAddressIndex === 0
+          ? Address.zeroAddress()
+          : (references[hAddressIndex - 1].address as Address);
+      const asset = references[hAssetIndex - 1].assetIndex as bigint;
+      references.push({ holding: { address: hAddress, assetIndex: asset } });
+      continue;
+    }
+    const locals = item.get('l') as Map<string, unknown> | undefined;
+    if (locals) {
+      const lAddressIndex = ensureSafeUnsignedInteger(locals.get('d') ?? 0);
+      const lAppIndex = ensureSafeUnsignedInteger(locals.get('p') ?? 0);
+      const lAddress =
+        lAddressIndex === 0
+          ? Address.zeroAddress()
+          : (references[lAddressIndex - 1].address as Address);
+      const app =
+        lAppIndex === 0
+          ? BigInt(0)
+          : (references[lAppIndex - 1].appIndex as bigint);
+      references.push({ locals: { address: lAddress, appIndex: app } });
+      continue;
+    }
+    const box = item.get('b') as Map<string, unknown> | undefined;
+    if (box) {
+      const bAppIndex = ensureSafeUnsignedInteger(box.get('i') ?? 0);
+      const name = box.get('n') as Uint8Array;
+      if (!name) {
+        throw new Error(`Box missing name: ${box}`);
+      }
+      const app =
+        bAppIndex === 0
+          ? BigInt(0)
+          : (references[bAppIndex - 1].appIndex as number | bigint);
+      references.push({ box: { appIndex: app, name } });
+    }
+  }
+  return references;
+}
+
+/**
+ * foreignArraysToResourceReferences makes a single array of ResourceReferences from various foreign resource arrays.
+ * Note, runtime representation of ResourceReference uses addresses, app and asset identifiers, not indexes.
+ *
+ * @param accounts - optional array of accounts
+ * @param foreignAssets - optional array of foreign assets
+ * @param foreignApps - optional array of foreign apps
+ * @param holdings - optional array of holdings
+ * @param locals - optional array of locals
+ * @param boxes - optional array of boxes
+ */
+export function foreignArraysToResourceReferences({
+  appIndex,
+  accounts,
+  foreignAssets,
+  foreignApps,
+  holdings,
+  locals,
+  boxes,
+}: {
+  appIndex: bigint | number;
+  accounts?: ReadonlyArray<string | Address>;
+  foreignAssets?: ReadonlyArray<number | bigint>;
+  foreignApps?: ReadonlyArray<number | bigint>;
+  holdings?: ReadonlyArray<HoldingReference>;
+  locals?: ReadonlyArray<LocalsReference>;
+  boxes?: ReadonlyArray<BoxReference>;
+}): Array<ResourceReference> {
+  const accessList: Array<ResourceReference> = [];
+  function ensureAddress(addr: string | Address) {
+    let addr2: Address;
+    if (typeof addr === 'string') {
+      if (addr === '') {
+        return;
+      }
+      addr2 = Address.fromString(addr);
+    } else {
+      addr2 = addr;
+    }
+    if (addr2.equals(Address.zeroAddress())) {
+      return;
+    }
+    let addrFound = false;
+    for (const rr of accessList) {
+      if (!rr.address) {
+        continue;
+      }
+      let rrAddress = rr.address;
+      if (typeof rr.address === 'string') {
+        rrAddress = Address.fromString(rr.address);
+      }
+      if ((rrAddress as Address).equals(addr2)) {
+        addrFound = true;
+        break;
+      }
+    }
+    if (!addrFound) {
+      accessList.push({ address: addr });
+    }
+  }
+  function ensureAsset(asset: number | bigint) {
+    let assetFound = false;
+    for (const rr of accessList) {
+      if (rr.assetIndex === asset) {
+        assetFound = true;
+        break;
+      }
+    }
+    if (!assetFound) {
+      accessList.push({ assetIndex: asset });
+    }
+  }
+  function ensureApp(app: number | bigint) {
+    let appFound = false;
+    for (const rr of accessList) {
+      if (rr.appIndex === app) {
+        appFound = true;
+        break;
+      }
+    }
+    if (!appFound) {
+      accessList.push({ appIndex: app });
+    }
+  }
+  for (const acct of accounts ?? []) {
+    ensureAddress(acct);
+  }
+  for (const asset of foreignAssets ?? []) {
+    ensureAsset(asset);
+  }
+  for (const app of foreignApps ?? []) {
+    ensureApp(app);
+  }
+  for (const holding of holdings ?? []) {
+    if (holding.address) {
+      ensureAddress(holding.address);
+    }
+    ensureAsset(holding.assetIndex);
+    accessList.push({ holding });
+  }
+  for (const local of locals ?? []) {
+    if (local.address) {
+      ensureAddress(local.address);
+    }
+    if (local.appIndex && BigInt(local.appIndex) !== appIndex) {
+      ensureApp(local.appIndex);
+    }
+    accessList.push({ locals: local });
+  }
+  for (const box of boxes ?? []) {
+    if (box.appIndex && BigInt(box.appIndex) !== appIndex) {
+      ensureApp(box.appIndex);
+    }
+    accessList.push({ box });
+  }
+  return accessList;
+}