@glamsystems/glam-sdk 0.1.23 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",
@@ -18,8 +18,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.31.0",
-    "@coral-xyz/borsh": "^0.31.0",
+    "@coral-xyz/anchor": "^0.31.1",
+    "@coral-xyz/borsh": "^0.31.1",
     "@marinade.finance/marinade-ts-sdk": "^5.0.15",
     "@meteora-ag/dlmm": "^1.4.11",
     "@solana/spl-stake-pool": "^1.1.5",

package/src/client/assets.d.ts

@@ -1,4 +1,20 @@
 import { PublicKey } from "@solana/web3.js";
+export declare const STAKE_POOLS: {
+    name: string;
+    symbol: string;
+    mint: string;
+    logoURI: string;
+    tokenProgram: any;
+    poolState: any;
+}[];
+export declare const STAKE_POOLS_MAP: Map<string, {
+    name: string;
+    symbol: string;
+    mint: string;
+    logoURI: string;
+    tokenProgram: any;
+    poolState: any;
+}>;
 /**
  * Metadata for an asset for pricing
  */
@@ -6,6 +22,7 @@ export interface AssetMeta {
     decimals: number;
     oracle: PublicKey;
     programId?: PublicKey;
+    isLst?: boolean;
 }
 export declare const ASSETS_MAINNET: Map<string, AssetMeta>;
 export declare const ASSETS_TESTS: Map<string, AssetMeta>;

package/src/client/base.d.ts

@@ -108,6 +108,9 @@ export declare class BaseClient {
      * @deprecated
      */
     getAssetIdFromCurrency(currency: string): string;
+    /**
+     * @deprecated
+     */
     listGlamStates(): Promise<PublicKey[]>;
     /**
      * Fetch glam state from onchain accounts and build a StateModel

package/src/client/investor.d.ts

@@ -5,13 +5,13 @@ export declare class InvestorClient {
     readonly base: BaseClient;
     constructor(base: BaseClient);
     subscribe(asset: PublicKey, amount: BN, mintId?: number, queued?: boolean, txOptions?: TxOptions): Promise<TransactionSignature>;
-    queuedRedeem(asset: PublicKey, amount: BN, mintId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
-    fulfill(asset: PublicKey, mintId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    queuedRedeem(amount: BN, mintId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
+    fulfill(mintId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
     claim(asset: PublicKey, mintId?: number, txOptions?: TxOptions): Promise<TransactionSignature>;
     subscribeTx(asset: PublicKey, amount: BN, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
     queuedSubscribeTx(asset: PublicKey, amount: BN, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
-    queuedRedeemTx(asset: PublicKey, amount: BN, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
-    fulfillTx(asset: PublicKey, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
+    queuedRedeemTx(amount: BN, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
+    fulfillTx(mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
     claimAssetTx(asset: PublicKey, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
     claimShareTx(asset: PublicKey, mintId?: number, txOptions?: TxOptions): Promise<VersionedTransaction>;
 }

package/src/client/kamino.d.ts

@@ -83,8 +83,8 @@ export declare class KaminoLendingClient {
     getObligationFarmState(obligation: PublicKey, farm: PublicKey): PublicKey;
     initUserMetadataTx(txOptions?: TxOptions): Promise<VersionedTransaction>;
     refreshReserveIxs(lendingMarket: PublicKey, reserves: PublicKey[]): TransactionInstruction[];
-    refreshObligationFarmsForReserveIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];
-    getRefreshIxs(obligation: PublicKey, refreshFarms?: boolean): Promise<TransactionInstruction[]>;
+    refreshObligationCollateralFarmsForReservesIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];
+    refreshObligationDebtFarmsForReservesIxs(obligation: PublicKey, lendingMarket: PublicKey, parsedReserves: ParsedReserve[]): TransactionInstruction[];
     getMarketAuthority(market: PublicKey): PublicKey;
     reservePdas(market: PublicKey, mint: PublicKey): {
         liquiditySupplyVault: PublicKey;

package/src/client/marinade.d.ts

@@ -1,6 +1,8 @@
 import { BN } from "@coral-xyz/anchor";
-import { PublicKey, VersionedTransaction, TransactionSignature } from "@solana/web3.js";
+import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction, Keypair } from "@solana/web3.js";
+import { MarinadeState } from "@marinade.finance/marinade-ts-sdk";
 import { BaseClient, TxOptions } from "./base";
+import { StakeAccountInfo } from "../utils/helpers";
 export type Ticket = {
     address: PublicKey;
     lamports: number;
@@ -12,12 +14,17 @@ export declare class MarinadeClient {
     readonly base: BaseClient;
     constructor(base: BaseClient);
     deposit(amount: BN, txOptions?: TxOptions): Promise<TransactionSignature>;
+    depositNative(amount: BN, txOptions?: TxOptions): Promise<TransactionSignature>;
     depositStakeAccount(stakeAccount: PublicKey): Promise<TransactionSignature>;
+    withdrawStakeAccount(amount: BN, txOptions?: TxOptions): Promise<TransactionSignature>;
     orderUnstake(amount: BN, txOptions?: TxOptions): Promise<TransactionSignature>;
     claim(tickets: PublicKey[], txOptions?: TxOptions): Promise<TransactionSignature>;
     getTickets(): Promise<PublicKey[]>;
     getParsedTickets(): Promise<Ticket[]>;
-    getMarinadeState(): {
+    /**
+     * @deprecated Use Marinade.getMarinadeState() instead
+     */
+    get marinadeStateStatic(): {
         marinadeStateAddress: PublicKey;
         msolMintAddress: PublicKey;
         treasuryMsolAccount: PublicKey;
@@ -27,9 +34,18 @@ export declare class MarinadeClient {
         msolLegAuthority: PublicKey;
         solLeg: PublicKey;
     };
+    fetchMarinadeState(): Promise<MarinadeState>;
     getParsedStakeAccountInfo(stakeAccount: PublicKey): Promise<any>;
     depositTx(amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    createStakeAccount(signer: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
+    depositNativeTx(amount: BN, txOptions: TxOptions): Promise<any>;
     depositStakeAccountTx(stakeAccount: PublicKey, txOptions: TxOptions): Promise<any>;
+    parseAccountList(data: Buffer, itemSize: number): any[];
+    getIndexes(stakeAccount: StakeAccountInfo, stakeList: any, validatorList: any): Promise<{
+        stakeIndex: number;
+        validatorIndex: number;
+    }>;
+    withdrawStakeAccountTx(amount: BN, txOptions: TxOptions): Promise<[VersionedTransaction, Keypair]>;
     orderUnstakeTx(amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
     claimTx(tickets: PublicKey[], txOptions: TxOptions): Promise<VersionedTransaction>;
 }

package/src/client/meteora.d.ts

@@ -9,7 +9,7 @@ export declare class MeteoraDlmmClient {
     getDlmmPool(pool: PublicKey | string): Promise<DLMM>;
     initializePosition(pool: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;
     initializePositionPda(pool: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;
-    addLiquidityByStrategy(position: PublicKey | string, amountX: BN | number, amountY: BN | number, strategyType: keyof typeof Strategy, txOptions?: TxOptions): Promise<string>;
+    addLiquidityByStrategy(position: PublicKey | string, amountX: BN | number, amountY: BN | number, strategyType: keyof typeof Strategy, maxActiveBinSlippage: number, txOptions?: TxOptions): Promise<string>;
     removeLiquidityByRange(position: PublicKey | string, bpsToRemove: number, txOptions?: TxOptions): Promise<string>;
     claimFee(position: PublicKey | string, txOptions?: TxOptions): Promise<string>;
     closePosition(position: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;

package/src/client/price.d.ts

@@ -21,7 +21,7 @@ export declare class PriceClient {
         isSigner: boolean;
         isWritable: boolean;
     }[]>;
-    remainingAccountsForPricingVaultAssets: () => Promise<{
+    remainingAccountsForPricingVaultAssets: (baseAssetOnly?: boolean) => Promise<{
         pubkey: PublicKey;
         isSigner: boolean;
         isWritable: boolean;

package/src/client/staking.d.ts

@@ -2,6 +2,7 @@ import { BN } from "@coral-xyz/anchor";
 import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
 import { BaseClient, TxOptions } from "./base";
 import { MarinadeClient } from "./marinade";
+import { StakeAccountInfo } from "../utils/helpers";
 interface StakePoolAccountData {
     programId: PublicKey;
     depositAuthority: PublicKey;
@@ -12,12 +13,6 @@ interface StakePoolAccountData {
     tokenProgramId: PublicKey;
     validatorList: PublicKey;
 }
-type StakeAccountInfo = {
-    address: PublicKey;
-    lamports: number;
-    state: string;
-    voter?: PublicKey;
-};
 export declare class StakingClient {
     readonly base: BaseClient;
     readonly marinade: MarinadeClient;

package/src/client/state.d.ts

@@ -1,5 +1,4 @@
-import { PublicKey, VersionedTransaction, TransactionInstruction, TransactionSignature } from "@solana/web3.js";
-import { BN } from "@coral-xyz/anchor";
+import { PublicKey, VersionedTransaction, TransactionSignature } from "@solana/web3.js";
 import { BaseClient, TxOptions } from "./base";
 import { DelegateAcl, StateModel } from "../models";
 export declare class StateClient {
@@ -26,17 +25,4 @@ export declare class StateClient {
      */
     deleteDelegateAcls(delegates: PublicKey[], txOptions?: TxOptions): Promise<TransactionSignature>;
     upsertDelegateAcls(delegateAcls: DelegateAcl[], txOptions?: TxOptions): Promise<TransactionSignature>;
-    closeTokenAccounts(tokenAccounts: PublicKey[], txOptions?: TxOptions): Promise<TransactionSignature>;
-    /**
-     * Close vault's token accounts, all token accounts must use the same token program
-     */
-    closeTokenAccountIx(tokenAccounts: PublicKey[], tokenProgram?: PublicKey, txOptions?: TxOptions): Promise<TransactionInstruction>;
-    closeTokenAccountsTx(accounts: PublicKey[], txOptions: TxOptions): Promise<VersionedTransaction>;
-    deposit(asset: PublicKey | string, amount: number | BN, txOptions?: TxOptions): Promise<TransactionSignature>;
-    depositSol(lamports: number | BN, wrap?: boolean, txOptions?: TxOptions): Promise<TransactionSignature>;
-    depositSolTx(lamports: number | BN, wrap?: boolean, txOptions?: TxOptions): Promise<VersionedTransaction>;
-    withdraw(asset: PublicKey | string, amount: number | BN, txOptions?: TxOptions): Promise<TransactionSignature>;
-    depositTx(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
-    withdrawIxs(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<TransactionInstruction[]>;
-    withdrawTx(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
 }

package/src/client/vault.d.ts

@@ -0,0 +1,27 @@
+import { BN } from "@coral-xyz/anchor";
+import { PublicKey, VersionedTransaction, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
+import { BaseClient, TxOptions } from "./base";
+export declare class VaultClient {
+    readonly base: BaseClient;
+    constructor(base: BaseClient);
+    wrap(amount: BN, txOptions?: TxOptions): Promise<TransactionSignature>;
+    unwrap(txOptions?: TxOptions): Promise<TransactionSignature>;
+    systemTransfer(amount: BN | number, to: PublicKey | string, txOptions?: TxOptions): Promise<TransactionSignature>;
+    closeTokenAccounts(tokenAccounts: PublicKey[], txOptions?: TxOptions): Promise<TransactionSignature>;
+    deposit(asset: PublicKey | string, amount: number | BN, txOptions?: TxOptions): Promise<TransactionSignature>;
+    depositSol(lamports: number | BN, wrap?: boolean, txOptions?: TxOptions): Promise<TransactionSignature>;
+    withdraw(asset: PublicKey | string, amount: number | BN, txOptions?: TxOptions): Promise<TransactionSignature>;
+    wrapTx(amount: BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+    unwrapTx(txOptions: TxOptions): Promise<VersionedTransaction>;
+    systemTransferTx(amount: BN, to: PublicKey, txOptions: TxOptions): Promise<VersionedTransaction>;
+    /**
+     * Returns an instruction that closes multiple vault token accounts
+     * All token accounts must be owned by the same token program
+     */
+    closeTokenAccountIx(tokenAccounts: PublicKey[], tokenProgram?: PublicKey, txOptions?: TxOptions): Promise<TransactionInstruction>;
+    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[]>;
+    withdrawTx(asset: PublicKey, amount: number | BN, txOptions: TxOptions): Promise<VersionedTransaction>;
+}

package/src/client.d.ts

@@ -4,7 +4,7 @@ import { DriftClient } from "./client/drift";
 import { JupiterSwapClient } from "./client/jupiter";
 import { JupiterVoteClient } from "./client/jupiter";
 import { MarinadeClient } from "./client/marinade";
-import { WSolClient } from "./client/wsol";
+import { VaultClient } from "./client/vault";
 import { StakingClient } from "./client/staking";
 import { StateClient } from "./client/state";
 import { MintClient } from "./client/mint";
@@ -24,7 +24,7 @@ export declare class GlamClient extends BaseClient {
     private _jupiterSwap?;
     private _jupiterVote?;
     private _marinade?;
-    private _wsol?;
+    private _vault?;
     private _price?;
     private _staking?;
     private _state?;
@@ -38,7 +38,7 @@ export declare class GlamClient extends BaseClient {
     get jupiterSwap(): JupiterSwapClient;
     get jupiterVote(): JupiterVoteClient;
     get marinade(): MarinadeClient;
-    get wsol(): WSolClient;
+    get vault(): VaultClient;
     get staking(): StakingClient;
     get price(): PriceClient;
     get state(): StateClient;

package/src/constants.d.ts

@@ -10,6 +10,7 @@ export declare const METEORA_POSITION_SIZE = 8120;
 export declare const KAMINO_OBTRIGATION_SIZE = 3344;
 export declare const JITO_TIP_DEFAULT: PublicKey;
 export declare const KAMINO_SCOPE_PRICES: PublicKey;
+export declare const MARINADE_NATIVE_STAKE_AUTHORITY: PublicKey;
 /**
  * Token mints. If no devnet version is defined, assume mainnet and devnet addresses are the same.
  *
@@ -17,10 +18,7 @@ export declare const KAMINO_SCOPE_PRICES: PublicKey;
  */
 export declare const WSOL: PublicKey;
 export declare const MSOL: PublicKey;
-export declare const JITOSOL: PublicKey;
 export declare const USDC: PublicKey;
-export declare const WETH: PublicKey;
-export declare const WBTC: PublicKey;
 export declare const JUP: PublicKey;
 /**
  * Program IDs

package/src/models.d.ts

@@ -22,7 +22,6 @@ export declare class StateIdlModel implements StateModelType {
     uri: string | null;
     enabled: boolean | null;
     assets: PublicKey[] | null;
-    externalVaultAccounts: PublicKey[] | null;
     mints: MintModel[] | null;
     company: CompanyModel | null;
     owner: ManagerModel | null;
@@ -36,6 +35,7 @@ export declare class StateIdlModel implements StateModelType {
     } | null;
     delegateAcls: DelegateAcl[] | null;
     integrations: Integration[] | null;
+    borrowableAssets: PublicKey[] | null;
     driftMarketIndexesPerp: number[] | null;
     driftMarketIndexesSpot: number[] | null;
     driftOrderTypes: number[] | null;
@@ -48,7 +48,12 @@ export declare class StateIdlModel implements StateModelType {
 }
 export declare class StateModel extends StateIdlModel {
     readonly glamProgramId: PublicKey;
-    constructor(data: Partial<StateIdlModel>, glamProgramId?: PublicKey);
+    externalVaultAccounts: PublicKey[] | null;
+    pricedAssets: any[] | null;
+    ledger: LedgerEntry[] | null;
+    timelockExpiresAt: number | null;
+    pendingUpdates: any | null;
+    constructor(data: Partial<StateModel>, glamProgramId?: PublicKey);
     get idStr(): string;
     get vaultPda(): PublicKey;
     get openfundsPda(): PublicKey;
@@ -193,6 +198,7 @@ export type FeeStructure = IdlTypes<GlamProtocol>["feeStructure"];
 export type FeeParams = IdlTypes<GlamProtocol>["feeParams"];
 export type AccruedFees = IdlTypes<GlamProtocol>["accruedFees"];
 export type NotifyAndSettle = IdlTypes<GlamProtocol>["notifyAndSettle"];
+export type LedgerEntry = IdlTypes<GlamProtocol>["ledgerEntry"];
 export declare class PriceDenom {
     static readonly SOL: {
         sol: {};
@@ -200,6 +206,16 @@ export declare class PriceDenom {
     static readonly USD: {
         usd: {};
     };
+    static readonly ASSET: {
+        asset6: {};
+    };
+    static fromAsset(asset: PublicKey): {
+        sol: {};
+    } | {
+        usd: {};
+    } | {
+        asset6: {};
+    };
 }
 export declare class TimeUnit {
     static readonly Slot: {

package/src/react/glam.d.ts

@@ -36,8 +36,9 @@ interface GlamProviderContext {
     driftUser: DriftUser;
     setActiveGlamState: (f: GlamStateCache) => void;
     refresh: () => Promise<void>;
+    refetchGlamStates: () => Promise<void>;
 }
-interface UserWallet {
+export interface UserWallet {
     queryKey: string[];
     pubkey?: PublicKey;
     balanceLamports: number;
@@ -49,6 +50,7 @@ export interface Vault {
     balanceLamports: number;
     uiAmount: number;
     tokenAccounts: TokenAccount[];
+    driftUser?: DriftUser;
 }
 interface GlamStateCache {
     address: string;

package/src/utils/helpers.d.ts

@@ -1,9 +1,13 @@
 import { Connection, PublicKey, TransactionInstruction, AddressLookupTableAccount } from "@solana/web3.js";
+export type StakeAccountInfo = {
+    address: PublicKey;
+    lamports: number;
+    state: string;
+    voter?: PublicKey;
+};
 export declare const fetchStakeAccounts: (connection: Connection, withdrawAuthority: PublicKey) => Promise<PublicKey[]>;
-export declare const fetchMarinadeTicketAccounts: (connection: Connection, beneficiary: PublicKey) => Promise<{
-    pubkey: PublicKey;
-    account: import("@solana/web3.js").AccountInfo<Buffer | import("@solana/web3.js").ParsedAccountData>;
-}[]>;
+export declare const getStakeAccountsWithStates: (connection: Connection, withdrawAuthority: PublicKey) => Promise<StakeAccountInfo[]>;
+export declare const fetchMarinadeTicketAccounts: (connection: Connection, beneficiary: PublicKey) => Promise<import("@solana/web3.js").GetProgramAccountsResponse>;
 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<{