Bump Codama renderer and adopt @solana/kit 6.10

clients/js/package.json

@@ -45,7 +45,7 @@
     },
     "devDependencies": {
         "@solana-config/oxc": "^0.1.1",
-        "@solana/kit": "^6.4.0",
+        "@solana/kit": "^6.10.0",
         "@solana/kit-plugin-litesvm": "^0.10.0",
         "@solana/kit-plugin-signer": "^0.10.0",
         "@types/node": "^24",
@@ -59,6 +59,6 @@
         "vitest": "^4.0.15"
     },
     "peerDependencies": {
-        "@solana/kit": "^6.4.0"
+        "@solana/kit": "^6.10.0"
     }
 }

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

@@ -19,6 +19,7 @@ import {
     type ClientWithRpc,
     type ClientWithTransactionPlanning,
     type ClientWithTransactionSending,
+    type ExtendedClient,
     type GetAccountInfoApi,
     type GetMultipleAccountsApi,
     type Instruction,
@@ -285,7 +286,12 @@ export function parseSystemInstruction<TProgram extends string>(
     }
 }
 
-export type SystemPlugin = { accounts: SystemPluginAccounts; instructions: SystemPluginInstructions };
+export type SystemPlugin = {
+    accounts: SystemPluginAccounts;
+    instructions: SystemPluginInstructions;
+    identifyInstruction: typeof identifySystemInstruction;
+    parseInstruction: typeof parseSystemInstruction;
+};
 
 export type SystemPluginAccounts = { nonce: ReturnType<typeof getNonceCodec> & SelfFetchFunctions<NonceArgs, Nonce> };
 
@@ -334,7 +340,7 @@ export type SystemPluginRequirements = ClientWithRpc<GetAccountInfoApi & GetMult
     ClientWithTransactionSending;
 
 export function systemProgram() {
-    return <T extends SystemPluginRequirements>(client: T): Omit<T, 'system'> & { system: SystemPlugin } => {
+    return <T extends SystemPluginRequirements>(client: T): ExtendedClient<T, { system: SystemPlugin }> => {
         return extendClient(client, {
             system: <SystemPlugin>{
                 accounts: { nonce: addSelfFetchFunctions(client, getNonceCodec()) },
@@ -370,6 +376,8 @@ export function systemProgram() {
                     createAccountAllowPrefund: input =>
                         addSelfPlanAndSendFunctions(client, getCreateAccountAllowPrefundInstruction(input)),
                 },
+                identifyInstruction: identifySystemInstruction,
+                parseInstruction: parseSystemInstruction,
             },
         });
     };

clients/rust/Cargo.toml

@@ -8,7 +8,7 @@ readme = "README.md"
 license-file = "../../LICENSE"
 
 [features]
-fetch = ["dep:solana-client"]
+fetch = ["dep:solana-rpc-client"]
 test-sbf = []
 
 [dependencies]
@@ -23,7 +23,7 @@ solana-address = { version = "~2.4", features = [
   'curve25519',
   'decode',
 ] }
-solana-client = { version = "^3.0", optional = true }
+solana-rpc-client = { version = "^3.0", optional = true }
 solana-cpi = "~3.1"
 solana-decode-error = "~2.3"
 solana-instruction = "~3.2"

clients/rust/src/generated/accounts/nonce.rs

@@ -41,7 +41,7 @@ impl<'a> TryFrom<&solana_account_info::AccountInfo<'a>> for Nonce {
 
 #[cfg(feature = "fetch")]
 pub fn fetch_nonce(
-    rpc: &solana_client::rpc_client::RpcClient,
+    rpc: &solana_rpc_client::rpc_client::RpcClient,
     address: &solana_address::Address,
 ) -> Result<crate::shared::DecodedAccount<Nonce>, std::io::Error> {
     let accounts = fetch_all_nonce(rpc, &[*address])?;
@@ -50,7 +50,7 @@ pub fn fetch_nonce(
 
 #[cfg(feature = "fetch")]
 pub fn fetch_all_nonce(
-    rpc: &solana_client::rpc_client::RpcClient,
+    rpc: &solana_rpc_client::rpc_client::RpcClient,
     addresses: &[solana_address::Address],
 ) -> Result<Vec<crate::shared::DecodedAccount<Nonce>>, std::io::Error> {
     let accounts = rpc
@@ -74,7 +74,7 @@ pub fn fetch_all_nonce(
 
 #[cfg(feature = "fetch")]
 pub fn fetch_maybe_nonce(
-    rpc: &solana_client::rpc_client::RpcClient,
+    rpc: &solana_rpc_client::rpc_client::RpcClient,
     address: &solana_address::Address,
 ) -> Result<crate::shared::MaybeAccount<Nonce>, std::io::Error> {
     let accounts = fetch_all_maybe_nonce(rpc, &[*address])?;
@@ -83,7 +83,7 @@ pub fn fetch_maybe_nonce(
 
 #[cfg(feature = "fetch")]
 pub fn fetch_all_maybe_nonce(
-    rpc: &solana_client::rpc_client::RpcClient,
+    rpc: &solana_rpc_client::rpc_client::RpcClient,
     addresses: &[solana_address::Address],
 ) -> Result<Vec<crate::shared::MaybeAccount<Nonce>>, std::io::Error> {
     let accounts = rpc

package.json

@@ -1,9 +1,9 @@
 {
     "private": true,
     "devDependencies": {
-        "@codama/renderers-js": "^2.2.0",
-        "@codama/renderers-rust": "^3.0.0",
-        "codama": "^1.6.0",
+        "@codama/renderers-js": "^2.3.0",
+        "@codama/renderers-rust": "^3.1.0",
+        "codama": "^1.8.0",
         "typescript": "^5.9.3"
     },
     "engines": {