Merge pull request #60 from macalinao/igm/update-deps

Update deps and use FixedSizeEncoder

Author: macalinao

.changeset/early-pumas-brake.md

@@ -0,0 +1,7 @@
+---
+"@macalinao/codama-renderers-js-esm": patch
+"@macalinao/clients-kamino-lending": patch
+"@macalinao/coda-visitors": patch
+---
+
+Update dependencies

.changeset/slick-carrots-smoke.md

@@ -0,0 +1,5 @@
+---
+"@macalinao/clients-kamino-lending": patch
+---
+
+Use FixedSizeEncoder for more types

biome.jsonc

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.6/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.7/schema.json",
   "extends": ["@macalinao/biome-config/base"],
   "files": {
     "ignoreUnknown": false,

bun.lock

@@ -319,10 +319,6 @@ export default defineConfig({
         instructions: {
           idlMissingTypes: "farmsIdlMissingTypes",
         },
-        definedTypes: {
-          tokenInfo: "farmsTokenInfo",
-          userState: "farmsUserState",
-        },
       },
     }),
     updateAccountsVisitor({

clients/kamino-lending/coda.config.mjs

@@ -822,7 +822,7 @@
       "discriminator": [149, 8, 156, 202, 160, 252, 176, 217]
     },
     {
-      "name": "UserState",
+      "name": "FarmsUserState",
       "discriminator": [72, 177, 85, 249, 76, 167, 186, 126]
     },
     {
@@ -1224,7 +1224,7 @@
             "name": "token",
             "type": {
               "defined": {
-                "name": "TokenInfo"
+                "name": "FarmsTokenInfo"
               }
             }
           },
@@ -1378,7 +1378,7 @@
       }
     },
     {
-      "name": "TokenInfo",
+      "name": "FarmsTokenInfo",
       "serialization": "bytemuck",
       "repr": {
         "kind": "c",
@@ -1496,7 +1496,7 @@
             "name": "token",
             "type": {
               "defined": {
-                "name": "TokenInfo"
+                "name": "FarmsTokenInfo"
               }
             }
           },
@@ -1729,7 +1729,7 @@
       }
     },
     {
-      "name": "UserState",
+      "name": "FarmsUserState",
       "serialization": "bytemuck",
       "repr": {
         "kind": "c",

clients/kamino-lending/idls/farms.json

@@ -9,21 +9,21 @@
 import type {
   Account,
   Address,
-  Codec,
-  Decoder,
   EncodedAccount,
-  Encoder,
   FetchAccountConfig,
   FetchAccountsConfig,
+  FixedSizeCodec,
+  FixedSizeDecoder,
+  FixedSizeEncoder,
   MaybeAccount,
   MaybeEncodedAccount,
   ReadonlyUint8Array,
 } from "@solana/kit";
 import type {
+  FarmsTokenInfo,
+  FarmsTokenInfoArgs,
   RewardInfo,
   RewardInfoArgs,
-  TokenInfo,
-  TokenInfoArgs,
 } from "../types/index.js";
 import {
   assertAccountExists,
@@ -53,10 +53,10 @@ import {
   transformEncoder,
 } from "@solana/kit";
 import {
+  getFarmsTokenInfoDecoder,
+  getFarmsTokenInfoEncoder,
   getRewardInfoDecoder,
   getRewardInfoEncoder,
-  getTokenInfoDecoder,
-  getTokenInfoEncoder,
 } from "../types/index.js";
 
 export const FARM_STATE_DISCRIMINATOR: ReadonlyUint8Array = new Uint8Array([
@@ -71,7 +71,7 @@ export interface FarmState {
   discriminator: ReadonlyUint8Array;
   farmAdmin: Address;
   globalConfig: Address;
-  token: TokenInfo;
+  token: FarmsTokenInfo;
   rewardInfos: RewardInfo[];
   numRewardTokens: bigint;
   /** Data used to calculate the rewards of the user */
@@ -149,7 +149,7 @@ export interface FarmState {
 export interface FarmStateArgs {
   farmAdmin: Address;
   globalConfig: Address;
-  token: TokenInfoArgs;
+  token: FarmsTokenInfoArgs;
   rewardInfos: RewardInfoArgs[];
   numRewardTokens: number | bigint;
   /** Data used to calculate the rewards of the user */
@@ -224,13 +224,13 @@ export interface FarmStateArgs {
   padding: (number | bigint)[];
 }
 
-export function getFarmStateEncoder(): Encoder<FarmStateArgs> {
+export function getFarmStateEncoder(): FixedSizeEncoder<FarmStateArgs> {
   return transformEncoder(
     getStructEncoder([
       ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
       ["farmAdmin", getAddressEncoder()],
       ["globalConfig", getAddressEncoder()],
-      ["token", getTokenInfoEncoder()],
+      ["token", getFarmsTokenInfoEncoder()],
       ["rewardInfos", getArrayEncoder(getRewardInfoEncoder(), { size: 10 })],
       ["numRewardTokens", getU64Encoder()],
       ["numUsers", getU64Encoder()],
@@ -270,12 +270,12 @@ export function getFarmStateEncoder(): Encoder<FarmStateArgs> {
   );
 }
 
-export function getFarmStateDecoder(): Decoder<FarmState> {
+export function getFarmStateDecoder(): FixedSizeDecoder<FarmState> {
   return getStructDecoder([
     ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
     ["farmAdmin", getAddressDecoder()],
     ["globalConfig", getAddressDecoder()],
-    ["token", getTokenInfoDecoder()],
+    ["token", getFarmsTokenInfoDecoder()],
     ["rewardInfos", getArrayDecoder(getRewardInfoDecoder(), { size: 10 })],
     ["numRewardTokens", getU64Decoder()],
     ["numUsers", getU64Decoder()],
@@ -313,7 +313,7 @@ export function getFarmStateDecoder(): Decoder<FarmState> {
   ]);
 }
 
-export function getFarmStateCodec(): Codec<FarmStateArgs, FarmState> {
+export function getFarmStateCodec(): FixedSizeCodec<FarmStateArgs, FarmState> {
   return combineCodec(getFarmStateEncoder(), getFarmStateDecoder());
 }
 

clients/kamino-lending/src/generated/accounts/farmState.ts

@@ -6,12 +6,17 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import type { Address, Codec, Decoder, Encoder } from "@solana/kit";
 import type {
+  Address,
+  FixedSizeCodec,
+  FixedSizeDecoder,
+  FixedSizeEncoder,
+} from "@solana/kit";
+import type {
+  FarmsTokenInfo,
+  FarmsTokenInfoArgs,
   RewardScheduleCurve,
   RewardScheduleCurveArgs,
-  TokenInfo,
-  TokenInfoArgs,
 } from "./index.js";
 import {
   combineCodec,
@@ -29,14 +34,14 @@ import {
   getU128Encoder,
 } from "@solana/kit";
 import {
+  getFarmsTokenInfoDecoder,
+  getFarmsTokenInfoEncoder,
   getRewardScheduleCurveDecoder,
   getRewardScheduleCurveEncoder,
-  getTokenInfoDecoder,
-  getTokenInfoEncoder,
 } from "./index.js";
 
 export interface RewardInfo {
-  token: TokenInfo;
+  token: FarmsTokenInfo;
   rewardsVault: Address;
   rewardsAvailable: bigint;
   rewardScheduleCurve: RewardScheduleCurve;
@@ -53,7 +58,7 @@ export interface RewardInfo {
 }
 
 export interface RewardInfoArgs {
-  token: TokenInfoArgs;
+  token: FarmsTokenInfoArgs;
   rewardsVault: Address;
   rewardsAvailable: number | bigint;
   rewardScheduleCurve: RewardScheduleCurveArgs;
@@ -69,9 +74,9 @@ export interface RewardInfoArgs {
   padding1: (number | bigint)[];
 }
 
-export function getRewardInfoEncoder(): Encoder<RewardInfoArgs> {
+export function getRewardInfoEncoder(): FixedSizeEncoder<RewardInfoArgs> {
   return getStructEncoder([
-    ["token", getTokenInfoEncoder()],
+    ["token", getFarmsTokenInfoEncoder()],
     ["rewardsVault", getAddressEncoder()],
     ["rewardsAvailable", getU64Encoder()],
     ["rewardScheduleCurve", getRewardScheduleCurveEncoder()],
@@ -88,9 +93,9 @@ export function getRewardInfoEncoder(): Encoder<RewardInfoArgs> {
   ]);
 }
 
-export function getRewardInfoDecoder(): Decoder<RewardInfo> {
+export function getRewardInfoDecoder(): FixedSizeDecoder<RewardInfo> {
   return getStructDecoder([
-    ["token", getTokenInfoDecoder()],
+    ["token", getFarmsTokenInfoDecoder()],
     ["rewardsVault", getAddressDecoder()],
     ["rewardsAvailable", getU64Decoder()],
     ["rewardScheduleCurve", getRewardScheduleCurveDecoder()],
@@ -107,6 +112,9 @@ export function getRewardInfoDecoder(): Decoder<RewardInfo> {
   ]);
 }
 
-export function getRewardInfoCodec(): Codec<RewardInfoArgs, RewardInfo> {
+export function getRewardInfoCodec(): FixedSizeCodec<
+  RewardInfoArgs,
+  RewardInfo
+> {
   return combineCodec(getRewardInfoEncoder(), getRewardInfoDecoder());
 }

clients/kamino-lending/src/generated/types/rewardInfo.ts

@@ -45,10 +45,10 @@
     "lint": "eslint . --cache"
   },
   "dependencies": {
-    "@solana-program/system": "^0.8.1",
-    "@solana-program/token": "^0.6.0",
-    "@solana-program/token-2022": "^0.5.0",
-    "@solana/sysvars": "^3.0.3",
+    "@solana-program/system": "^0.9.0",
+    "@solana-program/token": "^0.7.0",
+    "@solana-program/token-2022": "^0.6.0",
+    "@solana/sysvars": "^4.0.0",
     "codama": "catalog:"
   },
   "devDependencies": {

packages/coda-visitors/package.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@codama/renderers-core": "catalog:",
-    "@codama/renderers-js": "^1.4.2",
+    "@codama/renderers-js": "^1.4.3",
     "codama": "catalog:"
   },
   "devDependencies": {