From ee630ba3266b705f0bb68a19f6e74292248ff2c4 Mon Sep 17 00:00:00 2001 From: shotgunofdeath Date: Wed, 6 Mar 2024 11:44:08 +0100 Subject: [PATCH] chore(kinobi): migrate to Kinobi 0.17 --- .gitignore | 1 + clients/js/package.json | 2 +- clients/js/pnpm-lock.yaml | 67 ++++---- clients/js/src/generated/errors/mplCore.ts | 42 ++--- .../instructions/addCollectionPlugin.ts | 26 +++- .../addCollectionPluginAuthority.ts | 26 +++- .../src/generated/instructions/addPlugin.ts | 32 +++- .../instructions/addPluginAuthority.ts | 32 +++- clients/js/src/generated/instructions/burn.ts | 30 +++- .../generated/instructions/burnCollection.ts | 24 ++- .../js/src/generated/instructions/collect.ts | 10 +- .../js/src/generated/instructions/compress.ts | 28 +++- .../js/src/generated/instructions/create.ts | 40 +++-- .../instructions/createCollection.ts | 26 +++- .../src/generated/instructions/decompress.ts | 28 +++- .../instructions/removeCollectionPlugin.ts | 26 +++- .../removeCollectionPluginAuthority.ts | 26 +++- .../generated/instructions/removePlugin.ts | 32 +++- .../instructions/removePluginAuthority.ts | 32 +++- .../js/src/generated/instructions/transfer.ts | 32 +++- .../js/src/generated/instructions/update.ts | 28 +++- .../instructions/updateCollection.ts | 28 +++- .../instructions/updateCollectionPlugin.ts | 26 +++- .../generated/instructions/updatePlugin.ts | 32 +++- clients/rust/src/generated/accounts/mod.rs | 20 +-- .../instructions/add_collection_plugin.rs | 20 ++- .../add_collection_plugin_authority.rs | 20 ++- .../src/generated/instructions/add_plugin.rs | 22 ++- .../instructions/add_plugin_authority.rs | 22 ++- .../rust/src/generated/instructions/burn.rs | 20 ++- .../generated/instructions/burn_collection.rs | 18 ++- .../src/generated/instructions/collect.rs | 12 +- .../src/generated/instructions/compress.rs | 22 ++- .../rust/src/generated/instructions/create.rs | 26 +++- .../instructions/create_collection.rs | 20 ++- .../src/generated/instructions/decompress.rs | 22 ++- .../rust/src/generated/instructions/mod.rs | 80 +++++----- .../instructions/remove_collection_plugin.rs | 20 ++- .../remove_collection_plugin_authority.rs | 20 ++- .../generated/instructions/remove_plugin.rs | 22 ++- .../instructions/remove_plugin_authority.rs | 22 ++- .../src/generated/instructions/transfer.rs | 22 ++- .../rust/src/generated/instructions/update.rs | 22 ++- .../instructions/update_collection.rs | 22 ++- .../instructions/update_collection_plugin.rs | 20 ++- .../generated/instructions/update_plugin.rs | 22 ++- clients/rust/src/generated/types/mod.rs | 76 ++++----- configs/kinobi.cjs | 12 +- package.json | 4 +- pnpm-lock.yaml | 146 +++++++++++++++++- 50 files changed, 1087 insertions(+), 343 deletions(-) diff --git a/.gitignore b/.gitignore index ac6bf219..654435ec 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ dist .amman .crates .bin +.idea ASSETp3DinZKfiAyvdQG16YWWLJ2X3ZKjg9zku7n1sZD.json assetwo5JUM4WA59A1E3gFJBYvo8Ds8Rv32jyc3ASEe.json coreeNT3nkXDgYv28X1S7hi1PTW2oEZKc2dbZqbdbew.json diff --git a/clients/js/package.json b/clients/js/package.json index 2c1efeae..832ec814 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -50,7 +50,7 @@ "typedoc": "^0.23.16", "typedoc-plugin-expand-object-like-types": "^0.1.1", "typedoc-plugin-missing-exports": "^1.0.0", - "typescript": "^4.6.2", + "typescript": "^4.9.4", "vercel": "^28.16.0" }, "ava": { diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml index 494ea4b8..e692f94c 100644 --- a/clients/js/pnpm-lock.yaml +++ b/clients/js/pnpm-lock.yaml @@ -27,10 +27,10 @@ devDependencies: version: 1.73.0 '@typescript-eslint/eslint-plugin': specifier: ^5.0.0 - version: 5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.6.2) + version: 5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.9.4) '@typescript-eslint/parser': specifier: ^5.46.1 - version: 5.46.1(eslint@8.0.1)(typescript@4.6.2) + version: 5.46.1(eslint@8.0.1)(typescript@4.9.4) ava: specifier: ^5.1.0 version: 5.1.0(@ava/typescript@3.0.1) @@ -60,7 +60,7 @@ devDependencies: version: 3.0.2 typedoc: specifier: ^0.23.16 - version: 0.23.16(typescript@4.6.2) + version: 0.23.16(typescript@4.9.4) typedoc-plugin-expand-object-like-types: specifier: ^0.1.1 version: 0.1.1(typedoc@0.23.16) @@ -68,8 +68,8 @@ devDependencies: specifier: ^1.0.0 version: 1.0.0(typedoc@0.23.16) typescript: - specifier: ^4.6.2 - version: 4.6.2 + specifier: ^4.9.4 + version: 4.9.4 vercel: specifier: ^28.16.0 version: 28.16.0(@types/node@14.18.33) @@ -2479,7 +2479,7 @@ packages: '@types/node': 12.20.55 dev: true - /@typescript-eslint/eslint-plugin@5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.6.2): + /@typescript-eslint/eslint-plugin@5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.9.4): resolution: {integrity: sha512-T6V6fCD2U0YesOedvydTnrNtsC8E+c2QzpawIpDdlaObX0OX5dLo7tLU5c64FhTZvA1Xrdim+cXDI7NPsVx8Cg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2490,8 +2490,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.0.0(eslint@8.0.1)(typescript@4.6.2) - '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.6.2) + '@typescript-eslint/experimental-utils': 5.0.0(eslint@8.0.1)(typescript@4.9.4) + '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.9.4) '@typescript-eslint/scope-manager': 5.0.0 debug: 4.3.4 eslint: 8.0.1 @@ -2499,13 +2499,13 @@ packages: ignore: 5.3.1 regexpp: 3.2.0 semver: 7.6.0 - tsutils: 3.21.0(typescript@4.6.2) - typescript: 4.6.2 + tsutils: 3.21.0(typescript@4.9.4) + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils@5.0.0(eslint@8.0.1)(typescript@4.6.2): + /@typescript-eslint/experimental-utils@5.0.0(eslint@8.0.1)(typescript@4.9.4): resolution: {integrity: sha512-Dnp4dFIsZcPawD6CT1p5NibNUQyGSEz80sULJZkyhyna8AEqArmfwMwJPbmKzWVo4PabqNVzHYlzmcdLQWk+pg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2514,7 +2514,7 @@ packages: '@types/json-schema': 7.0.15 '@typescript-eslint/scope-manager': 5.0.0 '@typescript-eslint/types': 5.0.0 - '@typescript-eslint/typescript-estree': 5.0.0(typescript@4.6.2) + '@typescript-eslint/typescript-estree': 5.0.0(typescript@4.9.4) eslint: 8.0.1 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.0.1) @@ -2523,7 +2523,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser@5.46.1(eslint@8.0.1)(typescript@4.6.2): + /@typescript-eslint/parser@5.46.1(eslint@8.0.1)(typescript@4.9.4): resolution: {integrity: sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2535,10 +2535,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.46.1 '@typescript-eslint/types': 5.46.1 - '@typescript-eslint/typescript-estree': 5.46.1(typescript@4.6.2) + '@typescript-eslint/typescript-estree': 5.46.1(typescript@4.9.4) debug: 4.3.4 eslint: 8.0.1 - typescript: 4.6.2 + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true @@ -2569,7 +2569,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.0.0(typescript@4.6.2): + /@typescript-eslint/typescript-estree@5.0.0(typescript@4.9.4): resolution: {integrity: sha512-V/6w+PPQMhinWKSn+fCiX5jwvd1vRBm7AX7SJQXEGQtwtBvjMPjaU3YTQ1ik2UF1u96X7tsB96HMnulG3eLi9Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2584,13 +2584,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@4.6.2) - typescript: 4.6.2 + tsutils: 3.21.0(typescript@4.9.4) + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@5.46.1(typescript@4.6.2): + /@typescript-eslint/typescript-estree@5.46.1(typescript@4.9.4): resolution: {integrity: sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2605,8 +2605,8 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@4.6.2) - typescript: 4.6.2 + tsutils: 3.21.0(typescript@4.9.4) + typescript: 4.9.4 transitivePeerDependencies: - supports-color dev: true @@ -4478,8 +4478,8 @@ packages: eslint: ^7.32.0 || ^8.2.0 eslint-plugin-import: ^2.25.3 dependencies: - '@typescript-eslint/eslint-plugin': 5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.6.2) - '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.6.2) + '@typescript-eslint/eslint-plugin': 5.0.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1)(typescript@4.9.4) + '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.9.4) eslint: 8.0.1 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.0.1) eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.46.1)(eslint@8.0.1) @@ -4525,7 +4525,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.6.2) + '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.9.4) debug: 3.2.7 eslint: 8.0.1 eslint-import-resolver-node: 0.3.9 @@ -4543,7 +4543,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.6.2) + '@typescript-eslint/parser': 5.46.1(eslint@8.0.1)(typescript@4.9.4) array-includes: 3.1.7 array.prototype.flat: 1.3.2 debug: 2.6.9 @@ -6719,6 +6719,7 @@ packages: /node-addon-api@1.7.2: resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==} + requiresBuild: true dev: true optional: true @@ -8267,14 +8268,14 @@ packages: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true - /tsutils@3.21.0(typescript@4.6.2): + /tsutils@3.21.0(typescript@4.9.4): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.6.2 + typescript: 4.9.4 dev: true /type-check@0.3.2: @@ -8363,7 +8364,7 @@ packages: peerDependencies: typedoc: 0.22.x || 0.23.x dependencies: - typedoc: 0.23.16(typescript@4.6.2) + typedoc: 0.23.16(typescript@4.9.4) dev: true /typedoc-plugin-missing-exports@1.0.0(typedoc@0.23.16): @@ -8371,10 +8372,10 @@ packages: peerDependencies: typedoc: 0.22.x || 0.23.x dependencies: - typedoc: 0.23.16(typescript@4.6.2) + typedoc: 0.23.16(typescript@4.9.4) dev: true - /typedoc@0.23.16(typescript@4.6.2): + /typedoc@0.23.16(typescript@4.9.4): resolution: {integrity: sha512-rumYsCeNRXlyuZVzefD7050n7ptL2uudsCJg50dY0v/stKniqIlRpvx/F/6expC0/Q6Dbab+g/JpZuB7Sw90FA==} engines: {node: '>= 14.14'} hasBin: true @@ -8385,7 +8386,7 @@ packages: marked: 4.3.0 minimatch: 5.1.6 shiki: 0.11.1 - typescript: 4.6.2 + typescript: 4.9.4 dev: true /typescript@4.3.4: @@ -8394,8 +8395,8 @@ packages: hasBin: true dev: true - /typescript@4.6.2: - resolution: {integrity: sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==} + /typescript@4.9.4: + resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} engines: {node: '>=4.2.0'} hasBin: true dev: true diff --git a/clients/js/src/generated/errors/mplCore.ts b/clients/js/src/generated/errors/mplCore.ts index 802406ed..a0d497db 100644 --- a/clients/js/src/generated/errors/mplCore.ts +++ b/clients/js/src/generated/errors/mplCore.ts @@ -17,7 +17,7 @@ const nameToErrorMap: Map = new Map(); /** InvalidSystemProgram: Invalid System Program */ export class InvalidSystemProgramError extends ProgramError { - readonly name: string = 'InvalidSystemProgram'; + override readonly name: string = 'InvalidSystemProgram'; readonly code: number = 0x0; // 0 @@ -30,7 +30,7 @@ nameToErrorMap.set('InvalidSystemProgram', InvalidSystemProgramError); /** DeserializationError: Error deserializing account */ export class DeserializationErrorError extends ProgramError { - readonly name: string = 'DeserializationError'; + override readonly name: string = 'DeserializationError'; readonly code: number = 0x1; // 1 @@ -43,7 +43,7 @@ nameToErrorMap.set('DeserializationError', DeserializationErrorError); /** SerializationError: Error serializing account */ export class SerializationErrorError extends ProgramError { - readonly name: string = 'SerializationError'; + override readonly name: string = 'SerializationError'; readonly code: number = 0x2; // 2 @@ -56,7 +56,7 @@ nameToErrorMap.set('SerializationError', SerializationErrorError); /** PluginsNotInitialized: Plugins not initialized */ export class PluginsNotInitializedError extends ProgramError { - readonly name: string = 'PluginsNotInitialized'; + override readonly name: string = 'PluginsNotInitialized'; readonly code: number = 0x3; // 3 @@ -69,7 +69,7 @@ nameToErrorMap.set('PluginsNotInitialized', PluginsNotInitializedError); /** PluginNotFound: Plugin not found */ export class PluginNotFoundError extends ProgramError { - readonly name: string = 'PluginNotFound'; + override readonly name: string = 'PluginNotFound'; readonly code: number = 0x4; // 4 @@ -82,7 +82,7 @@ nameToErrorMap.set('PluginNotFound', PluginNotFoundError); /** NumericalOverflow: Numerical Overflow */ export class NumericalOverflowError extends ProgramError { - readonly name: string = 'NumericalOverflow'; + override readonly name: string = 'NumericalOverflow'; readonly code: number = 0x5; // 5 @@ -95,7 +95,7 @@ nameToErrorMap.set('NumericalOverflow', NumericalOverflowError); /** IncorrectAccount: Incorrect account */ export class IncorrectAccountError extends ProgramError { - readonly name: string = 'IncorrectAccount'; + override readonly name: string = 'IncorrectAccount'; readonly code: number = 0x6; // 6 @@ -108,7 +108,7 @@ nameToErrorMap.set('IncorrectAccount', IncorrectAccountError); /** IncorrectAssetHash: Incorrect asset hash */ export class IncorrectAssetHashError extends ProgramError { - readonly name: string = 'IncorrectAssetHash'; + override readonly name: string = 'IncorrectAssetHash'; readonly code: number = 0x7; // 7 @@ -121,7 +121,7 @@ nameToErrorMap.set('IncorrectAssetHash', IncorrectAssetHashError); /** InvalidPlugin: Invalid Plugin */ export class InvalidPluginError extends ProgramError { - readonly name: string = 'InvalidPlugin'; + override readonly name: string = 'InvalidPlugin'; readonly code: number = 0x8; // 8 @@ -134,7 +134,7 @@ nameToErrorMap.set('InvalidPlugin', InvalidPluginError); /** InvalidAuthority: Invalid Authority */ export class InvalidAuthorityError extends ProgramError { - readonly name: string = 'InvalidAuthority'; + override readonly name: string = 'InvalidAuthority'; readonly code: number = 0x9; // 9 @@ -147,7 +147,7 @@ nameToErrorMap.set('InvalidAuthority', InvalidAuthorityError); /** AssetIsFrozen: Cannot transfer a frozen asset */ export class AssetIsFrozenError extends ProgramError { - readonly name: string = 'AssetIsFrozen'; + override readonly name: string = 'AssetIsFrozen'; readonly code: number = 0xa; // 10 @@ -160,7 +160,7 @@ nameToErrorMap.set('AssetIsFrozen', AssetIsFrozenError); /** MissingCompressionProof: Missing compression proof */ export class MissingCompressionProofError extends ProgramError { - readonly name: string = 'MissingCompressionProof'; + override readonly name: string = 'MissingCompressionProof'; readonly code: number = 0xb; // 11 @@ -173,7 +173,7 @@ nameToErrorMap.set('MissingCompressionProof', MissingCompressionProofError); /** CannotMigrateMasterWithSupply: Cannot migrate a master edition used for prints */ export class CannotMigrateMasterWithSupplyError extends ProgramError { - readonly name: string = 'CannotMigrateMasterWithSupply'; + override readonly name: string = 'CannotMigrateMasterWithSupply'; readonly code: number = 0xc; // 12 @@ -189,7 +189,7 @@ nameToErrorMap.set( /** CannotMigratePrints: Cannot migrate a print edition */ export class CannotMigratePrintsError extends ProgramError { - readonly name: string = 'CannotMigratePrints'; + override readonly name: string = 'CannotMigratePrints'; readonly code: number = 0xd; // 13 @@ -202,7 +202,7 @@ nameToErrorMap.set('CannotMigratePrints', CannotMigratePrintsError); /** CannotBurnCollection: Cannot burn a collection NFT */ export class CannotBurnCollectionError extends ProgramError { - readonly name: string = 'CannotBurnCollection'; + override readonly name: string = 'CannotBurnCollection'; readonly code: number = 0xe; // 14 @@ -215,7 +215,7 @@ nameToErrorMap.set('CannotBurnCollection', CannotBurnCollectionError); /** PluginAlreadyExists: Plugin already exists */ export class PluginAlreadyExistsError extends ProgramError { - readonly name: string = 'PluginAlreadyExists'; + override readonly name: string = 'PluginAlreadyExists'; readonly code: number = 0xf; // 15 @@ -228,7 +228,7 @@ nameToErrorMap.set('PluginAlreadyExists', PluginAlreadyExistsError); /** NumericalOverflowError: Numerical overflow */ export class NumericalOverflowErrorError extends ProgramError { - readonly name: string = 'NumericalOverflowError'; + override readonly name: string = 'NumericalOverflowError'; readonly code: number = 0x10; // 16 @@ -241,7 +241,7 @@ nameToErrorMap.set('NumericalOverflowError', NumericalOverflowErrorError); /** AlreadyCompressed: Already compressed account */ export class AlreadyCompressedError extends ProgramError { - readonly name: string = 'AlreadyCompressed'; + override readonly name: string = 'AlreadyCompressed'; readonly code: number = 0x11; // 17 @@ -254,7 +254,7 @@ nameToErrorMap.set('AlreadyCompressed', AlreadyCompressedError); /** AlreadyDecompressed: Already decompressed account */ export class AlreadyDecompressedError extends ProgramError { - readonly name: string = 'AlreadyDecompressed'; + override readonly name: string = 'AlreadyDecompressed'; readonly code: number = 0x12; // 18 @@ -267,7 +267,7 @@ nameToErrorMap.set('AlreadyDecompressed', AlreadyDecompressedError); /** InvalidCollection: Invalid Collection passed in */ export class InvalidCollectionError extends ProgramError { - readonly name: string = 'InvalidCollection'; + override readonly name: string = 'InvalidCollection'; readonly code: number = 0x13; // 19 @@ -280,7 +280,7 @@ nameToErrorMap.set('InvalidCollection', InvalidCollectionError); /** MissingUpdateAuthority: Missing update authority */ export class MissingUpdateAuthorityError extends ProgramError { - readonly name: string = 'MissingUpdateAuthority'; + override readonly name: string = 'MissingUpdateAuthority'; readonly code: number = 0x14; // 20 diff --git a/clients/js/src/generated/instructions/addCollectionPlugin.ts b/clients/js/src/generated/instructions/addCollectionPlugin.ts index a00317f0..55009253 100644 --- a/clients/js/src/generated/instructions/addCollectionPlugin.ts +++ b/clients/js/src/generated/instructions/addCollectionPlugin.ts @@ -89,21 +89,33 @@ export function addCollectionPlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: AddCollectionPluginInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/addCollectionPluginAuthority.ts b/clients/js/src/generated/instructions/addCollectionPluginAuthority.ts index c0f586ab..a91b2105 100644 --- a/clients/js/src/generated/instructions/addCollectionPluginAuthority.ts +++ b/clients/js/src/generated/instructions/addCollectionPluginAuthority.ts @@ -101,21 +101,33 @@ export function addCollectionPluginAuthority( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: AddCollectionPluginAuthorityInstructionArgs = { diff --git a/clients/js/src/generated/instructions/addPlugin.ts b/clients/js/src/generated/instructions/addPlugin.ts index 0dc4957f..9c84b988 100644 --- a/clients/js/src/generated/instructions/addPlugin.ts +++ b/clients/js/src/generated/instructions/addPlugin.ts @@ -86,22 +86,38 @@ export function addPlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: AddPluginInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/addPluginAuthority.ts b/clients/js/src/generated/instructions/addPluginAuthority.ts index 371cf03f..9a864d16 100644 --- a/clients/js/src/generated/instructions/addPluginAuthority.ts +++ b/clients/js/src/generated/instructions/addPluginAuthority.ts @@ -103,22 +103,38 @@ export function addPluginAuthority( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: AddPluginAuthorityInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/burn.ts b/clients/js/src/generated/instructions/burn.ts index e06241f2..fb613af3 100644 --- a/clients/js/src/generated/instructions/burn.ts +++ b/clients/js/src/generated/instructions/burn.ts @@ -89,17 +89,33 @@ export function burn( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: BurnInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/burnCollection.ts b/clients/js/src/generated/instructions/burnCollection.ts index a5d78e66..aa16719b 100644 --- a/clients/js/src/generated/instructions/burnCollection.ts +++ b/clients/js/src/generated/instructions/burnCollection.ts @@ -94,16 +94,28 @@ export function burnCollection( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, logWrapper: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: BurnCollectionInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/collect.ts b/clients/js/src/generated/instructions/collect.ts index 13b525f5..bfebce4e 100644 --- a/clients/js/src/generated/instructions/collect.ts +++ b/clients/js/src/generated/instructions/collect.ts @@ -60,9 +60,13 @@ export function collect( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - recipient: { index: 0, isWritable: true, value: input.recipient ?? null }, - }; + const resolvedAccounts = { + recipient: { + index: 0, + isWritable: true as boolean, + value: input.recipient ?? null, + }, + } satisfies ResolvedAccountsWithIndices; // Accounts in order. const orderedAccounts: ResolvedAccount[] = Object.values( diff --git a/clients/js/src/generated/instructions/compress.ts b/clients/js/src/generated/instructions/compress.ts index 32ec571e..df7e8c1c 100644 --- a/clients/js/src/generated/instructions/compress.ts +++ b/clients/js/src/generated/instructions/compress.ts @@ -75,26 +75,38 @@ export function compress( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, collection: { index: 1, - isWritable: false, + isWritable: false as boolean, value: input.collection ?? null, }, - owner: { index: 2, isWritable: false, value: input.owner ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + owner: { + index: 2, + isWritable: false as boolean, + value: input.owner ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Default values. if (!resolvedAccounts.systemProgram.value) { diff --git a/clients/js/src/generated/instructions/create.ts b/clients/js/src/generated/instructions/create.ts index 66d09be7..07ed215e 100644 --- a/clients/js/src/generated/instructions/create.ts +++ b/clients/js/src/generated/instructions/create.ts @@ -106,28 +106,48 @@ export function create( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, - owner: { index: 4, isWritable: false, value: input.owner ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, + owner: { + index: 4, + isWritable: false as boolean, + value: input.owner ?? null, + }, updateAuthority: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.updateAuthority ?? null, }, systemProgram: { index: 6, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 7, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: CreateInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/createCollection.ts b/clients/js/src/generated/instructions/createCollection.ts index 9f57cf08..33eedce4 100644 --- a/clients/js/src/generated/instructions/createCollection.ts +++ b/clients/js/src/generated/instructions/createCollection.ts @@ -98,21 +98,33 @@ export function createCollection( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, updateAuthority: { index: 1, - isWritable: false, + isWritable: false as boolean, value: input.updateAuthority ?? null, }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, - owner: { index: 3, isWritable: false, value: input.owner ?? null }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, + owner: { + index: 3, + isWritable: false as boolean, + value: input.owner ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: CreateCollectionInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/decompress.ts b/clients/js/src/generated/instructions/decompress.ts index 924ed98b..b21078de 100644 --- a/clients/js/src/generated/instructions/decompress.ts +++ b/clients/js/src/generated/instructions/decompress.ts @@ -92,26 +92,38 @@ export function decompress( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, collection: { index: 1, - isWritable: false, + isWritable: false as boolean, value: input.collection ?? null, }, - owner: { index: 2, isWritable: false, value: input.owner ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + owner: { + index: 2, + isWritable: false as boolean, + value: input.owner ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: DecompressInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/removeCollectionPlugin.ts b/clients/js/src/generated/instructions/removeCollectionPlugin.ts index bbab7cb3..5b6ac4ce 100644 --- a/clients/js/src/generated/instructions/removeCollectionPlugin.ts +++ b/clients/js/src/generated/instructions/removeCollectionPlugin.ts @@ -91,21 +91,33 @@ export function removeCollectionPlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: RemoveCollectionPluginInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/removeCollectionPluginAuthority.ts b/clients/js/src/generated/instructions/removeCollectionPluginAuthority.ts index baca20e6..c9e01e79 100644 --- a/clients/js/src/generated/instructions/removeCollectionPluginAuthority.ts +++ b/clients/js/src/generated/instructions/removeCollectionPluginAuthority.ts @@ -101,21 +101,33 @@ export function removeCollectionPluginAuthority( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: RemoveCollectionPluginAuthorityInstructionArgs = { diff --git a/clients/js/src/generated/instructions/removePlugin.ts b/clients/js/src/generated/instructions/removePlugin.ts index 429a5a34..0ec4b41b 100644 --- a/clients/js/src/generated/instructions/removePlugin.ts +++ b/clients/js/src/generated/instructions/removePlugin.ts @@ -86,22 +86,38 @@ export function removePlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: RemovePluginInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/removePluginAuthority.ts b/clients/js/src/generated/instructions/removePluginAuthority.ts index 8fb8aa2e..4808bc33 100644 --- a/clients/js/src/generated/instructions/removePluginAuthority.ts +++ b/clients/js/src/generated/instructions/removePluginAuthority.ts @@ -103,22 +103,38 @@ export function removePluginAuthority( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: RemovePluginAuthorityInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/transfer.ts b/clients/js/src/generated/instructions/transfer.ts index 9680a4cb..aaffa9ca 100644 --- a/clients/js/src/generated/instructions/transfer.ts +++ b/clients/js/src/generated/instructions/transfer.ts @@ -95,22 +95,38 @@ export function transfer( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, collection: { index: 1, - isWritable: false, + isWritable: false as boolean, value: input.collection ?? null, }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, - newOwner: { index: 4, isWritable: false, value: input.newOwner ?? null }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, + newOwner: { + index: 4, + isWritable: false as boolean, + value: input.newOwner ?? null, + }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: TransferInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/update.ts b/clients/js/src/generated/instructions/update.ts index 04394082..198f7774 100644 --- a/clients/js/src/generated/instructions/update.ts +++ b/clients/js/src/generated/instructions/update.ts @@ -90,26 +90,38 @@ export function update( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, newUpdateAuthority: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.newUpdateAuthority ?? null, }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: UpdateInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/updateCollection.ts b/clients/js/src/generated/instructions/updateCollection.ts index 9f162a86..3a2f539d 100644 --- a/clients/js/src/generated/instructions/updateCollection.ts +++ b/clients/js/src/generated/instructions/updateCollection.ts @@ -98,26 +98,38 @@ export function updateCollection( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, newUpdateAuthority: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.newUpdateAuthority ?? null, }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: UpdateCollectionInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/updateCollectionPlugin.ts b/clients/js/src/generated/instructions/updateCollectionPlugin.ts index 2b28c9f7..7bf4439d 100644 --- a/clients/js/src/generated/instructions/updateCollectionPlugin.ts +++ b/clients/js/src/generated/instructions/updateCollectionPlugin.ts @@ -89,21 +89,33 @@ export function updateCollectionPlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - collection: { index: 0, isWritable: true, value: input.collection ?? null }, - authority: { index: 1, isWritable: false, value: input.authority ?? null }, - payer: { index: 2, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + collection: { + index: 0, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 1, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 2, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 3, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: UpdateCollectionPluginInstructionArgs = { ...input }; diff --git a/clients/js/src/generated/instructions/updatePlugin.ts b/clients/js/src/generated/instructions/updatePlugin.ts index 8df58a28..732473ca 100644 --- a/clients/js/src/generated/instructions/updatePlugin.ts +++ b/clients/js/src/generated/instructions/updatePlugin.ts @@ -86,22 +86,38 @@ export function updatePlugin( ); // Accounts. - const resolvedAccounts: ResolvedAccountsWithIndices = { - asset: { index: 0, isWritable: true, value: input.asset ?? null }, - collection: { index: 1, isWritable: true, value: input.collection ?? null }, - authority: { index: 2, isWritable: false, value: input.authority ?? null }, - payer: { index: 3, isWritable: true, value: input.payer ?? null }, + const resolvedAccounts = { + asset: { + index: 0, + isWritable: true as boolean, + value: input.asset ?? null, + }, + collection: { + index: 1, + isWritable: true as boolean, + value: input.collection ?? null, + }, + authority: { + index: 2, + isWritable: false as boolean, + value: input.authority ?? null, + }, + payer: { + index: 3, + isWritable: true as boolean, + value: input.payer ?? null, + }, systemProgram: { index: 4, - isWritable: false, + isWritable: false as boolean, value: input.systemProgram ?? null, }, logWrapper: { index: 5, - isWritable: false, + isWritable: false as boolean, value: input.logWrapper ?? null, }, - }; + } satisfies ResolvedAccountsWithIndices; // Arguments. const resolvedArgs: UpdatePluginInstructionArgs = { ...input }; diff --git a/clients/rust/src/generated/accounts/mod.rs b/clients/rust/src/generated/accounts/mod.rs index ab535f77..b18cc63c 100644 --- a/clients/rust/src/generated/accounts/mod.rs +++ b/clients/rust/src/generated/accounts/mod.rs @@ -5,14 +5,14 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -pub(crate) mod asset; -pub(crate) mod collection; -pub(crate) mod hashed_asset; -pub(crate) mod plugin_header; -pub(crate) mod plugin_registry; +pub(crate) mod r#asset; +pub(crate) mod r#collection; +pub(crate) mod r#hashed_asset; +pub(crate) mod r#plugin_header; +pub(crate) mod r#plugin_registry; -pub use self::asset::*; -pub use self::collection::*; -pub use self::hashed_asset::*; -pub use self::plugin_header::*; -pub use self::plugin_registry::*; +pub use self::r#asset::*; +pub use self::r#collection::*; +pub use self::r#hashed_asset::*; +pub use self::r#plugin_header::*; +pub use self::r#plugin_registry::*; diff --git a/clients/rust/src/generated/instructions/add_collection_plugin.rs b/clients/rust/src/generated/instructions/add_collection_plugin.rs index f96a7981..5bda5b42 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin.rs @@ -100,7 +100,15 @@ pub struct AddCollectionPluginInstructionArgs { pub plugin: Plugin, } -/// Instruction builder. +/// Instruction builder for `AddCollectionPlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct AddCollectionPluginBuilder { collection: Option, @@ -350,7 +358,15 @@ impl<'a, 'b> AddCollectionPluginCpi<'a, 'b> { } } -/// `add_collection_plugin` CPI instruction builder. +/// Instruction builder for `AddCollectionPlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[]` system_program +/// 4. `[optional]` log_wrapper pub struct AddCollectionPluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/add_collection_plugin_authority.rs b/clients/rust/src/generated/instructions/add_collection_plugin_authority.rs index 801e2171..0f5340ca 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_authority.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin_authority.rs @@ -102,7 +102,15 @@ pub struct AddCollectionPluginAuthorityInstructionArgs { pub new_authority: Authority, } -/// Instruction builder. +/// Instruction builder for `AddCollectionPluginAuthority`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct AddCollectionPluginAuthorityBuilder { collection: Option, @@ -362,7 +370,15 @@ impl<'a, 'b> AddCollectionPluginAuthorityCpi<'a, 'b> { } } -/// `add_collection_plugin_authority` CPI instruction builder. +/// Instruction builder for `AddCollectionPluginAuthority` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[]` system_program +/// 4. `[optional]` log_wrapper pub struct AddCollectionPluginAuthorityCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/add_plugin.rs b/clients/rust/src/generated/instructions/add_plugin.rs index 63e522a4..b1a752c7 100644 --- a/clients/rust/src/generated/instructions/add_plugin.rs +++ b/clients/rust/src/generated/instructions/add_plugin.rs @@ -109,7 +109,16 @@ pub struct AddPluginInstructionArgs { pub plugin: Plugin, } -/// Instruction builder. +/// Instruction builder for `AddPlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct AddPluginBuilder { asset: Option, @@ -385,7 +394,16 @@ impl<'a, 'b> AddPluginCpi<'a, 'b> { } } -/// `add_plugin` CPI instruction builder. +/// Instruction builder for `AddPlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct AddPluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/add_plugin_authority.rs b/clients/rust/src/generated/instructions/add_plugin_authority.rs index da64d908..cc87be9e 100644 --- a/clients/rust/src/generated/instructions/add_plugin_authority.rs +++ b/clients/rust/src/generated/instructions/add_plugin_authority.rs @@ -113,7 +113,16 @@ pub struct AddPluginAuthorityInstructionArgs { pub new_authority: Authority, } -/// Instruction builder. +/// Instruction builder for `AddPluginAuthority`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct AddPluginAuthorityBuilder { asset: Option, @@ -401,7 +410,16 @@ impl<'a, 'b> AddPluginAuthorityCpi<'a, 'b> { } } -/// `add_plugin_authority` CPI instruction builder. +/// Instruction builder for `AddPluginAuthority` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct AddPluginAuthorityCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/burn.rs b/clients/rust/src/generated/instructions/burn.rs index 5cb35f7c..db5b4958 100644 --- a/clients/rust/src/generated/instructions/burn.rs +++ b/clients/rust/src/generated/instructions/burn.rs @@ -103,7 +103,15 @@ pub struct BurnInstructionArgs { pub compression_proof: Option, } -/// Instruction builder. +/// Instruction builder for `Burn`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct BurnBuilder { asset: Option, @@ -359,7 +367,15 @@ impl<'a, 'b> BurnCpi<'a, 'b> { } } -/// `burn` CPI instruction builder. +/// Instruction builder for `Burn` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` log_wrapper pub struct BurnCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/burn_collection.rs b/clients/rust/src/generated/instructions/burn_collection.rs index 8a51ee46..0abeb442 100644 --- a/clients/rust/src/generated/instructions/burn_collection.rs +++ b/clients/rust/src/generated/instructions/burn_collection.rs @@ -92,7 +92,14 @@ pub struct BurnCollectionInstructionArgs { pub compression_proof: Option, } -/// Instruction builder. +/// Instruction builder for `BurnCollection`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` log_wrapper #[derive(Default)] pub struct BurnCollectionBuilder { collection: Option, @@ -320,7 +327,14 @@ impl<'a, 'b> BurnCollectionCpi<'a, 'b> { } } -/// `burn_collection` CPI instruction builder. +/// Instruction builder for `BurnCollection` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` log_wrapper pub struct BurnCollectionCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/collect.rs b/clients/rust/src/generated/instructions/collect.rs index b097bd19..ff386869 100644 --- a/clients/rust/src/generated/instructions/collect.rs +++ b/clients/rust/src/generated/instructions/collect.rs @@ -50,7 +50,11 @@ impl CollectInstructionData { } } -/// Instruction builder. +/// Instruction builder for `Collect`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` recipient #[derive(Default)] pub struct CollectBuilder { recipient: Option, @@ -186,7 +190,11 @@ impl<'a, 'b> CollectCpi<'a, 'b> { } } -/// `collect` CPI instruction builder. +/// Instruction builder for `Collect` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` recipient pub struct CollectCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/compress.rs b/clients/rust/src/generated/instructions/compress.rs index 01cdceae..2d3d0ad1 100644 --- a/clients/rust/src/generated/instructions/compress.rs +++ b/clients/rust/src/generated/instructions/compress.rs @@ -95,7 +95,16 @@ impl CompressInstructionData { } } -/// Instruction builder. +/// Instruction builder for `Compress`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` owner +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct CompressBuilder { asset: Option, @@ -356,7 +365,16 @@ impl<'a, 'b> CompressCpi<'a, 'b> { } } -/// `compress` CPI instruction builder. +/// Instruction builder for `Compress` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` owner +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct CompressCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/create.rs b/clients/rust/src/generated/instructions/create.rs index b0415451..38aeaac2 100644 --- a/clients/rust/src/generated/instructions/create.rs +++ b/clients/rust/src/generated/instructions/create.rs @@ -139,7 +139,18 @@ pub struct CreateInstructionArgs { pub plugins: Vec, } -/// Instruction builder. +/// Instruction builder for `Create`. +/// +/// ### Accounts: +/// +/// 0. `[writable, signer]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer, optional]` authority +/// 3. `[writable, signer]` payer +/// 4. `[optional]` owner +/// 5. `[optional]` update_authority +/// 6. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 7. `[optional]` log_wrapper #[derive(Default)] pub struct CreateBuilder { asset: Option, @@ -495,7 +506,18 @@ impl<'a, 'b> CreateCpi<'a, 'b> { } } -/// `create` CPI instruction builder. +/// Instruction builder for `Create` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable, signer]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer, optional]` authority +/// 3. `[writable, signer]` payer +/// 4. `[optional]` owner +/// 5. `[optional]` update_authority +/// 6. `[]` system_program +/// 7. `[optional]` log_wrapper pub struct CreateCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/create_collection.rs b/clients/rust/src/generated/instructions/create_collection.rs index edcf6aae..5e6eeb80 100644 --- a/clients/rust/src/generated/instructions/create_collection.rs +++ b/clients/rust/src/generated/instructions/create_collection.rs @@ -101,7 +101,15 @@ pub struct CreateCollectionInstructionArgs { pub plugins: Vec, } -/// Instruction builder. +/// Instruction builder for `CreateCollection`. +/// +/// ### Accounts: +/// +/// 0. `[writable, signer]` collection +/// 1. `[optional]` update_authority +/// 2. `[writable, signer]` payer +/// 3. `[optional]` owner +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) #[derive(Default)] pub struct CreateCollectionBuilder { collection: Option, @@ -363,7 +371,15 @@ impl<'a, 'b> CreateCollectionCpi<'a, 'b> { } } -/// `create_collection` CPI instruction builder. +/// Instruction builder for `CreateCollection` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable, signer]` collection +/// 1. `[optional]` update_authority +/// 2. `[writable, signer]` payer +/// 3. `[optional]` owner +/// 4. `[]` system_program pub struct CreateCollectionCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/decompress.rs b/clients/rust/src/generated/instructions/decompress.rs index 40e894ad..905efb54 100644 --- a/clients/rust/src/generated/instructions/decompress.rs +++ b/clients/rust/src/generated/instructions/decompress.rs @@ -108,7 +108,16 @@ pub struct DecompressInstructionArgs { pub compression_proof: CompressionProof, } -/// Instruction builder. +/// Instruction builder for `Decompress`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` owner +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct DecompressBuilder { asset: Option, @@ -387,7 +396,16 @@ impl<'a, 'b> DecompressCpi<'a, 'b> { } } -/// `decompress` CPI instruction builder. +/// Instruction builder for `Decompress` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` owner +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct DecompressCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/mod.rs b/clients/rust/src/generated/instructions/mod.rs index 1b724eea..de14c97e 100644 --- a/clients/rust/src/generated/instructions/mod.rs +++ b/clients/rust/src/generated/instructions/mod.rs @@ -5,44 +5,44 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -pub(crate) mod add_collection_plugin; -pub(crate) mod add_collection_plugin_authority; -pub(crate) mod add_plugin; -pub(crate) mod add_plugin_authority; -pub(crate) mod burn; -pub(crate) mod burn_collection; -pub(crate) mod collect; -pub(crate) mod compress; -pub(crate) mod create; -pub(crate) mod create_collection; -pub(crate) mod decompress; -pub(crate) mod remove_collection_plugin; -pub(crate) mod remove_collection_plugin_authority; -pub(crate) mod remove_plugin; -pub(crate) mod remove_plugin_authority; -pub(crate) mod transfer; -pub(crate) mod update; -pub(crate) mod update_collection; -pub(crate) mod update_collection_plugin; -pub(crate) mod update_plugin; +pub(crate) mod r#add_collection_plugin; +pub(crate) mod r#add_collection_plugin_authority; +pub(crate) mod r#add_plugin; +pub(crate) mod r#add_plugin_authority; +pub(crate) mod r#burn; +pub(crate) mod r#burn_collection; +pub(crate) mod r#collect; +pub(crate) mod r#compress; +pub(crate) mod r#create; +pub(crate) mod r#create_collection; +pub(crate) mod r#decompress; +pub(crate) mod r#remove_collection_plugin; +pub(crate) mod r#remove_collection_plugin_authority; +pub(crate) mod r#remove_plugin; +pub(crate) mod r#remove_plugin_authority; +pub(crate) mod r#transfer; +pub(crate) mod r#update; +pub(crate) mod r#update_collection; +pub(crate) mod r#update_collection_plugin; +pub(crate) mod r#update_plugin; -pub use self::add_collection_plugin::*; -pub use self::add_collection_plugin_authority::*; -pub use self::add_plugin::*; -pub use self::add_plugin_authority::*; -pub use self::burn::*; -pub use self::burn_collection::*; -pub use self::collect::*; -pub use self::compress::*; -pub use self::create::*; -pub use self::create_collection::*; -pub use self::decompress::*; -pub use self::remove_collection_plugin::*; -pub use self::remove_collection_plugin_authority::*; -pub use self::remove_plugin::*; -pub use self::remove_plugin_authority::*; -pub use self::transfer::*; -pub use self::update::*; -pub use self::update_collection::*; -pub use self::update_collection_plugin::*; -pub use self::update_plugin::*; +pub use self::r#add_collection_plugin::*; +pub use self::r#add_collection_plugin_authority::*; +pub use self::r#add_plugin::*; +pub use self::r#add_plugin_authority::*; +pub use self::r#burn::*; +pub use self::r#burn_collection::*; +pub use self::r#collect::*; +pub use self::r#compress::*; +pub use self::r#create::*; +pub use self::r#create_collection::*; +pub use self::r#decompress::*; +pub use self::r#remove_collection_plugin::*; +pub use self::r#remove_collection_plugin_authority::*; +pub use self::r#remove_plugin::*; +pub use self::r#remove_plugin_authority::*; +pub use self::r#transfer::*; +pub use self::r#update::*; +pub use self::r#update_collection::*; +pub use self::r#update_collection_plugin::*; +pub use self::r#update_plugin::*; diff --git a/clients/rust/src/generated/instructions/remove_collection_plugin.rs b/clients/rust/src/generated/instructions/remove_collection_plugin.rs index 35532353..c0cd5757 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin.rs @@ -100,7 +100,15 @@ pub struct RemoveCollectionPluginInstructionArgs { pub plugin_type: PluginType, } -/// Instruction builder. +/// Instruction builder for `RemoveCollectionPlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct RemoveCollectionPluginBuilder { collection: Option, @@ -350,7 +358,15 @@ impl<'a, 'b> RemoveCollectionPluginCpi<'a, 'b> { } } -/// `remove_collection_plugin` CPI instruction builder. +/// Instruction builder for `RemoveCollectionPlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[]` system_program +/// 4. `[optional]` log_wrapper pub struct RemoveCollectionPluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/remove_collection_plugin_authority.rs b/clients/rust/src/generated/instructions/remove_collection_plugin_authority.rs index a0835ad7..b8284c31 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_authority.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin_authority.rs @@ -102,7 +102,15 @@ pub struct RemoveCollectionPluginAuthorityInstructionArgs { pub authority_to_remove: Authority, } -/// Instruction builder. +/// Instruction builder for `RemoveCollectionPluginAuthority`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct RemoveCollectionPluginAuthorityBuilder { collection: Option, @@ -362,7 +370,15 @@ impl<'a, 'b> RemoveCollectionPluginAuthorityCpi<'a, 'b> { } } -/// `remove_collection_plugin_authority` CPI instruction builder. +/// Instruction builder for `RemoveCollectionPluginAuthority` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[]` system_program +/// 4. `[optional]` log_wrapper pub struct RemoveCollectionPluginAuthorityCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/remove_plugin.rs b/clients/rust/src/generated/instructions/remove_plugin.rs index 62378810..f6a41be4 100644 --- a/clients/rust/src/generated/instructions/remove_plugin.rs +++ b/clients/rust/src/generated/instructions/remove_plugin.rs @@ -109,7 +109,16 @@ pub struct RemovePluginInstructionArgs { pub plugin_type: PluginType, } -/// Instruction builder. +/// Instruction builder for `RemovePlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct RemovePluginBuilder { asset: Option, @@ -385,7 +394,16 @@ impl<'a, 'b> RemovePluginCpi<'a, 'b> { } } -/// `remove_plugin` CPI instruction builder. +/// Instruction builder for `RemovePlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct RemovePluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/remove_plugin_authority.rs b/clients/rust/src/generated/instructions/remove_plugin_authority.rs index da2aba1b..4efbb841 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_authority.rs +++ b/clients/rust/src/generated/instructions/remove_plugin_authority.rs @@ -113,7 +113,16 @@ pub struct RemovePluginAuthorityInstructionArgs { pub authority_to_remove: Authority, } -/// Instruction builder. +/// Instruction builder for `RemovePluginAuthority`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct RemovePluginAuthorityBuilder { asset: Option, @@ -401,7 +410,16 @@ impl<'a, 'b> RemovePluginAuthorityCpi<'a, 'b> { } } -/// `remove_plugin_authority` CPI instruction builder. +/// Instruction builder for `RemovePluginAuthority` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct RemovePluginAuthorityCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/transfer.rs b/clients/rust/src/generated/instructions/transfer.rs index 3eda0132..5cda0016 100644 --- a/clients/rust/src/generated/instructions/transfer.rs +++ b/clients/rust/src/generated/instructions/transfer.rs @@ -109,7 +109,16 @@ pub struct TransferInstructionArgs { pub compression_proof: Option, } -/// Instruction builder. +/// Instruction builder for `Transfer`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` new_owner +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct TransferBuilder { asset: Option, @@ -383,7 +392,16 @@ impl<'a, 'b> TransferCpi<'a, 'b> { } } -/// `transfer` CPI instruction builder. +/// Instruction builder for `Transfer` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` new_owner +/// 5. `[optional]` log_wrapper pub struct TransferCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/update.rs b/clients/rust/src/generated/instructions/update.rs index c8a0e01e..f100e36a 100644 --- a/clients/rust/src/generated/instructions/update.rs +++ b/clients/rust/src/generated/instructions/update.rs @@ -110,7 +110,16 @@ pub struct UpdateInstructionArgs { pub new_uri: Option, } -/// Instruction builder. +/// Instruction builder for `Update`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` new_update_authority +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct UpdateBuilder { asset: Option, @@ -398,7 +407,16 @@ impl<'a, 'b> UpdateCpi<'a, 'b> { } } -/// `update` CPI instruction builder. +/// Instruction builder for `Update` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` new_update_authority +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct UpdateCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/update_collection.rs b/clients/rust/src/generated/instructions/update_collection.rs index d01a2667..bdfa33d3 100644 --- a/clients/rust/src/generated/instructions/update_collection.rs +++ b/clients/rust/src/generated/instructions/update_collection.rs @@ -111,7 +111,16 @@ pub struct UpdateCollectionInstructionArgs { pub new_uri: Option, } -/// Instruction builder. +/// Instruction builder for `UpdateCollection`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` new_update_authority +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct UpdateCollectionBuilder { collection: Option, @@ -399,7 +408,16 @@ impl<'a, 'b> UpdateCollectionCpi<'a, 'b> { } } -/// `update_collection` CPI instruction builder. +/// Instruction builder for `UpdateCollection` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` new_update_authority +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct UpdateCollectionCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/update_collection_plugin.rs b/clients/rust/src/generated/instructions/update_collection_plugin.rs index 4201f7b3..ac7631d0 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin.rs +++ b/clients/rust/src/generated/instructions/update_collection_plugin.rs @@ -100,7 +100,15 @@ pub struct UpdateCollectionPluginInstructionArgs { pub plugin: Plugin, } -/// Instruction builder. +/// Instruction builder for `UpdateCollectionPlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 4. `[optional]` log_wrapper #[derive(Default)] pub struct UpdateCollectionPluginBuilder { collection: Option, @@ -350,7 +358,15 @@ impl<'a, 'b> UpdateCollectionPluginCpi<'a, 'b> { } } -/// `update_collection_plugin` CPI instruction builder. +/// Instruction builder for `UpdateCollectionPlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` collection +/// 1. `[signer]` authority +/// 2. `[writable, signer, optional]` payer +/// 3. `[]` system_program +/// 4. `[optional]` log_wrapper pub struct UpdateCollectionPluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/instructions/update_plugin.rs b/clients/rust/src/generated/instructions/update_plugin.rs index b58d5470..5a9d1364 100644 --- a/clients/rust/src/generated/instructions/update_plugin.rs +++ b/clients/rust/src/generated/instructions/update_plugin.rs @@ -109,7 +109,16 @@ pub struct UpdatePluginInstructionArgs { pub plugin: Plugin, } -/// Instruction builder. +/// Instruction builder for `UpdatePlugin`. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[optional]` system_program (default to `11111111111111111111111111111111`) +/// 5. `[optional]` log_wrapper #[derive(Default)] pub struct UpdatePluginBuilder { asset: Option, @@ -385,7 +394,16 @@ impl<'a, 'b> UpdatePluginCpi<'a, 'b> { } } -/// `update_plugin` CPI instruction builder. +/// Instruction builder for `UpdatePlugin` via CPI. +/// +/// ### Accounts: +/// +/// 0. `[writable]` asset +/// 1. `[writable, optional]` collection +/// 2. `[signer]` authority +/// 3. `[writable, signer, optional]` payer +/// 4. `[]` system_program +/// 5. `[optional]` log_wrapper pub struct UpdatePluginCpiBuilder<'a, 'b> { instruction: Box>, } diff --git a/clients/rust/src/generated/types/mod.rs b/clients/rust/src/generated/types/mod.rs index b76d7f39..0f70edee 100644 --- a/clients/rust/src/generated/types/mod.rs +++ b/clients/rust/src/generated/types/mod.rs @@ -5,42 +5,42 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -pub(crate) mod authority; -pub(crate) mod burn; -pub(crate) mod compression_proof; -pub(crate) mod creator; -pub(crate) mod data_state; -pub(crate) mod external_plugin_record; -pub(crate) mod extra_accounts; -pub(crate) mod freeze; -pub(crate) mod hashable_plugin_schema; -pub(crate) mod hashed_asset_schema; -pub(crate) mod key; -pub(crate) mod plugin; -pub(crate) mod plugin_type; -pub(crate) mod registry_record; -pub(crate) mod royalties; -pub(crate) mod rule_set; -pub(crate) mod transfer; -pub(crate) mod update_authority; -pub(crate) mod update_delegate; +pub(crate) mod r#authority; +pub(crate) mod r#burn; +pub(crate) mod r#compression_proof; +pub(crate) mod r#creator; +pub(crate) mod r#data_state; +pub(crate) mod r#external_plugin_record; +pub(crate) mod r#extra_accounts; +pub(crate) mod r#freeze; +pub(crate) mod r#hashable_plugin_schema; +pub(crate) mod r#hashed_asset_schema; +pub(crate) mod r#key; +pub(crate) mod r#plugin; +pub(crate) mod r#plugin_type; +pub(crate) mod r#registry_record; +pub(crate) mod r#royalties; +pub(crate) mod r#rule_set; +pub(crate) mod r#transfer; +pub(crate) mod r#update_authority; +pub(crate) mod r#update_delegate; -pub use self::authority::*; -pub use self::burn::*; -pub use self::compression_proof::*; -pub use self::creator::*; -pub use self::data_state::*; -pub use self::external_plugin_record::*; -pub use self::extra_accounts::*; -pub use self::freeze::*; -pub use self::hashable_plugin_schema::*; -pub use self::hashed_asset_schema::*; -pub use self::key::*; -pub use self::plugin::*; -pub use self::plugin_type::*; -pub use self::registry_record::*; -pub use self::royalties::*; -pub use self::rule_set::*; -pub use self::transfer::*; -pub use self::update_authority::*; -pub use self::update_delegate::*; +pub use self::r#authority::*; +pub use self::r#burn::*; +pub use self::r#compression_proof::*; +pub use self::r#creator::*; +pub use self::r#data_state::*; +pub use self::r#external_plugin_record::*; +pub use self::r#extra_accounts::*; +pub use self::r#freeze::*; +pub use self::r#hashable_plugin_schema::*; +pub use self::r#hashed_asset_schema::*; +pub use self::r#key::*; +pub use self::r#plugin::*; +pub use self::r#plugin_type::*; +pub use self::r#registry_record::*; +pub use self::r#royalties::*; +pub use self::r#rule_set::*; +pub use self::r#transfer::*; +pub use self::r#update_authority::*; +pub use self::r#update_delegate::*; diff --git a/configs/kinobi.cjs b/configs/kinobi.cjs index 255129de..d49a2189 100755 --- a/configs/kinobi.cjs +++ b/configs/kinobi.cjs @@ -10,7 +10,7 @@ const kinobi = k.createFromIdls([path.join(idlDir, "mpl_core.json")]); // Update programs. kinobi.update( - new k.UpdateProgramsVisitor({ + k.updateProgramsVisitor({ mplCoreProgram: { name: "mplCore" }, }) ); @@ -47,7 +47,7 @@ kinobi.update( // Update instructions. kinobi.update( - new k.UpdateInstructionsVisitor({ + k.updateInstructionsVisitor({ // create: { // bytesCreatedOnChain: k.bytesFromAccount("assetAccount"), // }, @@ -55,9 +55,9 @@ kinobi.update( ); // Set ShankAccount discriminator. -const key = (name) => ({ field: "key", value: k.vEnum("Key", name) }); +const key = (name) => ({ field: "key", value: k.enumValueNode("Key", name) }); kinobi.update( - new k.SetAccountDiscriminatorFromFieldVisitor({ + k.setAccountDiscriminatorFromFieldVisitor({ asset: key("Asset"), collection: key("Collection"), // myPdaAccount: key("MyPdaAccount"), @@ -67,13 +67,13 @@ kinobi.update( // Render JavaScript. const jsDir = path.join(clientDir, "js", "src", "generated"); const prettier = require(path.join(clientDir, "js", ".prettierrc.json")); -kinobi.accept(new k.RenderJavaScriptVisitor(jsDir, { prettier })); +kinobi.accept(k.renderJavaScriptVisitor(jsDir, { prettier })); // Render Rust. const crateDir = path.join(clientDir, "rust"); const rustDir = path.join(clientDir, "rust", "src", "generated"); kinobi.accept( - new k.RenderRustVisitor(rustDir, { + k.renderRustVisitor(rustDir, { formatCode: true, crateFolder: crateDir, }) diff --git a/package.json b/package.json index 551954b4..83512b6c 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "validator:stop": "amman stop" }, "devDependencies": { - "@metaplex-foundation/kinobi": "^0.16.0", - "@metaplex-foundation/shank-js": "^0.1.7", "@metaplex-foundation/amman": "^0.12.1", + "@metaplex-foundation/kinobi": "^0.17.7", + "@metaplex-foundation/shank-js": "^0.1.7", "typescript": "^4.9.4" }, "packageManager": "pnpm@8.9.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b82d4f2..a2335aee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ devDependencies: specifier: ^0.12.1 version: 0.12.1(typescript@4.9.4) '@metaplex-foundation/kinobi': - specifier: ^0.16.0 - version: 0.16.0 + specifier: ^0.17.7 + version: 0.17.7(fastestsmallesttextencoderdecoder@1.0.22) '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 @@ -89,15 +89,18 @@ packages: resolution: {integrity: sha512-S9RulC2fFCFOQraz61bij+5YCHhSO9llJegK8c8Y6731fSi6snUSQJdCUqYS8AIgR0TKbQvdvgSyIIdbDFZbBA==} dev: true - /@metaplex-foundation/kinobi@0.16.0: - resolution: {integrity: sha512-/fYOLJy0fWZFRRIht2iFoWNOrdcmI4RblwLq0iA2cpcF8Im11uY/2tqrrD5noGKMhR1sBVUJHytiFDaP4CbtuQ==} + /@metaplex-foundation/kinobi@0.17.7(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-cfx33zB/a0WH4q9ECoIIEGY3xmQZnmCQThz0oEqUZQ3755DIAv+WwHz3smTvKCLgNj2zchZ45O0xggo/egf1sA==} dependencies: '@noble/hashes': 1.3.3 + '@solana/codecs-strings': 2.0.0-experimental.a157265(fastestsmallesttextencoderdecoder@1.0.22) chalk: 4.1.2 + json-stable-stringify: 1.1.1 nunjucks: 3.2.4 prettier: 2.8.8 transitivePeerDependencies: - chokidar + - fastestsmallesttextencoderdecoder dev: true /@metaplex-foundation/rustbin@0.3.5: @@ -171,6 +174,26 @@ packages: buffer: 6.0.3 dev: true + /@solana/codecs-core@2.0.0-experimental.a157265: + resolution: {integrity: sha512-78SjZiLWWjAn5sVL92T5W+4LXYG01Vu28tVbtiCWi4QEX21794bW6lMcXbPmbivFPbD8Dje+EHAYADfxYj6RTA==} + dev: true + + /@solana/codecs-numbers@2.0.0-experimental.a157265: + resolution: {integrity: sha512-Bkp7Y1KyhMsu8tHKxwHDXCnYxEawT0P4kEsIO1Fzs54pxOS1jtwJHo7e4FE8Kv8ZSajUQAnbmQqj5GaIU08h9A==} + dependencies: + '@solana/codecs-core': 2.0.0-experimental.a157265 + dev: true + + /@solana/codecs-strings@2.0.0-experimental.a157265(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-1AypxqrFipI053/EOHZnDDcfKBduLjJdrpkbcqrgWJyciv/7+fMQjkgjbG+C8Vcqx5G8weUesXCcvAhqbdRwMw==} + peerDependencies: + fastestsmallesttextencoderdecoder: ^1.0.22 + dependencies: + '@solana/codecs-core': 2.0.0-experimental.a157265 + '@solana/codecs-numbers': 2.0.0-experimental.a157265 + fastestsmallesttextencoderdecoder: 1.0.22 + dev: true + /@solana/spl-token-registry@0.2.4574: resolution: {integrity: sha512-JzlfZmke8Rxug20VT/VpI2XsXlsqMlcORIUivF+Yucj7tFi7A0dXG7h+2UnD0WaZJw8BrUz2ABNkUnv89vbv1A==} engines: {node: '>=10'} @@ -396,6 +419,17 @@ packages: node-gyp-build: 4.8.0 dev: true + /call-bind@1.0.7: + resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + set-function-length: 1.2.1 + dev: true + /chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -496,6 +530,15 @@ packages: resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==} dev: true + /define-data-property@1.1.4: + resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + gopd: 1.0.1 + dev: true + /delay@5.0.0: resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==} engines: {node: '>=10'} @@ -558,6 +601,18 @@ packages: - utf-8-validate dev: true + /es-define-property@1.0.0: + resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.4 + dev: true + + /es-errors@1.3.0: + resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} + engines: {node: '>= 0.4'} + dev: true + /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -613,6 +668,10 @@ packages: resolution: {integrity: sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==} dev: true + /fastestsmallesttextencoderdecoder@1.0.22: + resolution: {integrity: sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw==} + dev: true + /file-uri-to-path@1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} dev: true @@ -642,21 +701,65 @@ packages: resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==} dev: true + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + dev: true + /get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} dev: true + /get-intrinsic@1.2.4: + resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + has-proto: 1.0.3 + has-symbols: 1.0.3 + hasown: 2.0.1 + dev: true + /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} dev: true + /gopd@1.0.1: + resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + dependencies: + get-intrinsic: 1.2.4 + dev: true + /has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} dev: true + /has-property-descriptors@1.0.2: + resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} + dependencies: + es-define-property: 1.0.0 + dev: true + + /has-proto@1.0.3: + resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} + engines: {node: '>= 0.4'} + dev: true + + /has-symbols@1.0.3: + resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} + engines: {node: '>= 0.4'} + dev: true + + /hasown@2.0.1: + resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + dev: true + /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -682,6 +785,10 @@ packages: engines: {node: '>=8'} dev: true + /isarray@2.0.5: + resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} + dev: true + /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true @@ -730,10 +837,24 @@ packages: resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==} dev: true + /json-stable-stringify@1.1.1: + resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.7 + isarray: 2.0.5 + jsonify: 0.0.1 + object-keys: 1.1.1 + dev: true + /json-stringify-safe@5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} dev: true + /jsonify@0.0.1: + resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} + dev: true + /jsonparse@1.3.1: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} engines: {'0': node >= 0.2.0} @@ -856,6 +977,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /object-keys@1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + dev: true + /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -941,6 +1067,18 @@ packages: lru-cache: 6.0.0 dev: true + /set-function-length@1.2.1: + resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==} + engines: {node: '>= 0.4'} + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + dev: true + /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'}