use allowOwnerOffCurve=true flag for hi level functions

SwenSchaeferjohann · SwenSchaeferjohann · commit eae43fc87918 · 2026-03-31T00:56:06.000+01:00
diff --git a/js/token-interface/src/account.ts b/js/token-interface/src/account.ts
@@ -130,7 +130,7 @@ export async function getAtaOrNull({
     mint,
     commitment,
 }: GetAtaInput): Promise<TokenInterfaceAccount | null> {
-    const address = getAssociatedTokenAddress(mint, owner);
+    const address = getAssociatedTokenAddress(mint, owner, true);
 
     const [hotInfo, compressedResult] = await Promise.all([
         rpc.getAccountInfo(address, commitment),
diff --git a/js/token-interface/src/instructions/approve.ts b/js/token-interface/src/instructions/approve.ts
@@ -6,7 +6,7 @@ import type {
     CreateRawApproveInstructionInput,
 } from '../types';
 import { toBigIntAmount } from '../helpers';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { createLoadInstructions } from './load';
 import { toInstructionPlan } from './_plan';
 
@@ -76,7 +76,7 @@ async function _createApproveInstructions(
     }: CreateApproveInstructionsInput,
     wrap: boolean,
 ): Promise<TransactionInstruction[]> {
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructions({
diff --git a/js/token-interface/src/instructions/ata.ts b/js/token-interface/src/instructions/ata.ts
@@ -13,7 +13,7 @@ import { LIGHT_TOKEN_PROGRAM_ID } from '@lightprotocol/stateless.js';
 import { struct, u8, u32, option, vec, array } from '@coral-xyz/borsh';
 import { LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR } from '../constants';
 import { getAtaProgramId } from '../read/ata-utils';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import type { CreateRawAtaInstructionInput } from '../types';
 import { toInstructionPlan } from './_plan';
 
@@ -410,11 +410,12 @@ export function createAtaInstruction({
     programId,
 }: CreateRawAtaInstructionInput): TransactionInstruction {
     const targetProgramId = programId ?? LIGHT_TOKEN_PROGRAM_ID;
-    const associatedToken = getAtaAddress({
-        owner,
+    const associatedToken = getAssociatedTokenAddress(
         mint,
-        programId: targetProgramId,
-    });
+        owner,
+        true,
+        targetProgramId,
+    );
 
     return createAtaIdempotent({
         payer,
diff --git a/js/token-interface/src/instructions/burn.ts b/js/token-interface/src/instructions/burn.ts
@@ -7,7 +7,7 @@ import type {
     CreateRawBurnInstructionInput,
 } from '../types';
 import { toBigIntAmount } from '../helpers';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { createLoadInstructions } from './load';
 import { toInstructionPlan } from './_plan';
 
@@ -122,7 +122,7 @@ async function _createBurnInstructions(
     }: CreateBurnInstructionsInput,
     wrap: boolean,
 ): Promise<TransactionInstruction[]> {
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     const amountBn = toBigIntAmount(amount);
     const burnIx =
diff --git a/js/token-interface/src/instructions/freeze.ts b/js/token-interface/src/instructions/freeze.ts
@@ -5,7 +5,7 @@ import type {
     CreateFreezeInstructionsInput,
     CreateRawFreezeInstructionInput,
 } from '../types';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { createLoadInstructions } from './load';
 import { toInstructionPlan } from './_plan';
 
@@ -50,7 +50,7 @@ async function _createFreezeInstructions(
     { rpc, payer, owner, mint, freezeAuthority }: CreateFreezeInstructionsInput,
     wrap: boolean,
 ): Promise<TransactionInstruction[]> {
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructions({
diff --git a/js/token-interface/src/instructions/load.ts b/js/token-interface/src/instructions/load.ts
@@ -30,7 +30,6 @@ import { getAtaProgramId, checkAtaAddress, AtaType } from '../read/ata-utils';
 import type { LoadOptions } from '../load-options';
 import { getMint } from '../read/get-mint';
 import { toLoadOptions } from '../helpers';
-import { getAtaAddress } from '../read';
 import type { CreateLoadInstructionsInput } from '../types';
 import { toInstructionPlan } from './_plan';
 import { createDecompressInstruction } from './load/decompress';
@@ -66,24 +65,24 @@ async function _buildLoadInstructions(
     const primaryColdCompressedAccount =
         selectPrimaryColdCompressedAccountForLoad(sources);
 
-    const lightTokenAtaAddress = getAssociatedTokenAddress(mint, owner);
+    const lightTokenAtaAddress = getAssociatedTokenAddress(mint, owner, true);
     const splAta = getAssociatedTokenAddressSync(
         mint,
         owner,
-        false,
+        true,
         TOKEN_PROGRAM_ID,
         getAtaProgramId(TOKEN_PROGRAM_ID),
     );
     const t22Ata = getAssociatedTokenAddressSync(
         mint,
         owner,
-        false,
+        true,
         TOKEN_2022_PROGRAM_ID,
         getAtaProgramId(TOKEN_2022_PROGRAM_ID),
     );
 
     let ataType: AtaType = 'light-token';
-    const validation = checkAtaAddress(targetAta, mint, owner);
+    const validation = checkAtaAddress(targetAta, mint, owner, undefined, true);
     ataType = validation.type;
     if (wrap && ataType !== 'light-token') {
         throw new Error(
@@ -344,7 +343,7 @@ export async function createLoadInstructions({
     splInterfaces,
     decimals,
 }: CreateLoadInstructionOptions): Promise<TransactionInstruction[]> {
-    const targetAta = getAtaAddress({ owner, mint });
+    const targetAta = getAssociatedTokenAddress(mint, owner, true);
     const loadOptions = buildLoadOptions(owner, authority, wrap, splInterfaces);
 
     assertV2Enabled();
@@ -361,6 +360,7 @@ export async function createLoadInstructions({
             undefined,
             undefined,
             wrap,
+            true,
         );
     } catch (e) {
         if (e instanceof TokenAccountNotFoundError) {
diff --git a/js/token-interface/src/instructions/revoke.ts b/js/token-interface/src/instructions/revoke.ts
@@ -5,7 +5,7 @@ import type {
     CreateRawRevokeInstructionInput,
     CreateRevokeInstructionsInput,
 } from '../types';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { createLoadInstructions } from './load';
 import { toInstructionPlan } from './_plan';
 
@@ -56,7 +56,7 @@ async function _createRevokeInstructions(
     { rpc, payer, owner, mint }: CreateRevokeInstructionsInput,
     wrap: boolean,
 ): Promise<TransactionInstruction[]> {
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructions({
diff --git a/js/token-interface/src/instructions/thaw.ts b/js/token-interface/src/instructions/thaw.ts
@@ -5,7 +5,7 @@ import type {
     CreateRawThawInstructionInput,
     CreateThawInstructionsInput,
 } from '../types';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { createLoadInstructions } from './load';
 import { toInstructionPlan } from './_plan';
 
@@ -50,7 +50,7 @@ async function _createThawInstructions(
     { rpc, payer, owner, mint, freezeAuthority }: CreateThawInstructionsInput,
     wrap: boolean,
 ): Promise<TransactionInstruction[]> {
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructions({
diff --git a/js/token-interface/src/instructions/transfer.ts b/js/token-interface/src/instructions/transfer.ts
@@ -4,7 +4,7 @@ import { LIGHT_TOKEN_PROGRAM_ID } from '@lightprotocol/stateless.js';
 import { getSplInterfaces } from '../spl-interface';
 import { createUnwrapInstruction } from './unwrap';
 import { getMintDecimals, toBigIntAmount } from '../helpers';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import type {
     CreateRawTransferInstructionInput,
     CreateTransferInstructionsInput,
@@ -123,15 +123,13 @@ async function _createTransferInstructions(
         decimals,
         splInterfaces: transferSplInterfaces,
     });
-    const recipientAta = getAtaAddress({
-        owner: recipient,
+    const recipientAta = getAssociatedTokenAddress(
         mint,
-        programId: recipientTokenProgramId,
-    });
-    const senderAta = getAtaAddress({
-        owner: sourceOwner,
-        mint,
-    });
+        recipient,
+        true,
+        recipientTokenProgramId,
+    );
+    const senderAta = getAssociatedTokenAddress(mint, sourceOwner, true);
 
     let transferInstruction: TransactionInstruction;
     if (recipientTokenProgramId.equals(LIGHT_TOKEN_PROGRAM_ID)) {
diff --git a/js/token-interface/src/nowrap/instructions.ts b/js/token-interface/src/nowrap/instructions.ts
@@ -11,7 +11,7 @@ import type {
 } from '../types';
 import { toInstructionPlan } from '../instructions/_plan';
 import { createLoadInstructions as createLoadInstructionsDefault } from '../instructions/load';
-import { getAtaAddress } from '../read';
+import { getAssociatedTokenAddress } from '../read';
 import { toBigIntAmount, getMintDecimals } from '../helpers';
 import { createTransferCheckedInstruction } from '../instructions/transfer';
 import { getSplInterfaces } from '../spl-interface';
@@ -76,15 +76,13 @@ export async function createTransferInstructions(
         splInterfaces: transferSplInterfaces,
     });
 
-    const recipientAta = getAtaAddress({
-        owner: recipient,
+    const recipientAta = getAssociatedTokenAddress(
         mint,
-        programId: recipientTokenProgramId,
-    });
-    const senderAta = getAtaAddress({
-        owner: sourceOwner,
-        mint,
-    });
+        recipient,
+        true,
+        recipientTokenProgramId,
+    );
+    const senderAta = getAssociatedTokenAddress(mint, sourceOwner, true);
 
     let transferInstruction: TransactionInstruction;
     if (recipientTokenProgramId.equals(LIGHT_TOKEN_PROGRAM_ID)) {
@@ -132,7 +130,7 @@ export async function createApproveInstructions(
     input: CreateApproveInstructionsInput,
 ): Promise<TransactionInstruction[]> {
     const { rpc, payer, owner, mint, delegate, amount } = input;
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructionsDefault({
@@ -156,7 +154,7 @@ export async function createRevokeInstructions(
     input: CreateRevokeInstructionsInput,
 ): Promise<TransactionInstruction[]> {
     const { rpc, payer, owner, mint } = input;
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructionsDefault({
@@ -178,7 +176,7 @@ export async function createBurnInstructions(
     input: CreateBurnInstructionsInput,
 ): Promise<TransactionInstruction[]> {
     const { rpc, payer, owner, mint, authority, amount, decimals } = input;
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     const amountBn = toBigIntAmount(amount);
     const burnIx =
@@ -216,7 +214,7 @@ export async function createFreezeInstructions(
     input: CreateFreezeInstructionsInput,
 ): Promise<TransactionInstruction[]> {
     const { rpc, payer, owner, mint, freezeAuthority } = input;
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructionsDefault({
@@ -238,7 +236,7 @@ export async function createThawInstructions(
     input: CreateThawInstructionsInput,
 ): Promise<TransactionInstruction[]> {
     const { rpc, payer, owner, mint, freezeAuthority } = input;
-    const tokenAccount = getAtaAddress({ owner, mint });
+    const tokenAccount = getAssociatedTokenAddress(mint, owner, true);
 
     return [
         ...(await createLoadInstructionsDefault({
diff --git a/js/token-interface/src/read/get-account.ts b/js/token-interface/src/read/get-account.ts
@@ -570,7 +570,7 @@ async function getUnifiedAccountView(
         lightTokenAta = getAssociatedTokenAddressSync(
             fetchByOwner.mint,
             fetchByOwner.owner,
-            false,
+            true,
             LIGHT_TOKEN_PROGRAM_ID,
             getAtaProgramId(LIGHT_TOKEN_PROGRAM_ID),
         );
@@ -602,14 +602,14 @@ async function getUnifiedAccountView(
         const splTokenAta = getAssociatedTokenAddressSync(
             fetchByOwner.mint,
             fetchByOwner.owner,
-            false,
+            true,
             TOKEN_PROGRAM_ID,
             getAtaProgramId(TOKEN_PROGRAM_ID),
         );
         const token2022Ata = getAssociatedTokenAddressSync(
             fetchByOwner.mint,
             fetchByOwner.owner,
-            false,
+            true,
             TOKEN_2022_PROGRAM_ID,
             getAtaProgramId(TOKEN_2022_PROGRAM_ID),
         );
@@ -737,7 +737,7 @@ async function getLightTokenAccountView(
         address = getAssociatedTokenAddressSync(
             fetchByOwner.mint,
             fetchByOwner.owner,
-            false,
+            true,
             LIGHT_TOKEN_PROGRAM_ID,
             getAtaProgramId(LIGHT_TOKEN_PROGRAM_ID),
         );
@@ -845,7 +845,7 @@ async function getSplOrToken2022AccountView(
         address = getAssociatedTokenAddressSync(
             fetchByOwner.mint,
             fetchByOwner.owner,
-            false,
+            true,
             programId,
             getAtaProgramId(programId),
         );
diff --git a/js/token-interface/src/read/index.ts b/js/token-interface/src/read/index.ts
@@ -1,10 +1,5 @@
-import type { PublicKey } from '@solana/web3.js';
 import { getAta as getTokenInterfaceAta } from '../account';
-import type {
-    AtaOwnerInput,
-    GetAtaInput,
-    TokenInterfaceAccount,
-} from '../types';
+import type { GetAtaInput, TokenInterfaceAccount } from '../types';
 import { getAssociatedTokenAddress } from './associated-token-address';
 
 export { getAssociatedTokenAddress } from './associated-token-address';
@@ -13,14 +8,6 @@ export { getMint } from './get-mint';
 export type { MintInfo } from './get-mint';
 export * from './get-account';
 
-export function getAtaAddress({
-    mint,
-    owner,
-    programId,
-}: AtaOwnerInput): PublicKey {
-    return getAssociatedTokenAddress(mint, owner, false, programId);
-}
-
 export async function getAta({
     rpc,
     owner,
diff --git a/js/token-interface/tests/e2e/approve-revoke.test.ts b/js/token-interface/tests/e2e/approve-revoke.test.ts
diff --git a/js/token-interface/tests/e2e/ata-read.test.ts b/js/token-interface/tests/e2e/ata-read.test.ts
diff --git a/js/token-interface/tests/e2e/freeze-thaw.test.ts b/js/token-interface/tests/e2e/freeze-thaw.test.ts
diff --git a/js/token-interface/tests/e2e/load.test.ts b/js/token-interface/tests/e2e/load.test.ts
diff --git a/js/token-interface/tests/e2e/transfer.test.ts b/js/token-interface/tests/e2e/transfer.test.ts
diff --git a/js/token-interface/tests/unit/public-api.test.ts b/js/token-interface/tests/unit/public-api.test.ts
