feat(associated token pda search): add tokenProgramId param

.gitignore

@@ -9,3 +9,4 @@ dist
 .amman
 .crates
 .bin
+.idea

clients/js/.gitignore

@@ -1,2 +1,3 @@
 .vercel
 docs
+.idea

clients/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaplex-foundation/mpl-toolbox",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Auto-generated essential Solana and Metaplex programs",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

clients/js/src/generated/instructions/createAssociatedToken.ts

@@ -70,10 +70,18 @@ export function createAssociatedToken(
   if (!resolvedAccounts.owner.value) {
     resolvedAccounts.owner.value = context.identity.publicKey;
   }
+  if (!resolvedAccounts.tokenProgram.value) {
+    resolvedAccounts.tokenProgram.value = context.programs.getPublicKey(
+      'splToken',
+      'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+    );
+    resolvedAccounts.tokenProgram.isWritable = false;
+  }
   if (!resolvedAccounts.ata.value) {
     resolvedAccounts.ata.value = findAssociatedTokenPda(context, {
       owner: expectPublicKey(resolvedAccounts.owner.value),
       mint: expectPublicKey(resolvedAccounts.mint.value),
+      tokenProgramId: expectPublicKey(resolvedAccounts.tokenProgram.value),
     });
   }
   if (!resolvedAccounts.systemProgram.value) {
@@ -83,13 +91,6 @@ export function createAssociatedToken(
     );
     resolvedAccounts.systemProgram.isWritable = false;
   }
-  if (!resolvedAccounts.tokenProgram.value) {
-    resolvedAccounts.tokenProgram.value = context.programs.getPublicKey(
-      'splToken',
-      'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
-    );
-    resolvedAccounts.tokenProgram.isWritable = false;
-  }
 
   // Accounts in order.
   const orderedAccounts: ResolvedAccount[] = Object.values(

clients/js/src/generated/instructions/createTokenIfMissing.ts

@@ -115,10 +115,18 @@ export function createTokenIfMissing(
   if (!resolvedAccounts.owner.value) {
     resolvedAccounts.owner.value = context.identity.publicKey;
   }
+  if (!resolvedAccounts.tokenProgram.value) {
+    resolvedAccounts.tokenProgram.value = context.programs.getPublicKey(
+      'splToken',
+      'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+    );
+    resolvedAccounts.tokenProgram.isWritable = false;
+  }
   if (!resolvedAccounts.ata.value) {
     resolvedAccounts.ata.value = findAssociatedTokenPda(context, {
       owner: expectPublicKey(resolvedAccounts.owner.value),
       mint: expectPublicKey(resolvedAccounts.mint.value),
+      tokenProgramId: expectPublicKey(resolvedAccounts.tokenProgram.value),
     });
   }
   if (!resolvedAccounts.token.value) {
@@ -131,13 +139,6 @@ export function createTokenIfMissing(
     );
     resolvedAccounts.systemProgram.isWritable = false;
   }
-  if (!resolvedAccounts.tokenProgram.value) {
-    resolvedAccounts.tokenProgram.value = context.programs.getPublicKey(
-      'splToken',
-      'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
-    );
-    resolvedAccounts.tokenProgram.isWritable = false;
-  }
   if (!resolvedAccounts.ataProgram.value) {
     resolvedAccounts.ataProgram.value = context.programs.getPublicKey(
       'splAssociatedToken',

clients/js/src/hooked/AssociatedToken.ts

@@ -8,14 +8,17 @@ export function findAssociatedTokenPda(
     mint: PublicKey;
     /** The owner of the token account */
     owner: PublicKey;
+    /** The Token or Token2022 Program id */
+    tokenProgramId?: PublicKey;
   }
 ): Pda {
   const associatedTokenProgramId =
     context.programs.getPublicKey('splAssociatedToken');
-  const tokenProgramId = context.programs.getPublicKey('splToken');
+  const tokenProgramIdResolved =
+    seeds.tokenProgramId ?? context.programs.getPublicKey('splToken');
   return context.eddsa.findPda(associatedTokenProgramId, [
     publicKey().serialize(seeds.owner),
-    publicKey().serialize(tokenProgramId),
+    publicKey().serialize(tokenProgramIdResolved),
     publicKey().serialize(seeds.mint),
   ]);
 }

configs/kinobi.cjs

@@ -63,7 +63,11 @@ kinobi.update(
 // Update instructions.
 const ataPdaDefaults = k.pdaDefault("AssociatedToken", {
   importFrom: "hooked",
-  seeds: { owner: k.accountDefault("owner"), mint: k.accountDefault("mint") },
+  seeds: {
+    owner: k.accountDefault("owner"),
+    mint: k.accountDefault("mint"),
+    tokenProgramId: k.accountDefault("tokenProgram")
+  },
 });
 kinobi.update(
   new k.UpdateInstructionsVisitor({