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

package/dist/cjs/renderers/js/templates/instructionsPage.njk

@@ -17,25 +17,15 @@ export function {{ instruction.name | camelCase }}(
     {{- '| \'payer\'' if needsPayer else '' }}
   >,
   {% set accountsType = instruction.name | pascalCase + 'InstructionAccounts' %}
-  {% if instruction.hasPdaAccounts %}
-    {% set argsType %}
-      Omit<{{ instruction.name | pascalCase + 'InstructionDataArgs' }}, 
-      {%- for account in instruction.pdaAccounts -%}
-        "{{ account.pdaBumpArg }}"{% if not loop.last %} | {% endif %}
-      {%- endfor -%}
-      >
-    {% endset %}
-  {% else %}
-    {% set argsType = instruction.name | pascalCase + 'InstructionDataArgs' %}
-  {% endif %}
+  {% set argsType = instruction.name | pascalCase + 'InstructionArgs' %}
   {% if canMergeAccountsAndArgs %}
     {% set accountsObj = 'input' %}
     {% set argsObj = 'input' %}
-    {% if instruction.hasAccounts and instruction.hasArgs %}
+    {% if instruction.hasAccounts and instruction.hasAnyArgs %}
       input: {{ accountsType }} & {{ argsType }},
     {% elif instruction.hasAccounts %}
       input: {{ accountsType }},
-    {% elif instruction.hasArgs %}
+    {% elif instruction.hasAnyArgs %}
       input: {{ argsType }},
     {% endif %}
   {% else %}
@@ -44,7 +34,7 @@ export function {{ instruction.name | camelCase }}(
     {% if instruction.hasAccounts %}
       accounts: {{ accountsType }},
     {% endif %}
-    {% if instruction.hasArgs %}
+    {% if instruction.hasAnyArgs %}
       args: {{ argsType }},
     {% endif %}
   {% endif %}
@@ -53,20 +43,15 @@ export function {{ instruction.name | camelCase }}(
   const keys: AccountMeta[] = [];
 
   // Program ID.
-  const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
+  const programId = { ...context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}'), isWritable: false };
+
+  {% include "instructionsPageResolvedInputs.njk" %}
 
   {% include "instructionsPageAccountMetas.njk" -%}
 
   // Data.
-  {% if instruction.hasArgs and instruction.hasPdaAccounts %}
-    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({
-      ...{{ argsObj }},
-      {% for account in instruction.pdaAccounts %}
-        {{ account.pdaBumpArg }}: {{ account.name | camelCase }}Account.bump,
-      {% endfor %}
-    });
-  {% elif instruction.hasArgs %}
-    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({{ argsObj }});
+  {% if instruction.hasArgs %}
+    const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize(resolvedArgs);
   {% elif instruction.hasData %}
     const data = get{{ instruction.name | pascalCase }}InstructionDataSerializer(context).serialize({});
   {% else %}
@@ -81,6 +66,8 @@ export function {{ instruction.name | camelCase }}(
     const bytesCreatedOnChain = Number({{ argsObj }}.{{ bytes.name }}){% if bytes.includeHeader %} + ACCOUNT_HEADER_SIZE{% endif %};
   {% elif bytes.kind === 'account' %}
     const bytesCreatedOnChain = get{{ bytes.name | pascalCase }}Size(){% if bytes.includeHeader %} + ACCOUNT_HEADER_SIZE{% endif %};
+  {% elif bytes.kind === 'resolver' %}
+    const bytesCreatedOnChain = {{ bytes.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
   {% else %}
     const bytesCreatedOnChain = 0;
   {% endif %}

package/dist/cjs/renderers/js/templates/instructionsPageAccountMetas.njk

@@ -1,62 +1,19 @@
-{% if accounts.length > 0 %}
-  // Resolved accounts.
-  {% for account in accounts | sort(false, false, 'dependencyPosition') %}
-    {% if not account.defaultsTo %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
-    {% elif account.defaultsTo.kind === 'account' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? {{ account.defaultsTo.name | camelCase }}Account;
-    {% elif account.defaultsTo.kind === 'pda' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? find{{ account.defaultsTo.pdaAccount | pascalCase }}Pda(context,
-      {%- if (account.defaultsTo.seeds | length) > 0 -%}
-        {
-          {%- for seedKey, seedValue in account.defaultsTo.seeds -%}
-            {%- if seedValue.kind === 'value' -%}
-              {{ seedKey }}: {{ seedValue.render }},
-            {%- elif seedValue.kind === 'account' -%}
-              {{ seedKey }}: publicKey({{ seedValue.name | camelCase }}Account),
-            {%- else -%}
-              {{ seedKey }}: {{ argsObj }}.{{ seedValue.name | camelCase }},
-            {%- endif -%}
-          {%- endfor -%}
-        }
-      {%- endif -%}
-      );
-    {% elif account.defaultsTo.kind === 'publicKey' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? publicKey('{{ account.defaultsTo.publicKey }}');
-    {% elif account.defaultsTo.kind === 'program' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
-    {% elif account.defaultsTo.kind === 'programId' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
-    {% elif account.defaultsTo.kind === 'identity' and (account.isSigner !== false) %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity;
-    {% elif account.defaultsTo.kind === 'identity' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity.publicKey;
-    {% elif account.defaultsTo.kind === 'payer' and (account.isSigner !== false) %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer;
-    {% elif account.defaultsTo.kind === 'payer' %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer.publicKey;
-    {% else %}
-      const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
-    {% endif %}
-  {% endfor %}
-{% endif %}
-
-{% for account in accounts | sort(false, false, 'position') %}
+{% for account in accounts %}
   {% set isWritableString = 'true' if account.isWritable else 'false' %}
   // {{ account.name | camelCase | titleCase }}{% if account.resolvedIsOptional %} (optional){% endif %}.
   {% if account.resolvedIsOptional %}
-  if ({{ account.name | camelCase }}Account) {
+  if (resolvedAccounts.{{ account.name | camelCase }}) {
   {% endif %}
     {% if account.resolvedIsSigner === 'either' %}
-      if (isSigner({{ account.name | camelCase }}Account)) {
-        signers.push({{ account.name | camelCase }}Account);
+      if (isSigner(resolvedAccounts.{{ account.name | camelCase }})) {
+        signers.push(resolvedAccounts.{{ account.name | camelCase }});
       }
-      keys.push({ pubkey: publicKey({{ account.name | camelCase }}Account), isSigner: isSigner({{ account.name | camelCase }}Account), isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      keys.push({ pubkey: publicKey(resolvedAccounts.{{ account.name | camelCase }}), isSigner: isSigner(resolvedAccounts.{{ account.name | camelCase }}), isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% elif account.resolvedIsSigner  %}
-      signers.push({{ account.name | camelCase }}Account);
-      keys.push({ pubkey: {{ account.name | camelCase }}Account.publicKey, isSigner: true, isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      signers.push(resolvedAccounts.{{ account.name | camelCase }});
+      keys.push({ pubkey: resolvedAccounts.{{ account.name | camelCase }}.publicKey, isSigner: true, isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% else %}
-      keys.push({ pubkey: {{ account.name | camelCase }}Account, isSigner: false, isWritable: isWritable({{ account.name | camelCase }}Account, {{ isWritableString }}) });
+      keys.push({ pubkey: resolvedAccounts.{{ account.name | camelCase }}, isSigner: false, isWritable: isWritable(resolvedAccounts.{{ account.name | camelCase }}, {{ isWritableString }}) });
     {% endif %}
   {% if account.resolvedIsOptional %}
   }

package/dist/cjs/renderers/js/templates/instructionsPageArgs.njk

@@ -1,7 +1,36 @@
-{% if not instruction.isLinked and instruction.hasData %}
-// Arguments.
-{{ macros.exportType(instruction.name | pascalCase + 'InstructionData', typeManifest) }}
+{% if not instruction.hasLinkedArgs and instruction.hasData %}
+  // Data.
+  {{ macros.exportType(instruction.name | pascalCase + 'InstructionData', argManifest) }}
 
-{{ macros.exportSerializer(instruction.name | pascalCase + 'InstructionData', typeManifest) }}
+  {{ macros.exportSerializer(instruction.name | pascalCase + 'InstructionData', argManifest) }}
+{% endif %}
 
-{% endif %}
+{% if not instruction.hasLinkedExtraArgs and instruction.hasExtraArgs %}
+  // Extra Args.
+  export type {{ instruction.name | pascalCase + 'InstructionExtraArgs' }} = {{ extraArgManifest.looseType }};
+{% endif %}
+
+{% if instruction.hasAnyArgs %}
+  {% set argType %}
+    {% if instruction.hasArgs and instruction.hasExtraArgs %}
+      {{ instruction.name | pascalCase + 'InstructionDataArgs' }} & {{ instruction.name | pascalCase + 'InstructionExtraArgs' }}
+    {% elif instruction.hasArgs %}
+      {{ instruction.name | pascalCase + 'InstructionDataArgs' }}
+    {% elif instruction.hasExtraArgs %}
+      {{ instruction.name | pascalCase + 'InstructionExtraArgs' }}
+    {% endif %}
+  {% endset %}
+
+  // Args.
+  {% if argDefaultKeys.length > 0 %}
+    type PickPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+    export type {{ instruction.name | pascalCase + 'InstructionArgs' }} = PickPartial<
+      {{ argType }}, 
+      {% for key in argDefaultKeys %}
+        "{{ key }}"{% if not loop.last %} | {% endif %}
+      {% endfor %}
+    >;
+  {% else %}
+    export type {{ instruction.name | pascalCase + 'InstructionArgs' }} = {{ argType }};
+  {% endif %}
+{% endif %}

package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk

@@ -0,0 +1,63 @@
+{% set hasResolvedAccounts = accounts.length > 0 or instruction.hasResolvers %}
+{% set hasResolvedArgs = instruction.hasArgs or instruction.hasArgDefaults or instruction.hasResolvers %}
+
+{% if resolvedInputs.length > 0 or hasResolvedAccounts or hasResolvedArgs %}
+  // Resolved inputs.
+  {% if hasResolvedAccounts %}
+    const resolvedAccounts: any = { ...{{ accountsObj }} };
+  {% endif %}
+  {% if hasResolvedArgs %}
+    const resolvedArgs: any = { ...{{ argsObj }} };
+  {% endif %}
+  {% for input in resolvedInputs %}
+    {% if input.kind === 'account' and input.defaultsTo %}
+      {% if input.defaultsTo.kind === 'account' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'pda' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? find{{ input.defaultsTo.pdaAccount | pascalCase }}Pda(context,
+        {%- if (input.defaultsTo.seeds | length) > 0 -%}
+          {
+            {%- for seedKey, seedValue in input.defaultsTo.seeds -%}
+              {%- if seedValue.kind === 'value' -%}
+                {{ seedKey }}: {{ seedValue.render }},
+              {%- elif seedValue.kind === 'account' -%}
+                {{ seedKey }}: publicKey(resolvedAccounts.{{ seedValue.name | camelCase }}),
+              {%- else -%}
+                {{ seedKey }}: resolvedArgs.{{ seedValue.name | camelCase }},
+              {%- endif -%}
+            {%- endfor -%}
+          }
+        {%- endif -%}
+        );
+      {% elif input.defaultsTo.kind === 'publicKey' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? publicKey('{{ input.defaultsTo.publicKey }}');
+      {% elif input.defaultsTo.kind === 'program' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ input.defaultsTo.program.name }}', '{{ input.defaultsTo.program.publicKey }}'), isWritable: false };
+      {% elif input.defaultsTo.kind === 'programId' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? programId;
+      {% elif input.defaultsTo.kind === 'identity' and (input.isSigner !== false) %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.identity;
+      {% elif input.defaultsTo.kind === 'identity' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.identity.publicKey;
+      {% elif input.defaultsTo.kind === 'payer' and (input.isSigner !== false) %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.payer;
+      {% elif input.defaultsTo.kind === 'payer' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? context.payer.publicKey;
+      {% elif input.defaultsTo.kind === 'resolver' %}
+        resolvedAccounts.{{ input.name | camelCase }} = resolvedAccounts.{{ input.name | camelCase }} ?? {{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
+      {% endif %}
+    {% elif input.kind === 'arg' %}
+      {% if input.defaultsTo.kind === 'arg' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedArgs.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'account' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }};
+      {% elif input.defaultsTo.kind === 'accountBump' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? resolvedAccounts.{{ input.defaultsTo.name | camelCase }}.bump;
+      {% elif input.defaultsTo.kind === 'value' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? {{ input.defaultsTo.render }};
+      {% elif input.defaultsTo.kind === 'resolver' %}
+        resolvedArgs.{{ input.name | camelCase }} = resolvedArgs.{{ input.name | camelCase }} ?? {{ input.defaultsTo.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endif %}

package/dist/cjs/renderers/js/templates/programsPage.njk

@@ -4,11 +4,13 @@
 {% block main %}
 {{ imports }}
 
+export const {{ program.name | snakeCase | upper }}_PROGRAM_ID = publicKey('{{ program.metadata.publicKey }}');
+
 {{ macros.docblock(program.docs) }}
-export function get{{ program.name | pascalCase }}Program(): Program {
+export function create{{ program.name | pascalCase }}Program(): Program {
   return {
     name: '{{ program.name | camelCase }}',
-    publicKey: publicKey('{{ program.metadata.publicKey }}'),
+    publicKey: {{ program.name | snakeCase | upper }}_PROGRAM_ID,
     getErrorFromCode(code: number, cause?: Error) {
       return get{{ program.name | pascalCase }}ErrorFromCode(code, this, cause);
     },
@@ -20,4 +22,12 @@ export function get{{ program.name | pascalCase }}Program(): Program {
     },
   };
 }
+
+export function get{{ program.name | pascalCase }}Program<T extends Program = Program>(context: Pick<Context, 'programs'>, clusterFilter?: ClusterFilter): T {
+  return context.programs.get<T>("{{ program.name | camelCase }}", clusterFilter);
+}
+
+export function get{{ program.name | pascalCase }}ProgramId(context: Pick<Context, 'programs'>, clusterFilter?: ClusterFilter): PublicKey {
+  return context.programs.getPublicKey("{{ program.name | camelCase }}", {{ program.name | snakeCase | upper }}_PROGRAM_ID, clusterFilter);
+}
 {% endblock %}

package/dist/cjs/visitors/BaseNodeOrNullVisitor.js

@@ -70,11 +70,16 @@ class BaseNodeOrNullVisitor {
         return new nodes.AccountNode({ ...account.metadata, seeds, gpaFields }, accountType);
     }
     visitInstruction(instruction) {
+        var _a, _b;
         const args = instruction.args.accept(this);
         if (args === null)
             return null;
         nodes.assertTypeStructOrDefinedLinkNode(args);
-        return new nodes.InstructionNode(instruction.metadata, instruction.accounts, args, instruction.subInstructions
+        const extraArgs = (_b = (_a = instruction.extraArgs) === null || _a === void 0 ? void 0 : _a.accept(this)) !== null && _b !== void 0 ? _b : null;
+        if (extraArgs !== null) {
+            nodes.assertTypeStructOrDefinedLinkNode(args);
+        }
+        return new nodes.InstructionNode(instruction.metadata, instruction.accounts, args, extraArgs, instruction.subInstructions
             .map((ix) => ix.accept(this))
             .filter(nodes.removeNullAndAssertNodeFilter(nodes.assertInstructionNode)));
     }

package/dist/cjs/visitors/BaseNodeOrNullVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseNodeOrNullVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeOrNullVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseNodeOrNullVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeOrNullVisitor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/visitors/BaseNodeVisitor.js

@@ -60,9 +60,14 @@ class BaseNodeVisitor {
         return new nodes.AccountNode({ ...account.metadata, seeds, gpaFields }, accountType);
     }
     visitInstruction(instruction) {
+        var _a, _b;
         const args = instruction.args.accept(this);
         nodes.assertTypeStructOrDefinedLinkNode(args);
-        return new nodes.InstructionNode(instruction.metadata, instruction.accounts, args, instruction.subInstructions
+        const extraArgs = (_b = (_a = instruction.extraArgs) === null || _a === void 0 ? void 0 : _a.accept(this)) !== null && _b !== void 0 ? _b : null;
+        if (extraArgs !== null) {
+            nodes.assertTypeStructOrDefinedLinkNode(args);
+        }
+        return new nodes.InstructionNode(instruction.metadata, instruction.accounts, args, extraArgs, instruction.subInstructions
             .map((ix) => ix.accept(this))
             .filter(nodes.removeNullAndAssertNodeFilter(nodes.assertInstructionNode)));
     }

package/dist/cjs/visitors/BaseNodeVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseNodeVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseNodeVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseNodeVisitor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/visitors/BaseVoidVisitor.js

@@ -17,7 +17,9 @@ class BaseVoidVisitor {
         account.metadata.gpaFields.forEach((field) => field.type.accept(this));
     }
     visitInstruction(instruction) {
+        var _a;
         instruction.args.accept(this);
+        (_a = instruction.extraArgs) === null || _a === void 0 ? void 0 : _a.accept(this);
         instruction.subInstructions.forEach((ix) => ix.accept(this));
     }
     visitDefinedType(definedType) {

package/dist/cjs/visitors/BaseVoidVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseVoidVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseVoidVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseVoidVisitor.js","sourceRoot":"","sources":["../../../src/visitors/BaseVoidVisitor.ts"],"names":[],"mappings":"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"}

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

@@ -25,9 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetDefaultValidatorBagVisitor = void 0;
 const nodes = __importStar(require("../../nodes"));
+const utils_1 = require("../../utils");
 const NodeStack_1 = require("../NodeStack");
 const ValidatorBag_1 = require("../ValidatorBag");
-const GetResolvedInstructionAccountsVisitor_1 = require("./GetResolvedInstructionAccountsVisitor");
+const GetResolvedInstructionInputsVisitor_1 = require("./GetResolvedInstructionInputsVisitor");
 class GetDefaultValidatorBagVisitor {
     constructor() {
         this.stack = new NodeStack_1.NodeStack();
@@ -98,14 +99,43 @@ class GetDefaultValidatorBagVisitor {
             }
         });
         // Check for cyclic dependencies in account defaults.
-        const cyclicCheckVisitor = new GetResolvedInstructionAccountsVisitor_1.GetResolvedInstructionAccountsVisitor();
+        const cyclicCheckVisitor = new GetResolvedInstructionInputsVisitor_1.GetResolvedInstructionInputsVisitor();
         try {
             instruction.accept(cyclicCheckVisitor);
         }
         catch (error) {
             bag.error(cyclicCheckVisitor.getError(), instruction, this.stack);
         }
+        // Check args.
         bag.mergeWith([instruction.args.accept(this)]);
+        // Check extra args.
+        if (instruction.extraArgs) {
+            bag.mergeWith([instruction.extraArgs.accept(this)]);
+            if (nodes.isTypeStructNode(instruction.args) &&
+                nodes.isTypeStructNode(instruction.extraArgs)) {
+                const names = [
+                    ...instruction.args.fields.map(({ name }) => (0, utils_1.mainCase)(name)),
+                    ...instruction.extraArgs.fields.map(({ name }) => (0, utils_1.mainCase)(name)),
+                ];
+                const duplicates = names.filter((e, i, a) => a.indexOf(e) !== i);
+                const uniqueDuplicates = [...new Set(duplicates)];
+                const hasConflictingNames = uniqueDuplicates.length > 0;
+                if (hasConflictingNames) {
+                    bag.error(`The names of the following instruction arguments are conflicting: ` +
+                        `[${uniqueDuplicates.join(', ')}].`, instruction, this.stack);
+                }
+            }
+        }
+        // Check arg defaults.
+        Object.entries(instruction.metadata.argDefaults).forEach(([name, defaultsTo]) => {
+            if (defaultsTo.kind === 'accountBump') {
+                const defaultAccount = instruction.accounts.find((account) => account.name === defaultsTo.name);
+                if (defaultAccount && defaultAccount.isSigner !== false) {
+                    bag.error(`Argument ${name} cannot default to the bump attribute of ` +
+                        `the [${defaultsTo.name}] account as it may be a Signer.`, instruction, this.stack);
+                }
+            }
+        });
         // Check sub-instructions.
         bag.mergeWith(instruction.subInstructions.map((ix) => ix.accept(this)));
         this.popNode();

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

@@ -1 +1 @@
-{"version":3,"file":"GetDefaultValidatorBagVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetDefaultValidatorBagVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GetDefaultValidatorBagVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetDefaultValidatorBagVisitor.ts"],"names":[],"mappings":"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"}

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

@@ -26,12 +26,14 @@ class GetNodeInlineStringVisitor {
         return `${ACCOUNT_PREFIX}[${account.name}](${child})`;
     }
     visitInstruction(instruction) {
+        var _a;
         const accounts = instruction.accounts.map((account) => account.name);
         const args = instruction.args.accept(this);
+        const extraArgs = (_a = instruction.extraArgs) === null || _a === void 0 ? void 0 : _a.accept(this);
+        const extraArgsString = extraArgs ? `,extraArgs:(${extraArgs})` : '';
         return (`${INSTRUCTION_PREFIX}[${instruction.name}](` +
             `accounts:(${accounts.join(',')}),` +
-            `args:(${args})` +
-            `)`);
+            `args:(${args})${extraArgsString})`);
     }
     visitDefinedType(definedType) {
         const child = definedType.type.accept(this);

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

@@ -1 +1 @@
-{"version":3,"file":"GetNodeInlineStringVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetNodeInlineStringVisitor.ts"],"names":[],"mappings":";;;AAGA,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,MAAM,cAAc,GAAG,GAAG,CAAC;AAC3B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,WAAW,GAAG,GAAG,CAAC;AACxB,MAAM,YAAY,GAAG,GAAG,CAAC;AAEzB,MAAa,0BAA0B;IACrC,SAAS,CAAC,IAAoB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,OAAO,GAAG,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,QAAQ,GAAG;YACf,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1D,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5D,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxD,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACnD,CAAC;QACF,OAAO,GAAG,cAAc,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACrE,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,OAAO,GAAG,cAAc,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC;IACxD,CAAC;IAED,gBAAgB,CAAC,WAAkC;QACjD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,CACL,GAAG,kBAAkB,IAAI,WAAW,CAAC,IAAI,IAAI;YAC7C,aAAa,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;YACnC,SAAS,IAAI,GAAG;YAChB,GAAG,CACJ,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,WAAkC;QACjD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,GAAG,WAAW,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,GAAG,CAAC;IACzD,CAAC;IAED,UAAU,CAAC,KAAsB;QAC/B,OAAO,GAAG,YAAY,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC;IAC1C,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvD,OAAO,SAAS,IAAI,IAAI,IAAI,GAAG,CAAC;IAClC,CAAC;IAED,oBAAoB,CAAC,eAA0C;QAC7D,OAAO,QAAQ,eAAe,CAAC,IAAI,IAAI,eAAe,CAAC,UAAU,GAAG,CAAC;IACvE,CAAC;IAED,aAAa,CAAC,QAA4B;QACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1E,OAAO,QAAQ,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACzD,CAAC;IAED,yBAAyB,CACvB,oBAAoD;QAEpD,OAAO,oBAAoB,CAAC,IAAI,CAAC;IACnC,CAAC;IAED,0BAA0B,CACxB,qBAAsD;QAEtD,MAAM,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,GAAG,qBAAqB,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;IAClD,CAAC;IAED,yBAAyB,CACvB,oBAAoD;QAEpD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtD,OAAO,GAAG,oBAAoB,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;IACjD,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,OAAO,GAAG,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC;IACxC,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,UAAU,IAAI,IAAI,MAAM,GAAG,KAAK,GAAG,CAAC;IAC7C,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,OAAO,OAAO,IAAI,IAAI,IAAI,GAAG,CAAC;IAChC,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,OAAO,UAAU,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAC7D,CAAC;IAED,oBAAoB,CAAC,eAA0C;QAC7D,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,GAAG,eAAe,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;IAC5C,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,OAAO,SAAS,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACxC,CAAC;IAED,aAAa,CAAC,QAA4B;QACxC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,cAAc,CAAC,SAA8B;QAC3C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,sBAAsB,CACpB,iBAA8C;QAE9C,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;QACtC,QAAQ,OAAO,CAAC,IAAI,EAAE;YACpB,KAAK,UAAU;gBACb,OAAO,YAAY,IAAI,GAAG,CAAC;YAC7B,KAAK,QAAQ;gBACX,OAAO,UAAU,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC;YACrE,KAAK,WAAW;gBACd,OAAO,aAAa,IAAI,GAAG,CAAC;YAC9B;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC;IAED,kBAAkB;QAChB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,UAAgC;QAC9C,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,oBAAoB,CAAC,IAAiC;QACpD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AAzJD,gEAyJC"}
+{"version":3,"file":"GetNodeInlineStringVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetNodeInlineStringVisitor.ts"],"names":[],"mappings":"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"}

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

@@ -88,6 +88,12 @@ class GetNodeTreeStringVisitor {
         this.indent += 1;
         children.push(instruction.args.accept(this));
         this.indent -= 1;
+        if (instruction.extraArgs) {
+            children.push(this.indented('extra arguments:'));
+            this.indent += 1;
+            children.push(instruction.extraArgs.accept(this));
+            this.indent -= 1;
+        }
         this.indent -= 1;
         return children.join('\n');
     }