@metaplex-foundation/kinobi 0.18.4 → 0.18.7-alpha.0

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 (13) hide show
  1. package/dist/cjs/renderers/rust/getRenderMapVisitor.js +0 -1
  2. package/dist/cjs/renderers/rust/getRenderMapVisitor.js.map +1 -1
  3. package/dist/cjs/renderers/rust/getTypeManifestVisitor.js +28 -19
  4. package/dist/cjs/renderers/rust/getTypeManifestVisitor.js.map +1 -1
  5. package/dist/cjs/renderers/rust/templates/accountsPage.njk +6 -0
  6. package/dist/cjs/renderers/rust/templates/definedTypesPage.njk +6 -0
  7. package/dist/cjs/renderers/rust/templates/instructionsPage.njk +18 -7
  8. package/package.json +1 -1
  9. package/src/renderers/rust/getRenderMapVisitor.ts +5 -6
  10. package/src/renderers/rust/getTypeManifestVisitor.ts +27 -17
  11. package/src/renderers/rust/templates/accountsPage.njk +6 -0
  12. package/src/renderers/rust/templates/definedTypesPage.njk +6 -0
  13. package/src/renderers/rust/templates/instructionsPage.njk +18 -7
package/dist/cjs/renderers/rust/getRenderMapVisitor.js CHANGED
@@ -126,7 +126,6 @@ function getRenderMapVisitor(options = {}) {
126
126
  visitInstruction(node) {
127
127
  // Imports.
128
128
  const imports = new RustImportMap_1.RustImportMap();
129
- imports.add(['borsh::BorshDeserialize', 'borsh::BorshSerialize']);
130
129
  // canMergeAccountsAndArgs
131
130
  const accountsAndArgsConflicts = getConflictsForInstructionAccountsAndArgs(node);
132
131
  if (accountsAndArgsConflicts.length > 0) {
package/dist/cjs/renderers/rust/getRenderMapVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getRenderMapVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getRenderMapVisitor.ts"],"names":[],"mappings":"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"}
package/dist/cjs/renderers/rust/getTypeManifestVisitor.js CHANGED
@@ -21,15 +21,13 @@ function getTypeManifestVisitor() {
21
21
  visitAccount(account, { self }) {
22
22
  parentName = (0, shared_1.pascalCase)(account.name);
23
23
  const manifest = (0, visitors_1.visit)(account.data, self);
24
- manifest.imports.add([
25
- 'borsh::BorshSerialize',
26
- 'borsh::BorshDeserialize',
27
- ]);
28
24
  parentName = null;
29
25
  return {
30
26
  ...manifest,
31
- type: '#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]\n' +
32
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
27
+ type: '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
28
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
29
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
30
+ `#[derive(Clone, Debug, Eq, PartialEq)]\n` +
33
31
  `${manifest.type}`,
34
32
  };
35
33
  },
@@ -37,13 +35,7 @@ function getTypeManifestVisitor() {
37
35
  parentName = (0, shared_1.pascalCase)(definedType.name);
38
36
  const manifest = (0, visitors_1.visit)(definedType.type, self);
39
37
  parentName = null;
40
- manifest.imports.add([
41
- 'borsh::BorshSerialize',
42
- 'borsh::BorshDeserialize',
43
- ]);
44
38
  const traits = [
45
- 'BorshSerialize',
46
- 'BorshDeserialize',
47
39
  'Clone',
48
40
  'Debug',
49
41
  'Eq',
@@ -56,11 +48,15 @@ function getTypeManifestVisitor() {
56
48
  }
57
49
  return {
58
50
  ...manifest,
59
- type: `#[derive(${traits.join(', ')})]\n` +
60
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
51
+ type: '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
52
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
53
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
54
+ `#[derive(${traits.join(', ')})]\n` +
61
55
  `${manifest.type}`,
62
- nestedStructs: manifest.nestedStructs.map((struct) => `#[derive(${traits.join(', ')})]\n` +
63
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
56
+ nestedStructs: manifest.nestedStructs.map((struct) => '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
57
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
58
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
59
+ `#[derive(${traits.join(', ')})]\n` +
64
60
  `${struct}`),
65
61
  };
66
62
  },
@@ -163,9 +159,18 @@ function getTypeManifestVisitor() {
163
159
  parentName = (0, shared_1.pascalCase)(originalParentName) + name;
164
160
  const childManifest = (0, visitors_1.visit)(enumTupleVariantType.tuple, self);
165
161
  parentName = originalParentName;
162
+ let derive = '';
163
+ if (childManifest.type === '(Pubkey)') {
164
+ derive =
165
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
166
+ }
167
+ else if (childManifest.type === '(Vec<Pubkey>)') {
168
+ derive =
169
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
170
+ }
166
171
  return {
167
172
  ...childManifest,
168
- type: `${name}${childManifest.type},`,
173
+ type: `${derive}${name}${childManifest.type},`,
169
174
  };
170
175
  },
171
176
  visitMapType(mapType, { self }) {
@@ -247,6 +252,10 @@ function getTypeManifestVisitor() {
247
252
  derive =
248
253
  '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
249
254
  }
255
+ else if (fieldManifest.type === 'Vec<Pubkey>') {
256
+ derive =
257
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
258
+ }
250
259
  else if ((structFieldType.type.kind === 'arrayTypeNode' ||
251
260
  structFieldType.type.kind === 'bytesTypeNode' ||
252
261
  structFieldType.type.kind === 'stringTypeNode') &&
@@ -337,8 +346,8 @@ function getTypeManifestVisitor() {
337
346
  }
338
347
  if ((0, nodes_1.isNode)(stringType.size, 'remainderSizeNode')) {
339
348
  return {
340
- type: `&str`,
341
- imports: new RustImportMap_1.RustImportMap(),
349
+ type: `RemainderStr`,
350
+ imports: new RustImportMap_1.RustImportMap().add(`kaigan::types::RemainderStr`),
342
351
  nestedStructs: [],
343
352
  };
344
353
  }
package/dist/cjs/renderers/rust/getTypeManifestVisitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getTypeManifestVisitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/getTypeManifestVisitor.ts"],"names":[],"mappings":"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"}
package/dist/cjs/renderers/rust/templates/accountsPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  {{ macros.docblock(account.docs) }}
9
15
  {{ typeManifest.type }}
package/dist/cjs/renderers/rust/templates/definedTypesPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  {{ macros.docblock(definedType.docs) }}
9
15
  {{- typeManifest.type }}
package/dist/cjs/renderers/rust/templates/instructionsPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  /// Accounts.
9
15
  pub struct {{ instruction.name | pascalCase }} {
@@ -107,8 +113,9 @@ impl {{ instruction.name | pascalCase }} {
107
113
  }
108
114
  }
109
115
 
110
- #[derive(BorshDeserialize, BorshSerialize)]
111
- struct {{ instruction.name | pascalCase }}InstructionData {
116
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
117
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
118
+ pub struct {{ instruction.name | pascalCase }}InstructionData {
112
119
  {% for arg in instructionArgs %}
113
120
  {% if arg.default %}
114
121
  {{ arg.name | snakeCase }}: {{ arg.type }},
@@ -117,7 +124,7 @@ struct {{ instruction.name | pascalCase }}InstructionData {
117
124
  }
118
125
 
119
126
  impl {{ instruction.name | pascalCase }}InstructionData {
120
- fn new() -> Self {
127
+ pub fn new() -> Self {
121
128
  Self {
122
129
  {% for arg in instructionArgs %}
123
130
  {% if arg.default %}
@@ -129,8 +136,10 @@ impl {{ instruction.name | pascalCase }}InstructionData {
129
136
  }
130
137
 
131
138
  {% if hasArgs %}
132
- #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
133
- #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
139
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
140
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
141
+ #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
142
+ #[derive(Clone, Debug, Eq, PartialEq)]
134
143
  pub struct {{ instruction.name | pascalCase }}InstructionArgs {
135
144
  {% for arg in instructionArgs %}
136
145
  {% if not arg.default %}
@@ -141,8 +150,10 @@ pub struct {{ instruction.name | pascalCase }}InstructionArgs {
141
150
  {% endif %}
142
151
 
143
152
  {% for nestedStruct in typeManifest.nestedStructs %}
144
- #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
145
- #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
153
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
154
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
155
+ #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
156
+ #[derive(Clone, Debug, Eq, PartialEq)]
146
157
  {{ nestedStruct }}
147
158
  {% endfor %}
148
159
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metaplex-foundation/kinobi",
3
- "version": "0.18.4",
3
+ "version": "0.18.7-alpha.0",
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/rust/getRenderMapVisitor.ts CHANGED
@@ -185,7 +185,6 @@ export function getRenderMapVisitor(options: GetRustRenderMapOptions = {}) {
185
185
  visitInstruction(node) {
186
186
  // Imports.
187
187
  const imports = new RustImportMap();
188
- imports.add(['borsh::BorshDeserialize', 'borsh::BorshSerialize']);
189
188
 
190
189
  // canMergeAccountsAndArgs
191
190
  const accountsAndArgsConflicts =
@@ -193,11 +192,11 @@ export function getRenderMapVisitor(options: GetRustRenderMapOptions = {}) {
193
192
  if (accountsAndArgsConflicts.length > 0) {
194
193
  logWarn(
195
194
  `[Rust] Accounts and args of instruction [${node.name}] have the following ` +
196
- `conflicting attributes [${accountsAndArgsConflicts.join(
197
- ', '
198
- )}]. ` +
199
- `Thus, the conflicting arguments will be suffixed with "_arg". ` +
200
- 'You may want to rename the conflicting attributes.'
195
+ `conflicting attributes [${accountsAndArgsConflicts.join(
196
+ ', '
197
+ )}]. ` +
198
+ `Thus, the conflicting arguments will be suffixed with "_arg". ` +
199
+ 'You may want to rename the conflicting attributes.'
201
200
  );
202
201
  }
203
202
 
package/src/renderers/rust/getTypeManifestVisitor.ts CHANGED
@@ -39,16 +39,14 @@ export function getTypeManifestVisitor() {
39
39
  visitAccount(account, { self }) {
40
40
  parentName = pascalCase(account.name);
41
41
  const manifest = visit(account.data, self);
42
- manifest.imports.add([
43
- 'borsh::BorshSerialize',
44
- 'borsh::BorshDeserialize',
45
- ]);
46
42
  parentName = null;
47
43
  return {
48
44
  ...manifest,
49
45
  type:
50
- '#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]\n' +
51
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
46
+ '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
47
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
48
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
49
+ `#[derive(Clone, Debug, Eq, PartialEq)]\n` +
52
50
  `${manifest.type}`,
53
51
  };
54
52
  },
@@ -57,13 +55,7 @@ export function getTypeManifestVisitor() {
57
55
  parentName = pascalCase(definedType.name);
58
56
  const manifest = visit(definedType.type, self);
59
57
  parentName = null;
60
- manifest.imports.add([
61
- 'borsh::BorshSerialize',
62
- 'borsh::BorshDeserialize',
63
- ]);
64
58
  const traits = [
65
- 'BorshSerialize',
66
- 'BorshDeserialize',
67
59
  'Clone',
68
60
  'Debug',
69
61
  'Eq',
@@ -79,13 +71,17 @@ export function getTypeManifestVisitor() {
79
71
  return {
80
72
  ...manifest,
81
73
  type:
74
+ '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
75
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
76
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
82
77
  `#[derive(${traits.join(', ')})]\n` +
83
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
84
78
  `${manifest.type}`,
85
79
  nestedStructs: manifest.nestedStructs.map(
86
80
  (struct) =>
81
+ '#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]\n' +
82
+ '#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]\n' +
83
+ '#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]\n' +
87
84
  `#[derive(${traits.join(', ')})]\n` +
88
- '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
89
85
  `${struct}`
90
86
  ),
91
87
  };
@@ -220,9 +216,18 @@ export function getTypeManifestVisitor() {
220
216
  const childManifest = visit(enumTupleVariantType.tuple, self);
221
217
  parentName = originalParentName;
222
218
 
219
+ let derive = '';
220
+ if (childManifest.type === '(Pubkey)') {
221
+ derive =
222
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
223
+ } else if (childManifest.type === '(Vec<Pubkey>)') {
224
+ derive =
225
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
226
+ }
227
+
223
228
  return {
224
229
  ...childManifest,
225
- type: `${name}${childManifest.type},`,
230
+ type: `${derive}${name}${childManifest.type},`,
226
231
  };
227
232
  },
228
233
 
@@ -327,6 +332,9 @@ export function getTypeManifestVisitor() {
327
332
  if (fieldManifest.type === 'Pubkey') {
328
333
  derive =
329
334
  '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
335
+ } else if (fieldManifest.type === 'Vec<Pubkey>') {
336
+ derive =
337
+ '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>"))]\n';
330
338
  } else if (
331
339
  (structFieldType.type.kind === 'arrayTypeNode' ||
332
340
  structFieldType.type.kind === 'bytesTypeNode' ||
@@ -439,8 +447,10 @@ export function getTypeManifestVisitor() {
439
447
 
440
448
  if (isNode(stringType.size, 'remainderSizeNode')) {
441
449
  return {
442
- type: `&str`,
443
- imports: new RustImportMap(),
450
+ type: `RemainderStr`,
451
+ imports: new RustImportMap().add(
452
+ `kaigan::types::RemainderStr`
453
+ ),
444
454
  nestedStructs: [],
445
455
  };
446
456
  }
package/src/renderers/rust/templates/accountsPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  {{ macros.docblock(account.docs) }}
9
15
  {{ typeManifest.type }}
package/src/renderers/rust/templates/definedTypesPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  {{ macros.docblock(definedType.docs) }}
9
15
  {{- typeManifest.type }}
package/src/renderers/rust/templates/instructionsPage.njk CHANGED
@@ -4,6 +4,12 @@
4
4
  {% block main %}
5
5
 
6
6
  {{ imports }}
7
+ #[cfg(feature = "anchor")]
8
+ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize};
9
+ #[cfg(not(feature = "anchor"))]
10
+ use borsh::{BorshDeserialize, BorshSerialize};
11
+ #[cfg(feature = "serde")]
12
+ use serde::{Deserialize, Serialize};
7
13
 
8
14
  /// Accounts.
9
15
  pub struct {{ instruction.name | pascalCase }} {
@@ -107,8 +113,9 @@ impl {{ instruction.name | pascalCase }} {
107
113
  }
108
114
  }
109
115
 
110
- #[derive(BorshDeserialize, BorshSerialize)]
111
- struct {{ instruction.name | pascalCase }}InstructionData {
116
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
117
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
118
+ pub struct {{ instruction.name | pascalCase }}InstructionData {
112
119
  {% for arg in instructionArgs %}
113
120
  {% if arg.default %}
114
121
  {{ arg.name | snakeCase }}: {{ arg.type }},
@@ -117,7 +124,7 @@ struct {{ instruction.name | pascalCase }}InstructionData {
117
124
  }
118
125
 
119
126
  impl {{ instruction.name | pascalCase }}InstructionData {
120
- fn new() -> Self {
127
+ pub fn new() -> Self {
121
128
  Self {
122
129
  {% for arg in instructionArgs %}
123
130
  {% if arg.default %}
@@ -129,8 +136,10 @@ impl {{ instruction.name | pascalCase }}InstructionData {
129
136
  }
130
137
 
131
138
  {% if hasArgs %}
132
- #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
133
- #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
139
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
140
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
141
+ #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
142
+ #[derive(Clone, Debug, Eq, PartialEq)]
134
143
  pub struct {{ instruction.name | pascalCase }}InstructionArgs {
135
144
  {% for arg in instructionArgs %}
136
145
  {% if not arg.default %}
@@ -141,8 +150,10 @@ pub struct {{ instruction.name | pascalCase }}InstructionArgs {
141
150
  {% endif %}
142
151
 
143
152
  {% for nestedStruct in typeManifest.nestedStructs %}
144
- #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
145
- #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
153
+ #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))]
154
+ #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))]
155
+ #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
156
+ #[derive(Clone, Debug, Eq, PartialEq)]
146
157
  {{ nestedStruct }}
147
158
  {% endfor %}
148
159