Bump Kinobi to 0.21.0 and web3.js to tp4 (#4)

clients/js/env-shim.ts

@@ -1,3 +0,0 @@
-// Clever obfuscation to prevent the build system from inlining the value of `NODE_ENV`
-export const __DEV__ = /* @__PURE__ */ (() =>
-  (process as any)['en' + 'v'].NODE_ENV === 'development')();

clients/js/package.json

@@ -34,24 +34,25 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-preview.3"
+    "@solana/web3.js": "2.0.0-preview.4"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
-    "@solana-program/system": "^0.3.1",
-    "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "tp3",
-    "@solana/webcrypto-ed25519-polyfill": "tp3",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
-    "ava": "^6.1.2",
+    "@solana-program/system": "^0.4.0",
+    "@solana/eslint-config-solana": "^3.0.3",
+    "@solana/web3.js": "2.0.0-preview.4",
+    "@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.4",
+    "@types/node": "^20",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
+    "ava": "^6.1.3",
     "eslint": "^8.57.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.2",
     "typedoc": "^0.25.12",
     "typedoc-plugin-missing-exports": "^2.2.0",
-    "typescript": "^5.4.2"
+    "typescript": "^5.5.3"
   },
   "ava": {
     "require": [

clients/js/src/generated/accounts/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './mint';

clients/js/src/generated/accounts/mint.ts

@@ -3,22 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Account,
-  Address,
-  Codec,
-  Decoder,
-  EncodedAccount,
-  Encoder,
-  FetchAccountConfig,
-  FetchAccountsConfig,
-  MaybeAccount,
-  MaybeEncodedAccount,
-  Option,
-  OptionOrNullable,
   assertAccountExists,
   assertAccountsExist,
   combineCodec,
@@ -39,6 +27,18 @@ import {
   getU64Encoder,
   getU8Decoder,
   getU8Encoder,
+  type Account,
+  type Address,
+  type Codec,
+  type Decoder,
+  type EncodedAccount,
+  type Encoder,
+  type FetchAccountConfig,
+  type FetchAccountsConfig,
+  type MaybeAccount,
+  type MaybeEncodedAccount,
+  type Option,
+  type OptionOrNullable,
 } from '@solana/web3.js';
 
 export type Mint = {
@@ -81,7 +81,7 @@ export function getMintEncoder(): Encoder<MintArgs> {
       'mintAuthority',
       getOptionEncoder(getAddressEncoder(), {
         prefix: getU32Encoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['supply', getU64Encoder()],
@@ -91,7 +91,7 @@ export function getMintEncoder(): Encoder<MintArgs> {
       'freezeAuthority',
       getOptionEncoder(getAddressEncoder(), {
         prefix: getU32Encoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
   ]);
@@ -103,7 +103,7 @@ export function getMintDecoder(): Decoder<Mint> {
       'mintAuthority',
       getOptionDecoder(getAddressDecoder(), {
         prefix: getU32Decoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['supply', getU64Decoder()],
@@ -113,7 +113,7 @@ export function getMintDecoder(): Decoder<Mint> {
       'freezeAuthority',
       getOptionDecoder(getAddressDecoder(), {
         prefix: getU32Decoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
   ]);

clients/js/src/generated/accounts/multisig.ts

@@ -3,20 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Account,
-  Address,
-  Codec,
-  Decoder,
-  EncodedAccount,
-  Encoder,
-  FetchAccountConfig,
-  FetchAccountsConfig,
-  MaybeAccount,
-  MaybeEncodedAccount,
   assertAccountExists,
   assertAccountsExist,
   combineCodec,
@@ -33,6 +23,16 @@ import {
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
+  type Account,
+  type Address,
+  type Codec,
+  type Decoder,
+  type EncodedAccount,
+  type Encoder,
+  type FetchAccountConfig,
+  type FetchAccountsConfig,
+  type MaybeAccount,
+  type MaybeEncodedAccount,
 } from '@solana/web3.js';
 
 export type Multisig = {

clients/js/src/generated/accounts/token.ts

@@ -3,22 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Account,
-  Address,
-  Codec,
-  Decoder,
-  EncodedAccount,
-  Encoder,
-  FetchAccountConfig,
-  FetchAccountsConfig,
-  MaybeAccount,
-  MaybeEncodedAccount,
-  Option,
-  OptionOrNullable,
   assertAccountExists,
   assertAccountsExist,
   combineCodec,
@@ -35,12 +23,24 @@ import {
   getU32Encoder,
   getU64Decoder,
   getU64Encoder,
+  type Account,
+  type Address,
+  type Codec,
+  type Decoder,
+  type EncodedAccount,
+  type Encoder,
+  type FetchAccountConfig,
+  type FetchAccountsConfig,
+  type MaybeAccount,
+  type MaybeEncodedAccount,
+  type Option,
+  type OptionOrNullable,
 } from '@solana/web3.js';
 import {
-  AccountState,
-  AccountStateArgs,
   getAccountStateDecoder,
   getAccountStateEncoder,
+  type AccountState,
+  type AccountStateArgs,
 } from '../types';
 
 export type Token = {
@@ -106,7 +106,7 @@ export function getTokenEncoder(): Encoder<TokenArgs> {
       'delegate',
       getOptionEncoder(getAddressEncoder(), {
         prefix: getU32Encoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['state', getAccountStateEncoder()],
@@ -114,7 +114,7 @@ export function getTokenEncoder(): Encoder<TokenArgs> {
       'isNative',
       getOptionEncoder(getU64Encoder(), {
         prefix: getU32Encoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['delegatedAmount', getU64Encoder()],
@@ -122,7 +122,7 @@ export function getTokenEncoder(): Encoder<TokenArgs> {
       'closeAuthority',
       getOptionEncoder(getAddressEncoder(), {
         prefix: getU32Encoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
   ]);
@@ -137,7 +137,7 @@ export function getTokenDecoder(): Decoder<Token> {
       'delegate',
       getOptionDecoder(getAddressDecoder(), {
         prefix: getU32Decoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['state', getAccountStateDecoder()],
@@ -145,7 +145,7 @@ export function getTokenDecoder(): Decoder<Token> {
       'isNative',
       getOptionDecoder(getU64Decoder(), {
         prefix: getU32Decoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
     ['delegatedAmount', getU64Decoder()],
@@ -153,7 +153,7 @@ export function getTokenDecoder(): Decoder<Token> {
       'closeAuthority',
       getOptionDecoder(getAddressDecoder(), {
         prefix: getU32Decoder(),
-        fixed: true,
+        noneValue: 'zeroes',
       }),
     ],
   ]);

clients/js/src/generated/errors/associatedToken.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 /** InvalidOwner: Associated token account owner does not match address derivation */
@@ -14,7 +14,7 @@ export type AssociatedTokenError = typeof ASSOCIATED_TOKEN_ERROR__INVALID_OWNER;
 let associatedTokenErrorMessages:
   | Record<AssociatedTokenError, string>
   | undefined;
-if (__DEV__) {
+if (process.env.NODE_ENV !== 'production') {
   associatedTokenErrorMessages = {
     [ASSOCIATED_TOKEN_ERROR__INVALID_OWNER]: `Associated token account owner does not match address derivation`,
   };
@@ -23,11 +23,11 @@ if (__DEV__) {
 export function getAssociatedTokenErrorMessage(
   code: AssociatedTokenError
 ): string {
-  if (__DEV__) {
+  if (process.env.NODE_ENV !== 'production') {
     return (
       associatedTokenErrorMessages as Record<AssociatedTokenError, string>
     )[code];
   }
 
-  return 'Error message not available in production bundles. Compile with `__DEV__` set to true to see more information.';
+  return 'Error message not available in production bundles.';
 }

clients/js/src/generated/errors/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './associatedToken';

clients/js/src/generated/errors/token.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 /** NotRentExempt: Lamport balance below rent-exempt threshold */
@@ -70,7 +70,7 @@ export type TokenError =
   | typeof TOKEN_ERROR__UNINITIALIZED_STATE;
 
 let tokenErrorMessages: Record<TokenError, string> | undefined;
-if (__DEV__) {
+if (process.env.NODE_ENV !== 'production') {
   tokenErrorMessages = {
     [TOKEN_ERROR__ACCOUNT_FROZEN]: `Account is frozen`,
     [TOKEN_ERROR__ALREADY_IN_USE]: `Already in use`,
@@ -96,9 +96,9 @@ if (__DEV__) {
 }
 
 export function getTokenErrorMessage(code: TokenError): string {
-  if (__DEV__) {
+  if (process.env.NODE_ENV !== 'production') {
     return (tokenErrorMessages as Record<TokenError, string>)[code];
   }
 
-  return 'Error message not available in production bundles. Compile with `__DEV__` set to true to see more information.';
+  return 'Error message not available in production bundles.';
 }

clients/js/src/generated/global.d.ts

@@ -1,11 +0,0 @@
-/**
- * This code was AUTOGENERATED using the kinobi library.
- * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
- *
- * @see https://github.com/metaplex-foundation/kinobi
- */
-
-/** Global variable provided by bundlers telling us if we are building for production or not. */
-// eslint-disable-next-line @typescript-eslint/naming-convention
-declare const __DEV__: boolean;

clients/js/src/generated/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './accounts';

clients/js/src/generated/instructions/amountToUiAmount.ts

@@ -3,19 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -24,9 +15,18 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type AmountToUiAmountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/approve.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type ApproveInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/approveChecked.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type ApproveCheckedInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/burn.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type BurnInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/burnChecked.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type BurnCheckedInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/closeAccount.ts

@@ -3,33 +3,33 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type CloseAccountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/createAssociatedToken.ts

@@ -3,36 +3,36 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  TransactionSigner,
-  WritableAccount,
-  WritableSignerAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type TransactionSigner,
+  type WritableAccount,
+  type WritableSignerAccount,
 } from '@solana/web3.js';
 import { findAssociatedTokenPda } from '../pdas';
 import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 import {
-  ResolvedAccount,
   expectAddress,
   getAccountMetaFactory,
+  type ResolvedAccount,
 } from '../shared';
 
 export type CreateAssociatedTokenInstruction<

clients/js/src/generated/instructions/createAssociatedTokenIdempotent.ts

@@ -3,36 +3,36 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  TransactionSigner,
-  WritableAccount,
-  WritableSignerAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type TransactionSigner,
+  type WritableAccount,
+  type WritableSignerAccount,
 } from '@solana/web3.js';
 import { findAssociatedTokenPda } from '../pdas';
 import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 import {
-  ResolvedAccount,
   expectAddress,
   getAccountMetaFactory,
+  type ResolvedAccount,
 } from '../shared';
 
 export type CreateAssociatedTokenIdempotentInstruction<

clients/js/src/generated/instructions/freezeAccount.ts

@@ -3,33 +3,33 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type FreezeAccountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/getAccountDataSize.ts

@@ -3,28 +3,28 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type GetAccountDataSizeInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './amountToUiAmount';

clients/js/src/generated/instructions/initializeAccount.ts

@@ -3,29 +3,29 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeAccountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeAccount2.ts

@@ -3,20 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  WritableAccount,
   combineCodec,
   getAddressDecoder,
   getAddressEncoder,
@@ -25,9 +15,19 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeAccount2Instruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeAccount3.ts

@@ -3,20 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  WritableAccount,
   combineCodec,
   getAddressDecoder,
   getAddressEncoder,
@@ -25,9 +15,19 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeAccount3Instruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeImmutableOwner.ts

@@ -3,28 +3,28 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeImmutableOwnerInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeMint.ts

@@ -3,22 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  Option,
-  OptionOrNullable,
-  ReadonlyAccount,
-  WritableAccount,
   combineCodec,
   getAddressDecoder,
   getAddressEncoder,
@@ -30,9 +18,21 @@ import {
   getU8Encoder,
   none,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type Option,
+  type OptionOrNullable,
+  type ReadonlyAccount,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeMintInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeMint2.ts

@@ -3,21 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  Option,
-  OptionOrNullable,
-  WritableAccount,
   combineCodec,
   getAddressDecoder,
   getAddressEncoder,
@@ -29,9 +18,20 @@ import {
   getU8Encoder,
   none,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type Option,
+  type OptionOrNullable,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeMint2Instruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeMultisig.ts

@@ -3,30 +3,30 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeMultisigInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/initializeMultisig2.ts

@@ -3,29 +3,29 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type InitializeMultisig2Instruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/mintTo.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type MintToInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/mintToChecked.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type MintToCheckedInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/recoverNestedAssociatedToken.ts

@@ -3,36 +3,36 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  TransactionSigner,
-  WritableAccount,
-  WritableSignerAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type TransactionSigner,
+  type WritableAccount,
+  type WritableSignerAccount,
 } from '@solana/web3.js';
 import { findAssociatedTokenPda } from '../pdas';
 import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS } from '../programs';
 import {
-  ResolvedAccount,
   expectAddress,
   getAccountMetaFactory,
+  type ResolvedAccount,
 } from '../shared';
 
 export type RecoverNestedAssociatedTokenInstruction<

clients/js/src/generated/instructions/revoke.ts

@@ -3,33 +3,33 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type RevokeInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/setAuthority.ts

@@ -3,26 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  Option,
-  OptionOrNullable,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getAddressDecoder,
   getAddressEncoder,
@@ -33,14 +18,29 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type Option,
+  type OptionOrNullable,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 import {
-  AuthorityType,
-  AuthorityTypeArgs,
   getAuthorityTypeDecoder,
   getAuthorityTypeEncoder,
+  type AuthorityType,
+  type AuthorityTypeArgs,
 } from '../types';
 
 export type SetAuthorityInstruction<

clients/js/src/generated/instructions/syncNative.ts

@@ -3,28 +3,28 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type SyncNativeInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/thawAccount.ts

@@ -3,33 +3,33 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type ThawAccountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/transfer.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type TransferInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/transferChecked.ts

@@ -3,24 +3,11 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
-  ReadonlySignerAccount,
-  TransactionSigner,
-  WritableAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -29,9 +16,22 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type TransferCheckedInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/instructions/uiAmountToAmount.ts

@@ -3,19 +3,10 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  Codec,
-  Decoder,
-  Encoder,
-  IAccountMeta,
-  IInstruction,
-  IInstructionWithAccounts,
-  IInstructionWithData,
-  ReadonlyAccount,
   combineCodec,
   getStructDecoder,
   getStructEncoder,
@@ -24,9 +15,18 @@ import {
   getUtf8Decoder,
   getUtf8Encoder,
   transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ADDRESS } from '../programs';
-import { ResolvedAccount, getAccountMetaFactory } from '../shared';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
 export type UiAmountToAmountInstruction<
   TProgram extends string = typeof TOKEN_PROGRAM_ADDRESS,

clients/js/src/generated/pdas/associatedToken.ts

@@ -3,14 +3,14 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Address,
-  ProgramDerivedAddress,
   getAddressEncoder,
   getProgramDerivedAddress,
+  type Address,
+  type ProgramDerivedAddress,
 } from '@solana/web3.js';
 
 export type AssociatedTokenSeeds = {

clients/js/src/generated/pdas/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './associatedToken';

clients/js/src/generated/programs/associatedToken.ts

@@ -3,14 +3,14 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
-import { Address, containsBytes, getU8Encoder } from '@solana/web3.js';
+import { containsBytes, getU8Encoder, type Address } from '@solana/web3.js';
 import {
-  ParsedCreateAssociatedTokenIdempotentInstruction,
-  ParsedCreateAssociatedTokenInstruction,
-  ParsedRecoverNestedAssociatedTokenInstruction,
+  type ParsedCreateAssociatedTokenIdempotentInstruction,
+  type ParsedCreateAssociatedTokenInstruction,
+  type ParsedRecoverNestedAssociatedTokenInstruction,
 } from '../instructions';
 
 export const ASSOCIATED_TOKEN_PROGRAM_ADDRESS =

clients/js/src/generated/programs/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './associatedToken';

clients/js/src/generated/programs/token.ts

@@ -3,36 +3,36 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
-import { Address, containsBytes, getU8Encoder } from '@solana/web3.js';
+import { containsBytes, getU8Encoder, type Address } from '@solana/web3.js';
 import {
-  ParsedAmountToUiAmountInstruction,
-  ParsedApproveCheckedInstruction,
-  ParsedApproveInstruction,
-  ParsedBurnCheckedInstruction,
-  ParsedBurnInstruction,
-  ParsedCloseAccountInstruction,
-  ParsedFreezeAccountInstruction,
-  ParsedGetAccountDataSizeInstruction,
-  ParsedInitializeAccount2Instruction,
-  ParsedInitializeAccount3Instruction,
-  ParsedInitializeAccountInstruction,
-  ParsedInitializeImmutableOwnerInstruction,
-  ParsedInitializeMint2Instruction,
-  ParsedInitializeMintInstruction,
-  ParsedInitializeMultisig2Instruction,
-  ParsedInitializeMultisigInstruction,
-  ParsedMintToCheckedInstruction,
-  ParsedMintToInstruction,
-  ParsedRevokeInstruction,
-  ParsedSetAuthorityInstruction,
-  ParsedSyncNativeInstruction,
-  ParsedThawAccountInstruction,
-  ParsedTransferCheckedInstruction,
-  ParsedTransferInstruction,
-  ParsedUiAmountToAmountInstruction,
+  type ParsedAmountToUiAmountInstruction,
+  type ParsedApproveCheckedInstruction,
+  type ParsedApproveInstruction,
+  type ParsedBurnCheckedInstruction,
+  type ParsedBurnInstruction,
+  type ParsedCloseAccountInstruction,
+  type ParsedFreezeAccountInstruction,
+  type ParsedGetAccountDataSizeInstruction,
+  type ParsedInitializeAccount2Instruction,
+  type ParsedInitializeAccount3Instruction,
+  type ParsedInitializeAccountInstruction,
+  type ParsedInitializeImmutableOwnerInstruction,
+  type ParsedInitializeMint2Instruction,
+  type ParsedInitializeMintInstruction,
+  type ParsedInitializeMultisig2Instruction,
+  type ParsedInitializeMultisigInstruction,
+  type ParsedMintToCheckedInstruction,
+  type ParsedMintToInstruction,
+  type ParsedRevokeInstruction,
+  type ParsedSetAuthorityInstruction,
+  type ParsedSyncNativeInstruction,
+  type ParsedThawAccountInstruction,
+  type ParsedTransferCheckedInstruction,
+  type ParsedTransferInstruction,
+  type ParsedUiAmountToAmountInstruction,
 } from '../instructions';
 
 export const TOKEN_PROGRAM_ADDRESS =

clients/js/src/generated/shared/index.ts

@@ -3,18 +3,18 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
   AccountRole,
-  Address,
-  IAccountMeta,
-  IAccountSignerMeta,
-  ProgramDerivedAddress,
-  TransactionSigner,
   isProgramDerivedAddress,
   isTransactionSigner as web3JsIsTransactionSigner,
+  type Address,
+  type IAccountMeta,
+  type IAccountSignerMeta,
+  type ProgramDerivedAddress,
+  type TransactionSigner,
   upgradeRoleToSigner,
 } from '@solana/web3.js';
 

clients/js/src/generated/types/accountState.ts

@@ -3,16 +3,16 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Codec,
-  Decoder,
-  Encoder,
   combineCodec,
   getEnumDecoder,
   getEnumEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
 } from '@solana/web3.js';
 
 export enum AccountState {

clients/js/src/generated/types/authorityType.ts

@@ -3,16 +3,16 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 import {
-  Codec,
-  Decoder,
-  Encoder,
   combineCodec,
   getEnumDecoder,
   getEnumEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
 } from '@solana/web3.js';
 
 export enum AuthorityType {

clients/js/src/generated/types/index.ts

@@ -3,7 +3,7 @@
  * Please DO NOT EDIT THIS FILE, instead use visitors
  * to add features, then rerun kinobi to update it.
  *
- * @see https://github.com/metaplex-foundation/kinobi
+ * @see https://github.com/kinobi-so/kinobi
  */
 
 export * from './accountState';

clients/js/tsup.config.ts

@@ -1,11 +1,9 @@
 import { env } from 'node:process';
-import path from 'path';
 import { defineConfig, Options } from 'tsup';
 
 const SHARED_OPTIONS: Options = {
   define: { __VERSION__: `"${env.npm_package_version}"` },
   entry: ['./src/index.ts'],
-  inject: [path.resolve(__dirname, 'env-shim.ts')],
   outDir: './dist/src',
   outExtension: ({ format }) => ({ js: format === 'cjs' ? '.js' : '.mjs' }),
   sourcemap: true,

package.json

@@ -11,10 +11,10 @@
   },
   "devDependencies": {
     "@iarna/toml": "^2.2.5",
-    "kinobi": "^0.20.1",
-    "@kinobi-so/renderers-js": "^0.20.1",
-    "@kinobi-so/renderers-rust": "^0.20.1",
-    "typescript": "^5.4.2",
+    "kinobi": "^0.21.0",
+    "@kinobi-so/renderers-js": "^0.21.0",
+    "@kinobi-so/renderers-rust": "^0.21.0",
+    "typescript": "^5.5.2",
     "zx": "^7.2.3"
   },
   "packageManager": "pnpm@9.1.0"

pnpm-lock.yaml

@@ -12,17 +12,17 @@ importers:
         specifier: ^2.2.5
         version: 2.2.5
       '@kinobi-so/renderers-js':
-        specifier: ^0.20.1
-        version: 0.20.1(fastestsmallesttextencoderdecoder@1.0.22)
+        specifier: ^0.21.0
+        version: 0.21.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)
       '@kinobi-so/renderers-rust':
-        specifier: ^0.20.1
-        version: 0.20.1(fastestsmallesttextencoderdecoder@1.0.22)
+        specifier: ^0.21.0
+        version: 0.21.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)
       kinobi:
-        specifier: ^0.20.1
-        version: 0.20.1
+        specifier: ^0.21.0
+        version: 0.21.0
       typescript:
-        specifier: ^5.4.2
-        version: 5.4.5
+        specifier: ^5.5.2
+        version: 5.5.3
       zx:
         specifier: ^7.2.3
         version: 7.2.3
@@ -32,33 +32,40 @@ packages:
   '@iarna/toml@2.2.5':
     resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
 
-  '@kinobi-so/errors@0.20.1':
-    resolution: {integrity: sha512-fXKuaJZpvXSqQmhdxrx8KatS31eFKjyTMTnQ9jkv2h5UQrZzbr6wyWH9ZceM96D8YGw+FopRovu9N1dUILuceA==}
+  '@kinobi-so/errors@0.21.0':
+    resolution: {integrity: sha512-7dPK35L/Y01qzekhVHdKAu+lENmHhuwX39rIx3qNJpNPHKi1VCcorLuOJlfT2F9MPPUjv5pZliL5qQ5IsvtNMw==}
     hasBin: true
 
-  '@kinobi-so/node-types@0.20.1':
-    resolution: {integrity: sha512-xdxJj613WOsS2Vr09uNrmoSkqASkZLhT+CebrMtvhGuCK5ndiHfNjT/7VQYQ7+EbMT9hK76MmVavzyP97uRfkg==}
+  '@kinobi-so/node-types@0.21.0':
+    resolution: {integrity: sha512-UmzjocmsLa1pZ/ExVklGRsWQZNoIvifKBuTEAcpdxlDhg6hmrMWoXwWvRrLI5o7v1WKvTucv7KuM+5GU9UhFDw==}
 
-  '@kinobi-so/nodes@0.20.1':
-    resolution: {integrity: sha512-dRX3kfjrcY81pmt7jAhBiEAygLHwTWVST8R20f7zpXyxm7dFWKmUX57litLsjchg7USEQYCcMAve47BVNO9QxQ==}
+  '@kinobi-so/nodes-from-anchor@0.20.9':
+    resolution: {integrity: sha512-xNlwvJek6Hbfi45Unocwq/lT3rFXhmpZcAZmQJMgdIH8E4iAya9ZQ89j4neRQ+C1KVrK9qFJh0SaJvt9xnJQXA==}
 
-  '@kinobi-so/renderers-core@0.20.1':
-    resolution: {integrity: sha512-bhzoGEPHOHIRK1q6CoRYY1pIy+O4PQ5WoBxCiuKaQ6zdQQP58o1AdTPY0Udmyf9swGTRaNKXLu1N0zcUo/G/5A==}
+  '@kinobi-so/nodes@0.21.0':
+    resolution: {integrity: sha512-Z8STFjB3/f9LzK494l6qydkBMsFtnm96YreJjlAg9/DeKNtphimslSvFTF/9qHiGMfOQpOVhQqbWFXpt+PCZiQ==}
 
-  '@kinobi-so/renderers-js@0.20.1':
-    resolution: {integrity: sha512-POSwrIvuoxv9ibxLeRVNWxxzLjwdS43R80pOmgIlq+4oCITzd1AKTYSBWhf4ioAi4il6RS/LJOJPuBmo9mx9wA==}
+  '@kinobi-so/renderers-core@0.20.7':
+    resolution: {integrity: sha512-KJhU8+UMowO9dDkLhEodAkbRkgSxdfBWeY+DIgOCgXcakt0T140K7OREuaAo9fp12Owf+10SAEGx9AzTNySoHA==}
 
-  '@kinobi-so/renderers-rust@0.20.1':
-    resolution: {integrity: sha512-W7VfgBEVxbrq1/zq7KMSSbgDgfb9B2nYDMabM4EULGMnHuphmCpctsnaD5Ag6i9GhJWjgNMcFlRJuNj0328KiA==}
+  '@kinobi-so/renderers-js@0.21.0':
+    resolution: {integrity: sha512-KjYU9BB8U2O9u2FZD+CIoMHgt6dSqO+cwDGIjCaH/GIsiKU5WDfO2IuBSoDWTO37icSVbzM2NeHyW3+RfUyYDg==}
 
-  '@kinobi-so/validators@0.20.1':
-    resolution: {integrity: sha512-rQ/3XPzY/z63nk+4I5g9JO7VAo3L/O8ZRCCgZkOlBRuRsU+kvR+LYPKu1NqRO1scFDU+uu57tUnycDiT0kzDRA==}
+  '@kinobi-so/renderers-rust@0.21.0':
+    resolution: {integrity: sha512-BLe1SW6XFBhjtZdCc7cuukMWrJTbhCafCCmXryLmjzF7jaiK9nyZZFinHxljSac4HCk2vDn22mHAwOjabaDQ2Q==}
 
-  '@kinobi-so/visitors-core@0.20.1':
-    resolution: {integrity: sha512-jSCniUzty6b0AB+X9tCT52+9ypiJzuVjd39ZlUT7cOFqX4GNCYR5d+XE2N0r6nnn3Fyrwy9wTvm42/4jndKJMg==}
+  '@kinobi-so/validators@0.21.0':
+    resolution: {integrity: sha512-mpBqgqlto/Wdj6rlf1mqWkyw00rPJw98bkNItXq+ofCEtBsjaMq9lsevCE+IPmfJJYEPFGHGJW4Gb6m/cLmOqw==}
 
-  '@kinobi-so/visitors@0.20.1':
-    resolution: {integrity: sha512-lUlB6sCPnMyN6ytRkCxAcEfNBcSRD0Gr3Egd7CJexxrhtg0ngSrBU/BH1m6YuBSt8InuuuFjCdmwbmG3ALDj+w==}
+  '@kinobi-so/visitors-core@0.21.0':
+    resolution: {integrity: sha512-m6C/cAy7q7ZAWhByQGo2YnBsbt0qS3Un0lyT4mmPGQt0QFXUDExFipjTvY/NnzZ5lQJ2grvnL04pqLx8V7eiuw==}
+
+  '@kinobi-so/visitors@0.21.0':
+    resolution: {integrity: sha512-gigysLJCfVtNCFkdDMeHGB+1SOvoiQOPUVKxewzOq1wDYVioFmmf4aXfB1GCEslLlMvl63cTJrwvh8bDIZoaSA==}
+
+  '@noble/hashes@1.4.0':
+    resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==}
+    engines: {node: '>= 16'}
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -72,20 +79,27 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
-  '@solana/codecs-core@2.0.0-preview.2':
-    resolution: {integrity: sha512-gLhCJXieSCrAU7acUJjbXl+IbGnqovvxQLlimztPoGgfLQ1wFYu+XJswrEVQqknZYK1pgxpxH3rZ+OKFs0ndQg==}
+  '@solana/codecs-core@2.0.0-preview.4':
+    resolution: {integrity: sha512-A0VVuDDA5kNKZUinOqHxJQK32aKTucaVbvn31YenGzHX1gPqq+SOnFwgaEY6pq4XEopSmaK16w938ZQS8IvCnw==}
+    peerDependencies:
+      typescript: '>=5'
 
-  '@solana/codecs-numbers@2.0.0-preview.2':
-    resolution: {integrity: sha512-aLZnDTf43z4qOnpTcDsUVy1Ci9im1Md8thWipSWbE+WM9ojZAx528oAql+Cv8M8N+6ALKwgVRhPZkto6E59ARw==}
+  '@solana/codecs-numbers@2.0.0-preview.4':
+    resolution: {integrity: sha512-Q061rLtMadsO7uxpguT+Z7G4UHnjQ6moVIxAQxR58nLxDPCC7MB1Pk106/Z7NDhDLHTcd18uO6DZ7ajHZEn2XQ==}
+    peerDependencies:
+      typescript: '>=5'
 
-  '@solana/codecs-strings@2.0.0-preview.2':
-    resolution: {integrity: sha512-EgBwY+lIaHHgMJIqVOGHfIfpdmmUDNoNO/GAUGeFPf+q0dF+DtwhJPEMShhzh64X2MeCZcmSO6Kinx0Bvmmz2g==}
+  '@solana/codecs-strings@2.0.0-preview.4':
+    resolution: {integrity: sha512-YDbsQePRWm+xnrfS64losSGRg8Wb76cjK1K6qfR8LPmdwIC3787x9uW5/E4icl/k+9nwgbIRXZ65lpF+ucZUnw==}
     peerDependencies:
       fastestsmallesttextencoderdecoder: ^1.0.22
+      typescript: '>=5'
 
-  '@solana/errors@2.0.0-preview.2':
-    resolution: {integrity: sha512-H2DZ1l3iYF5Rp5pPbJpmmtCauWeQXRJapkDg8epQ8BJ7cA2Ut/QEtC3CMmw/iMTcuS6uemFNLcWvlOfoQhvQuA==}
+  '@solana/errors@2.0.0-preview.4':
+    resolution: {integrity: sha512-kadtlbRv2LCWr8A9V22On15Us7Nn8BvqNaOB4hXsTB3O0fU40D1ru2l+cReqLcRPij4znqlRzW9Xi0m6J5DIhA==}
     hasBin: true
+    peerDependencies:
+      typescript: '>=5'
 
   '@types/fs-extra@11.0.4':
     resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
@@ -127,6 +141,10 @@ packages:
     resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==}
     engines: {node: '>=18'}
 
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
   commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
@@ -258,8 +276,8 @@ packages:
   jsonify@0.0.1:
     resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
 
-  kinobi@0.20.1:
-    resolution: {integrity: sha512-oA/X2Q9yP2ZVt49dI9wvfVVoRGdyX6cHcd0Pm9QOInO7I5tCt8VS46fXw+sWxxkDzRFPVrKBJ11pE+K7tvIX4w==}
+  kinobi@0.21.0:
+    resolution: {integrity: sha512-T71VNh4yS8uSvtNp1FEWhJGygW5/8O82SAlFRlPYsWiwqWH9X3eZwwUthBVH7dfazqs8GLia0rAMEmUP99iwLw==}
 
   map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
@@ -308,8 +326,8 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+  prettier@3.3.3:
+    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -349,8 +367,8 @@ packages:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
-  typescript@5.4.5:
-    resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+  typescript@5.5.3:
+    resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -388,67 +406,79 @@ snapshots:
 
   '@iarna/toml@2.2.5': {}
 
-  '@kinobi-so/errors@0.20.1':
+  '@kinobi-so/errors@0.21.0':
     dependencies:
-      '@kinobi-so/node-types': 0.20.1
+      '@kinobi-so/node-types': 0.21.0
       chalk: 5.3.0
       commander: 12.0.0
 
-  '@kinobi-so/node-types@0.20.1': {}
+  '@kinobi-so/node-types@0.21.0': {}
+
+  '@kinobi-so/nodes-from-anchor@0.20.9':
+    dependencies:
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/visitors': 0.21.0
+      '@noble/hashes': 1.4.0
 
-  '@kinobi-so/nodes@0.20.1':
+  '@kinobi-so/nodes@0.21.0':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/node-types': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/node-types': 0.21.0
 
-  '@kinobi-so/renderers-core@0.20.1':
+  '@kinobi-so/renderers-core@0.20.7':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/visitors-core': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/visitors-core': 0.21.0
 
-  '@kinobi-so/renderers-js@0.20.1(fastestsmallesttextencoderdecoder@1.0.22)':
+  '@kinobi-so/renderers-js@0.21.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/renderers-core': 0.20.1
-      '@kinobi-so/visitors-core': 0.20.1
-      '@solana/codecs-strings': 2.0.0-preview.2(fastestsmallesttextencoderdecoder@1.0.22)
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/nodes-from-anchor': 0.20.9
+      '@kinobi-so/renderers-core': 0.20.7
+      '@kinobi-so/visitors-core': 0.21.0
+      '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)
       nunjucks: 3.2.4
-      prettier: 3.2.5
+      prettier: 3.3.3
     transitivePeerDependencies:
       - chokidar
       - fastestsmallesttextencoderdecoder
+      - typescript
 
-  '@kinobi-so/renderers-rust@0.20.1(fastestsmallesttextencoderdecoder@1.0.22)':
+  '@kinobi-so/renderers-rust@0.21.0(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/renderers-core': 0.20.1
-      '@kinobi-so/visitors-core': 0.20.1
-      '@solana/codecs-strings': 2.0.0-preview.2(fastestsmallesttextencoderdecoder@1.0.22)
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/renderers-core': 0.20.7
+      '@kinobi-so/visitors-core': 0.21.0
+      '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)
       nunjucks: 3.2.4
     transitivePeerDependencies:
       - chokidar
       - fastestsmallesttextencoderdecoder
+      - typescript
 
-  '@kinobi-so/validators@0.20.1':
+  '@kinobi-so/validators@0.21.0':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/visitors-core': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/visitors-core': 0.21.0
 
-  '@kinobi-so/visitors-core@0.20.1':
+  '@kinobi-so/visitors-core@0.21.0':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
       json-stable-stringify: 1.1.1
 
-  '@kinobi-so/visitors@0.20.1':
+  '@kinobi-so/visitors@0.21.0':
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/visitors-core': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/visitors-core': 0.21.0
+
+  '@noble/hashes@1.4.0': {}
 
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
@@ -462,26 +492,30 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.17.1
 
-  '@solana/codecs-core@2.0.0-preview.2':
+  '@solana/codecs-core@2.0.0-preview.4(typescript@5.5.3)':
     dependencies:
-      '@solana/errors': 2.0.0-preview.2
+      '@solana/errors': 2.0.0-preview.4(typescript@5.5.3)
+      typescript: 5.5.3
 
-  '@solana/codecs-numbers@2.0.0-preview.2':
+  '@solana/codecs-numbers@2.0.0-preview.4(typescript@5.5.3)':
     dependencies:
-      '@solana/codecs-core': 2.0.0-preview.2
-      '@solana/errors': 2.0.0-preview.2
+      '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3)
+      '@solana/errors': 2.0.0-preview.4(typescript@5.5.3)
+      typescript: 5.5.3
 
-  '@solana/codecs-strings@2.0.0-preview.2(fastestsmallesttextencoderdecoder@1.0.22)':
+  '@solana/codecs-strings@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.3)':
     dependencies:
-      '@solana/codecs-core': 2.0.0-preview.2
-      '@solana/codecs-numbers': 2.0.0-preview.2
-      '@solana/errors': 2.0.0-preview.2
+      '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.3)
+      '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.3)
+      '@solana/errors': 2.0.0-preview.4(typescript@5.5.3)
       fastestsmallesttextencoderdecoder: 1.0.22
+      typescript: 5.5.3
 
-  '@solana/errors@2.0.0-preview.2':
+  '@solana/errors@2.0.0-preview.4(typescript@5.5.3)':
     dependencies:
       chalk: 5.3.0
-      commander: 12.0.0
+      commander: 12.1.0
+      typescript: 5.5.3
 
   '@types/fs-extra@11.0.4':
     dependencies:
@@ -522,6 +556,8 @@ snapshots:
 
   commander@12.0.0: {}
 
+  commander@12.1.0: {}
+
   commander@5.1.0: {}
 
   data-uri-to-buffer@4.0.1: {}
@@ -660,12 +696,12 @@ snapshots:
 
   jsonify@0.0.1: {}
 
-  kinobi@0.20.1:
+  kinobi@0.21.0:
     dependencies:
-      '@kinobi-so/errors': 0.20.1
-      '@kinobi-so/nodes': 0.20.1
-      '@kinobi-so/validators': 0.20.1
-      '@kinobi-so/visitors': 0.20.1
+      '@kinobi-so/errors': 0.21.0
+      '@kinobi-so/nodes': 0.21.0
+      '@kinobi-so/validators': 0.21.0
+      '@kinobi-so/visitors': 0.21.0
 
   map-stream@0.1.0: {}
 
@@ -702,7 +738,7 @@ snapshots:
 
   picomatch@2.3.1: {}
 
-  prettier@3.2.5: {}
+  prettier@3.3.3: {}
 
   ps-tree@1.2.0:
     dependencies:
@@ -741,7 +777,7 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
-  typescript@5.4.5: {}
+  typescript@5.5.3: {}
 
   undici-types@5.26.5: {}