@metaplex-foundation/kinobi 0.6.0 → 0.7.0-alpha.0

package/src/visitors/transformers/UpdateInstructionsVisitor.ts

@@ -1,5 +1,6 @@
 import * as nodes from '../../nodes';
 import { mainCase } from '../../utils';
+import { Dependency } from '../Dependency';
 import { InstructionNodeAccountDefaultsInput } from './SetInstructionAccountDefaultValuesVisitor';
 import {
   NodeTransform,
@@ -12,8 +13,8 @@ export type InstructionUpdates =
   | NodeTransformer<nodes.InstructionNode>
   | { delete: true }
   | (InstructionMetadataUpdates & {
-      accounts?: InstructionAccountUpdates;
       args?: Record<string, string>;
+      extraArgs?: nodes.TypeStructNode | nodes.TypeDefinedLinkNode | null;
     });
 
 export type InstructionMetadataUpdates = Partial<
@@ -38,9 +39,10 @@ type InstructionNodeBytesCreatedOnChainInput =
   | {
       kind: 'account';
       name: string;
-      dependency?: string;
+      dependency?: Dependency;
       includeHeader?: boolean;
-    };
+    }
+  | { kind: 'resolver'; name: string; dependency?: Dependency };
 
 export class UpdateInstructionsVisitor extends TransformNodesVisitor {
   protected allAccounts = new Map<string, nodes.AccountNode>();
@@ -61,7 +63,11 @@ export class UpdateInstructionsVisitor extends TransformNodesVisitor {
               return null;
             }
 
-            const { accounts: accountUpdates, ...metadataUpdates } = updates;
+            const {
+              accounts: accountUpdates,
+              extraArgs: extraArgsUpdates,
+              ...metadataUpdates
+            } = updates;
             const newName = mainCase(updates.name ?? node.name);
             const args = updates.args ?? {};
             const newMetadata = {
@@ -71,20 +77,19 @@ export class UpdateInstructionsVisitor extends TransformNodesVisitor {
             const newAccounts = node.accounts.map((account) =>
               this.handleInstructionAccount(account, accountUpdates ?? {})
             );
-
-            if (nodes.isTypeStructNode(node.args)) {
-              return new nodes.InstructionNode(
-                newMetadata,
-                newAccounts,
-                renameStructNode(node.args, args, `${newName}InstructionData`),
-                node.subInstructions
-              );
-            }
+            const newArgs = nodes.isTypeStructNode(node.args)
+              ? renameStructNode(node.args, args, `${newName}InstructionData`)
+              : node.args;
+            const newExtraArgs =
+              extraArgsUpdates === undefined
+                ? node.extraArgs
+                : extraArgsUpdates;
 
             return new nodes.InstructionNode(
               newMetadata,
               newAccounts,
-              node.args,
+              newArgs,
+              newExtraArgs,
               node.subInstructions
             );
           },

package/src/visitors/transformers/UseCustomInstructionSerializerVisitor.ts

@@ -70,6 +70,7 @@ export class UseCustomInstructionSerializerVisitor extends BaseNodeVisitor {
       new nodes.TypeDefinedLinkNode(options.name, {
         dependency: options.dependency,
       }),
+      instruction.extraArgs,
       instruction.subInstructions
     );
   }

package/dist/cjs/visitors/aggregators/GetResolvedInstructionAccountsVisitor.js

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetResolvedInstructionAccountsVisitor = void 0;
-const BaseThrowVisitor_1 = require("../BaseThrowVisitor");
-class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor_1.BaseThrowVisitor {
-    constructor() {
-        super(...arguments);
-        this.stack = [];
-        this.visited = new Map();
-        this.raw = new Map();
-        this.error = null;
-    }
-    getError() {
-        return this.error;
-    }
-    visitInstruction(instruction) {
-        // Ensure we always start with a clean slate.
-        this.error = null;
-        this.stack = [];
-        this.visited = new Map();
-        this.raw = instruction.accounts.reduce((map, account, index) => map.set(account.name, [account, index]), new Map());
-        // Visit all instruction accounts.
-        this.raw.forEach(([account, index]) => {
-            this.handleInstructionAccount(instruction, account, index);
-        });
-        return [...this.visited.values()].sort((a, b) => a.position - b.position);
-    }
-    handleInstructionAccount(instruction, account, index) {
-        var _a, _b, _c;
-        // Ensure we don't visit the same account twice.
-        if (this.visited.has(account.name)) {
-            return;
-        }
-        // Ensure we don't have a circular dependency.
-        if (this.stack.includes(account.name)) {
-            const cycle = [...this.stack, account.name].join(' -> ');
-            this.error =
-                `Circular dependency detected in the accounts of ` +
-                    `the "${instruction.name}" instruction. ` +
-                    `Got the following account dependency cycle: ${cycle}.`;
-            throw new Error(this.error);
-        }
-        // Get account dependencies.
-        const dependsOn = [];
-        if (((_a = account.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'account') {
-            dependsOn.push(account.defaultsTo.name);
-        }
-        else if (((_b = account.defaultsTo) === null || _b === void 0 ? void 0 : _b.kind) === 'pda') {
-            const accounts = Object.values(account.defaultsTo.seeds)
-                .filter((seed) => seed.kind === 'account')
-                .map((seed) => seed.name);
-            dependsOn.push(...new Set(accounts));
-        }
-        // Visit account dependencies first.
-        this.stack.push(account.name);
-        dependsOn.forEach((name) => {
-            const rawDependency = this.raw.get(name);
-            if (!rawDependency) {
-                this.error =
-                    `Account "${name}" is not a valid dependency of account ` +
-                        `"${account.name}" in the "${instruction.name}" instruction.`;
-                throw new Error(this.error);
-            }
-            const [dependency, dependencyIndex] = rawDependency;
-            this.handleInstructionAccount(instruction, dependency, dependencyIndex);
-        });
-        this.stack.pop();
-        const resolved = {
-            ...account,
-            position: index,
-            dependencyPosition: this.visited.size,
-            dependsOn,
-            resolvedIsSigner: account.isSigner,
-            resolvedIsOptional: account.isOptional,
-        };
-        switch ((_c = resolved.defaultsTo) === null || _c === void 0 ? void 0 : _c.kind) {
-            case 'account':
-                const defaultAccount = this.visited.get(resolved.defaultsTo.name);
-                const resolvedIsPublicKey = account.isSigner === false && defaultAccount.isSigner === false;
-                const resolvedIsSigner = account.isSigner === true && defaultAccount.isSigner === true;
-                const resolvedIsOptionalSigner = !resolvedIsPublicKey && !resolvedIsSigner;
-                resolved.resolvedIsSigner = resolvedIsOptionalSigner
-                    ? 'either'
-                    : resolvedIsSigner;
-                resolved.resolvedIsOptional = defaultAccount.isOptional;
-                break;
-            case 'publicKey':
-            case 'program':
-            case 'programId':
-                resolved.resolvedIsSigner =
-                    account.isSigner === false ? false : 'either';
-                resolved.resolvedIsOptional = false;
-                break;
-            case 'pda':
-                resolved.resolvedIsSigner =
-                    account.isSigner === false ? false : 'either';
-                resolved.resolvedIsOptional = false;
-                const { seeds } = resolved.defaultsTo;
-                Object.keys(seeds).forEach((seedKey) => {
-                    const seed = seeds[seedKey];
-                    if (seed.kind !== 'account')
-                        return;
-                    const dependency = this.visited.get(seed.name);
-                    if (dependency.resolvedIsOptional) {
-                        this.error =
-                            `Cannot use optional account "${seed.name}" as the "${seedKey}" PDA seed ` +
-                                `for the "${account.name}" account of the "${instruction.name}" instruction.`;
-                        throw new Error(this.error);
-                    }
-                });
-                break;
-            case 'identity':
-            case 'payer':
-                resolved.resolvedIsOptional = false;
-                break;
-            default:
-                break;
-        }
-        this.visited.set(account.name, resolved);
-    }
-}
-exports.GetResolvedInstructionAccountsVisitor = GetResolvedInstructionAccountsVisitor;
-//# sourceMappingURL=GetResolvedInstructionAccountsVisitor.js.map

package/dist/cjs/visitors/aggregators/GetResolvedInstructionAccountsVisitor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GetResolvedInstructionAccountsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetResolvedInstructionAccountsVisitor.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;AAUvD,MAAa,qCAAsC,SAAQ,mCAE1D;IAFD;;QAGY,UAAK,GAAa,EAAE,CAAC;QAErB,YAAO,GAAG,IAAI,GAAG,EAAsC,CAAC;QAExD,QAAG,GAAG,IAAI,GAAG,EAAkD,CAAC;QAEhE,UAAK,GAAkB,IAAI,CAAC;IAqIxC,CAAC;IAnIC,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,gBAAgB,CACd,WAAkC;QAElC,6CAA6C;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CACpC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,EAChE,IAAI,GAAG,EAAkD,CAC1D,CAAC;QAEF,kCAAkC;QAClC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;YACpC,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;IAED,wBAAwB,CACtB,WAAkC,EAClC,OAAqC,EACrC,KAAa;;QAEb,gDAAgD;QAChD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAClC,OAAO;SACR;QAED,8CAA8C;QAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,CAAC,KAAK;gBACR,kDAAkD;oBAClD,QAAQ,WAAW,CAAC,IAAI,iBAAiB;oBACzC,+CAA+C,KAAK,GAAG,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,4BAA4B;QAC5B,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,SAAS,EAAE;YAC1C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACzC;aAAM,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,KAAK,EAAE;YAK7C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;iBACrD,MAAM,CAAC,CAAC,IAAI,EAAuB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;iBAC9D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;SACtC;QAED,oCAAoC;QACpC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9B,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,EAAE;gBAClB,IAAI,CAAC,KAAK;oBACR,YAAY,IAAI,yCAAyC;wBACzD,IAAI,OAAO,CAAC,IAAI,aAAa,WAAW,CAAC,IAAI,gBAAgB,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC7B;YACD,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,aAAa,CAAC;YACpD,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAEjB,MAAM,QAAQ,GAA+B;YAC3C,GAAG,OAAO;YACV,QAAQ,EAAE,KAAK;YACf,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACrC,SAAS;YACT,gBAAgB,EAAE,OAAO,CAAC,QAAQ;YAClC,kBAAkB,EAAE,OAAO,CAAC,UAAU;SACvC,CAAC;QAEF,QAAQ,MAAA,QAAQ,CAAC,UAAU,0CAAE,IAAI,EAAE;YACjC,KAAK,SAAS;gBACZ,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAE,CAAC;gBACnE,MAAM,mBAAmB,GACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,cAAc,CAAC,QAAQ,KAAK,KAAK,CAAC;gBAClE,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,KAAK,IAAI,IAAI,cAAc,CAAC,QAAQ,KAAK,IAAI,CAAC;gBAChE,MAAM,wBAAwB,GAC5B,CAAC,mBAAmB,IAAI,CAAC,gBAAgB,CAAC;gBAC5C,QAAQ,CAAC,gBAAgB,GAAG,wBAAwB;oBAClD,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,gBAAgB,CAAC;gBACrB,QAAQ,CAAC,kBAAkB,GAAG,cAAc,CAAC,UAAU,CAAC;gBACxD,MAAM;YACR,KAAK,WAAW,CAAC;YACjB,KAAK,SAAS,CAAC;YACf,KAAK,WAAW;gBACd,QAAQ,CAAC,gBAAgB;oBACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAChD,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM;YACR,KAAK,KAAK;gBACR,QAAQ,CAAC,gBAAgB;oBACvB,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAChD,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;wBAAE,OAAO;oBACpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;oBAChD,IAAI,UAAU,CAAC,kBAAkB,EAAE;wBACjC,IAAI,CAAC,KAAK;4BACR,gCAAgC,IAAI,CAAC,IAAI,aAAa,OAAO,aAAa;gCAC1E,YAAY,OAAO,CAAC,IAAI,qBAAqB,WAAW,CAAC,IAAI,gBAAgB,CAAC;wBAChF,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBAC7B;gBACH,CAAC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,UAAU,CAAC;YAChB,KAAK,OAAO;gBACV,QAAQ,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACpC,MAAM;YACR;gBACE,MAAM;SACT;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;CACF;AA9ID,sFA8IC"}

package/dist/types/visitors/aggregators/GetResolvedInstructionAccountsVisitor.d.ts

@@ -1,18 +0,0 @@
-import type * as nodes from '../../nodes';
-import { BaseThrowVisitor } from '../BaseThrowVisitor';
-export type ResolvedInstructionAccount = nodes.InstructionNodeAccount & {
-    position: number;
-    dependencyPosition: number;
-    dependsOn: string[];
-    resolvedIsSigner: boolean | 'either';
-    resolvedIsOptional: boolean;
-};
-export declare class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor<ResolvedInstructionAccount[]> {
-    protected stack: string[];
-    protected visited: Map<string, ResolvedInstructionAccount>;
-    protected raw: Map<string, [nodes.InstructionNodeAccount, number]>;
-    protected error: string | null;
-    getError(): string | null;
-    visitInstruction(instruction: nodes.InstructionNode): ResolvedInstructionAccount[];
-    handleInstructionAccount(instruction: nodes.InstructionNode, account: nodes.InstructionNodeAccount, index: number): void;
-}

package/src/visitors/aggregators/GetResolvedInstructionAccountsVisitor.ts

@@ -1,155 +0,0 @@
-import type * as nodes from '../../nodes';
-import { InstructionNodeAccountDefaultsSeed } from '../../nodes';
-import { BaseThrowVisitor } from '../BaseThrowVisitor';
-
-export type ResolvedInstructionAccount = nodes.InstructionNodeAccount & {
-  position: number;
-  dependencyPosition: number;
-  dependsOn: string[];
-  resolvedIsSigner: boolean | 'either';
-  resolvedIsOptional: boolean;
-};
-
-export class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor<
-  ResolvedInstructionAccount[]
-> {
-  protected stack: string[] = [];
-
-  protected visited = new Map<string, ResolvedInstructionAccount>();
-
-  protected raw = new Map<string, [nodes.InstructionNodeAccount, number]>();
-
-  protected error: string | null = null;
-
-  getError(): string | null {
-    return this.error;
-  }
-
-  visitInstruction(
-    instruction: nodes.InstructionNode
-  ): ResolvedInstructionAccount[] {
-    // Ensure we always start with a clean slate.
-    this.error = null;
-    this.stack = [];
-    this.visited = new Map();
-    this.raw = instruction.accounts.reduce(
-      (map, account, index) => map.set(account.name, [account, index]),
-      new Map<string, [nodes.InstructionNodeAccount, number]>()
-    );
-
-    // Visit all instruction accounts.
-    this.raw.forEach(([account, index]) => {
-      this.handleInstructionAccount(instruction, account, index);
-    });
-
-    return [...this.visited.values()].sort((a, b) => a.position - b.position);
-  }
-
-  handleInstructionAccount(
-    instruction: nodes.InstructionNode,
-    account: nodes.InstructionNodeAccount,
-    index: number
-  ): void {
-    // Ensure we don't visit the same account twice.
-    if (this.visited.has(account.name)) {
-      return;
-    }
-
-    // Ensure we don't have a circular dependency.
-    if (this.stack.includes(account.name)) {
-      const cycle = [...this.stack, account.name].join(' -> ');
-      this.error =
-        `Circular dependency detected in the accounts of ` +
-        `the "${instruction.name}" instruction. ` +
-        `Got the following account dependency cycle: ${cycle}.`;
-      throw new Error(this.error);
-    }
-
-    // Get account dependencies.
-    const dependsOn: string[] = [];
-    if (account.defaultsTo?.kind === 'account') {
-      dependsOn.push(account.defaultsTo.name);
-    } else if (account.defaultsTo?.kind === 'pda') {
-      type AccountSeed = Extract<
-        InstructionNodeAccountDefaultsSeed,
-        { kind: 'account' }
-      >;
-      const accounts = Object.values(account.defaultsTo.seeds)
-        .filter((seed): seed is AccountSeed => seed.kind === 'account')
-        .map((seed) => seed.name);
-      dependsOn.push(...new Set(accounts));
-    }
-
-    // Visit account dependencies first.
-    this.stack.push(account.name);
-    dependsOn.forEach((name) => {
-      const rawDependency = this.raw.get(name);
-      if (!rawDependency) {
-        this.error =
-          `Account "${name}" is not a valid dependency of account ` +
-          `"${account.name}" in the "${instruction.name}" instruction.`;
-        throw new Error(this.error);
-      }
-      const [dependency, dependencyIndex] = rawDependency;
-      this.handleInstructionAccount(instruction, dependency, dependencyIndex);
-    });
-    this.stack.pop();
-
-    const resolved: ResolvedInstructionAccount = {
-      ...account,
-      position: index,
-      dependencyPosition: this.visited.size,
-      dependsOn,
-      resolvedIsSigner: account.isSigner,
-      resolvedIsOptional: account.isOptional,
-    };
-
-    switch (resolved.defaultsTo?.kind) {
-      case 'account':
-        const defaultAccount = this.visited.get(resolved.defaultsTo.name)!;
-        const resolvedIsPublicKey =
-          account.isSigner === false && defaultAccount.isSigner === false;
-        const resolvedIsSigner =
-          account.isSigner === true && defaultAccount.isSigner === true;
-        const resolvedIsOptionalSigner =
-          !resolvedIsPublicKey && !resolvedIsSigner;
-        resolved.resolvedIsSigner = resolvedIsOptionalSigner
-          ? 'either'
-          : resolvedIsSigner;
-        resolved.resolvedIsOptional = defaultAccount.isOptional;
-        break;
-      case 'publicKey':
-      case 'program':
-      case 'programId':
-        resolved.resolvedIsSigner =
-          account.isSigner === false ? false : 'either';
-        resolved.resolvedIsOptional = false;
-        break;
-      case 'pda':
-        resolved.resolvedIsSigner =
-          account.isSigner === false ? false : 'either';
-        resolved.resolvedIsOptional = false;
-        const { seeds } = resolved.defaultsTo;
-        Object.keys(seeds).forEach((seedKey) => {
-          const seed = seeds[seedKey];
-          if (seed.kind !== 'account') return;
-          const dependency = this.visited.get(seed.name)!;
-          if (dependency.resolvedIsOptional) {
-            this.error =
-              `Cannot use optional account "${seed.name}" as the "${seedKey}" PDA seed ` +
-              `for the "${account.name}" account of the "${instruction.name}" instruction.`;
-            throw new Error(this.error);
-          }
-        });
-        break;
-      case 'identity':
-      case 'payer':
-        resolved.resolvedIsOptional = false;
-        break;
-      default:
-        break;
-    }
-
-    this.visited.set(account.name, resolved);
-  }
-}