@glamsystems/glam-sdk 0.1.16 → 0.1.17

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
   "homepage": "https://www.glam.systems",
   "repository": {
     "type": "git",
-    "url": "git@github.com:glamsystems/glam-sdk.git"
+    "url": "git@github.com:glamsystems/glam.git"
   },
   "keywords": [
     "glam",
@@ -20,16 +20,15 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.0",
     "@coral-xyz/borsh": "^0.31.0",
-    "@drift-labs/sdk": "2.118.0-beta.7",
+    "@drift-labs/sdk": "2.114.0-beta.3",
     "@marinade.finance/marinade-ts-sdk": "^5.0.15",
+    "@pythnetwork/client": "^2.21.1",
     "@solana/spl-stake-pool": "^1.1.5",
     "@solana/spl-token": "^0.4.9",
     "@solana/spl-token-metadata": "^0.1.4",
     "@solana/web3.js": "^1.98.0",
-    "@meteora-ag/dlmm": "^1.4.11",
     "bs58": "^5.0.0",
-    "buffer": "^6.0.3",
-    "@switchboard-xyz/common": "^3.0.0"
+    "buffer": "^6.0.3"
   },
   "engines": {
     "node": ">=20.18.0"
@@ -38,20 +37,13 @@
     "@rollup/plugin-terser": "^0.4.4",
     "rollup-plugin-javascript-obfuscator": "^1.0.4"
   },
-  "peerDependencies": {
-    "solana-bankrun": "^0.4.0",
-    "@coral-xyz/anchor": "^0.31.0",
-    "@solana/web3.js": "^1.98.0"
-  },
   "pnpm": {
     "overrides": {
-      "anchor-bankrun": "^0.4.0",
-      "solana-bankrun": "^0.4.0",
-      "@coral-xyz/anchor": "^0.31.0",
-      "@solana/web3.js": "^1.98.0",
-      "@solana/spl-token": "^0.4.6",
-      "@solana/spl-stake-pool": "^1.1.5",
-      "typescript": "^5.5.3"
+      "@solana/web3.js@>=0.0.1": "^1.98.0",
+      "@solana/spl-token@>=0.0.1": "^0.4.6",
+      "@solana/spl-stake-pool@>=0.0.1": "^1.1.5",
+      "typescript@>=0.0.1": "^5.5.3",
+      "solana-bankrun@>=0.0.1": "^0.3.0"
     }
   },
   "types": "./index.esm.d.ts"

package/src/client/assets.d.ts

@@ -2,17 +2,11 @@ import { PublicKey } from "@solana/web3.js";
 /**
  * Metadata for an asset for pricing
  */
-export declare class AssetMeta {
-    pricingAccount?: PublicKey;
-    stateAccount?: PublicKey;
-    priceFeed?: string;
+export interface AssetMeta {
+    decimals: number;
+    oracle: PublicKey;
     programId?: PublicKey;
 }
-/**
- * We use sponsored feed listed on https://docs.pyth.network/price-feeds/sponsored-feeds/solana for popular tokens.
- *
- * For PYUSD, we use the price feed from Drift.
- * For LSTs, we use the state account to calculate the price based on the number of SOLs locked.
- */
 export declare const ASSETS_MAINNET: Map<string, AssetMeta>;
 export declare const ASSETS_TESTS: Map<string, AssetMeta>;
+export declare const SOL_ORACLE: PublicKey;

package/src/client/base.d.ts

@@ -52,7 +52,7 @@ export declare class BaseClient {
     intoVersionedTransaction(tx: Transaction, { lookupTables, signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee, jitoTipLamports, simulate, }: TxOptions): Promise<VersionedTransaction>;
     sendAndConfirm(tx: VersionedTransaction | Transaction, additionalSigners?: Keypair[]): Promise<TransactionSignature>;
     parseProgramLogs(logs?: null | string[]): string;
-    getAdressLookupTableAccounts(keys?: string[]): Promise<AddressLookupTableAccount[]>;
+    getAdressLookupTableAccounts(keys?: string[] | PublicKey[]): Promise<AddressLookupTableAccount[]>;
     getWallet(): Wallet;
     getSigner(): PublicKey;
     getAta(mint: PublicKey, owner: PublicKey, tokenProgram?: anchor.web3.PublicKey): PublicKey;

package/src/client/drift.d.ts

@@ -3,7 +3,7 @@ import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstr
 import { MarketType, OrderParams, PositionDirection, SpotPosition, PerpPosition, ModifyOrderParams } from "@drift-labs/sdk";
 import { BaseClient, TxOptions } from "./base";
 import { AccountMeta } from "@solana/web3.js";
-import { StateModel } from "../models";
+import { PriceDenom, StateModel } from "../models";
 interface OrderConstants {
     perpBaseScale: number;
     quoteScale: number;
@@ -57,7 +57,7 @@ export interface GlamDriftUser {
 export declare class DriftClient {
     readonly base: BaseClient;
     constructor(base: BaseClient);
-    initialize(statePda: PublicKey, subAccountId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    initialize(statePda: PublicKey | string, subAccountId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
     updateUserCustomMarginRatio(statePda: PublicKey, maxLeverage: number, // 1=1x, 2=2x ... 50=50x leverage
     subAccountId?: number): Promise<TransactionSignature>;
     updateUserMarginTradingEnabled(statePda: PublicKey, marginTradingEnabled: boolean, subAccountId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
@@ -69,7 +69,8 @@ export declare class DriftClient {
     modifyOrder(statePda: PublicKey | string, modifyOrderParams: ModifyOrderParams, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<TransactionSignature>;
     cancelOrders(statePda: PublicKey | string, marketType: MarketType, marketIndex: number, direction: PositionDirection, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<TransactionSignature>;
     cancelOrdersByIds(statePda: PublicKey | string, orderIds: number[], subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<TransactionSignature>;
-    priceDrift(statePda: PublicKey | string, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<TransactionSignature>;
+    settlePnl(statePda: PublicKey | string, marketIndex: number, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<TransactionSignature>;
+    priceDrift(statePda: PublicKey | string, marketConfigs: DriftMarketConfigs, priceDenom: PriceDenom, txOptions?: TxOptions): Promise<TransactionSignature>;
     getUser(statePda: PublicKey | string, subAccountId?: number): PublicKey[];
     fetchMarketConfigs(): Promise<DriftMarketConfigs>;
     fetchGlamDriftUser(glamState: PublicKey | string, subAccountId?: number): Promise<GlamDriftUser>;
@@ -108,6 +109,7 @@ export declare class DriftClient {
     modifyOrderTx(statePda: PublicKey, modifyOrderParams: ModifyOrderParams, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<VersionedTransaction>;
     cancelOrdersTx(glamState: PublicKey, marketType: MarketType, marketIndex: number, direction: PositionDirection, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<VersionedTransaction>;
     cancelOrdersByIdsTx(glamState: PublicKey, orderIds: number[], subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<VersionedTransaction>;
-    priceDriftTx(glamState: PublicKey, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<VersionedTransaction>;
+    settlePnlTx(glamState: PublicKey, marketIndex: number, subAccountId: number, marketConfigs: DriftMarketConfigs, txOptions?: TxOptions): Promise<VersionedTransaction>;
+    priceDriftTx(glamState: PublicKey, marketConfigs: DriftMarketConfigs, priceDenom: PriceDenom, txOptions?: TxOptions): Promise<VersionedTransaction>;
 }
 export {};

package/src/client/kamino.d.ts

@@ -1,17 +1,123 @@
 import { BN } from "@coral-xyz/anchor";
-import { PublicKey, VersionedTransaction, TransactionSignature } from "@solana/web3.js";
+import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
 import { BaseClient, TxOptions } from "./base";
+interface ParsedReserve {
+    address: PublicKey;
+    farmCollateral?: PublicKey;
+    farmDebt?: PublicKey;
+    liquidityMint: PublicKey;
+    liquiditySupplyVault: PublicKey;
+    collateralMint: PublicKey;
+    collateralSupplyVault: PublicKey;
+    feeVault: PublicKey;
+}
+interface ParsedObligation {
+    deposits: {
+        reserve: PublicKey;
+    }[];
+    borrows: {
+        reserve: PublicKey;
+    }[];
+}
 export declare class KaminoLendingClient {
     readonly base: BaseClient;
+    private reserves;
+    private obligations;
     constructor(base: BaseClient);
-    initialize(statePda: PublicKey, txOptions?: TxOptions): Promise<TransactionSignature>;
-    deposit(statePda: PublicKey, amount: BN | number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    /**
+     * Initializes Kamino user metadata
+     *
+     * @param statePda
+     * @param market Lending market
+     * @param referrer Referrer user metadata
+     * @param txOptions
+     * @returns
+     */
+    initUserMetadata(statePda: PublicKey | string, referrer?: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;
+    /**
+     * Deposits asset to the lending market.
+     *
+     * @param statePda
+     * @param market Lending market
+     * @param asset Asset mint
+     * @param amount Amount to deposit
+     * @param txOptions
+     * @returns
+     */
+    deposit(statePda: PublicKey | string, market: PublicKey | string, asset: PublicKey | string, amount: BN | number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    /**
+     * Withdraws asset from the lending market.
+     *
+     * @param statePda
+     * @param market Lending market
+     * @param asset Asset mint
+     * @param amount Amount to deposit
+     * @param txOptions
+     * @returns
+     */
+    withdraw(statePda: PublicKey | string, market: PublicKey | string, asset: PublicKey | string, amount: BN | number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    /**
+     * Borrows asset from the lending market.
+     *
+     * @param statePda GLAM state
+     * @param market Lending market
+     * @param asset Asset mint
+     * @param amount Amount to borrow
+     * @param txOptions
+     * @returns
+     */
+    borrow(statePda: PublicKey | string, market: PublicKey | string, asset: PublicKey | string, amount: BN | number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    /**
+     * Repays asset to the lending market.
+     *
+     * @param statePda
+     * @param market
+     * @param asset
+     * @param amount
+     * @param txOptions
+     * @returns
+     */
+    repay(statePda: PublicKey | string, market: PublicKey | string, asset: PublicKey | string, amount: BN | number, txOptions?: TxOptions): Promise<TransactionSignature>;
     getUserMetadataPda(owner: PublicKey): PublicKey;
-    getObligationPda(owner: PublicKey, args: {
+    getObligationPda(owner: PublicKey, market: PublicKey, args?: {
         tag: number;
         id: number;
     }): PublicKey;
-    getObligationFarm(obligation: PublicKey): PublicKey;
-    initializeTx(statePda: PublicKey, txOptions: TxOptions): Promise<VersionedTransaction>;
-    depositTx(statePda: PublicKey, asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    getObligationFarmState(obligation: PublicKey, farm: PublicKey): PublicKey;
+    initUserMetadataTx(glamState: PublicKey, referrer: PublicKey, txOptions: TxOptions): Promise<VersionedTransaction>;
+    refreshReserveIxs(lendingMarket: PublicKey, reserves: PublicKey[]): TransactionInstruction[];
+    refreshObligationFarmsForReserveIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];
+    /**
+     * Returns an array of instructions for refreshing an existing obligation and reserves it depends on.
+     */
+    getRefreshIxs(obligation: PublicKey, lendingMarket: PublicKey): Promise<TransactionInstruction[]>;
+    getMarketAuthority(market: PublicKey): PublicKey;
+    reservePdas(market: PublicKey, mint: PublicKey): {
+        liquiditySupplyVault: PublicKey;
+        collateralMint: PublicKey;
+        collateralSupplyVault: PublicKey;
+        feeVault: PublicKey;
+    };
+    /**
+     * Fetches and parses obligation account
+     *
+     * @param obligation User obligation pubkey
+     * @returns Pubkeys of reserves for deposits and borrows
+     */
+    fetchAndParseObligation(obligation: PublicKey): Promise<ParsedObligation>;
+    pubkeyArraysEqual: (a: PublicKey[], b: PublicKey[]) => boolean;
+    /**
+     * We only need pubkeys that don't change over time. No need to fetch them every time.
+     *
+     * @param market
+     * @param asset
+     * @returns
+     */
+    fetchAndParseReserves(reserves: PublicKey[]): Promise<ParsedReserve[]>;
+    findAndParseReserve(market: PublicKey, asset: PublicKey): Promise<ParsedReserve>;
+    depositTx(glamState: PublicKey, market: PublicKey, asset: PublicKey, amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    withdrawTx(glamState: PublicKey, market: PublicKey, asset: PublicKey, amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    borrowTx(glamState: PublicKey, market: PublicKey, asset: PublicKey, amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    repayTx(glamState: PublicKey, market: PublicKey, asset: PublicKey, amount: BN, txOptions?: TxOptions): Promise<VersionedTransaction>;
 }
+export {};

package/src/client/meteora.d.ts

@@ -15,17 +15,9 @@ export declare class MeteoraDlmmClient {
     closePosition(statePda: PublicKey | string, position: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;
     getPositionPda(lbPair: PublicKey, base: PublicKey, lowerBinId: number, // i32
     width: number): PublicKey;
-    fetchPositions(owner: PublicKey): Promise<PublicKey[]>;
-    parsePosition(position: PublicKey): Promise<{
-        lowerBinId: number;
-        upperBinId: number;
-        binArrayLower: PublicKey;
-        binArrayUpper: PublicKey;
-        lbPair: PublicKey;
-    }>;
     autoFillY(dlmmPool: DLMM, amountX: BN): Promise<{
         amountX: BN;
-        amountY: any;
+        amountY: BN;
         activeBinId: number;
     }>;
 }

package/src/client/price.d.ts

@@ -1,15 +1,28 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { BN } from "@coral-xyz/anchor";
 import { BaseClient } from "./base";
+import { PriceDenom } from "../models";
 export declare class PriceClient {
     readonly base: BaseClient;
     constructor(base: BaseClient);
     /**
      * !! 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. If the vault has not been priced or pricing data is outdated, the number is NOT meaningful.
+     * !! It doesn't reflect the actual AUM of the vault.
+     * !! If the vault has not been priced or pricing data is outdated, the number is NOT meaningful.
      */
     getAum(glamState: PublicKey): Promise<BN>;
-    priceVaultIxs(glamState: PublicKey): Promise<TransactionInstruction[]>;
-    remainingAccountsForPricing: (glamState: PublicKey) => Promise<{
+    priceVaultIxs(glamState: PublicKey, priceDenom: PriceDenom): Promise<TransactionInstruction[]>;
+    remainingAccountsForPricingKamino: (glamState: PublicKey) => Promise<{
+        pubkey: PublicKey;
+        isSigner: boolean;
+        isWritable: boolean;
+    }[]>;
+    remainingAccountsForPricingMeteora: (glamState: PublicKey) => Promise<{
+        pubkey: PublicKey;
+        isSigner: boolean;
+        isWritable: boolean;
+    }[]>;
+    remainingAccountsForPricingVaultAssets: (glamState: PublicKey) => Promise<{
         pubkey: PublicKey;
         isSigner: boolean;
         isWritable: boolean;

package/src/constants.d.ts

@@ -6,6 +6,8 @@ export declare const SEED_VAULT: string;
 export declare const SEED_ESCROW: string;
 export declare const MARINADE_TICKET_SIZE = 88;
 export declare const STAKE_ACCOUNT_SIZE = 200;
+export declare const METEORA_POSITION_SIZE = 8120;
+export declare const KAMINO_OBTRIGATION_SIZE = 3344;
 export declare const JITO_TIP_DEFAULT: PublicKey;
 /**
  * Token mints. If no devnet version is defined, assume mainnet and devnet addresses are the same.
@@ -30,6 +32,10 @@ export declare const GOVERNANCE_PROGRAM_ID: PublicKey;
 export declare const JUP_VOTE_PROGRAM: PublicKey;
 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_FARM_PROGRAM: PublicKey;
+export declare const MEMO_PROGRAM: PublicKey;
 /**
  * Stake pools
  */

package/src/index.d.ts

@@ -9,3 +9,4 @@ export * from "./utils/helpers";
 export * from "./utils/priorityfee";
 export * from "./constants";
 export * from "./error";
+export * from "./client/assets";

package/src/models.d.ts

@@ -178,3 +178,11 @@ export type FeeStructure = IdlTypes<GlamProtocol>["feeStructure"];
 export type FeeParams = IdlTypes<GlamProtocol>["feeParams"];
 export type AccruedFees = IdlTypes<GlamProtocol>["accruedFees"];
 export type Valuation = IdlTypes<GlamProtocol>["valuation"];
+export declare class PriceDenom {
+    static readonly SOL: {
+        sol: {};
+    };
+    static readonly USD: {
+        usd: {};
+    };
+}

package/src/utils/helpers.d.ts

@@ -4,4 +4,13 @@ export declare const fetchMarinadeTicketAccounts: (connection: Connection, benef
     pubkey: PublicKey;
     account: import("@solana/web3.js").AccountInfo<Buffer | import("@solana/web3.js").ParsedAccountData>;
 }[]>;
+export declare const fetchKaminoObligations: (connection: Connection, owner: PublicKey, market?: PublicKey) => Promise<PublicKey[]>;
+export declare const fetchMeteoraPositions: (connection: Connection, owner: PublicKey) => Promise<PublicKey[]>;
+export declare const parseMeteoraPosition: (connection: Connection, position: PublicKey) => Promise<{
+    lbPair: PublicKey;
+    lowerBinId: number;
+    upperBinId: number;
+    binArrayLower: PublicKey;
+    binArrayUpper: PublicKey;
+}>;
 export declare const getSimulationComputeUnits: (connection: Connection, instructions: Array<TransactionInstruction>, payer: PublicKey, lookupTables?: Array<AddressLookupTableAccount>) => Promise<number | undefined>;