Skip to content

Recognize program address from Anchor IDL with seed of kind "account" #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2025
Merged

Recognize program address from Anchor IDL with seed of kind "account" #621

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1290840
fix 607
daog1 May 29, 2025
7b83f73
fix 607 test
daog1 May 29, 2025
33d8107
Throw if program address is not found
lorisleiva Jun 13, 2025
434ef2d
Create tasty-weeks-protect.md
lorisleiva Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/nodes-from-anchor/src/v01/InstructionAccountNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
import { getBase58Codec } from '@solana/codecs';

import { hex } from '../utils';
import { IdlV01InstructionAccount, IdlV01InstructionAccountItem, IdlV01Seed } from './idl';
import { IdlV01InstructionAccount, IdlV01InstructionAccountItem, IdlV01Seed, IdlV01SeedAccount } from './idl';

export function instructionAccountNodesFromAnchorV01(
allAccounts: AccountNode[],
Expand All @@ -40,14 +40,15 @@ export function instructionAccountNodesFromAnchorV01(
return idl.flatMap(account =>
'accounts' in account
? instructionAccountNodesFromAnchorV01(allAccounts, instructionArguments, account.accounts)
: [instructionAccountNodeFromAnchorV01(allAccounts, instructionArguments, account)],
: [instructionAccountNodeFromAnchorV01(allAccounts, instructionArguments, account, idl)],
);
}

export function instructionAccountNodeFromAnchorV01(
allAccounts: AccountNode[],
instructionArguments: InstructionArgumentNode[],
idl: IdlV01InstructionAccount,
parentIdl: IdlV01InstructionAccountItem[],
): InstructionAccountNode {
const isOptional = idl.optional ?? false;
const docs = idl.docs ?? [];
Expand Down Expand Up @@ -133,6 +134,16 @@ export function instructionAccountNodeFromAnchorV01(
programId = getBase58Codec().decode(new Uint8Array(idl.pda.program.value));
break;
}
case 'account': {
const accNode = parentIdl.find(acc => acc.name == (idl.pda?.program as IdlV01SeedAccount).path);
if (accNode) {
programId = (accNode as IdlV01InstructionAccount).address;
} else {
programId = '';
}

break;
}
default: {
throw new CodamaError(CODAMA_ERROR__ANCHOR__PROGRAM_ID_KIND_UNIMPLEMENTED, { kind });
}
Expand Down
19 changes: 12 additions & 7 deletions packages/nodes-from-anchor/test/v01/InstructionAccountNode.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@ import { expect, test } from 'vitest';
import { instructionAccountNodeFromAnchorV01, instructionAccountNodesFromAnchorV01 } from '../../src';

test('it creates instruction account nodes', () => {
const node = instructionAccountNodeFromAnchorV01([], [], {
docs: ['my docs'],
name: 'MyInstructionAccount',
optional: true,
signer: false,
writable: true,
});
const node = instructionAccountNodeFromAnchorV01(
[],
[],
{
docs: ['my docs'],
name: 'MyInstructionAccount',
optional: true,
signer: false,
writable: true,
},
[],
);

expect(node).toEqual(
instructionAccountNode({
Expand Down
Loading