@metaplex-foundation/kinobi 0.4.2 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/cjs/renderers/js/templates/accountsPage.njk +2 -2
  2. package/dist/cjs/renderers/js/templates/instructionsPage.njk +1 -1
  3. package/dist/cjs/renderers/js/templates/instructionsPageAccountMetas.njk +1 -1
  4. package/dist/cjs/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.js +37 -1
  5. package/dist/cjs/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/renderers/js/templates/accountsPage.njk +2 -2
  8. package/src/renderers/js/templates/instructionsPage.njk +1 -1
  9. package/src/renderers/js/templates/instructionsPageAccountMetas.njk +1 -1
  10. package/src/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.ts +38 -1
package/dist/cjs/renderers/js/templates/accountsPage.njk CHANGED
@@ -70,7 +70,7 @@ export async function safeFetchAll{{ account.name | pascalCase }}(
70
70
  {% if gpaFields !== null %}
71
71
  export function get{{ account.name | pascalCase }}GpaBuilder(context: Pick<Context, 'rpc' | 'serializer' | 'programs'>) {
72
72
  const s = context.serializer;
73
- const programId = context.programs.get('{{ program.name | camelCase }}').publicKey;
73
+ const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
74
74
  return gpaBuilder(context, programId)
75
75
  .registerFields<{{ gpaFields.type }}>({{ gpaFields.argument }})
76
76
  .deserializeUsing<{{ account.name | pascalCase }}>((account) => deserialize{{ account.name | pascalCase }}(context, account))
@@ -106,7 +106,7 @@ export function find{{ account.name | pascalCase }}Pda(
106
106
  {% if pdaHelperNeedsSerializer %}
107
107
  const s = context.serializer;
108
108
  {% endif %}
109
- const programId: PublicKey = context.programs.get('{{ program.metadata.name | camelCase }}').publicKey;
109
+ const programId = context.programs.getPublicKey('{{ program.metadata.name | camelCase }}', '{{ program.metadata.publicKey }}');
110
110
  return context.eddsa.findPda(programId, [
111
111
  {% for seed in seeds %}
112
112
  {% if seed.kind === 'programId' %}
package/dist/cjs/renderers/js/templates/instructionsPage.njk CHANGED
@@ -53,7 +53,7 @@ export function {{ instruction.name | camelCase }}(
53
53
  const keys: AccountMeta[] = [];
54
54
 
55
55
  // Program ID.
56
- const programId: PublicKey = context.programs.get('{{ program.name | camelCase }}').publicKey;
56
+ const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
57
57
 
58
58
  {% include "instructionsPageAccountMetas.njk" -%}
59
59
 
package/dist/cjs/renderers/js/templates/instructionsPageAccountMetas.njk CHANGED
@@ -22,7 +22,7 @@
22
22
  {% elif account.defaultsTo.kind === 'publicKey' %}
23
23
  const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? publicKey('{{ account.defaultsTo.publicKey }}');
24
24
  {% elif account.defaultsTo.kind === 'program' %}
25
- const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.get('{{ account.defaultsTo.program.name }}').publicKey, isWritable: false };
25
+ const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
26
26
  {% elif account.defaultsTo.kind === 'programId' %}
27
27
  const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
28
28
  {% elif account.defaultsTo.kind === 'identity' and (account.isSigner or account.isOptionalSigner) %}
package/dist/cjs/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.js CHANGED
@@ -70,6 +70,42 @@ exports.DEFAULT_INSTRUCTION_ACCOUNT_DEFAULT_RULES = [
70
70
  },
71
71
  ignoreIfOptional: true,
72
72
  },
73
+ {
74
+ kind: 'program',
75
+ account: /^tokenMetadataProgram|mplTokenMetadataProgram$/,
76
+ program: {
77
+ name: 'mplTokenMetadata',
78
+ publicKey: 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s',
79
+ },
80
+ ignoreIfOptional: true,
81
+ },
82
+ {
83
+ kind: 'program',
84
+ account: /^(tokenAuth|mplTokenAuth|authorization|mplAuthorization|auth|mplAuth)RulesProgram$/,
85
+ program: {
86
+ name: 'mplTokenAuthRules',
87
+ publicKey: 'auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg',
88
+ },
89
+ ignoreIfOptional: true,
90
+ },
91
+ {
92
+ kind: 'program',
93
+ account: /^candyMachineProgram|mplCandyMachineProgram$/,
94
+ program: {
95
+ name: 'mplCandyMachine',
96
+ publicKey: 'CndyV3LdqHUfDLmE5naZjVN8rBZz4tqhdefbAnjHG3JR',
97
+ },
98
+ ignoreIfOptional: true,
99
+ },
100
+ {
101
+ kind: 'program',
102
+ account: /^candyGuardProgram|mplCandyGuardProgram$/,
103
+ program: {
104
+ name: 'mplCandyGuard',
105
+ publicKey: 'Guard1JwRhJkVH6XZhzoYxeBVQe872VH6QggF4BWmS9g',
106
+ },
107
+ ignoreIfOptional: true,
108
+ },
73
109
  {
74
110
  kind: 'publicKey',
75
111
  account: /^clockSysvar|sysvarClockSysvar$/,
@@ -84,7 +120,7 @@ exports.DEFAULT_INSTRUCTION_ACCOUNT_DEFAULT_RULES = [
84
120
  },
85
121
  {
86
122
  kind: 'publicKey',
87
- account: /^instructionsSysvar|sysvarInstructions$/,
123
+ account: /^(instructions?Sysvar|sysvarInstructions?)(Account)?$/,
88
124
  publicKey: 'Sysvar1nstructions1111111111111111111111111',
89
125
  ignoreIfOptional: true,
90
126
  },
package/dist/cjs/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SetInstructionAccountDefaultValuesVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SetInstructionAccountDefaultValuesVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metaplex-foundation/kinobi",
3
- "version": "0.4.2",
3
+ "version": "0.4.3",
4
4
  "description": "Generate powerful clients for your Solana programs",
5
5
  "main": "dist/cjs/index.js",
6
6
  "types": "dist/types/index.d.ts",
package/src/renderers/js/templates/accountsPage.njk CHANGED
@@ -70,7 +70,7 @@ export async function safeFetchAll{{ account.name | pascalCase }}(
70
70
  {% if gpaFields !== null %}
71
71
  export function get{{ account.name | pascalCase }}GpaBuilder(context: Pick<Context, 'rpc' | 'serializer' | 'programs'>) {
72
72
  const s = context.serializer;
73
- const programId = context.programs.get('{{ program.name | camelCase }}').publicKey;
73
+ const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
74
74
  return gpaBuilder(context, programId)
75
75
  .registerFields<{{ gpaFields.type }}>({{ gpaFields.argument }})
76
76
  .deserializeUsing<{{ account.name | pascalCase }}>((account) => deserialize{{ account.name | pascalCase }}(context, account))
@@ -106,7 +106,7 @@ export function find{{ account.name | pascalCase }}Pda(
106
106
  {% if pdaHelperNeedsSerializer %}
107
107
  const s = context.serializer;
108
108
  {% endif %}
109
- const programId: PublicKey = context.programs.get('{{ program.metadata.name | camelCase }}').publicKey;
109
+ const programId = context.programs.getPublicKey('{{ program.metadata.name | camelCase }}', '{{ program.metadata.publicKey }}');
110
110
  return context.eddsa.findPda(programId, [
111
111
  {% for seed in seeds %}
112
112
  {% if seed.kind === 'programId' %}
package/src/renderers/js/templates/instructionsPage.njk CHANGED
@@ -53,7 +53,7 @@ export function {{ instruction.name | camelCase }}(
53
53
  const keys: AccountMeta[] = [];
54
54
 
55
55
  // Program ID.
56
- const programId: PublicKey = context.programs.get('{{ program.name | camelCase }}').publicKey;
56
+ const programId = context.programs.getPublicKey('{{ program.name | camelCase }}', '{{ program.metadata.publicKey }}');
57
57
 
58
58
  {% include "instructionsPageAccountMetas.njk" -%}
59
59
 
package/src/renderers/js/templates/instructionsPageAccountMetas.njk CHANGED
@@ -22,7 +22,7 @@
22
22
  {% elif account.defaultsTo.kind === 'publicKey' %}
23
23
  const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? publicKey('{{ account.defaultsTo.publicKey }}');
24
24
  {% elif account.defaultsTo.kind === 'program' %}
25
- const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.get('{{ account.defaultsTo.program.name }}').publicKey, isWritable: false };
25
+ const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
26
26
  {% elif account.defaultsTo.kind === 'programId' %}
27
27
  const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
28
28
  {% elif account.defaultsTo.kind === 'identity' and (account.isSigner or account.isOptionalSigner) %}
package/src/visitors/transformers/SetInstructionAccountDefaultValuesVisitor.ts CHANGED
@@ -66,6 +66,43 @@ export const DEFAULT_INSTRUCTION_ACCOUNT_DEFAULT_RULES: InstructionAccountDefaul
66
66
  },
67
67
  ignoreIfOptional: true,
68
68
  },
69
+ {
70
+ kind: 'program',
71
+ account: /^tokenMetadataProgram|mplTokenMetadataProgram$/,
72
+ program: {
73
+ name: 'mplTokenMetadata',
74
+ publicKey: 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s',
75
+ },
76
+ ignoreIfOptional: true,
77
+ },
78
+ {
79
+ kind: 'program',
80
+ account:
81
+ /^(tokenAuth|mplTokenAuth|authorization|mplAuthorization|auth|mplAuth)RulesProgram$/,
82
+ program: {
83
+ name: 'mplTokenAuthRules',
84
+ publicKey: 'auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg',
85
+ },
86
+ ignoreIfOptional: true,
87
+ },
88
+ {
89
+ kind: 'program',
90
+ account: /^candyMachineProgram|mplCandyMachineProgram$/,
91
+ program: {
92
+ name: 'mplCandyMachine',
93
+ publicKey: 'CndyV3LdqHUfDLmE5naZjVN8rBZz4tqhdefbAnjHG3JR',
94
+ },
95
+ ignoreIfOptional: true,
96
+ },
97
+ {
98
+ kind: 'program',
99
+ account: /^candyGuardProgram|mplCandyGuardProgram$/,
100
+ program: {
101
+ name: 'mplCandyGuard',
102
+ publicKey: 'Guard1JwRhJkVH6XZhzoYxeBVQe872VH6QggF4BWmS9g',
103
+ },
104
+ ignoreIfOptional: true,
105
+ },
69
106
  {
70
107
  kind: 'publicKey',
71
108
  account: /^clockSysvar|sysvarClockSysvar$/,
@@ -80,7 +117,7 @@ export const DEFAULT_INSTRUCTION_ACCOUNT_DEFAULT_RULES: InstructionAccountDefaul
80
117
  },
81
118
  {
82
119
  kind: 'publicKey',
83
- account: /^instructionsSysvar|sysvarInstructions$/,
120
+ account: /^(instructions?Sysvar|sysvarInstructions?)(Account)?$/,
84
121
  publicKey: 'Sysvar1nstructions1111111111111111111111111',
85
122
  ignoreIfOptional: true,
86
123
  },