@glamsystems/glam-sdk 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/src/client/base.d.ts

@@ -42,7 +42,7 @@ export declare class BaseClient {
     get detectedCluster(): ClusterNetwork;
     get statePda(): PublicKey;
     set statePda(statePda: PublicKey);
-    isMainnet(): boolean;
+    get isMainnet(): boolean;
     isPhantom(): boolean;
     /**
      * Get metadata of an asset for pricing

package/src/client/drift.d.ts

@@ -1,7 +1,7 @@
 import * as anchor from "@coral-xyz/anchor";
 import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
 import { MarketType, OrderParams, PositionDirection, SpotPosition, PerpPosition, ModifyOrderParams, OracleSource, SpotBalanceType, MarginMode, Order } from "../utils/driftTypes";
-import { DriftVault } from "../layouts/drift-vault";
+import { DriftVault } from "../deser/driftLayouts";
 import { BaseClient, TxOptions } from "./base";
 import { AccountMeta } from "@solana/web3.js";
 import { StateModel } from "../models";
@@ -89,17 +89,17 @@ export declare class DriftClient {
         userStats: PublicKey;
     };
     get driftStatePda(): PublicKey;
-    fetchAndParseSpotMarket(marketIndex: number): Promise<SpotMarket>;
-    fetchAndParseSpotMarkets(marketIndexes: number[]): Promise<SpotMarket[]>;
-    fetchAndParsePerpMarket(marketIndex: number): Promise<PerpMarket>;
-    fetchAndParsePerpMarkets(marketIndexes: number[]): Promise<PerpMarket[]>;
-    fetchMarketConfigs(): Promise<DriftMarketConfigs>;
+    fetchAndParseSpotMarket(marketIndex: number, skipCache?: boolean): Promise<SpotMarket>;
+    fetchAndParseSpotMarkets(marketIndexes: number[], skipCache?: boolean): Promise<SpotMarket[]>;
+    fetchAndParsePerpMarket(marketIndex: number, skipCache?: boolean): Promise<PerpMarket>;
+    fetchAndParsePerpMarkets(marketIndexes: number[], skipCache?: boolean): Promise<PerpMarket[]>;
+    fetchMarketConfigs(skipCache?: boolean): Promise<DriftMarketConfigs>;
     charsToName(chars: number[] | Buffer): string;
-    fetchDriftUser(subAccountId?: number): Promise<DriftUser | null>;
+    fetchDriftUser(subAccountId?: number, skipCache?: boolean): Promise<DriftUser | null>;
     /**
      * @deprecated
      */
-    fetchPolicyConfig(glamState: StateModel): Promise<{
+    fetchPolicyConfig(stateModel: StateModel): Promise<{
         driftAccessControl: number;
         driftDelegatedAccount: anchor.web3.PublicKey;
         driftMarketIndexesPerp: number[];

package/src/client/kamino.d.ts

@@ -1,8 +1,10 @@
 import { BN } from "@coral-xyz/anchor";
-import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction, AccountMeta } from "@solana/web3.js";
 import { BaseClient, TxOptions } from "./base";
+import { KVaultAllocation, KVaultState } from "../deser/kaminoLayouts";
 interface ParsedReserve {
     address: PublicKey;
+    market: PublicKey;
     farmCollateral: PublicKey | null;
     farmDebt: PublicKey | null;
     liquidityMint: PublicKey;
@@ -133,4 +135,19 @@ export declare class KaminoFarmClient {
     harvest(txOptions?: TxOptions): Promise<TransactionSignature>;
     harvestTx(txOptions?: TxOptions): Promise<VersionedTransaction>;
 }
+export declare class KaminoVaultsClient {
+    readonly base: BaseClient;
+    readonly kaminoLending: KaminoLendingClient;
+    private vaultStates;
+    private shareMintToVaultPdaMap;
+    constructor(base: BaseClient, kaminoLending: KaminoLendingClient);
+    deposit(vault: PublicKey, amount: number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    withdraw(vault: PublicKey, amount: number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    findAndParseKaminoVaults(): Promise<KVaultState[]>;
+    getVaultPdasByShareMints(mints: PublicKey[]): Promise<PublicKey[]>;
+    fetchAndParseVaultState(vault: PublicKey): Promise<KVaultState>;
+    composeRemainingAccounts(allocationStrategies: KVaultAllocation[]): Promise<AccountMeta[]>;
+    depositTx(vault: PublicKey, amount: BN, txOptions?: TxOptions): Promise<VersionedTransaction>;
+    withdrawTx(vault: PublicKey, amount: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
+}
 export {};

package/src/client/price.d.ts

@@ -1,14 +1,15 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { KaminoLendingClient } from "./kamino";
+import { KaminoLendingClient, KaminoVaultsClient } from "./kamino";
 import { BaseClient } from "./base";
 import { PriceDenom } from "../models";
 import { DriftClient, DriftVaultsClient } from "./drift";
 export declare class PriceClient {
     readonly base: BaseClient;
     readonly klend: KaminoLendingClient;
+    readonly kvaults: KaminoVaultsClient;
     readonly drift: DriftClient;
-    readonly driftVaults: DriftVaultsClient;
-    constructor(base: BaseClient, klend: KaminoLendingClient, drift: DriftClient, driftVaults: DriftVaultsClient);
+    readonly dvaults: DriftVaultsClient;
+    constructor(base: BaseClient, klend: KaminoLendingClient, kvaults: KaminoVaultsClient, drift: DriftClient, dvaults: DriftVaultsClient);
     /**
      * !! This is a convenience method that calculates the AUM of the vault based on priced assets.
      * !! It doesn't reflect the actual AUM of the vault.
@@ -20,6 +21,7 @@ export declare class PriceClient {
      * If there are no Kamino obligations, returns null.
      */
     priceKaminoObligationsIx(priceDenom: PriceDenom): Promise<TransactionInstruction | null>;
+    priceKaminoVaultSharesIx(priceDenom: PriceDenom): Promise<TransactionInstruction | null>;
     /**
      * Returns an instruction that prices the all Drift users (aka sub-accounts) controlled by the GLAM vault.
      * These Drift users must share the same user_stats that's also controlled by the GLAM vault.

package/src/client/vault.d.ts

@@ -22,6 +22,6 @@ export declare class VaultClient {
     closeTokenAccountsTx(accounts: PublicKey[], txOptions: TxOptions): Promise<VersionedTransaction>;
     depositSolTx(lamports: number | BN, wrap?: boolean, txOptions?: TxOptions): Promise<VersionedTransaction>;
     depositTx(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
-    withdrawIxs(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<TransactionInstruction[]>;
+    withdrawIxs(asset: PublicKey, amount: number | BN, txOptions?: TxOptions): Promise<TransactionInstruction[]>;
     withdrawTx(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
 }

package/src/client.d.ts

@@ -8,7 +8,7 @@ import { VaultClient } from "./client/vault";
 import { StakingClient } from "./client/staking";
 import { StateClient } from "./client/state";
 import { MintClient } from "./client/mint";
-import { KaminoFarmClient, KaminoLendingClient } from "./client/kamino";
+import { KaminoFarmClient, KaminoLendingClient, KaminoVaultsClient } from "./client/kamino";
 import { MeteoraDlmmClient } from "./client/meteora";
 import { InvestorClient } from "./client/investor";
 import { PriceClient } from "./client/price";
@@ -32,6 +32,7 @@ export declare class GlamClient extends BaseClient {
     private _mint?;
     private _kaminoLending?;
     private _kaminoFarm?;
+    private _kaminoVaults?;
     private _meteoraDlmm?;
     constructor(config?: GlamClientConfig);
     get drift(): DriftClient;
@@ -47,5 +48,6 @@ export declare class GlamClient extends BaseClient {
     get mint(): MintClient;
     get kaminoLending(): KaminoLendingClient;
     get kaminoFarm(): KaminoFarmClient;
+    get kaminoVaults(): KaminoVaultsClient;
     get meteoraDlmm(): MeteoraDlmmClient;
 }

package/src/constants.d.ts

@@ -34,6 +34,7 @@ export declare const MERKLE_DISTRIBUTOR_PROGRAM: PublicKey;
 export declare const TRANSFER_HOOK_PROGRAM: PublicKey;
 export declare const METEORA_DLMM_PROGRAM: PublicKey;
 export declare const KAMINO_LENDING_PROGRAM: PublicKey;
+export declare const KAMINO_VAULTS_PROGRAM: PublicKey;
 export declare const KAMINO_FARM_PROGRAM: PublicKey;
 export declare const MEMO_PROGRAM: PublicKey;
 /**

package/src/{layouts/drift-vault.d.ts → deser/driftLayouts.d.ts}

@@ -49,3 +49,20 @@ export interface DriftVault {
     cumulativeFuel: BN;
     padding: BN[];
 }
+export declare const DriftSpotMarket: any;
+export interface DriftSpotMarket {
+    discriminator: number[];
+    marketPda: PublicKey;
+    oracle: PublicKey;
+    mint: PublicKey;
+    vault: PublicKey;
+    name: number[];
+    padding1: number[];
+    cumulativeDepositInterest: BN;
+    cumulativeBorrowInterest: BN;
+    padding2: number[];
+    decimals: number;
+    marketIndex: number;
+    padding3: number;
+    oracleSource: number;
+}

package/src/deser/kaminoLayouts.d.ts

@@ -0,0 +1,55 @@
+import { BN } from "@coral-xyz/anchor";
+import { PublicKey } from "@solana/web3.js";
+export declare const VaultAllocationLayout: any;
+export declare const KVaultStateLayout: any;
+export interface KVaultAllocation {
+    reserve: PublicKey;
+    ctokenVault: PublicKey;
+    targetAllocationWeight: BN;
+    tokenAllocationCap: BN;
+    ctokenVaultBump: BN;
+    configPadding: BN[];
+    ctokenAllocation: BN;
+    lastInvestSlot: BN;
+    tokenTargetAllocationSf: BN;
+    statePadding: BN[];
+}
+export interface KVaultState {
+    discriminator: number[];
+    vaultAdminAuthority: PublicKey;
+    baseVaultAuthority: PublicKey;
+    baseVaultAuthorityBump: BN;
+    tokenMint: PublicKey;
+    tokenMintDecimals: BN;
+    tokenVault: PublicKey;
+    tokenProgram: PublicKey;
+    sharesMint: PublicKey;
+    sharesMintDecimals: BN;
+    tokenAvailable: BN;
+    sharesIssued: BN;
+    availableCrankFunds: BN;
+    padding0: BN;
+    performanceFeeBps: BN;
+    managementFeeBps: BN;
+    lastFeeChargeTimestamp: BN;
+    prevAumSf: BN;
+    pendingFeesSf: BN;
+    vaultAllocationStrategy: KVaultAllocation[];
+    padding1: BN[];
+    minDepositAmount: BN;
+    minWithdrawAmount: BN;
+    minInvestAmount: BN;
+    minInvestDelaySlots: BN;
+    crankFundFeePerReserve: BN;
+    pendingAdmin: PublicKey;
+    cumulativeEarnedInterestSf: BN;
+    cumulativeMgmtFeesSf: BN;
+    cumulativePerfFeesSf: BN;
+    name: number[];
+    vaultLookupTable: PublicKey;
+    vaultFarm: PublicKey;
+    creationTimestamp: BN;
+    padding2: BN;
+    allocationAdmin: PublicKey;
+    padding3: BN[];
+}

package/src/utils/driftTypes.d.ts

@@ -210,6 +210,7 @@ export declare class OracleSource {
     static readonly PYTH_LAZER_STABLE_COIN: {
         pythLazerStableCoin: {};
     };
+    static fromString(name: string): OracleSource;
     static get(n: Number): any;
 }
 export declare class OracleSourceNum {

package/target/idl/glam_protocol.json

@@ -2,7 +2,7 @@
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glam_protocol",
-    "version": "0.4.28",
+    "version": "0.4.29",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -4252,10 +4252,12 @@
       ],
       "accounts": [
         {
-          "name": "glam_state"
+          "name": "glam_state",
+          "writable": true
         },
         {
           "name": "glam_vault",
+          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -4347,10 +4349,12 @@
       ],
       "accounts": [
         {
-          "name": "glam_state"
+          "name": "glam_state",
+          "writable": true
         },
         {
           "name": "glam_vault",
+          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -6630,6 +6634,146 @@
         }
       ]
     },
+    {
+      "name": "price_kamino_vault_shares",
+      "discriminator": [
+        112,
+        92,
+        238,
+        224,
+        145,
+        105,
+        38,
+        249
+      ],
+      "accounts": [
+        {
+          "name": "glam_state",
+          "writable": true
+        },
+        {
+          "name": "glam_vault",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  118,
+                  97,
+                  117,
+                  108,
+                  116
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "glam_state"
+              }
+            ]
+          }
+        },
+        {
+          "name": "signer",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "kamino_lending_program",
+          "address": "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD"
+        },
+        {
+          "name": "sol_oracle"
+        },
+        {
+          "name": "glam_config",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  103,
+                  108,
+                  111,
+                  98,
+                  97,
+                  108,
+                  95,
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              }
+            ],
+            "program": {
+              "kind": "const",
+              "value": [
+                10,
+                11,
+                0,
+                83,
+                72,
+                16,
+                46,
+                144,
+                46,
+                42,
+                79,
+                22,
+                157,
+                123,
+                21,
+                242,
+                192,
+                146,
+                1,
+                78,
+                88,
+                59,
+                102,
+                9,
+                190,
+                226,
+                92,
+                189,
+                187,
+                232,
+                83,
+                220
+              ]
+            }
+          }
+        },
+        {
+          "name": "pyth_oracle",
+          "optional": true
+        },
+        {
+          "name": "switchboard_price_oracle",
+          "optional": true
+        },
+        {
+          "name": "switchboard_twap_oracle",
+          "optional": true
+        },
+        {
+          "name": "scope_prices",
+          "optional": true
+        }
+      ],
+      "args": [
+        {
+          "name": "denom",
+          "type": {
+            "defined": {
+              "name": "PriceDenom"
+            }
+          }
+        }
+      ]
+    },
     {
       "name": "price_meteora_positions",
       "discriminator": [

package/target/types/glam_protocol.d.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
     "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
     "metadata": {
         "name": "glamProtocol";
-        "version": "0.4.28";
+        "version": "0.4.29";
         "spec": "0.1.0";
         "description": "Glam Protocol";
     };
@@ -4259,9 +4259,11 @@ export type GlamProtocol = {
             "accounts": [
                 {
                     "name": "glamState";
+                    "writable": true;
                 },
                 {
                     "name": "glamVault";
+                    "writable": true;
                     "pda": {
                         "seeds": [
                             {
@@ -4354,9 +4356,11 @@ export type GlamProtocol = {
             "accounts": [
                 {
                     "name": "glamState";
+                    "writable": true;
                 },
                 {
                     "name": "glamVault";
+                    "writable": true;
                     "pda": {
                         "seeds": [
                             {
@@ -6636,6 +6640,146 @@ export type GlamProtocol = {
                 }
             ];
         },
+        {
+            "name": "priceKaminoVaultShares";
+            "discriminator": [
+                112,
+                92,
+                238,
+                224,
+                145,
+                105,
+                38,
+                249
+            ];
+            "accounts": [
+                {
+                    "name": "glamState";
+                    "writable": true;
+                },
+                {
+                    "name": "glamVault";
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116
+                                ];
+                            },
+                            {
+                                "kind": "account";
+                                "path": "glamState";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "signer";
+                    "writable": true;
+                    "signer": true;
+                },
+                {
+                    "name": "kaminoLendingProgram";
+                    "address": "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD";
+                },
+                {
+                    "name": "solOracle";
+                },
+                {
+                    "name": "glamConfig";
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    103,
+                                    108,
+                                    111,
+                                    98,
+                                    97,
+                                    108,
+                                    95,
+                                    99,
+                                    111,
+                                    110,
+                                    102,
+                                    105,
+                                    103
+                                ];
+                            }
+                        ];
+                        "program": {
+                            "kind": "const";
+                            "value": [
+                                10,
+                                11,
+                                0,
+                                83,
+                                72,
+                                16,
+                                46,
+                                144,
+                                46,
+                                42,
+                                79,
+                                22,
+                                157,
+                                123,
+                                21,
+                                242,
+                                192,
+                                146,
+                                1,
+                                78,
+                                88,
+                                59,
+                                102,
+                                9,
+                                190,
+                                226,
+                                92,
+                                189,
+                                187,
+                                232,
+                                83,
+                                220
+                            ];
+                        };
+                    };
+                },
+                {
+                    "name": "pythOracle";
+                    "optional": true;
+                },
+                {
+                    "name": "switchboardPriceOracle";
+                    "optional": true;
+                },
+                {
+                    "name": "switchboardTwapOracle";
+                    "optional": true;
+                },
+                {
+                    "name": "scopePrices";
+                    "optional": true;
+                }
+            ];
+            "args": [
+                {
+                    "name": "denom";
+                    "type": {
+                        "defined": {
+                            "name": "priceDenom";
+                        };
+                    };
+                }
+            ];
+        },
         {
             "name": "priceMeteoraPositions";
             "discriminator": [