@glamsystems/glam-sdk 0.1.30 → 0.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
@@ -26,7 +26,7 @@
     "@solana/spl-token": "^0.4.9",
     "@solana/spl-token-metadata": "^0.1.4",
     "@solana/web3.js": "^1.98.0",
-    "sanctum-lst-list": "^0.2.53",
+    "@glamsystems/sanctum-lst-list": "^0.2.54",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3"
   },

package/src/client/assets.d.ts

@@ -25,6 +25,7 @@ export interface AssetMeta {
     oracle: PublicKey;
     programId?: PublicKey;
     isLst?: boolean;
+    aggIndex?: number;
 }
 export declare const ASSETS_MAINNET: Map<string, AssetMeta>;
 export declare const ASSETS_TESTS: Map<string, AssetMeta>;

package/src/client/kamino.d.ts

@@ -2,6 +2,36 @@ import { BN } from "@coral-xyz/anchor";
 import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction, AccountMeta } from "@solana/web3.js";
 import { BaseClient, TxOptions } from "./base";
 import { KVaultAllocation, KVaultState } from "../deser/kaminoLayouts";
+interface RefreshObligationAccounts {
+    lendingMarket: PublicKey;
+    obligation: PublicKey;
+    reserves: PublicKey[];
+}
+interface RefreshReserveAccounts {
+    reserve: PublicKey;
+    lendingMarket: PublicKey;
+    pythOracle: PublicKey;
+    switchboardPriceOracle: PublicKey;
+    switchboardTwapOracle: PublicKey;
+    scopePrices: PublicKey;
+}
+interface RefreshObligationFarmsForReserveArgs {
+    mode: number;
+}
+interface RefreshObligationFarmsForReserveAccounts {
+    crank: PublicKey;
+    baseAccounts: {
+        obligation: PublicKey;
+        lendingMarketAuthority: PublicKey;
+        reserve: PublicKey;
+        reserveFarmState: PublicKey;
+        obligationFarmUserState: PublicKey;
+        lendingMarket: PublicKey;
+    };
+    farmsProgram: PublicKey;
+    rent: PublicKey;
+    systemProgram: PublicKey;
+}
 interface ParsedReserve {
     address: PublicKey;
     market: PublicKey;
@@ -83,6 +113,10 @@ export declare class KaminoLendingClient {
         id: number;
     }): PublicKey;
     getObligationFarmState(obligation: PublicKey, farm: PublicKey): PublicKey;
+    refreshObligationIx(accounts: RefreshObligationAccounts, programId?: PublicKey): TransactionInstruction;
+    refreshReserveIx(accounts: RefreshReserveAccounts, programId?: PublicKey): TransactionInstruction;
+    refreshObligationFarmsForReserveIx(args: RefreshObligationFarmsForReserveArgs, accounts: RefreshObligationFarmsForReserveAccounts, programId?: PublicKey): TransactionInstruction;
+    refreshReservesBatchIx(reserves: PublicKey[], lendingMarkets: PublicKey[], skipPriceUpdates: boolean, programId?: PublicKey): TransactionInstruction;
     refreshReserveIxs(lendingMarket: PublicKey, reserves: PublicKey[]): TransactionInstruction[];
     refreshObligationCollateralFarmsForReservesIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];
     refreshObligationDebtFarmsForReservesIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];

package/src/client/price.d.ts

@@ -1,7 +1,7 @@
 import { AccountMeta, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { KaminoLendingClient, KaminoVaultsClient } from "./kamino";
 import { BaseClient } from "./base";
-import { PriceDenom } from "../models";
+import { PriceDenom, StateModel } from "../models";
 import { DriftClient, DriftVaultsClient } from "./drift";
 export declare class PriceClient {
     readonly base: BaseClient;
@@ -9,7 +9,14 @@ export declare class PriceClient {
     readonly kvaults: KaminoVaultsClient;
     readonly drift: DriftClient;
     readonly dvaults: DriftVaultsClient;
+    private _stateModel;
+    private _lookupTables;
+    private _kaminoVaults;
     constructor(base: BaseClient, klend: KaminoLendingClient, kvaults: KaminoVaultsClient, drift: DriftClient, dvaults: DriftVaultsClient);
+    get stateModel(): StateModel;
+    set stateModel(stateModel: StateModel);
+    get lookupTables(): PublicKey[];
+    get kaminoVaults(): PublicKey[];
     /**
      * !! 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.

package/src/models.d.ts

@@ -218,6 +218,11 @@ export declare class PriceDenom {
     } | {
         asset6: {};
     };
+    static fromString(str: string): {
+        sol: {};
+    } | {
+        usd: {};
+    };
 }
 export declare class TimeUnit {
     static readonly Slot: {

package/src/react/glam.d.ts

@@ -18,7 +18,6 @@ interface GlamProviderContext {
     glamStatesList: GlamStateCache[];
     delegateAcls: DelegateAcl[];
     allGlamStates: StateModel[];
-    userWallet: UserWallet;
     prices: TokenPrice[];
     jupTokenList?: TokenListItem[];
     driftMarketConfigs: DriftMarketConfigs;
@@ -26,13 +25,6 @@ interface GlamProviderContext {
     refresh: () => Promise<void>;
     refetchGlamStates: () => Promise<void>;
 }
-export interface UserWallet {
-    queryKey: string[];
-    pubkey?: PublicKey;
-    balanceLamports: number;
-    uiAmount: number;
-    tokenAccounts: TokenAccount[];
-}
 export interface Vault {
     pubkey: PublicKey;
     balanceLamports: number;

package/src/utils/helpers.d.ts

@@ -1,10 +1,20 @@
 import { Connection, PublicKey, TransactionInstruction, AddressLookupTableAccount } from "@solana/web3.js";
+import { type TokenAccount } from "../client/base";
 export type StakeAccountInfo = {
     address: PublicKey;
     lamports: number;
     state: string;
     voter?: PublicKey;
 };
+/**
+ * Fetches all the token accounts owned by the specified pubkey.
+ */
+export declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey): Promise<TokenAccount[]>;
+export declare function getSolAndTokenBalances(connection: Connection, owner: PublicKey): Promise<{
+    balanceLamports: number;
+    uiAmount: number;
+    tokenAccounts: TokenAccount[];
+}>;
 export declare const findStakeAccounts: (connection: Connection, withdrawAuthority: PublicKey) => Promise<PublicKey[]>;
 export declare const getStakeAccountsWithStates: (connection: Connection, withdrawAuthority: PublicKey) => Promise<StakeAccountInfo[]>;
 export declare const fetchMeteoraPositions: (connection: Connection, owner: PublicKey) => Promise<PublicKey[]>;

package/target/idl/glam_protocol.json

@@ -2,7 +2,7 @@
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glam_protocol",
-    "version": "0.4.35",
+    "version": "0.4.36",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -975,7 +975,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -6798,7 +6798,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -6929,7 +6929,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7065,7 +7065,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7211,7 +7211,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7335,7 +7335,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7455,7 +7455,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7521,8 +7521,11 @@
       "docs": [
         "Price vault SOL balance and tokens it holds.",
         "",
+        "If aggregation oracle is used for token #`i`, `agg_indexes[i]` must be set to its index in the oracle mapping account.",
+        "",
         "Extra accounts for pricing N tokens:",
-        "- (ata, mint, oracle) x N"
+        "- (ata, mint, oracle) x N",
+        "- optional oracle mapping (only add it if any token uses an agg oracle)"
       ],
       "discriminator": [
         54,
@@ -7581,7 +7584,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -7639,6 +7642,12 @@
               "name": "PriceDenom"
             }
           }
+        },
+        {
+          "name": "agg_indexes",
+          "type": {
+            "vec": "i16"
+          }
         }
       ]
     },
@@ -8047,7 +8056,7 @@
                   98,
                   97,
                   108,
-                  95,
+                  45,
                   99,
                   111,
                   110,
@@ -9993,7 +10002,8 @@
       ],
       "accounts": [
         {
-          "name": "glam_state"
+          "name": "glam_state",
+          "writable": true
         },
         {
           "name": "glam_vault",
@@ -11193,6 +11203,23 @@
                 "name": "OracleSource"
               }
             }
+          },
+          {
+            "name": "max_age_seconds",
+            "type": "u16"
+          },
+          {
+            "name": "priority",
+            "type": "u8"
+          },
+          {
+            "name": "padding",
+            "type": {
+              "array": [
+                "u8",
+                3
+              ]
+            }
           }
         ]
       }
@@ -12293,8 +12320,7 @@
           {
             "name": "fee_authority",
             "docs": [
-              "The authority that can modify fee structure of individual glam state",
-              "and claim protocol fees"
+              "The authority that can modify fee structure of individual glam state and claim protocol fees"
             ],
             "type": "pubkey"
           },
@@ -13205,6 +13231,9 @@
           {
             "name": "PythLazerStableCoin"
           },
+          {
+            "name": "NotSet"
+          },
           {
             "name": "LstPoolState"
           },
@@ -13213,6 +13242,9 @@
           },
           {
             "name": "BaseAsset"
+          },
+          {
+            "name": "ChainlinkRWA"
           }
         ]
       }
@@ -13540,6 +13572,9 @@
           },
           {
             "name": "Fulfill"
+          },
+          {
+            "name": "ClaimFees"
           }
         ]
       }

package/target/types/glam_protocol.d.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
     "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
     "metadata": {
         "name": "glamProtocol";
-        "version": "0.4.35";
+        "version": "0.4.36";
         "spec": "0.1.0";
         "description": "Glam Protocol";
     };
@@ -981,7 +981,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -6804,7 +6804,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -6935,7 +6935,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7071,7 +7071,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7217,7 +7217,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7341,7 +7341,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7461,7 +7461,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7527,8 +7527,11 @@ export type GlamProtocol = {
             "docs": [
                 "Price vault SOL balance and tokens it holds.",
                 "",
+                "If aggregation oracle is used for token #`i`, `agg_indexes[i]` must be set to its index in the oracle mapping account.",
+                "",
                 "Extra accounts for pricing N tokens:",
-                "- (ata, mint, oracle) x N"
+                "- (ata, mint, oracle) x N",
+                "- optional oracle mapping (only add it if any token uses an agg oracle)"
             ];
             "discriminator": [
                 54,
@@ -7587,7 +7590,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -7645,6 +7648,12 @@ export type GlamProtocol = {
                             "name": "priceDenom";
                         };
                     };
+                },
+                {
+                    "name": "aggIndexes";
+                    "type": {
+                        "vec": "i16";
+                    };
                 }
             ];
         },
@@ -8053,7 +8062,7 @@ export type GlamProtocol = {
                                     98,
                                     97,
                                     108,
-                                    95,
+                                    45,
                                     99,
                                     111,
                                     110,
@@ -10000,6 +10009,7 @@ export type GlamProtocol = {
             "accounts": [
                 {
                     "name": "glamState";
+                    "writable": true;
                 },
                 {
                     "name": "glamVault";
@@ -11199,6 +11209,23 @@ export type GlamProtocol = {
                                 "name": "oracleSource";
                             };
                         };
+                    },
+                    {
+                        "name": "maxAgeSeconds";
+                        "type": "u16";
+                    },
+                    {
+                        "name": "priority";
+                        "type": "u8";
+                    },
+                    {
+                        "name": "padding";
+                        "type": {
+                            "array": [
+                                "u8",
+                                3
+                            ];
+                        };
                     }
                 ];
             };
@@ -12299,8 +12326,7 @@ export type GlamProtocol = {
                     {
                         "name": "feeAuthority";
                         "docs": [
-                            "The authority that can modify fee structure of individual glam state",
-                            "and claim protocol fees"
+                            "The authority that can modify fee structure of individual glam state and claim protocol fees"
                         ];
                         "type": "pubkey";
                     },
@@ -13211,6 +13237,9 @@ export type GlamProtocol = {
                     {
                         "name": "pythLazerStableCoin";
                     },
+                    {
+                        "name": "notSet";
+                    },
                     {
                         "name": "lstPoolState";
                     },
@@ -13219,6 +13248,9 @@ export type GlamProtocol = {
                     },
                     {
                         "name": "baseAsset";
+                    },
+                    {
+                        "name": "chainlinkRwa";
                     }
                 ];
             };
@@ -13546,6 +13578,9 @@ export type GlamProtocol = {
                     },
                     {
                         "name": "fulfill";
+                    },
+                    {
+                        "name": "claimFees";
                     }
                 ];
             };