@metaplex-foundation/kinobi 0.12.0 → 0.12.2
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/InstructionAccountNode.js +3 -2
- package/dist/cjs/nodes/InstructionAccountNode.js.map +1 -1
- package/dist/cjs/nodes/InstructionNode.js +1 -0
- package/dist/cjs/nodes/InstructionNode.js.map +1 -1
- package/dist/cjs/nodes/TypeNode.js +2 -1
- package/dist/cjs/nodes/TypeNode.js.map +1 -1
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js +12 -2
- package/dist/cjs/renderers/js/GetJavaScriptRenderMapVisitor.js.map +1 -1
- package/dist/cjs/renderers/js/templates/instructionsPage.njk +2 -0
- package/dist/cjs/renderers/js/templates/instructionsPageRemainingAccounts.njk +14 -0
- package/dist/cjs/renderers/js/templates/instructionsPageResolvedInputs.njk +1 -1
- package/dist/cjs/shared/RemainingAccounts.js +13 -0
- package/dist/cjs/shared/RemainingAccounts.js.map +1 -0
- package/dist/cjs/shared/index.js +1 -0
- package/dist/cjs/shared/index.js.map +1 -1
- package/dist/types/idl/IdlInstruction.d.ts +1 -0
- package/dist/types/nodes/InstructionNode.d.ts +2 -1
- package/dist/types/shared/RemainingAccounts.d.ts +12 -0
- package/dist/types/shared/index.d.ts +1 -0
- package/package.json +1 -1
- package/src/idl/IdlInstruction.ts +1 -0
- package/src/nodes/InstructionAccountNode.ts +2 -1
- package/src/nodes/InstructionNode.ts +3 -0
- package/src/nodes/TypeNode.ts +2 -1
- package/src/renderers/js/GetJavaScriptRenderMapVisitor.ts +16 -1
- package/src/renderers/js/templates/instructionsPage.njk +2 -0
- package/src/renderers/js/templates/instructionsPageRemainingAccounts.njk +14 -0
- package/src/renderers/js/templates/instructionsPageResolvedInputs.njk +1 -1
- package/src/shared/RemainingAccounts.ts +20 -0
- package/src/shared/index.ts +1 -0
|
@@ -16,14 +16,15 @@ function instructionAccountNode(input) {
|
|
|
16
16
|
}
|
|
17
17
|
exports.instructionAccountNode = instructionAccountNode;
|
|
18
18
|
function instructionAccountNodeFromIdl(idl, useProgramIdForOptionalAccounts = true) {
|
|
19
|
-
var _a, _b, _c, _d, _e;
|
|
19
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
20
20
|
const isOptional = (_b = (_a = idl.optional) !== null && _a !== void 0 ? _a : idl.isOptional) !== null && _b !== void 0 ? _b : false;
|
|
21
|
+
const desc = idl.desc ? [idl.desc] : undefined;
|
|
21
22
|
return instructionAccountNode({
|
|
22
23
|
name: (_c = idl.name) !== null && _c !== void 0 ? _c : '',
|
|
23
24
|
isWritable: (_d = idl.isMut) !== null && _d !== void 0 ? _d : false,
|
|
24
25
|
isSigner: idl.isOptionalSigner ? 'either' : (_e = idl.isSigner) !== null && _e !== void 0 ? _e : false,
|
|
25
26
|
isOptional,
|
|
26
|
-
docs: idl.
|
|
27
|
+
docs: (_g = (_f = idl.docs) !== null && _f !== void 0 ? _f : desc) !== null && _g !== void 0 ? _g : [],
|
|
27
28
|
defaultsTo: isOptional && useProgramIdForOptionalAccounts
|
|
28
29
|
? (0, shared_1.programIdDefault)()
|
|
29
30
|
: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstructionAccountNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionAccountNode.ts"],"names":[],"mappings":";;;AACA,sCAKmB;AAmBnB,SAAgB,sBAAsB,CACpC,KAAkC;;IAElC,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE,MAAA,KAAK,CAAC,UAAU,mCAAI,KAAK;QACrC,IAAI,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE;QACtB,UAAU,EAAE,KAAK,CAAC,UAAU;KACH,CAAC;AAC9B,CAAC;AAZD,wDAYC;AAED,SAAgB,6BAA6B,CAC3C,GAA0B,EAC1B,+BAA+B,GAAG,IAAI;;IAEtC,MAAM,UAAU,GAAG,MAAA,MAAA,GAAG,CAAC,QAAQ,mCAAI,GAAG,CAAC,UAAU,mCAAI,KAAK,CAAC;IAC3D,OAAO,sBAAsB,CAAC;QAC5B,IAAI,EAAE,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE;QACpB,UAAU,EAAE,MAAA,GAAG,CAAC,KAAK,mCAAI,KAAK;QAC9B,QAAQ,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,QAAQ,mCAAI,KAAK;QACjE,UAAU;QACV,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"InstructionAccountNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionAccountNode.ts"],"names":[],"mappings":";;;AACA,sCAKmB;AAmBnB,SAAgB,sBAAsB,CACpC,KAAkC;;IAElC,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,UAAU,EAAE,MAAA,KAAK,CAAC,UAAU,mCAAI,KAAK;QACrC,IAAI,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE;QACtB,UAAU,EAAE,KAAK,CAAC,UAAU;KACH,CAAC;AAC9B,CAAC;AAZD,wDAYC;AAED,SAAgB,6BAA6B,CAC3C,GAA0B,EAC1B,+BAA+B,GAAG,IAAI;;IAEtC,MAAM,UAAU,GAAG,MAAA,MAAA,GAAG,CAAC,QAAQ,mCAAI,GAAG,CAAC,UAAU,mCAAI,KAAK,CAAC;IAC3D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,OAAO,sBAAsB,CAAC;QAC5B,IAAI,EAAE,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE;QACpB,UAAU,EAAE,MAAA,GAAG,CAAC,KAAK,mCAAI,KAAK;QAC9B,QAAQ,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,QAAQ,mCAAI,KAAK;QACjE,UAAU;QACV,IAAI,EAAE,MAAA,MAAA,GAAG,CAAC,IAAI,mCAAI,IAAI,mCAAI,EAAE;QAC5B,UAAU,EACR,UAAU,IAAI,+BAA+B;YAC3C,CAAC,CAAC,IAAA,yBAAgB,GAAE;YACpB,CAAC,CAAC,SAAS;KAChB,CAAC,CAAC;AACL,CAAC;AAjBD,sEAiBC;AAED,SAAgB,wBAAwB,CACtC,IAAiB;IAEjB,OAAO,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,CAAC;AAC1D,CAAC;AAJD,4DAIC;AAED,SAAgB,4BAA4B,CAC1C,IAAiB;;IAEjB,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,MAAM,GAAG,CAChE,CAAC;KACH;AACH,CAAC;AARD,oEAQC"}
|
|
@@ -30,6 +30,7 @@ function instructionNode(input) {
|
|
|
30
30
|
docs: (_d = input.docs) !== null && _d !== void 0 ? _d : [],
|
|
31
31
|
internal: (_e = input.internal) !== null && _e !== void 0 ? _e : false,
|
|
32
32
|
bytesCreatedOnChain: input.bytesCreatedOnChain,
|
|
33
|
+
remainingAccounts: input.remainingAccounts,
|
|
33
34
|
argDefaults: Object.fromEntries(Object.entries((_f = input.argDefaults) !== null && _f !== void 0 ? _f : {}).map(([key, value]) => [
|
|
34
35
|
(0, shared_1.mainCase)(key),
|
|
35
36
|
value,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InstructionNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionNode.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"InstructionNode.js","sourceRoot":"","sources":["../../../src/nodes/InstructionNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.assertStructOrLinkTypeNode = exports.isStructOrLinkTypeNode = exports.assertTypeNode = exports.isTypeNode = exports.createTypeNodeFromIdl = void 0;
|
|
4
4
|
const idl_1 = require("../idl");
|
|
5
|
+
const shared_1 = require("../shared");
|
|
5
6
|
const ArrayTypeNode_1 = require("./ArrayTypeNode");
|
|
6
7
|
const BoolTypeNode_1 = require("./BoolTypeNode");
|
|
7
8
|
const BytesTypeNode_1 = require("./BytesTypeNode");
|
|
@@ -44,7 +45,7 @@ const createTypeNodeFromIdl = (idlType) => {
|
|
|
44
45
|
if (idlType === 'publicKey')
|
|
45
46
|
return (0, PublicKeyTypeNode_1.publicKeyTypeNode)();
|
|
46
47
|
if (idlType === 'bytes')
|
|
47
|
-
return (0, BytesTypeNode_1.bytesTypeNode)();
|
|
48
|
+
return (0, BytesTypeNode_1.bytesTypeNode)((0, shared_1.prefixedSize)());
|
|
48
49
|
return (0, NumberTypeNode_1.numberTypeNode)(idlType);
|
|
49
50
|
}
|
|
50
51
|
// Ensure eveything else is an object.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeNode.js","sourceRoot":"","sources":["../../../src/nodes/TypeNode.ts"],"names":[],"mappings":";;;AAAA,gCAAkD;AAClD,mDAAsE;AACtE,iDAA4D;AAC5D,mDAA+D;AAC/D,iDAAmE;AACnE,iDAA4D;AAC5D,+CAAgE;AAEhE,qDAAkE;AAElE,qDAAyE;AACzE,2DAA2E;AAC3E,+CAAgE;AAChE,qDAAkE;AAClE,qDAAyE;AACzE,mDAAsE;AAkBtE,MAAM,iBAAiB,GAAG;IACxB,eAAe;IACf,cAAc;IACd,eAAe;IACf,cAAc;IACd,cAAc;IACd,aAAa;IACb,gBAAgB;IAChB,uBAAuB;IACvB,gBAAgB;IAChB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;CAChB,CAAC;AAEF,SAAS,aAAa,CAAC,KAAU,EAAE,IAAY;IAC7C,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;AACvD,CAAC;AAEM,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAY,EAAE;IAClE,QAAQ;IACR,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,qBAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACpE,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO,IAAA,2BAAY,GAAE,CAAC;QAC9C,IAAI,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAA,+BAAc,GAAE,CAAC;QAClD,IAAI,OAAO,KAAK,WAAW;YAAE,OAAO,IAAA,qCAAiB,GAAE,CAAC;QACxD,IAAI,OAAO,KAAK,OAAO;YAAE,OAAO,IAAA,6BAAa,GAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TypeNode.js","sourceRoot":"","sources":["../../../src/nodes/TypeNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -266,7 +266,7 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
266
266
|
}));
|
|
267
267
|
}
|
|
268
268
|
visitInstruction(instruction) {
|
|
269
|
-
var _a;
|
|
269
|
+
var _a, _b;
|
|
270
270
|
// Imports.
|
|
271
271
|
const imports = new JavaScriptImportMap_1.JavaScriptImportMap().add('umi', [
|
|
272
272
|
'AccountMeta',
|
|
@@ -288,7 +288,11 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
288
288
|
const hasArgResolvers = Object.values(instruction.argDefaults).some(({ kind }) => kind === 'resolver');
|
|
289
289
|
const hasAccountResolvers = instruction.accounts.some(({ defaultsTo }) => (defaultsTo === null || defaultsTo === void 0 ? void 0 : defaultsTo.kind) === 'resolver');
|
|
290
290
|
const hasByteResolver = ((_a = instruction.bytesCreatedOnChain) === null || _a === void 0 ? void 0 : _a.kind) === 'resolver';
|
|
291
|
-
const
|
|
291
|
+
const hasRemainingAccountsResolver = ((_b = instruction.remainingAccounts) === null || _b === void 0 ? void 0 : _b.kind) === 'resolver';
|
|
292
|
+
const hasResolvers = hasArgResolvers ||
|
|
293
|
+
hasAccountResolvers ||
|
|
294
|
+
hasByteResolver ||
|
|
295
|
+
hasRemainingAccountsResolver;
|
|
292
296
|
// Resolved inputs.
|
|
293
297
|
const resolvedInputs = (0, visitors_1.visit)(instruction, this.resolvedInstructionInputVisitor).map((input) => {
|
|
294
298
|
var _a, _b;
|
|
@@ -376,6 +380,11 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
376
380
|
else if ((bytes === null || bytes === void 0 ? void 0 : bytes.kind) === 'resolver') {
|
|
377
381
|
imports.add(bytes.importFrom, (0, shared_1.camelCase)(bytes.name));
|
|
378
382
|
}
|
|
383
|
+
// Remaining accounts.
|
|
384
|
+
const { remainingAccounts } = instruction;
|
|
385
|
+
if ((remainingAccounts === null || remainingAccounts === void 0 ? void 0 : remainingAccounts.kind) === 'resolver') {
|
|
386
|
+
imports.add(remainingAccounts.importFrom, (0, shared_1.camelCase)(remainingAccounts.name));
|
|
387
|
+
}
|
|
379
388
|
// canMergeAccountsAndArgs
|
|
380
389
|
let canMergeAccountsAndArgs = false;
|
|
381
390
|
if (!linkedDataArgs && !linkedExtraArgs) {
|
|
@@ -413,6 +422,7 @@ class GetJavaScriptRenderMapVisitor extends visitors_1.BaseThrowVisitor {
|
|
|
413
422
|
hasArgResolvers,
|
|
414
423
|
hasAccountResolvers,
|
|
415
424
|
hasByteResolver,
|
|
425
|
+
hasRemainingAccountsResolver,
|
|
416
426
|
hasResolvers,
|
|
417
427
|
}));
|
|
418
428
|
}
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4E;AAC5E,mDAAqC;AACrC,yCAMsB;AACtB,4CAA4C;AAC5C,6CAQwB;AACxB,4CAAyC;AACzC,oCAA2C;AAC3C,yFAG4C;AAC5C,+DAA4D;AAC5D,2EAAwE;AAExE,MAAM,wBAAwB,GAAoB;IAChD,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,CAAC;IACX,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,EAAE;IACd,MAAM,EAAE,YAAY;CACrB,CAAC;AAcF,MAAa,6BAA8B,SAAQ,2BAA2B;IAK5E,YAAY,UAAyC,EAAE;;QACrD,KAAK,EAAE,CAAC;QAHF,YAAO,GAA6B,IAAI,CAAC;QAI/C,IAAI,CAAC,OAAO,GAAG;YACb,wBAAwB,EAAE,MAAA,OAAO,CAAC,wBAAwB,mCAAI,KAAK;YACnE,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI;YACtC,eAAe,EAAE;gBACf,GAAG,wBAAwB;gBAC3B,GAAG,OAAO,CAAC,eAAe;aAC3B;YACD,aAAa,EAAE;gBACb,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,cAAc;gBACtB,GAAG,EAAE,0BAA0B;gBAC/B,cAAc,EAAE,sCAAsC;gBACtD,aAAa,EAAE,kCAAkC;gBACjD,UAAU,EAAE,kCAAkC;gBAC9C,GAAG,OAAO,CAAC,aAAa;gBACxB,iEAAiE;gBACjE,iBAAiB,EAAE,aAAa;gBAChC,eAAe,EAAE,WAAW;gBAC5B,cAAc,EAAE,UAAU;aAC3B;YACD,mBAAmB,EACjB,MAAA,OAAO,CAAC,mBAAmB,mCAAI,IAAI,mEAAgC,EAAE;YACvE,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,IAAI,6BAAkB,EAAE;YACpE,+BAA+B,EAC7B,MAAA,OAAO,CAAC,+BAA+B,mCACvC,IAAI,8CAAmC,EAAE;SAC5C,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,IAAoB;;QAC5B,MAAA,MAAA,IAAI,CAAC,eAAe,EAAC,oBAAoB,mDAAG,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5E,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,KAAK;aAC3B,cAAc,CAAC,IAAI,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,oBAAoB,GAAG,KAAK;aAC/B,0BAA0B,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC;aACxE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,oBAAoB,GAAG,KAAK;aAC/B,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,mBAAmB,GACvB,gBAAgB,CAAC,MAAM,GAAG,CAAC;YAC3B,gBAAgB,CAAC,MAAM,GAAG,CAAC;YAC3B,oBAAoB,CAAC,MAAM,GAAG,CAAC;YAC/B,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;QAElC,MAAM,GAAG,GAAG;YACV,IAAI;YACJ,gBAAgB;YAChB,gBAAgB;YAChB,oBAAoB;YACpB,oBAAoB;YACpB,mBAAmB;SACpB,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,qBAAS,EAAE,CAAC;QAC5B,IAAI,mBAAmB,EAAE;YACvB,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC;SAChE;QACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,GAAG;iBACA,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;iBAC/D,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC;SAChE;QACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,CAAC;SACrE;QACD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACnC,GAAG,CAAC,GAAG,CACL,uBAAuB,EACvB,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAC1C,CAAC;SACH;QACD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACnC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC,CAAC;SACtE;QAED,OAAO,GAAG;aACP,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;aAClD,SAAS,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,gBAAK,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QACzB,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE;aAC9B,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,gBAAK,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;aACrE,SAAS,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,gBAAK,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAEvE,8CAA8C;QAC9C,gDAAgD;QAChD,2CAA2C;QAC3C,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,SAAS,CAAC;SAClB;QAED,SAAS;aACN,SAAS,CACR,GAAG,KAAK;aACL,0BAA0B,CACzB,OAAO,EACP,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CACvC;aACA,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,gBAAK,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAChC;aACA,GAAG,CACF,UAAU,IAAA,kBAAS,EAAC,IAAI,CAAC,KAAK,EAC9B,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC5B,OAAO,EAAE,IAAI,yCAAmB,EAAE;iBAC/B,GAAG,CAAC,KAAK,EAAE,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;iBACvC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YACvC,OAAO;YACP,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrC,GAAG,KAAK;gBACR,YAAY,EAAE,IAAA,mBAAU,EAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,CAAC;aAClE,CAAC,CAAC;SACJ,CAAC,CACH;aACA,GAAG,CACF,YAAY,IAAA,kBAAS,EAAC,IAAI,CAAC,KAAK,EAChC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC9B,OAAO,EAAE,IAAI,yCAAmB,EAAE;iBAC/B,GAAG,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;iBAChE,GAAG,CAAC,QAAQ,EAAE;gBACb,MAAM,cAAc,eAAe;gBACnC,MAAM,cAAc,eAAe;aACpC,CAAC;iBACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YACvC,OAAO;SACR,CAAC,CACH,CAAC;QACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,OAA0B;;QACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QACrC,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,yCAAmB,EAAE,CAAC,SAAS,CACjD,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,iBAAiB,CAC/B,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SAC9C;QACD,OAAO;aACJ,GAAG,CAAC,KAAK,EAAE;YACV,SAAS;YACT,qBAAqB;YACrB,SAAS;YACT,oBAAoB;YACpB,KAAK;YACL,WAAW;YACX,WAAW;YACX,YAAY;YACZ,sBAAsB;YACtB,uBAAuB;SACxB,CAAC;aACD,GAAG,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACtD,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QAE/C,iBAAiB;QACjB,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QAClC,IAAI,qBAAqB,GAGd,IAAI,CAAC;QAChB,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,OAAO,EAAE;YACnC,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACxD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CACrC,CAAC;YACF,MAAM,kBAAkB,GAAG,CAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU,0CAAE,KAAK;gBAC9D,CAAC,CAAC,IAAA,qDAAyB,EAAC,kBAAkB,CAAC,UAAU,CAAC,KAAK,CAAC;gBAChE,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,kBAAkB,EAAE;gBACtB,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;gBAC9C,qBAAqB,GAAG;oBACtB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,KAAK,EAAE,kBAAkB,CAAC,MAAM;iBACjC,CAAC;aACH;SACF;aAAM,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,MAAM,EAAE;YACzC,qBAAqB;gBACnB,OAAO,CAAC,IAAI,KAAK,SAAS;oBACxB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE;oBAC5C,CAAC,CAAC,IAAI,CAAC;SACZ;QAED,cAAc;QACd,MAAM,SAAS,GAAG,IAAA,gCAAuB,EACvC,OAAO,EACP,IAAI,CAAC,eAAe,CACrB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACxE,OAAO,CAAC,SAAS,CACf,gBAAgB,CAAC,YAAY,EAC7B,gBAAgB,CAAC,iBAAiB,CACnC,CAAC;YACF,OAAO,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,IAAI,iBAAiB,GAA8C,IAAI,CAAC;QACxE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YACnC,iBAAiB,GAAG;gBAClB,IAAI,EAAE,KAAK,SAAS;qBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;qBAClD,IAAI,CAAC,IAAI,CAAC,IAAI;gBACjB,QAAQ,EAAE,KAAK,SAAS;qBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;oBAC1D,OAAO,IAAI,CAAC,CAAC,IAAI,OAAO,MAAM,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC;gBAC9D,CAAC,CAAC;qBACD,IAAI,CAAC,IAAI,CAAC,IAAI;aAClB,CAAC;SACH;QAED,SAAS;QACT,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC5B,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAChE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;gBAClD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7B,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,SAAS,CAAC,CAAC;gBAC1D,SAAiB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;gBACjD,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACzC,OAAO,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;aAChD;YACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC5B,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAChE,OAAO,CAAC,SAAS,CACf,YAAY,CAAC,YAAY,EACzB,YAAY,CAAC,iBAAiB,CAC/B,CAAC;gBACF,OAAO,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;aAChD;YACD,OAAO;iBACJ,GAAG,CAAC,gBAAgB,EAAE,WAAW,CAAC;iBAClC,QAAQ,CAAC,gBAAgB,EAAE,WAAW,EAAE,qBAAqB,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7B;QACD,MAAM,gBAAgB,GACpB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAEtE,OAAO,IAAI,qBAAS,EAAE,CAAC,GAAG,CACxB,YAAY,IAAA,kBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC9B,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YACrD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY;YACZ,aAAa,EAAE,qBAAqB;YACpC,SAAS,EAAE,iBAAiB;YAC5B,KAAK;YACL,gBAAgB;SACjB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,WAAkC;;QACjD,WAAW;QACX,MAAM,OAAO,GAAG,IAAI,yCAAmB,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE;YACnD,aAAa;YACb,SAAS;YACT,QAAQ;YACR,oBAAoB;YACpB,oBAAoB;SACrB,CAAC,CAAC;QAEH,uBAAuB;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACpD,MAAM,OAAO,GACX,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI;YAC3B,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAChD,MAAM,WAAW,GACf,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI;YAC3B,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CACvC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,QAAQ,MAAK,SAAS,CAAA,EAAA,CACpD,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,MAAM,YAAY,GAChB,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI;YAC5B,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CACxC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,QAAQ,MAAK,SAAS,CAAA,EAAA,CACpD,CAAC,MAAM,GAAG,CAAC,CAAC;QACf,MAAM,UAAU,GAAG,WAAW,IAAI,YAAY,CAAC;QAC/C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,IAAI,CACjE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAClC,CAAC;QACF,MAAM,mBAAmB,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CACnD,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,MAAK,UAAU,CACpD,CAAC;QACF,MAAM,eAAe,GACnB,CAAA,MAAA,WAAW,CAAC,mBAAmB,0CAAE,IAAI,MAAK,UAAU,CAAC;QACvD,MAAM,4BAA4B,GAChC,CAAA,MAAA,WAAW,CAAC,iBAAiB,0CAAE,IAAI,MAAK,UAAU,CAAC;QACrD,MAAM,YAAY,GAChB,eAAe;YACf,mBAAmB;YACnB,eAAe;YACf,4BAA4B,CAAC;QAE/B,mBAAmB;QACnB,MAAM,cAAc,GAAG,IAAA,gBAAK,EAC1B,WAAW,EACX,IAAI,CAAC,+BAA+B,CACrC,CAAC,GAAG,CAAC,CAAC,KAA+B,EAAE,EAAE;;YACxC,IAAI,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,IAAI,MAAK,KAAK,EAAE;gBACpC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;oBAC1C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO;wBAAE,OAAO;oBACvC,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAChE,SAAiB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;oBACjD,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,IAAI,MAAK,OAAO,EAAE;gBAC7C,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;gBAC7B,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACjE,UAAkB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;gBAClD,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;aAC1C;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,MAAM,0BAA0B,GAAG,cAAc,CAAC,MAAM,CACtD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,CACtE,CAAC;QACF,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;SAC5C;QACD,MAAM,oBAAoB,GAAG,0BAA0B;aACpD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC;aAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,gBAAgB,GAAG,0BAA0B;aAChD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC;aACvC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE9B,YAAY;QACZ,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACpD,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;YAC7C,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,CACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CACrC,CAAC;YAChC,OAAO;gBACL,GAAG,eAAe;gBAClB,IAAI,EAAE,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC;gBACrD,YAAY,EAAE,eAAe,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC9D,eAAe;aAChB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;SACzC;QAED,aAAa;QACb,MAAM,cAAc,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,gBAAK,EAC3B,WAAW,CAAC,QAAQ,EACpB,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,IAAI,cAAc,IAAI,OAAO,EAAE;YAC7B,OAAO,CAAC,SAAS,CACf,eAAe,CAAC,YAAY,EAC5B,eAAe,CAAC,iBAAiB,CAClC,CAAC;SACH;QACD,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,cAAc,IAAI,OAAO,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;SAC/C;QAED,cAAc;QACd,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC;QACrD,MAAM,gBAAgB,GAAG,IAAA,gBAAK,EAC5B,WAAW,CAAC,SAAS,EACrB,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAEjD,gBAAgB;QAChB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5D,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE;gBAClC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,IAAA,kBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;aAChE;QACH,CAAC,CAAC,CAAC;QACH,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;SACxC;QAED,0BAA0B;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,mBAAmB,CAAC;QAC9C,IAAI,KAAK,IAAI,eAAe,IAAI,KAAK,IAAI,KAAK,CAAC,aAAa,EAAE;YAC5D,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;SAC3C;QACD,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,MAAK,SAAS,EAAE;YAC7B,MAAM,WAAW,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3C,MAAM,UAAU,GACd,KAAK,CAAC,UAAU,KAAK,WAAW;gBAC9B,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,WAAW,MAAM,CAAC,CAAC;SAClD;aAAM,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,MAAK,UAAU,EAAE;YACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,kBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACtD;QAED,sBAAsB;QACtB,MAAM,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC;QAC1C,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,MAAK,UAAU,EAAE;YAC1C,OAAO,CAAC,GAAG,CACT,iBAAiB,CAAC,UAAU,EAC5B,IAAA,kBAAS,EAAC,iBAAiB,CAAC,IAAI,CAAC,CAClC,CAAC;SACH;QAED,0BAA0B;QAC1B,IAAI,uBAAuB,GAAG,KAAK,CAAC;QACpC,IAAI,CAAC,cAAc,IAAI,CAAC,eAAe,EAAE;YACvC,MAAM,wBAAwB,GAC5B,IAAI,CAAC,8CAA8C,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvC,IAAA,cAAO,EACL,qCAAqC,WAAW,CAAC,IAAI,uBAAuB;oBAC1E,2BAA2B,wBAAwB,CAAC,IAAI,CACtD,IAAI,CACL,KAAK;oBACN,6DAA6D;oBAC7D,oDAAoD,CACvD,CAAC;aACH;YACD,uBAAuB,GAAG,wBAAwB,CAAC,MAAM,KAAK,CAAC,CAAC;SACjE;QAED,MAAM,eAAe,GAAG,CAAC,KAAwC,EAAE,EAAE,CACnE,cAAc,CAAC,IAAI,CACjB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CACrE,CAAC;QAEJ,OAAO,IAAI,qBAAS,EAAE,CAAC,GAAG,CACxB,gBAAgB,IAAA,kBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAChD,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE;YAClC,WAAW;YACX,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YACrD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc;YACd,0BAA0B;YAC1B,oBAAoB;YACpB,gBAAgB;YAChB,QAAQ;YACR,UAAU,EAAE,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,YAAY;YACpD,aAAa,EAAE,eAAe,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,YAAY;YAC5D,UAAU,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,YAAY;YACtD,eAAe;YACf,gBAAgB;YAChB,uBAAuB;YACvB,WAAW;YACX,OAAO;YACP,WAAW;YACX,YAAY;YACZ,UAAU;YACV,cAAc;YACd,eAAe;YACf,mBAAmB;YACnB,eAAe;YACf,4BAA4B;YAC5B,YAAY;SACb,CAAC,CACH,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,WAAkC;QACjD,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,yCAAmB,EAAE;aACtC,iBAAiB,CAAC,YAAY,CAAC;aAC/B,GAAG,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC;aACrC,MAAM,CAAC,gBAAgB,EAAE;YACxB,cAAc;YACd,GAAG,cAAc,MAAM;YACvB,MAAM,cAAc,YAAY;SACjC,CAAC,CAAC;QAEL,OAAO,IAAI,qBAAS,EAAE,CAAC,GAAG,CACxB,SAAS,IAAA,kBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EACzC,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE;YAClC,WAAW;YACX,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;gBACxB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa;gBAC7B,cAAc,EAAE,GAAG;aACpB,CAAC;YACF,YAAY;YACZ,UAAU,EACR,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC;gBACtC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC;SACrC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAC1C,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;IACtC,CAAC;IAED,IAAI,+BAA+B;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC;IACtD,CAAC;IAES,yBAAyB,CACjC,OAAmC;QAEnC,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;QAC9D,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAAE,OAAO,0BAA0B,CAAC;QACrE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC;IACzD,CAAC;IAES,4BAA4B,CACpC,QAAsC;QAEtC,MAAM,OAAO,GAAG,IAAI,yCAAmB,EAAE,CAAC;QAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;YAC3B,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK;gBAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACzD,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAE7D,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,WAAW,EAAE;gBAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;aACjC;iBAAM,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,KAAK,EAAE;gBAC7C,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAC7D,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,CAAC,UAAU,KAAK,WAAW;oBAC3C,CAAC,CAAC,mBAAmB;oBACrB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;gBACpC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,UAAU,KAAK,CAAC,CAAC;gBAChD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACvD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;qBACjC;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,CAAA,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,MAAK,UAAU,EAAE;gBAClD,OAAO,CAAC,GAAG,CACT,OAAO,CAAC,UAAU,CAAC,UAAU,EAC7B,IAAA,kBAAS,EAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CACnC,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,8CAA8C,CACtD,WAAkC;QAElC,MAAM,QAAQ,GAAG;YACf,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;YAChE,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SAClE,CAAC;QACF,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IAClC,CAAC;IAES,MAAM,CACd,QAAgB,EAChB,OAAgB,EAChB,OAA0B;QAE1B,MAAM,IAAI,GAAG,IAAA,uBAAe,EAC1B,GAAG,SAAS,YAAY,EACxB,QAAQ,EACR,OAAO,EACP,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU;YAC5B,CAAC,CAAC,IAAA,iBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;CACF;AAnlBD,sEAmlBC"}
|
|
@@ -48,6 +48,8 @@ export function {{ instruction.name | camelCase }}(
|
|
|
48
48
|
|
|
49
49
|
{% include "instructionsPageAccountMetas.njk" %}
|
|
50
50
|
|
|
51
|
+
{% include "instructionsPageRemainingAccounts.njk" %}
|
|
52
|
+
|
|
51
53
|
// Data.
|
|
52
54
|
{% if hasDataArgs %}
|
|
53
55
|
const data = get{{ instruction.dataArgs.name | pascalCase }}Serializer().serialize(resolvedArgs);
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{% set remaining = instruction.remainingAccounts %}
|
|
2
|
+
{% macro getArgVar(name, argsObj) -%}
|
|
3
|
+
{{ 'resolvedArgs' if argsWithDefaults.includes(name) else argsObj }}.{{ name | camelCase }}
|
|
4
|
+
{%- endmacro %}
|
|
5
|
+
|
|
6
|
+
{% if remaining.kind === 'arg' %}
|
|
7
|
+
// Remaining Accounts.
|
|
8
|
+
const remainingAccounts = {{ getArgVar(remaining.name) }}.map(address => ([address, {{ "true" if remaining.isWritable else "false" }}] as const));
|
|
9
|
+
remainingAccounts.forEach((remainingAccount) => addAccountMeta(keys, signers, remainingAccount, false));
|
|
10
|
+
{% elif remaining.kind === 'resolver' %}
|
|
11
|
+
// Remaining Accounts.
|
|
12
|
+
const remainingAccounts = {{ remaining.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
|
|
13
|
+
remainingAccounts.forEach((remainingAccount) => addAccountMeta(keys, signers, remainingAccount, false));
|
|
14
|
+
{% endif %}
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
addObjectProperty({{ inputPrefix }} {{ inputDefault }});
|
|
93
93
|
{% endif -%}
|
|
94
94
|
{% endfor %}
|
|
95
|
-
{% if hasDataArgs or hasByteResolver %}
|
|
95
|
+
{% if hasDataArgs or hasByteResolver or instruction.remainingAccounts %}
|
|
96
96
|
const resolvedArgs = { ...{{ argsObj }}, ...resolvingArgs };
|
|
97
97
|
{% endif %}
|
|
98
98
|
{% endif %}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.remainingAccountsFromResolver = exports.remainingAccountsFromArg = void 0;
|
|
4
|
+
const utils_1 = require("./utils");
|
|
5
|
+
const remainingAccountsFromArg = (arg, isWritable = false) => ({ kind: 'arg', name: (0, utils_1.mainCase)(arg), isWritable });
|
|
6
|
+
exports.remainingAccountsFromArg = remainingAccountsFromArg;
|
|
7
|
+
const remainingAccountsFromResolver = (name, importFrom = 'hooked') => ({
|
|
8
|
+
kind: 'resolver',
|
|
9
|
+
name: (0, utils_1.mainCase)(name),
|
|
10
|
+
importFrom,
|
|
11
|
+
});
|
|
12
|
+
exports.remainingAccountsFromResolver = remainingAccountsFromResolver;
|
|
13
|
+
//# sourceMappingURL=RemainingAccounts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RemainingAccounts.js","sourceRoot":"","sources":["../../../src/shared/RemainingAccounts.ts"],"names":[],"mappings":";;;AACA,mCAAmC;AAM5B,MAAM,wBAAwB,GAAG,CACtC,GAAW,EACX,aAAsB,KAAK,EACR,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,gBAAQ,EAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;AAH9D,QAAA,wBAAwB,4BAGsC;AAEpE,MAAM,6BAA6B,GAAG,CAC3C,IAAY,EACZ,aAAyB,QAAQ,EACd,EAAE,CAAC,CAAC;IACvB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC;IACpB,UAAU;CACX,CAAC,CAAC;AAPU,QAAA,6BAA6B,iCAOvC"}
|
package/dist/cjs/shared/index.js
CHANGED
|
@@ -21,6 +21,7 @@ __exportStar(require("./BytesCreatedOnChain"), exports);
|
|
|
21
21
|
__exportStar(require("./GpaField"), exports);
|
|
22
22
|
__exportStar(require("./ImportFrom"), exports);
|
|
23
23
|
__exportStar(require("./InstructionDefault"), exports);
|
|
24
|
+
__exportStar(require("./RemainingAccounts"), exports);
|
|
24
25
|
__exportStar(require("./SizeStrategy"), exports);
|
|
25
26
|
__exportStar(require("./errors"), exports);
|
|
26
27
|
__exportStar(require("./logs"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gDAA8B;AAC9B,wDAAsC;AACtC,wDAAsC;AACtC,6CAA2B;AAC3B,+CAA6B;AAC7B,uDAAqC;AACrC,iDAA+B;AAC/B,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gDAA8B;AAC9B,wDAAsC;AACtC,wDAAsC;AACtC,6CAA2B;AAC3B,+CAA6B;AAC7B,uDAAqC;AACrC,sDAAoC;AACpC,iDAA+B;AAC/B,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IdlInstruction } from '../idl';
|
|
2
|
-
import { BytesCreatedOnChain, InstructionArgDefault, PartialExcept } from '../shared';
|
|
2
|
+
import { BytesCreatedOnChain, InstructionArgDefault, PartialExcept, RemainingAccounts } from '../shared';
|
|
3
3
|
import { InstructionAccountNode } from './InstructionAccountNode';
|
|
4
4
|
import { InstructionDataArgsNode } from './InstructionDataArgsNode';
|
|
5
5
|
import { InstructionExtraArgsNode } from './InstructionExtraArgsNode';
|
|
@@ -18,6 +18,7 @@ export type InstructionNode = {
|
|
|
18
18
|
readonly docs: string[];
|
|
19
19
|
readonly internal: boolean;
|
|
20
20
|
readonly bytesCreatedOnChain?: BytesCreatedOnChain;
|
|
21
|
+
readonly remainingAccounts?: RemainingAccounts;
|
|
21
22
|
readonly argDefaults: Record<string, InstructionArgDefault>;
|
|
22
23
|
};
|
|
23
24
|
export type InstructionNodeInput = Omit<PartialExcept<InstructionNode, 'name' | 'accounts' | 'dataArgs'>, '__instructionNode' | 'kind'>;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ImportFrom } from './ImportFrom';
|
|
2
|
+
export type RemainingAccounts = {
|
|
3
|
+
kind: 'arg';
|
|
4
|
+
name: string;
|
|
5
|
+
isWritable: boolean;
|
|
6
|
+
} | {
|
|
7
|
+
kind: 'resolver';
|
|
8
|
+
name: string;
|
|
9
|
+
importFrom: ImportFrom;
|
|
10
|
+
};
|
|
11
|
+
export declare const remainingAccountsFromArg: (arg: string, isWritable?: boolean) => RemainingAccounts;
|
|
12
|
+
export declare const remainingAccountsFromResolver: (name: string, importFrom?: ImportFrom) => RemainingAccounts;
|
|
@@ -5,6 +5,7 @@ export * from './BytesCreatedOnChain';
|
|
|
5
5
|
export * from './GpaField';
|
|
6
6
|
export * from './ImportFrom';
|
|
7
7
|
export * from './InstructionDefault';
|
|
8
|
+
export * from './RemainingAccounts';
|
|
8
9
|
export * from './SizeStrategy';
|
|
9
10
|
export * from './errors';
|
|
10
11
|
export * from './logs';
|
package/package.json
CHANGED
|
@@ -42,12 +42,13 @@ export function instructionAccountNodeFromIdl(
|
|
|
42
42
|
useProgramIdForOptionalAccounts = true
|
|
43
43
|
): InstructionAccountNode {
|
|
44
44
|
const isOptional = idl.optional ?? idl.isOptional ?? false;
|
|
45
|
+
const desc = idl.desc ? [idl.desc] : undefined;
|
|
45
46
|
return instructionAccountNode({
|
|
46
47
|
name: idl.name ?? '',
|
|
47
48
|
isWritable: idl.isMut ?? false,
|
|
48
49
|
isSigner: idl.isOptionalSigner ? 'either' : idl.isSigner ?? false,
|
|
49
50
|
isOptional,
|
|
50
|
-
docs: idl.
|
|
51
|
+
docs: idl.docs ?? desc ?? [],
|
|
51
52
|
defaultsTo:
|
|
52
53
|
isOptional && useProgramIdForOptionalAccounts
|
|
53
54
|
? programIdDefault()
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
InstructionArgDefault,
|
|
5
5
|
InvalidKinobiTreeError,
|
|
6
6
|
PartialExcept,
|
|
7
|
+
RemainingAccounts,
|
|
7
8
|
mainCase,
|
|
8
9
|
} from '../shared';
|
|
9
10
|
import {
|
|
@@ -38,6 +39,7 @@ export type InstructionNode = {
|
|
|
38
39
|
readonly docs: string[];
|
|
39
40
|
readonly internal: boolean;
|
|
40
41
|
readonly bytesCreatedOnChain?: BytesCreatedOnChain;
|
|
42
|
+
readonly remainingAccounts?: RemainingAccounts;
|
|
41
43
|
readonly argDefaults: Record<string, InstructionArgDefault>;
|
|
42
44
|
};
|
|
43
45
|
|
|
@@ -67,6 +69,7 @@ export function instructionNode(input: InstructionNodeInput): InstructionNode {
|
|
|
67
69
|
docs: input.docs ?? [],
|
|
68
70
|
internal: input.internal ?? false,
|
|
69
71
|
bytesCreatedOnChain: input.bytesCreatedOnChain,
|
|
72
|
+
remainingAccounts: input.remainingAccounts,
|
|
70
73
|
argDefaults: Object.fromEntries(
|
|
71
74
|
Object.entries(input.argDefaults ?? {}).map(([key, value]) => [
|
|
72
75
|
mainCase(key),
|
package/src/nodes/TypeNode.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IDL_TYPE_LEAVES, IdlType } from '../idl';
|
|
2
|
+
import { prefixedSize } from '../shared';
|
|
2
3
|
import { ArrayTypeNode, arrayTypeNodeFromIdl } from './ArrayTypeNode';
|
|
3
4
|
import { BoolTypeNode, boolTypeNode } from './BoolTypeNode';
|
|
4
5
|
import { BytesTypeNode, bytesTypeNode } from './BytesTypeNode';
|
|
@@ -58,7 +59,7 @@ export const createTypeNodeFromIdl = (idlType: IdlType): TypeNode => {
|
|
|
58
59
|
if (idlType === 'bool') return boolTypeNode();
|
|
59
60
|
if (idlType === 'string') return stringTypeNode();
|
|
60
61
|
if (idlType === 'publicKey') return publicKeyTypeNode();
|
|
61
|
-
if (idlType === 'bytes') return bytesTypeNode();
|
|
62
|
+
if (idlType === 'bytes') return bytesTypeNode(prefixedSize());
|
|
62
63
|
return numberTypeNode(idlType);
|
|
63
64
|
}
|
|
64
65
|
|
|
@@ -358,8 +358,13 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
358
358
|
);
|
|
359
359
|
const hasByteResolver =
|
|
360
360
|
instruction.bytesCreatedOnChain?.kind === 'resolver';
|
|
361
|
+
const hasRemainingAccountsResolver =
|
|
362
|
+
instruction.remainingAccounts?.kind === 'resolver';
|
|
361
363
|
const hasResolvers =
|
|
362
|
-
hasArgResolvers ||
|
|
364
|
+
hasArgResolvers ||
|
|
365
|
+
hasAccountResolvers ||
|
|
366
|
+
hasByteResolver ||
|
|
367
|
+
hasRemainingAccountsResolver;
|
|
363
368
|
|
|
364
369
|
// Resolved inputs.
|
|
365
370
|
const resolvedInputs = visit(
|
|
@@ -467,6 +472,15 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
467
472
|
imports.add(bytes.importFrom, camelCase(bytes.name));
|
|
468
473
|
}
|
|
469
474
|
|
|
475
|
+
// Remaining accounts.
|
|
476
|
+
const { remainingAccounts } = instruction;
|
|
477
|
+
if (remainingAccounts?.kind === 'resolver') {
|
|
478
|
+
imports.add(
|
|
479
|
+
remainingAccounts.importFrom,
|
|
480
|
+
camelCase(remainingAccounts.name)
|
|
481
|
+
);
|
|
482
|
+
}
|
|
483
|
+
|
|
470
484
|
// canMergeAccountsAndArgs
|
|
471
485
|
let canMergeAccountsAndArgs = false;
|
|
472
486
|
if (!linkedDataArgs && !linkedExtraArgs) {
|
|
@@ -516,6 +530,7 @@ export class GetJavaScriptRenderMapVisitor extends BaseThrowVisitor<RenderMap> {
|
|
|
516
530
|
hasArgResolvers,
|
|
517
531
|
hasAccountResolvers,
|
|
518
532
|
hasByteResolver,
|
|
533
|
+
hasRemainingAccountsResolver,
|
|
519
534
|
hasResolvers,
|
|
520
535
|
})
|
|
521
536
|
);
|
|
@@ -48,6 +48,8 @@ export function {{ instruction.name | camelCase }}(
|
|
|
48
48
|
|
|
49
49
|
{% include "instructionsPageAccountMetas.njk" %}
|
|
50
50
|
|
|
51
|
+
{% include "instructionsPageRemainingAccounts.njk" %}
|
|
52
|
+
|
|
51
53
|
// Data.
|
|
52
54
|
{% if hasDataArgs %}
|
|
53
55
|
const data = get{{ instruction.dataArgs.name | pascalCase }}Serializer().serialize(resolvedArgs);
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{% set remaining = instruction.remainingAccounts %}
|
|
2
|
+
{% macro getArgVar(name, argsObj) -%}
|
|
3
|
+
{{ 'resolvedArgs' if argsWithDefaults.includes(name) else argsObj }}.{{ name | camelCase }}
|
|
4
|
+
{%- endmacro %}
|
|
5
|
+
|
|
6
|
+
{% if remaining.kind === 'arg' %}
|
|
7
|
+
// Remaining Accounts.
|
|
8
|
+
const remainingAccounts = {{ getArgVar(remaining.name) }}.map(address => ([address, {{ "true" if remaining.isWritable else "false" }}] as const));
|
|
9
|
+
remainingAccounts.forEach((remainingAccount) => addAccountMeta(keys, signers, remainingAccount, false));
|
|
10
|
+
{% elif remaining.kind === 'resolver' %}
|
|
11
|
+
// Remaining Accounts.
|
|
12
|
+
const remainingAccounts = {{ remaining.name | camelCase }}(context, resolvedAccounts, resolvedArgs, programId);
|
|
13
|
+
remainingAccounts.forEach((remainingAccount) => addAccountMeta(keys, signers, remainingAccount, false));
|
|
14
|
+
{% endif %}
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
addObjectProperty({{ inputPrefix }} {{ inputDefault }});
|
|
93
93
|
{% endif -%}
|
|
94
94
|
{% endfor %}
|
|
95
|
-
{% if hasDataArgs or hasByteResolver %}
|
|
95
|
+
{% if hasDataArgs or hasByteResolver or instruction.remainingAccounts %}
|
|
96
96
|
const resolvedArgs = { ...{{ argsObj }}, ...resolvingArgs };
|
|
97
97
|
{% endif %}
|
|
98
98
|
{% endif %}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { ImportFrom } from './ImportFrom';
|
|
2
|
+
import { mainCase } from './utils';
|
|
3
|
+
|
|
4
|
+
export type RemainingAccounts =
|
|
5
|
+
| { kind: 'arg'; name: string; isWritable: boolean }
|
|
6
|
+
| { kind: 'resolver'; name: string; importFrom: ImportFrom };
|
|
7
|
+
|
|
8
|
+
export const remainingAccountsFromArg = (
|
|
9
|
+
arg: string,
|
|
10
|
+
isWritable: boolean = false
|
|
11
|
+
): RemainingAccounts => ({ kind: 'arg', name: mainCase(arg), isWritable });
|
|
12
|
+
|
|
13
|
+
export const remainingAccountsFromResolver = (
|
|
14
|
+
name: string,
|
|
15
|
+
importFrom: ImportFrom = 'hooked'
|
|
16
|
+
): RemainingAccounts => ({
|
|
17
|
+
kind: 'resolver',
|
|
18
|
+
name: mainCase(name),
|
|
19
|
+
importFrom,
|
|
20
|
+
});
|
package/src/shared/index.ts
CHANGED
|
@@ -5,6 +5,7 @@ export * from './BytesCreatedOnChain';
|
|
|
5
5
|
export * from './GpaField';
|
|
6
6
|
export * from './ImportFrom';
|
|
7
7
|
export * from './InstructionDefault';
|
|
8
|
+
export * from './RemainingAccounts';
|
|
8
9
|
export * from './SizeStrategy';
|
|
9
10
|
export * from './errors';
|
|
10
11
|
export * from './logs';
|