diff --git a/clients/js/src/generated/errors/tokenWrap.ts b/clients/js/src/generated/errors/tokenWrap.ts index 6629a86b..5041c8cf 100644 --- a/clients/js/src/generated/errors/tokenWrap.ts +++ b/clients/js/src/generated/errors/tokenWrap.ts @@ -50,7 +50,7 @@ export type TokenWrapError = | typeof TOKEN_WRAP_ERROR__ZERO_WRAP_AMOUNT; let tokenWrapErrorMessages: Record | undefined; -if (process.env.NODE_ENV !== 'production') { +if (process.env['NODE_ENV'] !== 'production') { tokenWrapErrorMessages = { [TOKEN_WRAP_ERROR__BACKPOINTER_MISMATCH]: `Wrapped backpointer account address does not match expected PDA`, [TOKEN_WRAP_ERROR__ESCROW_IN_GOOD_STATE]: `The escrow account is in a good state and cannot be recreated`, @@ -72,7 +72,7 @@ if (process.env.NODE_ENV !== 'production') { } export function getTokenWrapErrorMessage(code: TokenWrapError): string { - if (process.env.NODE_ENV !== 'production') { + if (process.env['NODE_ENV'] !== 'production') { return (tokenWrapErrorMessages as Record)[code]; } diff --git a/clients/js/src/generated/instructions/closeStuckEscrow.ts b/clients/js/src/generated/instructions/closeStuckEscrow.ts index 739eda95..11690cb1 100644 --- a/clients/js/src/generated/instructions/closeStuckEscrow.ts +++ b/clients/js/src/generated/instructions/closeStuckEscrow.ts @@ -32,7 +32,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const CLOSE_STUCK_ESCROW_DISCRIMINATOR = 3; -export function getCloseStuckEscrowDiscriminatorBytes() { +export function getCloseStuckEscrowDiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(CLOSE_STUCK_ESCROW_DISCRIMINATOR); } diff --git a/clients/js/src/generated/instructions/createMint.ts b/clients/js/src/generated/instructions/createMint.ts index e213d498..f5720f2f 100644 --- a/clients/js/src/generated/instructions/createMint.ts +++ b/clients/js/src/generated/instructions/createMint.ts @@ -34,7 +34,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const CREATE_MINT_DISCRIMINATOR = 0; -export function getCreateMintDiscriminatorBytes() { +export function getCreateMintDiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(CREATE_MINT_DISCRIMINATOR); } diff --git a/clients/js/src/generated/instructions/syncMetadataToSplToken.ts b/clients/js/src/generated/instructions/syncMetadataToSplToken.ts index 94dc3b5f..30021adb 100644 --- a/clients/js/src/generated/instructions/syncMetadataToSplToken.ts +++ b/clients/js/src/generated/instructions/syncMetadataToSplToken.ts @@ -32,7 +32,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const SYNC_METADATA_TO_SPL_TOKEN_DISCRIMINATOR = 5; -export function getSyncMetadataToSplTokenDiscriminatorBytes() { +export function getSyncMetadataToSplTokenDiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(SYNC_METADATA_TO_SPL_TOKEN_DISCRIMINATOR); } diff --git a/clients/js/src/generated/instructions/syncMetadataToToken2022.ts b/clients/js/src/generated/instructions/syncMetadataToToken2022.ts index 9f40c8a5..1c9eeb6e 100644 --- a/clients/js/src/generated/instructions/syncMetadataToToken2022.ts +++ b/clients/js/src/generated/instructions/syncMetadataToToken2022.ts @@ -32,7 +32,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const SYNC_METADATA_TO_TOKEN2022_DISCRIMINATOR = 4; -export function getSyncMetadataToToken2022DiscriminatorBytes() { +export function getSyncMetadataToToken2022DiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(SYNC_METADATA_TO_TOKEN2022_DISCRIMINATOR); } diff --git a/clients/js/src/generated/instructions/unwrap.ts b/clients/js/src/generated/instructions/unwrap.ts index 46f1f94c..7eff5e1a 100644 --- a/clients/js/src/generated/instructions/unwrap.ts +++ b/clients/js/src/generated/instructions/unwrap.ts @@ -38,7 +38,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const UNWRAP_DISCRIMINATOR = 2; -export function getUnwrapDiscriminatorBytes() { +export function getUnwrapDiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(UNWRAP_DISCRIMINATOR); } diff --git a/clients/js/src/generated/instructions/wrap.ts b/clients/js/src/generated/instructions/wrap.ts index e22e0937..037b8973 100644 --- a/clients/js/src/generated/instructions/wrap.ts +++ b/clients/js/src/generated/instructions/wrap.ts @@ -38,7 +38,7 @@ import { TOKEN_WRAP_PROGRAM_ADDRESS } from '../programs'; export const WRAP_DISCRIMINATOR = 1; -export function getWrapDiscriminatorBytes() { +export function getWrapDiscriminatorBytes(): ReadonlyUint8Array { return getU8Encoder().encode(WRAP_DISCRIMINATOR); } diff --git a/clients/js/src/generated/programs/tokenWrap.ts b/clients/js/src/generated/programs/tokenWrap.ts index 5b916824..e514e9c1 100644 --- a/clients/js/src/generated/programs/tokenWrap.ts +++ b/clients/js/src/generated/programs/tokenWrap.ts @@ -9,6 +9,7 @@ import { assertIsInstructionWithAccounts, containsBytes, + extendClient, getU8Encoder, SOLANA_ERROR__PROGRAM_CLIENTS__FAILED_TO_IDENTIFY_INSTRUCTION, SOLANA_ERROR__PROGRAM_CLIENTS__UNRECOGNIZED_INSTRUCTION_TYPE, @@ -196,9 +197,10 @@ export type TokenWrapPluginRequirements = ClientWithRpc(client: T) => { - return { - ...client, + return ( + client: T, + ): Omit & { tokenWrap: TokenWrapPlugin } => { + return extendClient(client, { tokenWrap: { accounts: { backpointer: addSelfFetchFunctions(client, getBackpointerCodec()) }, instructions: { @@ -218,6 +220,6 @@ export function tokenWrapProgram() { wrappedMintAuthority: findWrappedMintAuthorityPda, }, }, - }; + }); }; } diff --git a/package.json b/package.json index f6a2167c..b1fa9da2 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ }, "devDependencies": { "@changesets/cli": "^2.31.0", - "@codama/renderers-js": "^2.1.0", + "@codama/renderers-js": "^2.2.0", "@solana-program/system": "^0.12.0", "@solana/sysvars": "^6.8.0", "@solana/prettier-config-solana": "0.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01c2bfaa..5641ad3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^2.31.0 version: 2.31.0(@types/node@25.6.0) '@codama/renderers-js': - specifier: ^2.1.0 - version: 2.1.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + specifier: ^2.2.0 + version: 2.2.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) '@solana-program/system': specifier: ^0.12.0 version: 0.12.0(@solana/kit@6.8.0(bufferutil@4.0.9)(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(utf-8-validate@5.0.10)) @@ -153,39 +153,26 @@ packages: resolution: {integrity: sha512-Cn9SokOi0IpixbdW1Aus61Qt0GCJhWE/+q1OdcvRBAQ4V0NacCpdf7N9aF9HR/H7AD+LWJa3JtK7pEs69ywM6Q==} hasBin: true - '@codama/errors@1.5.1': - resolution: {integrity: sha512-kdLk/OSLBt03DoViRU1Xr0M7NZ7J/CSqaXV8fooF9qMRGPRJdgUeW2VkCGlLXDQSaIALrls3HkHmKRKbqqjSOA==} - hasBin: true - '@codama/errors@1.6.0': resolution: {integrity: sha512-Evj9wO5lqvxvbjxG856ITY5lhRN7SqoYfRX4tMMBjs8J/kT+pKQ8qL0hz9OynOOv/5mWn9Q/sPCNzQ6CUscibQ==} hasBin: true - '@codama/node-types@1.5.1': - resolution: {integrity: sha512-jMGz93MSszb1iXAAyWWa0i7RQbLxGihLKRZ+zr9aBsjaFFmhXhONfTFeSXzbEfc05cajpd/gW2QI7xmQHlUDKQ==} - '@codama/node-types@1.6.0': resolution: {integrity: sha512-atIJW2/3MjPYey0bNlE86W9Gvq9aq8bud7zT7PMyyhj98mbmLqPwT4wclPdbFua0fROLkq17z3bXaaJy5FqSEw==} - '@codama/nodes@1.5.1': - resolution: {integrity: sha512-6fIoH5Cfa5dFUE1fRxymZloeNg02klOT4fHsWwQavkkRWkoySgiti//w0j1itiZj6j5O+usujrwsZUJqSFjnhQ==} - '@codama/nodes@1.6.0': resolution: {integrity: sha512-F6Hy3REfl+Ih5R3jldPqEMjFqaPj871iBWX/LV0EtNK0xn7E4DG/3XCK4wlbHrOT9Z1NsiA70e0M1uChzmIrsw==} - '@codama/renderers-core@1.3.6': - resolution: {integrity: sha512-m3yAmhrObnagyC7d8g9bZxyLC5YMpttLagRE0aAKD4zlDDh23o3zV7TxSYCh2nRCg5ObceflgvXdauIHUm/6Xg==} + '@codama/renderers-core@1.3.7': + resolution: {integrity: sha512-R42xYJaLansjcpMcBuJ4JBEKFp9aof3WqwDnOtUz90P4Px/3K8NDQn18YkyKTEvZBy42cnTPlzV9Um89s9W+uw==} - '@codama/renderers-js@2.1.0': - resolution: {integrity: sha512-Zs9avEFb1+Y4GDPIBTEv/bhHCdjRkAkisWSqNo9edxQyfPj4GzV+0/FtE0AfR+yFkxQVHANlaEpo2dtdS0UPbA==} + '@codama/renderers-js@2.2.0': + resolution: {integrity: sha512-/GWVnB329kMkeqlOqX+NWQAmd1k6yybVOp7C5X+LEvrZ2A5w1saQwWFbBMCq/EQPqnFU+CRFoG/+7KubAEa73Q==} engines: {node: '>=20.18.0'} '@codama/validators@1.6.0': resolution: {integrity: sha512-QlLIQt6EpZ7sQvVOz8NFKtrzWLAwYzle0tet2Q0DDU8+4LO654lj+oAwjXzY3eAfTesqBqOgMCPtQe0EpGWk3g==} - '@codama/visitors-core@1.5.1': - resolution: {integrity: sha512-JotrDJLI7OfPNHulu4KtPfUDF/FYMC3RgEnv9lu47Fiiy0upbGAw1NorgBuoreyJ9Uj0GZyHt7Q5rjrCoa1U0g==} - '@codama/visitors-core@1.6.0': resolution: {integrity: sha512-YG0rExvLbBCDAzXnZX6Imu4KwDoZrZz9NF232/nzs9Dr8uQuEWJ81x4VR9UxIcANHcF0+XwJzHamSwhZroAtjQ==} @@ -618,15 +605,6 @@ packages: typescript: optional: true - '@solana/codecs-core@6.5.0': - resolution: {integrity: sha512-Wb+YUj7vUKz5CxqZkrkugtQjxOP2fkMKnffySRlAmVAkpRnQvBY/2eP3VJAKTgDD4ru9xHSIQSpDu09hC/cQZg==} - engines: {node: '>=20.18.0'} - peerDependencies: - typescript: ^5.0.0 - peerDependenciesMeta: - typescript: - optional: true - '@solana/codecs-core@6.8.0': resolution: {integrity: sha512-udFO8TrvzgROonwX3rY3E2SG675RehILNb4ZYcKlf1mL7vkDJ9bEJnBxi87AEwl8RWZFTl+MhT0MmrJnbpvdug==} engines: {node: '>=20.18.0'} @@ -645,15 +623,6 @@ packages: typescript: optional: true - '@solana/codecs-numbers@6.5.0': - resolution: {integrity: sha512-gU/7eYqD+zl2Kwzo7ctt7YHaxF+c3RX164F+iU4X02dwq8DGVcypp+kmEF1QaO6OiShtdryTxhL+JJmEBjhdfA==} - engines: {node: '>=20.18.0'} - peerDependencies: - typescript: ^5.0.0 - peerDependenciesMeta: - typescript: - optional: true - '@solana/codecs-numbers@6.8.0': resolution: {integrity: sha512-ebf4f1D19EAe0uhdUYOCEYnn5+EellsBxbJ42tM2yYEoIBVz5FoBBC0gSsq+UTNbQHFa7XagyBT3LewxXttiTQ==} engines: {node: '>=20.18.0'} @@ -663,18 +632,6 @@ packages: typescript: optional: true - '@solana/codecs-strings@6.5.0': - resolution: {integrity: sha512-9TuQQxumA9gWJeJzbv1GUg0+o0nZp204EijX3efR+lgBOKbkU7W0UWp33ygAZ+RvWE+kTs48ePoYoJ7UHpyxkQ==} - engines: {node: '>=20.18.0'} - peerDependencies: - fastestsmallesttextencoderdecoder: ^1.0.22 - typescript: ^5.0.0 - peerDependenciesMeta: - fastestsmallesttextencoderdecoder: - optional: true - typescript: - optional: true - '@solana/codecs-strings@6.8.0': resolution: {integrity: sha512-Rpk5NVhbKYcPnE7wz3IpTp0GVNVs0IYKdmyzByiimgPTiII8eb8ay4wQiYHGHrpYh62hD14Qy3GiGDFgipRKqA==} engines: {node: '>=20.18.0'} @@ -696,16 +653,6 @@ packages: typescript: optional: true - '@solana/errors@6.5.0': - resolution: {integrity: sha512-XPc0I8Ck6vgx8Uu+LVLewx/1RWDkXkY3lU+1aN1kmbrPAQWbX4Txk7GPmuIIFpyys8o5aKocYfNxJOPKvfaQhg==} - engines: {node: '>=20.18.0'} - hasBin: true - peerDependencies: - typescript: ^5.0.0 - peerDependenciesMeta: - typescript: - optional: true - '@solana/errors@6.8.0': resolution: {integrity: sha512-HRTrLgTn0c99GKz4v4IKgz2+6soaRY1mh2tLW4sk1Fe4Zzv85Q6ZLK1mXrVGL73z1apyHDrr9/Sd/9ZhUsUvpA==} engines: {node: '>=20.18.0'} @@ -1160,8 +1107,8 @@ packages: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} engines: {node: '>= 0.4'} - call-bind@1.0.8: - resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} + call-bind@1.0.9: + resolution: {integrity: sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==} engines: {node: '>= 0.4'} call-bound@1.0.4: @@ -1422,8 +1369,8 @@ packages: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} - hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + hasown@2.0.3: + resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==} engines: {node: '>= 0.4'} human-id@4.1.3: @@ -2101,45 +2048,32 @@ snapshots: picocolors: 1.1.1 prompts: 2.4.2 - '@codama/errors@1.5.1': - dependencies: - '@codama/node-types': 1.5.1 - commander: 14.0.3 - picocolors: 1.1.1 - '@codama/errors@1.6.0': dependencies: '@codama/node-types': 1.6.0 commander: 14.0.3 picocolors: 1.1.1 - '@codama/node-types@1.5.1': {} - '@codama/node-types@1.6.0': {} - '@codama/nodes@1.5.1': - dependencies: - '@codama/errors': 1.5.1 - '@codama/node-types': 1.5.1 - '@codama/nodes@1.6.0': dependencies: '@codama/errors': 1.6.0 '@codama/node-types': 1.6.0 - '@codama/renderers-core@1.3.6': + '@codama/renderers-core@1.3.7': dependencies: - '@codama/errors': 1.5.1 - '@codama/nodes': 1.5.1 - '@codama/visitors-core': 1.5.1 + '@codama/errors': 1.6.0 + '@codama/nodes': 1.6.0 + '@codama/visitors-core': 1.6.0 - '@codama/renderers-js@2.1.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + '@codama/renderers-js@2.2.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@codama/errors': 1.5.1 - '@codama/nodes': 1.5.1 - '@codama/renderers-core': 1.3.6 - '@codama/visitors-core': 1.5.1 - '@solana/codecs-strings': 6.5.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@codama/errors': 1.6.0 + '@codama/nodes': 1.6.0 + '@codama/renderers-core': 1.3.7 + '@codama/visitors-core': 1.6.0 + '@solana/codecs-strings': 6.8.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) prettier: 3.8.3 semver: 7.7.4 transitivePeerDependencies: @@ -2152,12 +2086,6 @@ snapshots: '@codama/nodes': 1.6.0 '@codama/visitors-core': 1.6.0 - '@codama/visitors-core@1.5.1': - dependencies: - '@codama/errors': 1.5.1 - '@codama/nodes': 1.5.1 - json-stable-stringify: 1.3.0 - '@codama/visitors-core@1.6.0': dependencies: '@codama/errors': 1.6.0 @@ -2486,12 +2414,6 @@ snapshots: optionalDependencies: typescript: 5.9.3 - '@solana/codecs-core@6.5.0(typescript@5.9.3)': - dependencies: - '@solana/errors': 6.5.0(typescript@5.9.3) - optionalDependencies: - typescript: 5.9.3 - '@solana/codecs-core@6.8.0(typescript@5.9.3)': dependencies: '@solana/errors': 6.8.0(typescript@5.9.3) @@ -2506,13 +2428,6 @@ snapshots: optionalDependencies: typescript: 5.9.3 - '@solana/codecs-numbers@6.5.0(typescript@5.9.3)': - dependencies: - '@solana/codecs-core': 6.5.0(typescript@5.9.3) - '@solana/errors': 6.5.0(typescript@5.9.3) - optionalDependencies: - typescript: 5.9.3 - '@solana/codecs-numbers@6.8.0(typescript@5.9.3)': dependencies: '@solana/codecs-core': 6.8.0(typescript@5.9.3) @@ -2520,15 +2435,6 @@ snapshots: optionalDependencies: typescript: 5.9.3 - '@solana/codecs-strings@6.5.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': - dependencies: - '@solana/codecs-core': 6.5.0(typescript@5.9.3) - '@solana/codecs-numbers': 6.5.0(typescript@5.9.3) - '@solana/errors': 6.5.0(typescript@5.9.3) - optionalDependencies: - fastestsmallesttextencoderdecoder: 1.0.22 - typescript: 5.9.3 - '@solana/codecs-strings@6.8.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: '@solana/codecs-core': 6.8.0(typescript@5.9.3) @@ -2550,13 +2456,6 @@ snapshots: transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/errors@6.5.0(typescript@5.9.3)': - dependencies: - chalk: 5.6.2 - commander: 14.0.3 - optionalDependencies: - typescript: 5.9.3 - '@solana/errors@6.8.0(typescript@5.9.3)': dependencies: chalk: 5.6.2 @@ -3118,7 +3017,7 @@ snapshots: es-errors: 1.3.0 function-bind: 1.1.2 - call-bind@1.0.8: + call-bind@1.0.9: dependencies: call-bind-apply-helpers: 1.0.2 es-define-property: 1.0.1 @@ -3389,7 +3288,7 @@ snapshots: get-proto: 1.0.1 gopd: 1.2.0 has-symbols: 1.1.0 - hasown: 2.0.2 + hasown: 2.0.3 math-intrinsics: 1.1.0 get-proto@1.0.1: @@ -3428,7 +3327,7 @@ snapshots: has-symbols@1.1.0: {} - hasown@2.0.2: + hasown@2.0.3: dependencies: function-bind: 1.1.2 @@ -3481,7 +3380,7 @@ snapshots: json-stable-stringify@1.3.0: dependencies: - call-bind: 1.0.8 + call-bind: 1.0.9 call-bound: 1.0.4 isarray: 2.0.5 jsonify: 0.0.1