Skip to content

Update deps and use FixedSizeEncoder #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 22, 2025
Merged

Update deps and use FixedSizeEncoder #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc8ae30
Update dependencies, fix FixedSizeEncoder
macalinao Oct 22, 2025
64f22ed
docs(changeset): Update dependencies
macalinao Oct 22, 2025
b2958d8
docs(changeset): Use FixedSizeEncoder for more types
macalinao Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/early-pumas-brake.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@macalinao/codama-renderers-js-esm": patch
"@macalinao/clients-kamino-lending": patch
"@macalinao/coda-visitors": patch
---

Update dependencies
5 changes: 5 additions & 0 deletions .changeset/slick-carrots-smoke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@macalinao/clients-kamino-lending": patch
---

Use FixedSizeEncoder for more types
2 changes: 1 addition & 1 deletion biome.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
100 changes: 80 additions & 20 deletions bun.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions clients/kamino-lending/coda.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,6 @@ export default defineConfig({
instructions: {
idlMissingTypes: "farmsIdlMissingTypes",
},
definedTypes: {
tokenInfo: "farmsTokenInfo",
userState: "farmsUserState",
},
},
}),
updateAccountsVisitor({
Expand Down
10 changes: 5 additions & 5 deletions clients/kamino-lending/idls/farms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
},
{
Expand Down Expand Up @@ -1224,7 +1224,7 @@
"name": "token",
"type": {
"defined": {
"name": "TokenInfo"
"name": "FarmsTokenInfo"
}
}
},
Expand Down Expand Up @@ -1378,7 +1378,7 @@
}
},
{
"name": "TokenInfo",
"name": "FarmsTokenInfo",
"serialization": "bytemuck",
"repr": {
"kind": "c",
Expand Down Expand Up @@ -1496,7 +1496,7 @@
"name": "token",
"type": {
"defined": {
"name": "TokenInfo"
"name": "FarmsTokenInfo"
}
}
},
Expand Down Expand Up @@ -1729,7 +1729,7 @@
}
},
{
"name": "UserState",
"name": "FarmsUserState",
"serialization": "bytemuck",
"repr": {
"kind": "c",
Expand Down
28 changes: 14 additions & 14 deletions clients/kamino-lending/src/generated/accounts/farmState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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([
Expand All @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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()],
Expand Down Expand Up @@ -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()],
Expand Down Expand Up @@ -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());
}

Expand Down
32 changes: 20 additions & 12 deletions clients/kamino-lending/src/generated/types/rewardInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand All @@ -53,7 +58,7 @@ export interface RewardInfo {
}

export interface RewardInfoArgs {
token: TokenInfoArgs;
token: FarmsTokenInfoArgs;
rewardsVault: Address;
rewardsAvailable: number | bigint;
rewardScheduleCurve: RewardScheduleCurveArgs;
Expand All @@ -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()],
Expand All @@ -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()],
Expand All @@ -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());
}
8 changes: 4 additions & 4 deletions packages/coda-visitors/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/codama-renderers-js-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@codama/renderers-core": "catalog:",
"@codama/renderers-js": "^1.4.2",
"@codama/renderers-js": "^1.4.3",
"codama": "catalog:"
},
"devDependencies": {
Expand Down