@metaplex-foundation/kinobi 0.4.6 → 0.5.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.
- package/dist/cjs/nodes/InstructionNode.js +14 -11
- package/dist/cjs/nodes/InstructionNode.js.map +1 -1
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js +15 -12
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js.map +1 -1
- package/dist/cjs/renderers/js/templates/instructionsPage.njk +2 -2
- package/dist/cjs/renderers/js/templates/instructionsPageAccountMetas.njk +6 -4
- package/dist/cjs/visitors/aggregators/GetNodeTreeStringVisitor.js +1 -1
- package/dist/cjs/visitors/aggregators/GetNodeTreeStringVisitor.js.map +1 -1
- package/dist/cjs/visitors/aggregators/GetResolvedInstructionAccountsVisitor.js +14 -12
- package/dist/cjs/visitors/aggregators/GetResolvedInstructionAccountsVisitor.js.map +1 -1
- package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js +3 -3
- package/dist/cjs/visitors/transformers/UpdateInstructionsVisitor.js.map +1 -1
- package/dist/types/nodes/InstructionNode.d.ts +3 -8
- package/dist/types/visitors/aggregators/GetResolvedInstructionAccountsVisitor.d.ts +1 -2
- package/dist/types/visitors/transformers/UpdateInstructionsVisitor.d.ts +1 -3
- package/package.json +1 -1
- package/src/nodes/InstructionNode.ts +16 -16
- package/src/renderers/js/GetJavaScriptRenderMapVisitor.ts +13 -12
- package/src/renderers/js/templates/instructionsPage.njk +2 -2
- package/src/renderers/js/templates/instructionsPageAccountMetas.njk +6 -4
- package/src/visitors/aggregators/GetNodeTreeStringVisitor.ts +1 -1
- package/src/visitors/aggregators/GetResolvedInstructionAccountsVisitor.ts +16 -14
- package/src/visitors/transformers/UpdateInstructionsVisitor.ts +5 -6
|
@@ -14,17 +14,19 @@ class InstructionNode {
|
|
|
14
14
|
this.metadata = {
|
|
15
15
|
...metadata,
|
|
16
16
|
name: (0, utils_1.mainCase)(metadata.name),
|
|
17
|
-
bytesCreatedOnChain: 'name' in bytes
|
|
17
|
+
bytesCreatedOnChain: bytes && 'name' in bytes
|
|
18
|
+
? { ...bytes, name: (0, utils_1.mainCase)(bytes.name) }
|
|
19
|
+
: bytes,
|
|
18
20
|
};
|
|
19
21
|
this.accounts = accounts.map((account) => {
|
|
20
22
|
const { defaultsTo } = account;
|
|
21
|
-
if (defaultsTo.kind === 'account') {
|
|
23
|
+
if ((defaultsTo === null || defaultsTo === void 0 ? void 0 : defaultsTo.kind) === 'account') {
|
|
22
24
|
defaultsTo.name = (0, utils_1.mainCase)(defaultsTo.name);
|
|
23
25
|
}
|
|
24
|
-
else if (defaultsTo.kind === 'program') {
|
|
26
|
+
else if ((defaultsTo === null || defaultsTo === void 0 ? void 0 : defaultsTo.kind) === 'program') {
|
|
25
27
|
defaultsTo.program.name = (0, utils_1.mainCase)(defaultsTo.program.name);
|
|
26
28
|
}
|
|
27
|
-
else if (defaultsTo.kind === 'pda') {
|
|
29
|
+
else if ((defaultsTo === null || defaultsTo === void 0 ? void 0 : defaultsTo.kind) === 'pda') {
|
|
28
30
|
defaultsTo.pdaAccount = (0, utils_1.mainCase)(defaultsTo.pdaAccount);
|
|
29
31
|
defaultsTo.seeds = Object.fromEntries(Object.entries(defaultsTo.seeds).map(([key, seed]) => [
|
|
30
32
|
(0, utils_1.mainCase)(key),
|
|
@@ -48,22 +50,23 @@ class InstructionNode {
|
|
|
48
50
|
idlName,
|
|
49
51
|
docs: (_c = idl.docs) !== null && _c !== void 0 ? _c : [],
|
|
50
52
|
internal: false,
|
|
51
|
-
bytesCreatedOnChain:
|
|
53
|
+
bytesCreatedOnChain: null,
|
|
52
54
|
};
|
|
53
55
|
const accounts = ((_d = idl.accounts) !== null && _d !== void 0 ? _d : []).map((account) => {
|
|
54
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
56
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
55
57
|
const isOptional = (_b = (_a = account.optional) !== null && _a !== void 0 ? _a : account.isOptional) !== null && _b !== void 0 ? _b : false;
|
|
56
58
|
return {
|
|
57
59
|
name: (0, utils_1.camelCase)((_c = account.name) !== null && _c !== void 0 ? _c : ''),
|
|
58
60
|
isWritable: (_d = account.isMut) !== null && _d !== void 0 ? _d : false,
|
|
59
|
-
isSigner:
|
|
60
|
-
|
|
61
|
+
isSigner: account.isOptionalSigner
|
|
62
|
+
? 'either'
|
|
63
|
+
: (_e = account.isSigner) !== null && _e !== void 0 ? _e : false,
|
|
61
64
|
isOptional,
|
|
62
|
-
description: (
|
|
65
|
+
description: (_f = account.desc) !== null && _f !== void 0 ? _f : '',
|
|
63
66
|
defaultsTo: isOptional && useProgramIdForOptionalAccounts
|
|
64
67
|
? { kind: 'programId' }
|
|
65
|
-
:
|
|
66
|
-
pdaBumpArg: (
|
|
68
|
+
: null,
|
|
69
|
+
pdaBumpArg: (_g = account.pdaBumpArg) !== null && _g !== void 0 ? _g : null,
|
|
67
70
|
};
|
|
68
71
|
});
|
|
69
72
|
let args = TypeStructNode_1.TypeStructNode.fromIdl({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstructionNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionNode.ts"],"names":[],"mappings":";;;AAAA,oCAA+C;AAI/C,yCAAmD;AACnD,qDAAkD;AAClD,+DAA4D;AAC5D,2CAAiD;AACjD,+DAG+B;
|
|
1
|
+
{"version":3,"file":"InstructionNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -253,14 +253,16 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
253
253
|
'AccountMeta',
|
|
254
254
|
'Context',
|
|
255
255
|
'Signer',
|
|
256
|
-
'
|
|
256
|
+
'TransactionBuilder',
|
|
257
|
+
'transactionBuilder',
|
|
257
258
|
]);
|
|
258
259
|
// Accounts.
|
|
259
260
|
const accounts = instruction
|
|
260
261
|
.accept(this.resolvedInstructionAccountVisitor)
|
|
261
262
|
.map((account) => {
|
|
262
|
-
|
|
263
|
-
|
|
263
|
+
var _a;
|
|
264
|
+
const hasDefaultValue = !!account.defaultsTo;
|
|
265
|
+
if (((_a = account.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'pda') {
|
|
264
266
|
const { seeds } = account.defaultsTo;
|
|
265
267
|
Object.keys(seeds).forEach((seed) => {
|
|
266
268
|
const seedValue = seeds[seed];
|
|
@@ -292,10 +294,10 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
292
294
|
}
|
|
293
295
|
// Bytes created on chain.
|
|
294
296
|
const bytes = instruction.metadata.bytesCreatedOnChain;
|
|
295
|
-
if (bytes
|
|
297
|
+
if (bytes && bytes.includeHeader) {
|
|
296
298
|
imports.add('core', 'ACCOUNT_HEADER_SIZE');
|
|
297
299
|
}
|
|
298
|
-
if (bytes.kind === 'account') {
|
|
300
|
+
if ((bytes === null || bytes === void 0 ? void 0 : bytes.kind) === 'account') {
|
|
299
301
|
const accountName = (0, utils_1.pascalCase)(bytes.name);
|
|
300
302
|
const dependency = bytes.dependency === 'generated'
|
|
301
303
|
? 'generatedAccounts'
|
|
@@ -325,9 +327,9 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
325
327
|
imports: imports.toString(this.options.dependencyMap),
|
|
326
328
|
program: this.program,
|
|
327
329
|
accounts,
|
|
328
|
-
needsEddsa: accounts.some((a) => a.defaultsTo.kind === 'pda'),
|
|
329
|
-
needsIdentity: accounts.some((a) => a.defaultsTo.kind === 'identity'),
|
|
330
|
-
needsPayer: accounts.some((a) => a.defaultsTo.kind === 'payer'),
|
|
330
|
+
needsEddsa: accounts.some((a) => { var _a; return ((_a = a.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'pda'; }),
|
|
331
|
+
needsIdentity: accounts.some((a) => { var _a; return ((_a = a.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'identity'; }),
|
|
332
|
+
needsPayer: accounts.some((a) => { var _a; return ((_a = a.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'payer'; }),
|
|
331
333
|
typeManifest,
|
|
332
334
|
canMergeAccountsAndArgs,
|
|
333
335
|
}));
|
|
@@ -353,20 +355,21 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
353
355
|
getInstructionAccountType(account) {
|
|
354
356
|
if (account.pdaBumpArg)
|
|
355
357
|
return 'Pda';
|
|
356
|
-
if (account.
|
|
358
|
+
if (account.isSigner === 'either')
|
|
357
359
|
return 'PublicKey | Signer';
|
|
358
360
|
return account.isSigner ? 'Signer' : 'PublicKey';
|
|
359
361
|
}
|
|
360
362
|
getInstructionAccountImports(accounts) {
|
|
361
363
|
const imports = new JavaScriptImportMap_1.JavaScriptImportMap();
|
|
362
364
|
accounts.forEach((account) => {
|
|
365
|
+
var _a, _b;
|
|
363
366
|
if (account.pdaBumpArg) {
|
|
364
367
|
imports.add('core', 'Pda');
|
|
365
368
|
}
|
|
366
|
-
if (account.defaultsTo.kind === 'publicKey') {
|
|
369
|
+
if (((_a = account.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'publicKey') {
|
|
367
370
|
imports.add('core', 'publicKey');
|
|
368
371
|
}
|
|
369
|
-
if (account.defaultsTo.kind === 'pda') {
|
|
372
|
+
if (((_b = account.defaultsTo) === null || _b === void 0 ? void 0 : _b.kind) === 'pda') {
|
|
370
373
|
const pdaAccount = (0, utils_1.pascalCase)(account.defaultsTo.pdaAccount);
|
|
371
374
|
const dependency = account.defaultsTo.dependency === 'generated'
|
|
372
375
|
? 'generatedAccounts'
|
|
@@ -378,7 +381,7 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
378
381
|
}
|
|
379
382
|
});
|
|
380
383
|
}
|
|
381
|
-
if (account.
|
|
384
|
+
if (account.resolvedIsSigner === 'either') {
|
|
382
385
|
imports.add('core', ['PublicKey', 'publicKey', 'Signer', 'isSigner']);
|
|
383
386
|
}
|
|
384
387
|
else if (account.resolvedIsSigner) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetJavaScriptRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptRenderMapVisitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"GetJavaScriptRenderMapVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/js/GetJavaScriptRenderMapVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ export function {{ instruction.name | camelCase }}(
|
|
|
48
48
|
args: {{ argsType }},
|
|
49
49
|
{% endif %}
|
|
50
50
|
{% endif %}
|
|
51
|
-
):
|
|
51
|
+
): TransactionBuilder {
|
|
52
52
|
const signers: Signer[] = [];
|
|
53
53
|
const keys: AccountMeta[] = [];
|
|
54
54
|
|
|
@@ -85,6 +85,6 @@ export function {{ instruction.name | camelCase }}(
|
|
|
85
85
|
const bytesCreatedOnChain = 0;
|
|
86
86
|
{% endif %}
|
|
87
87
|
|
|
88
|
-
return { instruction: { keys, programId, data }, signers, bytesCreatedOnChain };
|
|
88
|
+
return transactionBuilder([{ instruction: { keys, programId, data }, signers, bytesCreatedOnChain }]);
|
|
89
89
|
}
|
|
90
90
|
{% endblock %}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
{% if accounts.length > 0 %}
|
|
2
2
|
// Resolved accounts.
|
|
3
3
|
{% for account in accounts | sort(false, false, 'dependencyPosition') %}
|
|
4
|
-
{% if account.defaultsTo
|
|
4
|
+
{% if not account.defaultsTo %}
|
|
5
|
+
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
|
|
6
|
+
{% elif account.defaultsTo.kind === 'account' %}
|
|
5
7
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? {{ account.defaultsTo.name | camelCase }}Account;
|
|
6
8
|
{% elif account.defaultsTo.kind === 'pda' %}
|
|
7
9
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? find{{ account.defaultsTo.pdaAccount | pascalCase }}Pda(context,
|
|
@@ -25,11 +27,11 @@
|
|
|
25
27
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
|
|
26
28
|
{% elif account.defaultsTo.kind === 'programId' %}
|
|
27
29
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
|
|
28
|
-
{% elif account.defaultsTo.kind === 'identity' and (account.isSigner
|
|
30
|
+
{% elif account.defaultsTo.kind === 'identity' and (account.isSigner !== false) %}
|
|
29
31
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity;
|
|
30
32
|
{% elif account.defaultsTo.kind === 'identity' %}
|
|
31
33
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity.publicKey;
|
|
32
|
-
{% elif account.defaultsTo.kind === 'payer' and (account.isSigner
|
|
34
|
+
{% elif account.defaultsTo.kind === 'payer' and (account.isSigner !== false) %}
|
|
33
35
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer;
|
|
34
36
|
{% elif account.defaultsTo.kind === 'payer' %}
|
|
35
37
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer.publicKey;
|
|
@@ -45,7 +47,7 @@
|
|
|
45
47
|
{% if account.resolvedIsOptional %}
|
|
46
48
|
if ({{ account.name | camelCase }}Account) {
|
|
47
49
|
{% endif %}
|
|
48
|
-
{% if account.
|
|
50
|
+
{% if account.resolvedIsSigner === 'either' %}
|
|
49
51
|
if (isSigner({{ account.name | camelCase }}Account)) {
|
|
50
52
|
signers.push({{ account.name | camelCase }}Account);
|
|
51
53
|
}
|
|
@@ -78,7 +78,7 @@ class GetNodeTreeStringVisitor {
|
|
|
78
78
|
tags.push('signer');
|
|
79
79
|
if (account.isOptional)
|
|
80
80
|
tags.push('optional');
|
|
81
|
-
if (account.defaultsTo
|
|
81
|
+
if (account.defaultsTo)
|
|
82
82
|
tags.push(`defaults to ${account.defaultsTo.kind}`);
|
|
83
83
|
const tagsAsString = tags.length > 0 ? ` (${tags.join(', ')})` : '';
|
|
84
84
|
return this.indented(account.name + tagsAsString);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetNodeTreeStringVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetNodeTreeStringVisitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"GetNodeTreeStringVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetNodeTreeStringVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor_1.BaseThrow
|
|
|
26
26
|
return [...this.visited.values()].sort((a, b) => a.position - b.position);
|
|
27
27
|
}
|
|
28
28
|
handleInstructionAccount(instruction, account, index) {
|
|
29
|
+
var _a, _b, _c;
|
|
29
30
|
// Ensure we don't visit the same account twice.
|
|
30
31
|
if (this.visited.has(account.name)) {
|
|
31
32
|
return;
|
|
@@ -41,10 +42,10 @@ class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor_1.BaseThrow
|
|
|
41
42
|
}
|
|
42
43
|
// Get account dependencies.
|
|
43
44
|
const dependsOn = [];
|
|
44
|
-
if (account.defaultsTo.kind === 'account') {
|
|
45
|
+
if (((_a = account.defaultsTo) === null || _a === void 0 ? void 0 : _a.kind) === 'account') {
|
|
45
46
|
dependsOn.push(account.defaultsTo.name);
|
|
46
47
|
}
|
|
47
|
-
else if (account.defaultsTo.kind === 'pda') {
|
|
48
|
+
else if (((_b = account.defaultsTo) === null || _b === void 0 ? void 0 : _b.kind) === 'pda') {
|
|
48
49
|
const accounts = Object.values(account.defaultsTo.seeds)
|
|
49
50
|
.filter((seed) => seed.kind === 'account')
|
|
50
51
|
.map((seed) => seed.name);
|
|
@@ -70,28 +71,29 @@ class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor_1.BaseThrow
|
|
|
70
71
|
dependencyPosition: this.visited.size,
|
|
71
72
|
dependsOn,
|
|
72
73
|
resolvedIsSigner: account.isSigner,
|
|
73
|
-
resolvedIsOptionalSigner: account.isOptionalSigner,
|
|
74
74
|
resolvedIsOptional: account.isOptional,
|
|
75
75
|
};
|
|
76
|
-
switch (resolved.defaultsTo.kind) {
|
|
76
|
+
switch ((_c = resolved.defaultsTo) === null || _c === void 0 ? void 0 : _c.kind) {
|
|
77
77
|
case 'account':
|
|
78
78
|
const defaultAccount = this.visited.get(resolved.defaultsTo.name);
|
|
79
|
-
const resolvedIsPublicKey =
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
const resolvedIsPublicKey = account.isSigner === false && defaultAccount.isSigner === false;
|
|
80
|
+
const resolvedIsSigner = account.isSigner === true && defaultAccount.isSigner === true;
|
|
81
|
+
const resolvedIsOptionalSigner = !resolvedIsPublicKey && !resolvedIsSigner;
|
|
82
|
+
resolved.resolvedIsSigner = resolvedIsOptionalSigner
|
|
83
|
+
? 'either'
|
|
84
|
+
: resolvedIsSigner;
|
|
83
85
|
resolved.resolvedIsOptional = defaultAccount.isOptional;
|
|
84
86
|
break;
|
|
85
87
|
case 'publicKey':
|
|
86
88
|
case 'program':
|
|
87
89
|
case 'programId':
|
|
88
|
-
resolved.
|
|
89
|
-
|
|
90
|
+
resolved.resolvedIsSigner =
|
|
91
|
+
account.isSigner === false ? false : 'either';
|
|
90
92
|
resolved.resolvedIsOptional = false;
|
|
91
93
|
break;
|
|
92
94
|
case 'pda':
|
|
93
|
-
resolved.
|
|
94
|
-
|
|
95
|
+
resolved.resolvedIsSigner =
|
|
96
|
+
account.isSigner === false ? false : 'either';
|
|
95
97
|
resolved.resolvedIsOptional = false;
|
|
96
98
|
const { seeds } = resolved.defaultsTo;
|
|
97
99
|
Object.keys(seeds).forEach((seedKey) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetResolvedInstructionAccountsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetResolvedInstructionAccountsVisitor.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;
|
|
1
|
+
{"version":3,"file":"GetResolvedInstructionAccountsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/aggregators/GetResolvedInstructionAccountsVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,13 +71,13 @@ class UpdateInstructionsVisitor extends TransformNodesVisitor_1.TransformNodesVi
|
|
|
71
71
|
}
|
|
72
72
|
handleMetadata(metadataUpdates) {
|
|
73
73
|
const metadata = metadataUpdates;
|
|
74
|
-
if (
|
|
74
|
+
if (metadataUpdates.bytesCreatedOnChain) {
|
|
75
75
|
metadata.bytesCreatedOnChain = {
|
|
76
76
|
includeHeader: true,
|
|
77
|
-
dependency:
|
|
77
|
+
dependency: metadataUpdates.bytesCreatedOnChain.kind === 'account'
|
|
78
78
|
? 'generated'
|
|
79
79
|
: undefined,
|
|
80
|
-
...
|
|
80
|
+
...metadataUpdates.bytesCreatedOnChain,
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
83
|
return metadata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateInstructionsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/UpdateInstructionsVisitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,uCAAuC;AAEvC,mEAIiC;AACjC,qDAAoD;
|
|
1
|
+
{"version":3,"file":"UpdateInstructionsVisitor.js","sourceRoot":"","sources":["../../../../src/visitors/transformers/UpdateInstructionsVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,16 +9,15 @@ export type InstructionNodeMetadata = {
|
|
|
9
9
|
idlName: string;
|
|
10
10
|
docs: string[];
|
|
11
11
|
internal: boolean;
|
|
12
|
-
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChain;
|
|
12
|
+
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChain | null;
|
|
13
13
|
};
|
|
14
14
|
export type InstructionNodeAccount = {
|
|
15
15
|
name: string;
|
|
16
16
|
isWritable: boolean;
|
|
17
|
-
isSigner: boolean;
|
|
18
|
-
isOptionalSigner: boolean;
|
|
17
|
+
isSigner: boolean | 'either';
|
|
19
18
|
isOptional: boolean;
|
|
20
19
|
description: string;
|
|
21
|
-
defaultsTo: InstructionNodeAccountDefaults;
|
|
20
|
+
defaultsTo: InstructionNodeAccountDefaults | null;
|
|
22
21
|
pdaBumpArg: string | null;
|
|
23
22
|
};
|
|
24
23
|
export type InstructionNodeAccountDefaults = {
|
|
@@ -44,8 +43,6 @@ export type InstructionNodeAccountDefaults = {
|
|
|
44
43
|
};
|
|
45
44
|
} | {
|
|
46
45
|
kind: 'programId';
|
|
47
|
-
} | {
|
|
48
|
-
kind: 'none';
|
|
49
46
|
};
|
|
50
47
|
export type InstructionNodeAccountDefaultsSeed = {
|
|
51
48
|
kind: 'account';
|
|
@@ -70,8 +67,6 @@ export type InstructionNodeBytesCreatedOnChain = {
|
|
|
70
67
|
name: string;
|
|
71
68
|
dependency: string;
|
|
72
69
|
includeHeader: boolean;
|
|
73
|
-
} | {
|
|
74
|
-
kind: 'none';
|
|
75
70
|
};
|
|
76
71
|
export declare class InstructionNode implements Visitable {
|
|
77
72
|
readonly nodeClass: "InstructionNode";
|
|
@@ -4,8 +4,7 @@ export type ResolvedInstructionAccount = nodes.InstructionNodeAccount & {
|
|
|
4
4
|
position: number;
|
|
5
5
|
dependencyPosition: number;
|
|
6
6
|
dependsOn: string[];
|
|
7
|
-
resolvedIsSigner: boolean;
|
|
8
|
-
resolvedIsOptionalSigner: boolean;
|
|
7
|
+
resolvedIsSigner: boolean | 'either';
|
|
9
8
|
resolvedIsOptional: boolean;
|
|
10
9
|
};
|
|
11
10
|
export declare class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor<ResolvedInstructionAccount[]> {
|
|
@@ -8,7 +8,7 @@ export type InstructionUpdates = NodeTransformer<nodes.InstructionNode> | {
|
|
|
8
8
|
args?: Record<string, string>;
|
|
9
9
|
});
|
|
10
10
|
export type InstructionMetadataUpdates = Partial<Omit<nodes.InstructionNodeMetadata, 'bytesCreatedOnChain'> & {
|
|
11
|
-
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChainInput;
|
|
11
|
+
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChainInput | null;
|
|
12
12
|
accounts: InstructionAccountUpdates;
|
|
13
13
|
}>;
|
|
14
14
|
export type InstructionAccountUpdates = Record<string, Partial<Omit<nodes.InstructionNodeAccount, 'defaultsTo'> & {
|
|
@@ -27,8 +27,6 @@ type InstructionNodeBytesCreatedOnChainInput = {
|
|
|
27
27
|
name: string;
|
|
28
28
|
dependency?: string;
|
|
29
29
|
includeHeader?: boolean;
|
|
30
|
-
} | {
|
|
31
|
-
kind: 'none';
|
|
32
30
|
};
|
|
33
31
|
export declare class UpdateInstructionsVisitor extends TransformNodesVisitor {
|
|
34
32
|
readonly map: Record<string, InstructionUpdates>;
|
package/package.json
CHANGED
|
@@ -16,17 +16,16 @@ export type InstructionNodeMetadata = {
|
|
|
16
16
|
idlName: string;
|
|
17
17
|
docs: string[];
|
|
18
18
|
internal: boolean;
|
|
19
|
-
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChain;
|
|
19
|
+
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChain | null;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
export type InstructionNodeAccount = {
|
|
23
23
|
name: string;
|
|
24
24
|
isWritable: boolean;
|
|
25
|
-
isSigner: boolean;
|
|
26
|
-
isOptionalSigner: boolean;
|
|
25
|
+
isSigner: boolean | 'either';
|
|
27
26
|
isOptional: boolean;
|
|
28
27
|
description: string;
|
|
29
|
-
defaultsTo: InstructionNodeAccountDefaults;
|
|
28
|
+
defaultsTo: InstructionNodeAccountDefaults | null;
|
|
30
29
|
pdaBumpArg: string | null;
|
|
31
30
|
};
|
|
32
31
|
|
|
@@ -42,8 +41,7 @@ export type InstructionNodeAccountDefaults =
|
|
|
42
41
|
seeds: Record<string, InstructionNodeAccountDefaultsSeed>;
|
|
43
42
|
}
|
|
44
43
|
| { kind: 'program'; program: { name: string; publicKey: string } }
|
|
45
|
-
| { kind: 'programId' }
|
|
46
|
-
| { kind: 'none' };
|
|
44
|
+
| { kind: 'programId' };
|
|
47
45
|
|
|
48
46
|
export type InstructionNodeAccountDefaultsSeed =
|
|
49
47
|
| { kind: 'account'; name: string }
|
|
@@ -58,8 +56,7 @@ export type InstructionNodeBytesCreatedOnChain =
|
|
|
58
56
|
name: string;
|
|
59
57
|
dependency: string;
|
|
60
58
|
includeHeader: boolean;
|
|
61
|
-
}
|
|
62
|
-
| { kind: 'none' };
|
|
59
|
+
};
|
|
63
60
|
|
|
64
61
|
export class InstructionNode implements Visitable {
|
|
65
62
|
readonly nodeClass = 'InstructionNode' as const;
|
|
@@ -83,15 +80,17 @@ export class InstructionNode implements Visitable {
|
|
|
83
80
|
...metadata,
|
|
84
81
|
name: mainCase(metadata.name),
|
|
85
82
|
bytesCreatedOnChain:
|
|
86
|
-
'name' in bytes
|
|
83
|
+
bytes && 'name' in bytes
|
|
84
|
+
? { ...bytes, name: mainCase(bytes.name) }
|
|
85
|
+
: bytes,
|
|
87
86
|
};
|
|
88
87
|
this.accounts = accounts.map((account) => {
|
|
89
88
|
const { defaultsTo } = account;
|
|
90
|
-
if (defaultsTo
|
|
89
|
+
if (defaultsTo?.kind === 'account') {
|
|
91
90
|
defaultsTo.name = mainCase(defaultsTo.name);
|
|
92
|
-
} else if (defaultsTo
|
|
91
|
+
} else if (defaultsTo?.kind === 'program') {
|
|
93
92
|
defaultsTo.program.name = mainCase(defaultsTo.program.name);
|
|
94
|
-
} else if (defaultsTo
|
|
93
|
+
} else if (defaultsTo?.kind === 'pda') {
|
|
95
94
|
defaultsTo.pdaAccount = mainCase(defaultsTo.pdaAccount);
|
|
96
95
|
defaultsTo.seeds = Object.fromEntries(
|
|
97
96
|
Object.entries(defaultsTo.seeds).map(([key, seed]) => [
|
|
@@ -118,7 +117,7 @@ export class InstructionNode implements Visitable {
|
|
|
118
117
|
idlName,
|
|
119
118
|
docs: idl.docs ?? [],
|
|
120
119
|
internal: false,
|
|
121
|
-
bytesCreatedOnChain:
|
|
120
|
+
bytesCreatedOnChain: null,
|
|
122
121
|
};
|
|
123
122
|
|
|
124
123
|
const accounts = (idl.accounts ?? []).map(
|
|
@@ -127,14 +126,15 @@ export class InstructionNode implements Visitable {
|
|
|
127
126
|
return {
|
|
128
127
|
name: camelCase(account.name ?? ''),
|
|
129
128
|
isWritable: account.isMut ?? false,
|
|
130
|
-
isSigner: account.
|
|
131
|
-
|
|
129
|
+
isSigner: account.isOptionalSigner
|
|
130
|
+
? 'either'
|
|
131
|
+
: account.isSigner ?? false,
|
|
132
132
|
isOptional,
|
|
133
133
|
description: account.desc ?? '',
|
|
134
134
|
defaultsTo:
|
|
135
135
|
isOptional && useProgramIdForOptionalAccounts
|
|
136
136
|
? { kind: 'programId' }
|
|
137
|
-
:
|
|
137
|
+
: null,
|
|
138
138
|
pdaBumpArg: account.pdaBumpArg ?? null,
|
|
139
139
|
};
|
|
140
140
|
}
|
|
@@ -295,15 +295,16 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
295
295
|
'AccountMeta',
|
|
296
296
|
'Context',
|
|
297
297
|
'Signer',
|
|
298
|
-
'
|
|
298
|
+
'TransactionBuilder',
|
|
299
|
+
'transactionBuilder',
|
|
299
300
|
]);
|
|
300
301
|
|
|
301
302
|
// Accounts.
|
|
302
303
|
const accounts = instruction
|
|
303
304
|
.accept(this.resolvedInstructionAccountVisitor)
|
|
304
305
|
.map((account) => {
|
|
305
|
-
const hasDefaultValue = account.defaultsTo
|
|
306
|
-
if (account.defaultsTo
|
|
306
|
+
const hasDefaultValue = !!account.defaultsTo;
|
|
307
|
+
if (account.defaultsTo?.kind === 'pda') {
|
|
307
308
|
const { seeds } = account.defaultsTo;
|
|
308
309
|
Object.keys(seeds).forEach((seed: string) => {
|
|
309
310
|
const seedValue = seeds[seed];
|
|
@@ -336,10 +337,10 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
336
337
|
|
|
337
338
|
// Bytes created on chain.
|
|
338
339
|
const bytes = instruction.metadata.bytesCreatedOnChain;
|
|
339
|
-
if (bytes
|
|
340
|
+
if (bytes && bytes.includeHeader) {
|
|
340
341
|
imports.add('core', 'ACCOUNT_HEADER_SIZE');
|
|
341
342
|
}
|
|
342
|
-
if (bytes
|
|
343
|
+
if (bytes?.kind === 'account') {
|
|
343
344
|
const accountName = pascalCase(bytes.name);
|
|
344
345
|
const dependency =
|
|
345
346
|
bytes.dependency === 'generated'
|
|
@@ -380,9 +381,9 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
380
381
|
imports: imports.toString(this.options.dependencyMap),
|
|
381
382
|
program: this.program,
|
|
382
383
|
accounts,
|
|
383
|
-
needsEddsa: accounts.some((a) => a.defaultsTo
|
|
384
|
-
needsIdentity: accounts.some((a) => a.defaultsTo
|
|
385
|
-
needsPayer: accounts.some((a) => a.defaultsTo
|
|
384
|
+
needsEddsa: accounts.some((a) => a.defaultsTo?.kind === 'pda'),
|
|
385
|
+
needsIdentity: accounts.some((a) => a.defaultsTo?.kind === 'identity'),
|
|
386
|
+
needsPayer: accounts.some((a) => a.defaultsTo?.kind === 'payer'),
|
|
386
387
|
typeManifest,
|
|
387
388
|
canMergeAccountsAndArgs,
|
|
388
389
|
})
|
|
@@ -417,7 +418,7 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
417
418
|
account: ResolvedInstructionAccount
|
|
418
419
|
): string {
|
|
419
420
|
if (account.pdaBumpArg) return 'Pda';
|
|
420
|
-
if (account.
|
|
421
|
+
if (account.isSigner === 'either') return 'PublicKey | Signer';
|
|
421
422
|
return account.isSigner ? 'Signer' : 'PublicKey';
|
|
422
423
|
}
|
|
423
424
|
|
|
@@ -429,10 +430,10 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
429
430
|
if (account.pdaBumpArg) {
|
|
430
431
|
imports.add('core', 'Pda');
|
|
431
432
|
}
|
|
432
|
-
if (account.defaultsTo
|
|
433
|
+
if (account.defaultsTo?.kind === 'publicKey') {
|
|
433
434
|
imports.add('core', 'publicKey');
|
|
434
435
|
}
|
|
435
|
-
if (account.defaultsTo
|
|
436
|
+
if (account.defaultsTo?.kind === 'pda') {
|
|
436
437
|
const pdaAccount = pascalCase(account.defaultsTo.pdaAccount);
|
|
437
438
|
const dependency =
|
|
438
439
|
account.defaultsTo.dependency === 'generated'
|
|
@@ -445,7 +446,7 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
445
446
|
}
|
|
446
447
|
});
|
|
447
448
|
}
|
|
448
|
-
if (account.
|
|
449
|
+
if (account.resolvedIsSigner === 'either') {
|
|
449
450
|
imports.add('core', ['PublicKey', 'publicKey', 'Signer', 'isSigner']);
|
|
450
451
|
} else if (account.resolvedIsSigner) {
|
|
451
452
|
imports.add('core', 'Signer');
|
|
@@ -48,7 +48,7 @@ export function {{ instruction.name | camelCase }}(
|
|
|
48
48
|
args: {{ argsType }},
|
|
49
49
|
{% endif %}
|
|
50
50
|
{% endif %}
|
|
51
|
-
):
|
|
51
|
+
): TransactionBuilder {
|
|
52
52
|
const signers: Signer[] = [];
|
|
53
53
|
const keys: AccountMeta[] = [];
|
|
54
54
|
|
|
@@ -85,6 +85,6 @@ export function {{ instruction.name | camelCase }}(
|
|
|
85
85
|
const bytesCreatedOnChain = 0;
|
|
86
86
|
{% endif %}
|
|
87
87
|
|
|
88
|
-
return { instruction: { keys, programId, data }, signers, bytesCreatedOnChain };
|
|
88
|
+
return transactionBuilder([{ instruction: { keys, programId, data }, signers, bytesCreatedOnChain }]);
|
|
89
89
|
}
|
|
90
90
|
{% endblock %}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
{% if accounts.length > 0 %}
|
|
2
2
|
// Resolved accounts.
|
|
3
3
|
{% for account in accounts | sort(false, false, 'dependencyPosition') %}
|
|
4
|
-
{% if account.defaultsTo
|
|
4
|
+
{% if not account.defaultsTo %}
|
|
5
|
+
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }};
|
|
6
|
+
{% elif account.defaultsTo.kind === 'account' %}
|
|
5
7
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? {{ account.defaultsTo.name | camelCase }}Account;
|
|
6
8
|
{% elif account.defaultsTo.kind === 'pda' %}
|
|
7
9
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? find{{ account.defaultsTo.pdaAccount | pascalCase }}Pda(context,
|
|
@@ -25,11 +27,11 @@
|
|
|
25
27
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...context.programs.getPublicKey('{{ account.defaultsTo.program.name }}', '{{ account.defaultsTo.program.publicKey }}'), isWritable: false };
|
|
26
28
|
{% elif account.defaultsTo.kind === 'programId' %}
|
|
27
29
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? { ...programId, isWritable: false };
|
|
28
|
-
{% elif account.defaultsTo.kind === 'identity' and (account.isSigner
|
|
30
|
+
{% elif account.defaultsTo.kind === 'identity' and (account.isSigner !== false) %}
|
|
29
31
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity;
|
|
30
32
|
{% elif account.defaultsTo.kind === 'identity' %}
|
|
31
33
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.identity.publicKey;
|
|
32
|
-
{% elif account.defaultsTo.kind === 'payer' and (account.isSigner
|
|
34
|
+
{% elif account.defaultsTo.kind === 'payer' and (account.isSigner !== false) %}
|
|
33
35
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer;
|
|
34
36
|
{% elif account.defaultsTo.kind === 'payer' %}
|
|
35
37
|
const {{ account.name | camelCase }}Account = {{ accountsObj }}.{{ account.name | camelCase }} ?? context.payer.publicKey;
|
|
@@ -45,7 +47,7 @@
|
|
|
45
47
|
{% if account.resolvedIsOptional %}
|
|
46
48
|
if ({{ account.name | camelCase }}Account) {
|
|
47
49
|
{% endif %}
|
|
48
|
-
{% if account.
|
|
50
|
+
{% if account.resolvedIsSigner === 'either' %}
|
|
49
51
|
if (isSigner({{ account.name | camelCase }}Account)) {
|
|
50
52
|
signers.push({{ account.name | camelCase }}Account);
|
|
51
53
|
}
|
|
@@ -80,7 +80,7 @@ export class GetNodeTreeStringVisitor implements Visitor<string> {
|
|
|
80
80
|
if (account.isWritable) tags.push('writable');
|
|
81
81
|
if (account.isSigner) tags.push('signer');
|
|
82
82
|
if (account.isOptional) tags.push('optional');
|
|
83
|
-
if (account.defaultsTo
|
|
83
|
+
if (account.defaultsTo)
|
|
84
84
|
tags.push(`defaults to ${account.defaultsTo.kind}`);
|
|
85
85
|
const tagsAsString = tags.length > 0 ? ` (${tags.join(', ')})` : '';
|
|
86
86
|
return this.indented(account.name + tagsAsString);
|
|
@@ -6,8 +6,7 @@ export type ResolvedInstructionAccount = nodes.InstructionNodeAccount & {
|
|
|
6
6
|
position: number;
|
|
7
7
|
dependencyPosition: number;
|
|
8
8
|
dependsOn: string[];
|
|
9
|
-
resolvedIsSigner: boolean;
|
|
10
|
-
resolvedIsOptionalSigner: boolean;
|
|
9
|
+
resolvedIsSigner: boolean | 'either';
|
|
11
10
|
resolvedIsOptional: boolean;
|
|
12
11
|
};
|
|
13
12
|
|
|
@@ -68,9 +67,9 @@ export class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor<
|
|
|
68
67
|
|
|
69
68
|
// Get account dependencies.
|
|
70
69
|
const dependsOn: string[] = [];
|
|
71
|
-
if (account.defaultsTo
|
|
70
|
+
if (account.defaultsTo?.kind === 'account') {
|
|
72
71
|
dependsOn.push(account.defaultsTo.name);
|
|
73
|
-
} else if (account.defaultsTo
|
|
72
|
+
} else if (account.defaultsTo?.kind === 'pda') {
|
|
74
73
|
type AccountSeed = Extract<
|
|
75
74
|
InstructionNodeAccountDefaultsSeed,
|
|
76
75
|
{ kind: 'account' }
|
|
@@ -102,30 +101,33 @@ export class GetResolvedInstructionAccountsVisitor extends BaseThrowVisitor<
|
|
|
102
101
|
dependencyPosition: this.visited.size,
|
|
103
102
|
dependsOn,
|
|
104
103
|
resolvedIsSigner: account.isSigner,
|
|
105
|
-
resolvedIsOptionalSigner: account.isOptionalSigner,
|
|
106
104
|
resolvedIsOptional: account.isOptional,
|
|
107
105
|
};
|
|
108
106
|
|
|
109
|
-
switch (resolved.defaultsTo
|
|
107
|
+
switch (resolved.defaultsTo?.kind) {
|
|
110
108
|
case 'account':
|
|
111
109
|
const defaultAccount = this.visited.get(resolved.defaultsTo.name)!;
|
|
112
110
|
const resolvedIsPublicKey =
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
111
|
+
account.isSigner === false && defaultAccount.isSigner === false;
|
|
112
|
+
const resolvedIsSigner =
|
|
113
|
+
account.isSigner === true && defaultAccount.isSigner === true;
|
|
114
|
+
const resolvedIsOptionalSigner =
|
|
115
|
+
!resolvedIsPublicKey && !resolvedIsSigner;
|
|
116
|
+
resolved.resolvedIsSigner = resolvedIsOptionalSigner
|
|
117
|
+
? 'either'
|
|
118
|
+
: resolvedIsSigner;
|
|
117
119
|
resolved.resolvedIsOptional = defaultAccount.isOptional;
|
|
118
120
|
break;
|
|
119
121
|
case 'publicKey':
|
|
120
122
|
case 'program':
|
|
121
123
|
case 'programId':
|
|
122
|
-
resolved.
|
|
123
|
-
|
|
124
|
+
resolved.resolvedIsSigner =
|
|
125
|
+
account.isSigner === false ? false : 'either';
|
|
124
126
|
resolved.resolvedIsOptional = false;
|
|
125
127
|
break;
|
|
126
128
|
case 'pda':
|
|
127
|
-
resolved.
|
|
128
|
-
|
|
129
|
+
resolved.resolvedIsSigner =
|
|
130
|
+
account.isSigner === false ? false : 'either';
|
|
129
131
|
resolved.resolvedIsOptional = false;
|
|
130
132
|
const { seeds } = resolved.defaultsTo;
|
|
131
133
|
Object.keys(seeds).forEach((seedKey) => {
|
|
@@ -18,7 +18,7 @@ export type InstructionUpdates =
|
|
|
18
18
|
|
|
19
19
|
export type InstructionMetadataUpdates = Partial<
|
|
20
20
|
Omit<nodes.InstructionNodeMetadata, 'bytesCreatedOnChain'> & {
|
|
21
|
-
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChainInput;
|
|
21
|
+
bytesCreatedOnChain: InstructionNodeBytesCreatedOnChainInput | null;
|
|
22
22
|
accounts: InstructionAccountUpdates;
|
|
23
23
|
}
|
|
24
24
|
>;
|
|
@@ -40,8 +40,7 @@ type InstructionNodeBytesCreatedOnChainInput =
|
|
|
40
40
|
name: string;
|
|
41
41
|
dependency?: string;
|
|
42
42
|
includeHeader?: boolean;
|
|
43
|
-
}
|
|
44
|
-
| { kind: 'none' };
|
|
43
|
+
};
|
|
45
44
|
|
|
46
45
|
export class UpdateInstructionsVisitor extends TransformNodesVisitor {
|
|
47
46
|
protected allAccounts = new Map<string, nodes.AccountNode>();
|
|
@@ -107,14 +106,14 @@ export class UpdateInstructionsVisitor extends TransformNodesVisitor {
|
|
|
107
106
|
metadataUpdates: InstructionMetadataUpdates
|
|
108
107
|
): Partial<nodes.InstructionNodeMetadata> {
|
|
109
108
|
const metadata = metadataUpdates as Partial<nodes.InstructionNodeMetadata>;
|
|
110
|
-
if (
|
|
109
|
+
if (metadataUpdates.bytesCreatedOnChain) {
|
|
111
110
|
metadata.bytesCreatedOnChain = {
|
|
112
111
|
includeHeader: true,
|
|
113
112
|
dependency:
|
|
114
|
-
|
|
113
|
+
metadataUpdates.bytesCreatedOnChain.kind === 'account'
|
|
115
114
|
? 'generated'
|
|
116
115
|
: undefined,
|
|
117
|
-
...
|
|
116
|
+
...metadataUpdates.bytesCreatedOnChain,
|
|
118
117
|
} as nodes.InstructionNodeBytesCreatedOnChain;
|
|
119
118
|
}
|
|
120
119
|
return metadata;
|