[token js]: transfer-hook: align key pushing flow with Rust helpers

Joe C · web-flow · commit 2b30a1b250b8 · 2023-11-14T10:59:29.000Z
This PR modifes the ordering of pushing account metas to an instruction to align exactly with the Rust interface's `offchain` helper. Closes #5686
diff --git a/token/js/src/extensions/transferHook/instructions.ts b/token/js/src/extensions/transferHook/instructions.ts
@@ -172,7 +172,6 @@ export async function addExtraAccountsToInstruction(
     const extraAccountMetas = getExtraAccountMetas(extraAccountsInfo);
 
     const accountMetas = instruction.keys;
-    accountMetas.push({ pubkey: extraAccountsAccount, isSigner: false, isWritable: false });
 
     for (const extraAccountMeta of extraAccountMetas) {
         const accountMetaUnchecked = await resolveExtraAccountMeta(
@@ -186,6 +185,7 @@ export async function addExtraAccountsToInstruction(
         accountMetas.push(accountMeta);
     }
     accountMetas.push({ pubkey: transferHook.programId, isSigner: false, isWritable: false });
+    accountMetas.push({ pubkey: extraAccountsAccount, isSigner: false, isWritable: false });
 
     return new TransactionInstruction({ keys: accountMetas, programId, data: instruction.data });
 }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ export async function addExtraAccountsToInstruction(`
`172`	`172`	`const extraAccountMetas = getExtraAccountMetas(extraAccountsInfo);`
`173`	`173`
`174`	`174`	`const accountMetas = instruction.keys;`
`175`		`- accountMetas.push({ pubkey: extraAccountsAccount, isSigner: false, isWritable: false });`
`176`	`175`
`177`	`176`	`for (const extraAccountMeta of extraAccountMetas) {`
`178`	`177`	`const accountMetaUnchecked = await resolveExtraAccountMeta(`
`@@ -186,6 +185,7 @@ export async function addExtraAccountsToInstruction(`
`186`	`185`	`accountMetas.push(accountMeta);`
`187`	`186`	`}`
`188`	`187`	`accountMetas.push({ pubkey: transferHook.programId, isSigner: false, isWritable: false });`
	`188`	`+ accountMetas.push({ pubkey: extraAccountsAccount, isSigner: false, isWritable: false });`
`189`	`189`
`190`	`190`	`return new TransactionInstruction({ keys: accountMetas, programId, data: instruction.data });`
`191`	`191`	`}`