@glamsystems/glam-sdk 0.1.23 → 0.1.25

package/index.cjs.js

@@ -5,6 +5,7 @@ var web3_js = require('@solana/web3.js');
 var splToken = require('@solana/spl-token');
 var splTokenMetadata = require('@solana/spl-token-metadata');
 var DLMM = require('@meteora-ag/dlmm');
+var sanctumLstList = require('sanctum-lst-list');
 var bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 var marinadeTsSdk = require('@marinade.finance/marinade-ts-sdk');
 var splStakePool = require('@solana/spl-stake-pool');
@@ -33,7 +34,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.20",
+    version: "0.4.24",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -2931,11 +2932,6 @@ var instructions = [
                 name: "escrow",
                 writable: true
             },
-            {
-                name: "payer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
@@ -4203,6 +4199,126 @@ var instructions = [
             }
         ]
     },
+    {
+        name: "marinade_withdraw_stake_account",
+        discriminator: [
+            88,
+            200,
+            107,
+            134,
+            244,
+            89,
+            194,
+            111
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+            },
+            {
+                name: "state",
+                writable: true
+            },
+            {
+                name: "msol_mint",
+                writable: true
+            },
+            {
+                name: "burn_msol_from",
+                writable: true
+            },
+            {
+                name: "treasury_msol_account",
+                writable: true
+            },
+            {
+                name: "validator_list",
+                writable: true
+            },
+            {
+                name: "stake_list",
+                writable: true
+            },
+            {
+                name: "stake_withdraw_authority"
+            },
+            {
+                name: "stake_deposit_authority"
+            },
+            {
+                name: "stake_account",
+                writable: true
+            },
+            {
+                name: "split_stake_account",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "clock"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "token_program"
+            },
+            {
+                name: "stake_program"
+            }
+        ],
+        args: [
+            {
+                name: "stake_index",
+                type: "u32"
+            },
+            {
+                name: "validator_index",
+                type: "u32"
+            },
+            {
+                name: "msol_amount",
+                type: "u64"
+            },
+            {
+                name: "beneficiary",
+                type: "pubkey"
+            }
+        ]
+    },
     {
         name: "merkle_distributor_new_claim_and_stake",
         discriminator: [
@@ -4845,16 +4961,16 @@ var instructions = [
         ]
     },
     {
-        name: "meteora_dlmm_close_position",
+        name: "meteora_dlmm_close_position2",
         discriminator: [
-            186,
+            69,
             117,
-            42,
-            24,
-            221,
-            194,
+            240,
+            192,
             34,
-            143
+            79,
+            62,
+            230
         ],
         accounts: [
             {
@@ -4895,18 +5011,6 @@ var instructions = [
                 name: "position",
                 writable: true
             },
-            {
-                name: "lb_pair",
-                writable: true
-            },
-            {
-                name: "bin_array_lower",
-                writable: true
-            },
-            {
-                name: "bin_array_upper",
-                writable: true
-            },
             {
                 name: "rent_receiver",
                 writable: true
@@ -4967,11 +5071,6 @@ var instructions = [
                 name: "cpi_program",
                 address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
             },
-            {
-                name: "payer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "position",
                 writable: true,
@@ -5053,11 +5152,6 @@ var instructions = [
                 name: "cpi_program",
                 address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
             },
-            {
-                name: "payer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "position",
                 writable: true
@@ -6797,6 +6891,102 @@ var instructions = [
             }
         ]
     },
+    {
+        name: "set_protocol_fees",
+        discriminator: [
+            49,
+            143,
+            189,
+            18,
+            56,
+            206,
+            158,
+            226
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                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
+                        ]
+                    }
+                }
+            }
+        ],
+        args: [
+            {
+                name: "base_fee_bps",
+                type: "u16"
+            },
+            {
+                name: "flow_fee_bps",
+                type: "u16"
+            }
+        ]
+    },
     {
         name: "set_token_accounts_states",
         discriminator: [
@@ -6901,7 +7091,7 @@ var instructions = [
                 type: "pubkey"
             },
             {
-                name: "staker_with_withdrawer",
+                name: "staker_or_withdrawer",
                 type: "u32"
             }
         ]
@@ -9307,6 +9497,26 @@ var errors = [
         name: "TimelockStillActive",
         msg: "Timelock still active"
     },
+    {
+        code: 48006,
+        name: "AssetNotBorrowable",
+        msg: "Asset is not allowed to borrow"
+    },
+    {
+        code: 48007,
+        name: "InvalidAccountOwner",
+        msg: "Account owned by an invalid program"
+    },
+    {
+        code: 48008,
+        name: "InvalidAuthority",
+        msg: "Invalid authority"
+    },
+    {
+        code: 48009,
+        name: "InvalidPriceDenom",
+        msg: "Invalid price denom"
+    },
     {
         code: 49000,
         name: "InvalidAccountType",
@@ -9497,6 +9707,16 @@ var errors = [
         name: "MathError",
         msg: "Math error"
     },
+    {
+        code: 51108,
+        name: "TypeCastingError",
+        msg: "Type casting error"
+    },
+    {
+        code: 51109,
+        name: "BaseAssetNotSupported",
+        msg: "Base asset must have 6 decimals."
+    },
     {
         code: 52000,
         name: "TransfersDisabled",
@@ -10045,6 +10265,9 @@ var types = [
                 },
                 {
                     name: "MeteoraDlmmPools"
+                },
+                {
+                    name: "BorrowableAssets"
                 }
             ]
         }
@@ -11642,6 +11865,9 @@ var types = [
                 },
                 {
                     name: "MarinadeState"
+                },
+                {
+                    name: "BaseAsset"
                 }
             ]
         }
@@ -12538,14 +12764,6 @@ var types = [
                         }
                     }
                 },
-                {
-                    name: "external_vault_accounts",
-                    type: {
-                        option: {
-                            vec: "pubkey"
-                        }
-                    }
-                },
                 {
                     name: "mints",
                     type: {
@@ -12634,6 +12852,14 @@ var types = [
                         }
                     }
                 },
+                {
+                    name: "borrowable_assets",
+                    type: {
+                        option: {
+                            vec: "pubkey"
+                        }
+                    }
+                },
                 {
                     name: "drift_market_indexes_perp",
                     type: {
@@ -12870,19 +13096,15 @@ const METEORA_POSITION_SIZE = 8120;
 const KAMINO_OBTRIGATION_SIZE = 3344;
 const JITO_TIP_DEFAULT = new web3_js.PublicKey("96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5");
 const KAMINO_SCOPE_PRICES = new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C");
+const MARINADE_NATIVE_STAKE_AUTHORITY = new web3_js.PublicKey("stWirqFCf2Uts1JBL1Jsd3r6VBWhgnpdPxCTe1MFjrq");
 /**
  * Token mints. If no devnet version is defined, assume mainnet and devnet addresses are the same.
  *
  * Unless otherwise noted, all mints have 9 decimals.
  */ const WSOL = new web3_js.PublicKey("So11111111111111111111111111111111111111112");
 const MSOL = new web3_js.PublicKey("mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So");
-const JITOSOL = new web3_js.PublicKey("J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn");
 // USDC, 6 decimals
 const USDC = new web3_js.PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
-// Wrapped ETH (Wormhole), 8 decimals
-const WETH = new web3_js.PublicKey("7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs");
-// Wrapped BTC (Wormhole), 8 decimals
-const WBTC = new web3_js.PublicKey("3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh");
 // JUP, 6 decimals
 const JUP = new web3_js.PublicKey("JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN");
 /**
@@ -12918,7 +13140,6 @@ class StateIdlModel {
         this.uri = data.uri ?? null;
         this.enabled = data.enabled ?? null;
         this.assets = data.assets ?? null;
-        this.externalVaultAccounts = data.externalVaultAccounts ?? null;
         this.mints = data.mints ?? null;
         this.company = data.company ?? null;
         this.owner = data.owner ?? null;
@@ -12930,6 +13151,7 @@ class StateIdlModel {
         // ACLs
         this.delegateAcls = data.delegateAcls ?? null;
         this.integrations = data.integrations ?? null;
+        this.borrowableAssets = data.borrowableAssets ?? null;
         // Integration specific configs
         this.driftMarketIndexesPerp = data.driftMarketIndexesPerp ?? null;
         this.driftMarketIndexesSpot = data.driftMarketIndexesSpot ?? null;
@@ -13005,24 +13227,32 @@ class StateModel extends StateIdlModel {
             created: stateAccount.created,
             delegateAcls: stateAccount.delegateAcls,
             integrations: stateAccount.integrations,
-            owner: new ManagerModel({
-                pubkey: stateAccount.owner
-            }),
             mints: []
         };
         // All fields in fund params[0] should be available on the StateModel
-        // @ts-ignore
         stateAccount.params[0].forEach((param)=>{
             const name = Object.keys(param.name)[0];
             // @ts-ignore
             const value = Object.values(param.value)[0].val;
-            if (new StateIdlModel({}).hasOwnProperty(name)) {
+            if (new StateModel({}).hasOwnProperty(name)) {
                 // @ts-ignore
                 stateModel[name] = value;
             } else if (process.env.NODE_ENV === "development") {
-                console.warn(`State param ${name} not found in StateIdlModel`);
+                console.warn(`State param ${name} not found in StateModel`);
             }
         });
+        // If timelock is enabled, parse pending updates from params[2] and params[3]
+        stateModel.pendingUpdates = {};
+        if (stateAccount.params[2]) {
+            // pending updates to state params
+            stateAccount.params[2].forEach((param)=>{
+                const name = Object.keys(param.name)[0];
+                // @ts-ignore
+                const value = Object.values(param.value)[0].val;
+                stateModel.pendingUpdates[name] = value;
+            });
+        }
+        if (stateAccount.params[3]) ;
         // Build stateModel.rawOpenfunds from openfunds account
         const fundOpenfundsFields = {};
         openfundsMetadataAccount?.fund.forEach((param)=>{
@@ -13041,6 +13271,17 @@ class StateModel extends StateIdlModel {
             company[name] = value;
         });
         stateModel.company = new CompanyModel(company);
+        // Build stateModel.owner from openfunds account
+        const owner = {
+            pubkey: stateAccount.owner
+        };
+        openfundsMetadataAccount?.fundManagers[0].forEach((param)=>{
+            const name = Object.keys(param.name)[0];
+            const value = param.value;
+            // @ts-ignore
+            owner[name] = value;
+        });
+        stateModel.owner = new ManagerModel(owner);
         // Build the array of ShareClassModel
         stateAccount.mints.forEach((_, i)=>{
             const mintIdlModel = {};
@@ -13049,6 +13290,12 @@ class StateModel extends StateIdlModel {
                 const name = Object.keys(param.name)[0];
                 // @ts-ignore
                 const value = Object.values(param.value)[0].val;
+                // Ledger is a mint param but we store it on the state model
+                if (Object.keys(stateAccount.accountType)[0] === "fund") {
+                    if (name === "ledger") {
+                        stateModel["ledger"] = value;
+                    }
+                }
                 mintIdlModel[name] = value;
             });
             if (openfundsMetadataAccount) {
@@ -13090,6 +13337,12 @@ class StateModel extends StateIdlModel {
     constructor(data, glamProgramId = GLAM_PROGRAM_ID_DEFAULT){
         super(data);
         this.glamProgramId = glamProgramId;
+        // Will be set from state params
+        this.externalVaultAccounts = data.externalVaultAccounts ?? null;
+        this.pricedAssets = data.pricedAssets ?? null;
+        this.ledger = data.ledger ?? null;
+        this.timelockExpiresAt = data.timelockExpiresAt ? Number(data.timelockExpiresAt.toString()) : null;
+        this.pendingUpdates = data.pendingUpdates ?? null;
     }
 }
 class FundOpenfundsModel {
@@ -13230,6 +13483,15 @@ class DelegateAcl {
     }
 }
 class PriceDenom {
+    static fromAsset(asset) {
+        if (asset.equals(WSOL)) {
+            return PriceDenom.SOL;
+        }
+        if (asset.equals(USDC)) {
+            return PriceDenom.USD;
+        }
+        return PriceDenom.ASSET;
+    }
 }
 PriceDenom.SOL = {
     sol: {}
@@ -13237,6 +13499,9 @@ PriceDenom.SOL = {
 PriceDenom.USD = {
     usd: {}
 };
+PriceDenom.ASSET = {
+    asset6: {}
+};
 class TimeUnit {
 }
 TimeUnit.Slot = {
@@ -13255,6 +13520,8 @@ var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
 }({});
 
 const fetchStakeAccounts = async (connection, withdrawAuthority)=>{
+    // stake authority offset: 12
+    // withdraw authority offset: 44
     const accounts = await connection.getParsedProgramAccounts(web3_js.StakeProgram.programId, {
         filters: [
             {
@@ -13262,7 +13529,7 @@ const fetchStakeAccounts = async (connection, withdrawAuthority)=>{
             },
             {
                 memcmp: {
-                    offset: 12,
+                    offset: 44,
                     bytes: withdrawAuthority.toBase58()
                 }
             }
@@ -13271,7 +13538,55 @@ const fetchStakeAccounts = async (connection, withdrawAuthority)=>{
     // order by lamports desc
     return accounts.sort((a, b)=>b.account.lamports - a.account.lamports).map((a)=>a.pubkey);
 };
-const fetchMarinadeTicketAccounts = async (connection, beneficiary)=>await connection.getParsedProgramAccounts(MARINADE_PROGRAM_ID, {
+const getStakeAccountsWithStates = async (connection, withdrawAuthority)=>{
+    // stake authority offset: 12
+    // withdraw authority offset: 44
+    const accounts = await connection.getParsedProgramAccounts(web3_js.StakeProgram.programId, {
+        filters: [
+            {
+                dataSize: STAKE_ACCOUNT_SIZE
+            },
+            {
+                memcmp: {
+                    offset: 44,
+                    bytes: withdrawAuthority.toBase58()
+                }
+            }
+        ]
+    });
+    const epochInfo = await connection.getEpochInfo();
+    const stakes = await Promise.all(accounts.map(async (account)=>{
+        const delegation = account.account.data.parsed.info.stake?.delegation;
+        let state = "undelegated";
+        if (!delegation) {
+            return {
+                address: account.pubkey,
+                lamports: account.account.lamports,
+                state
+            };
+        }
+        // possible state if delegated: active, inactive, activating, deactivating
+        const { activationEpoch, deactivationEpoch, voter } = delegation;
+        if (activationEpoch == epochInfo.epoch) {
+            state = "activating";
+        } else if (deactivationEpoch == epochInfo.epoch) {
+            state = "deactivating";
+        } else if (epochInfo.epoch > deactivationEpoch) {
+            state = "inactive";
+        } else if (epochInfo.epoch > activationEpoch) {
+            state = "active";
+        }
+        return {
+            address: account.pubkey,
+            lamports: account.account.lamports,
+            voter: new web3_js.PublicKey(voter),
+            state
+        };
+    }));
+    // order by lamports desc
+    return stakes.sort((a, b)=>b.lamports - a.lamports);
+};
+const fetchMarinadeTicketAccounts = async (connection, beneficiary)=>await connection.getProgramAccounts(MARINADE_PROGRAM_ID, {
         filters: [
             {
                 dataSize: MARINADE_TICKET_SIZE
@@ -13285,7 +13600,7 @@ const fetchMarinadeTicketAccounts = async (connection, beneficiary)=>await conne
         ]
     });
 const fetchKaminoObligations = async (connection, owner, market)=>{
-    const accounts = await connection.getParsedProgramAccounts(KAMINO_LENDING_PROGRAM, {
+    const accounts = await connection.getProgramAccounts(KAMINO_LENDING_PROGRAM, {
         filters: [
             {
                 dataSize: KAMINO_OBTRIGATION_SIZE
@@ -13309,7 +13624,7 @@ const fetchKaminoObligations = async (connection, owner, market)=>{
     return accounts.map((a)=>a.pubkey);
 };
 const fetchMeteoraPositions = async (connection, owner)=>{
-    const accounts = await connection.getParsedProgramAccounts(METEORA_DLMM_PROGRAM, {
+    const accounts = await connection.getProgramAccounts(METEORA_DLMM_PROGRAM, {
         filters: [
             {
                 dataSize: METEORA_POSITION_SIZE
@@ -13346,28 +13661,23 @@ const parseMeteoraPosition = async (connection, position)=>{
     };
 };
 async function fetchLookupTables(connection, authority, firstEntry) {
-    const ALT_PROGRAM_ID = new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
+    new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
     // Fetch all accounts owned by the ALT program
-    const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
-        filters: [
-            {
-                memcmp: {
-                    offset: 22,
-                    bytes: authority.toBase58()
-                }
-            },
-            {
-                memcmp: {
-                    offset: 56,
-                    bytes: firstEntry.toBase58()
-                }
-            }
-        ]
-    });
-    return accounts.map(({ pubkey, account })=>new web3_js.AddressLookupTableAccount({
-            key: pubkey,
-            state: web3_js.AddressLookupTableAccount.deserialize(account.data)
-        }));
+    // This is currently disabled due to RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
+    // const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
+    //   filters: [
+    //     { memcmp: { offset: 22, bytes: authority.toBase58() } },
+    //     { memcmp: { offset: 56, bytes: firstEntry.toBase58() } }, // 1st entry in the table
+    //   ],
+    // });
+    // return accounts.map(
+    //   ({ pubkey, account }) =>
+    //     new AddressLookupTableAccount({
+    //       key: pubkey,
+    //       state: AddressLookupTableAccount.deserialize(account.data),
+    //     }),
+    // );
+    return [];
 }
 const getSimulationComputeUnits = async (connection, instructions, payer, lookupTables)=>{
     const testInstructions = [
@@ -13411,14 +13721,14 @@ const getErrorFromRPCResponse = (rpcResponse)=>{
                 // @ts-ignore due to missing typing information mentioned above.
                 const instructionError = error["InstructionError"];
                 // An instruction error is a custom program error and looks like:
-                // [
-                //   1,
-                //   {
-                //     "Custom": 1
-                //   }
-                // ]
+                // [1, {"Custom": 1}]
                 // See also https://solana.stackexchange.com/a/931/294
-                throw new Error(`Error in transaction: instruction index ${instructionError[0]}, custom program error ${instructionError[1]["Custom"]}`);
+                const customErrorCode = instructionError[1]["Custom"];
+                const { errors: glamErrors } = GlamProtocolIdlJson;
+                const glamError = glamErrors.find((e)=>e.code === customErrorCode);
+                const msg = glamError?.msg || "Unknown custsom error";
+                console.log(`Custom error code: ${customErrorCode}, error: ${msg}}`);
+                throw new Error(msg);
             }
         }
         throw Error(error.toString());
@@ -13432,6 +13742,21 @@ const setsAreEqual = (a, b)=>{
     return true;
 };
 
+const STAKE_POOLS = sanctumLstList.LstList.filter((lst)=>!lst.name.includes("Sanctum Automated") && (lst.pool.program === "Spl" || lst.pool.program === "Marinade" || lst.pool.program === "SanctumSpl" || lst.pool.program === "SanctumSplMulti")).map((lst)=>{
+    const { pool, tokenProgram } = lst.pool;
+    return {
+        name: lst.name,
+        symbol: lst.symbol,
+        mint: lst.mint,
+        logoURI: lst.logoUri,
+        tokenProgram,
+        poolState: lst.pool.program === "Marinade" ? "8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC" : pool || ""
+    };
+});
+const STAKE_POOLS_MAP = new Map(STAKE_POOLS.map((p)=>[
+        p.mint,
+        p
+    ]));
 const ASSETS_MAINNET = new Map([
     [
         // SOL
@@ -13497,12 +13822,52 @@ const ASSETS_MAINNET = new Map([
             oracle: new web3_js.PublicKey("JDKJSkxjasBGL3ce1pkrN6tqDzuVUZPWzzkGuyX8m9yN")
         }
     ],
+    [
+        // USDY
+        "A1KLoBrKBde8Ty9qtNQUtq3C2ortoC3u7twggz7sEto6",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("9PgHM68FNGDK6nHb29ERDBcFrV6gNMD8LyUqwxbyyeb2")
+        }
+    ],
+    [
+        // PYUSD
+        "2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("5QZMnsyndmphvZF4BNgoMHwVZaREXeE2rpBoCPMxgCCd"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID
+        }
+    ],
+    [
+        // USDe
+        "DEkqHyPN7GMRJ5cArtQFAWefqbZb33Hyf6s5iCwjEonT",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("5uR6oza6teuMRpjsbMi9fDhCDid2hoYdRBiLW7WzcK54")
+        }
+    ],
+    [
+        // sUSDe
+        "Eh6XEPhSwoLv5wFApukmnaVSHQ6sAnoD9BmgmwQoN2sN",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("BRuNuzLAPHHGSSVAJPKMcmJMdgDfrekvnSxkxPDGdeqp")
+        }
+    ],
+    [
+        // USDS
+        "USDSwr9ApdHk5bvJKMjzff41FfuX8bSxdKcR81vTwcA",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("7pT9mxKXyvfaZKeKy1oe2oV2K1RFtF7tPEJHUY3h2vVV")
+        }
+    ],
     [
         // mSOL
         "mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So",
         {
             decimals: 9,
-            // oracle: new PublicKey("FAq7hqjn7FWGXKDwJHzsXGgBcydGTcK4kziJpAGWXjDb"), // drift pyth
             oracle: new web3_js.PublicKey("8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC")
         }
     ],
@@ -13511,8 +13876,8 @@ const ASSETS_MAINNET = new Map([
         "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn",
         {
             decimals: 9,
-            // oracle: new PublicKey("9QE1P5EfzthYDgoQ9oPeTByCEKaRJeZbVVqKJfgU9iau"), // drift pyth
-            oracle: new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb")
+            oracle: new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb"),
+            isLst: true
         }
     ],
     [
@@ -13520,7 +13885,8 @@ const ASSETS_MAINNET = new Map([
         "BonK1YhkXEGLZzwtcvRTip3gAL9nCeQD7ppZBLXhtTs",
         {
             decimals: 9,
-            oracle: new web3_js.PublicKey("ArAQfbzsdotoKB5jJcZa3ajQrrPcWr2YQoDAEAiFxJAC")
+            oracle: new web3_js.PublicKey("ArAQfbzsdotoKB5jJcZa3ajQrrPcWr2YQoDAEAiFxJAC"),
+            isLst: true
         }
     ],
     [
@@ -13528,7 +13894,8 @@ const ASSETS_MAINNET = new Map([
         "Dso1bDeDjCQxTrWHqUUi63oBvV7Mdm6WaobLbQ7gnPQ",
         {
             decimals: 9,
-            oracle: new web3_js.PublicKey("9mhGNSPArRMHpLDMSmxAvuoizBqtBGqYdT8WGuqgxNdn")
+            oracle: new web3_js.PublicKey("9mhGNSPArRMHpLDMSmxAvuoizBqtBGqYdT8WGuqgxNdn"),
+            isLst: true
         }
     ]
 ]);
@@ -13786,12 +14153,14 @@ class BaseClient {
             // - gui: wallet apps usually do the simulation themselves, we should ignore the simulation error here by default
             // - cli: we should set simulate=true
             if (simulate) {
-                tx.recentBlockhash = recentBlockhash;
-                tx.feePayer = signer;
-                console.log("Tx (base64):", tx.serialize({
-                    verifySignatures: false
-                }).toString("base64"));
-                console.error("Simulation failed. If error message is too obscure, inspect the tx in explorer (https://explorer.solana.com/tx/inspector)");
+                const vTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
+                    instructions,
+                    payerKey: signer,
+                    recentBlockhash: web3_js.PublicKey.default.toString()
+                }).compileToV0Message(lookupTables));
+                console.log("Lookup tables:", lookupTables.map((lt)=>lt.key.toString()));
+                console.log("Tx (base64):", Buffer.from(vTx.serialize()).toString("base64"));
+                console.error("Simulation failed. If error message is too obscure, inspect and simulate the tx in explorer: https://explorer.solana.com/tx/inspector");
                 throw e;
             }
         }
@@ -14019,7 +14388,7 @@ class BaseClient {
         if (state.params.length < 2) {
             throw new Error("Invalid mint index");
         }
-        // iterate over the mint params
+        // Iterate over the mint params
         for (const param of state.params[1]){
             const name = Object.keys(param.name)[0];
             // @ts-ignore
@@ -14081,7 +14450,9 @@ class BaseClient {
         }
         return "";
     }
-    async listGlamStates() {
+    /**
+   * @deprecated
+   */ async listGlamStates() {
         const bytes$1 = Uint8Array.from([
             0x31,
             0x68,
@@ -14092,7 +14463,7 @@ class BaseClient {
             0xad,
             0x9a
         ]);
-        const accounts = await this.provider.connection.getParsedProgramAccounts(this.program.programId, {
+        const accounts = await this.provider.connection.getProgramAccounts(this.program.programId, {
             filters: [
                 {
                     memcmp: {
@@ -14169,7 +14540,7 @@ class BaseClient {
             this.statePda = config.statePda;
         }
         this.jupiterApi = config?.jupiterApi || JUPITER_API_DEFAULT;
-        this.blockhashWithCache = new BlockhashWithCache(this.provider, !!isBrowser);
+        this.blockhashWithCache = new BlockhashWithCache(this.provider, false);
     }
 }
 
@@ -16113,10 +16484,20 @@ class MarinadeClient {
         const tx = await this.depositTx(amount, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
+    async depositNative(amount, txOptions = {}) {
+        const tx = await this.depositNativeTx(amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
     async depositStakeAccount(stakeAccount) {
         const tx = await this.depositStakeAccountTx(stakeAccount, {});
         return await this.base.sendAndConfirm(tx);
     }
+    async withdrawStakeAccount(amount, txOptions = {}) {
+        const [tx, extraSigner] = await this.withdrawStakeAccountTx(amount, txOptions);
+        return await this.base.sendAndConfirm(tx, [
+            extraSigner
+        ]);
+    }
     async orderUnstake(amount, txOptions = {}) {
         const tx = await this.orderUnstakeTx(amount, txOptions);
         return await this.base.sendAndConfirm(tx);
@@ -16149,10 +16530,11 @@ class MarinadeClient {
             };
         });
     }
-    getMarinadeState() {
+    /**
+   * @deprecated Use Marinade.getMarinadeState() instead
+   */ get marinadeStateStatic() {
         // The addresses are the same in mainnet and devnet:
         // https://docs.marinade.finance/developers/contract-addresses
-        // TODO: use marinade.getMarinadeState(); ?
         return {
             marinadeStateAddress: new web3_js.PublicKey("8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC"),
             msolMintAddress: MSOL,
@@ -16164,6 +16546,12 @@ class MarinadeClient {
             solLeg: new web3_js.PublicKey("UefNb6z6yvArqe4cJHTXCqStRsKmWhGxnZzuHbikP5Q")
         };
     }
+    async fetchMarinadeState() {
+        const marinade = new marinadeTsSdk.Marinade(new marinadeTsSdk.MarinadeConfig({
+            connection: this.base.provider.connection
+        }));
+        return await marinade.getMarinadeState();
+    }
     async getParsedStakeAccountInfo(stakeAccount) {
         const { value: stakeAccountInfo } = await this.base.provider.connection.getParsedAccountInfo(stakeAccount);
         if (!stakeAccountInfo) {
@@ -16176,7 +16564,7 @@ class MarinadeClient {
         const balanceLamports = stakeAccountInfo.lamports;
         const stakedLamports = parsedData?.parsed?.info?.stake?.delegation?.stake ?? null;
         if (parsedData.space != 200) {
-            throw new Error(`${stakeAccount.toBase58()} is not a stake account because space is ${parsedData.space} != 200`);
+            throw new Error(`${stakeAccount} is not a stake account. Account size ${parsedData.space} != 200`);
         }
         return {
             voter: new web3_js.PublicKey(parsedData.parsed.info?.stake?.delegation?.voter),
@@ -16189,7 +16577,7 @@ class MarinadeClient {
    */ async depositTx(amount, txOptions) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vault = this.base.vaultPda;
-        const marinadeState = this.getMarinadeState();
+        const marinadeState = this.marinadeStateStatic;
         const vaultMsolAta = this.base.getVaultAta(marinadeState.msolMintAddress);
         const createMsolAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, vaultMsolAta, vault, marinadeState.msolMintAddress);
         // @ts-ignore
@@ -16210,11 +16598,54 @@ class MarinadeClient {
         ]).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
+    async createStakeAccount(signer) {
+        const seed = Date.now().toString();
+        const stakeAccount = await web3_js.PublicKey.createWithSeed(signer, seed, web3_js.StakeProgram.programId);
+        const lamports = await this.base.provider.connection.getMinimumBalanceForRentExemption(STAKE_ACCOUNT_SIZE);
+        const createStakeAccountIx = web3_js.SystemProgram.createAccountWithSeed({
+            fromPubkey: signer,
+            newAccountPubkey: stakeAccount,
+            basePubkey: signer,
+            seed,
+            lamports,
+            space: STAKE_ACCOUNT_SIZE,
+            programId: web3_js.StakeProgram.programId
+        });
+        return [
+            stakeAccount,
+            createStakeAccountIx
+        ];
+    }
+    async depositNativeTx(amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        // Create and fund the stake account
+        const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
+        const initStakeIx = await this.base.program.methods.stakeInitialize().accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            stake: stakeAccount
+        }).instruction();
+        const fundStakeIx = await this.base.program.methods.systemTransfer(amount).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            to: stakeAccount
+        }).instruction();
+        // Then set stake authority to the marinade key
+        const tx = await this.base.program.methods.stakeAuthorize(MARINADE_NATIVE_STAKE_AUTHORITY, 0).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            stake: stakeAccount
+        }).preInstructions([
+            createStakeAccountIx,
+            initStakeIx,
+            fundStakeIx
+        ]).transaction();
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
     async depositStakeAccountTx(stakeAccount, txOptions) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const stakeAccountInfo = await this.getParsedStakeAccountInfo(stakeAccount);
-        console.log("Stake account info", stakeAccountInfo);
-        const marinadeState = await new marinadeTsSdk.Marinade().getMarinadeState();
+        const marinadeState = await this.fetchMarinadeState();
         const { validatorRecords } = await marinadeState.getValidatorRecords();
         const validatorLookupIndex = validatorRecords.findIndex(({ validatorAccount })=>validatorAccount.equals(stakeAccountInfo.voter));
         const validatorIndex = validatorLookupIndex === -1 ? marinadeState.state.validatorSystem.validatorList.count : validatorLookupIndex;
@@ -16236,9 +16667,71 @@ class MarinadeClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
+    parseAccountList(data, itemSize) {
+        const accounts = [];
+        for(let i = 8; i < data.length; i += itemSize){
+            accounts.push(new web3_js.PublicKey(data.subarray(i, i + 32)));
+        }
+        return accounts;
+    }
+    async getIndexes(stakeAccount, stakeList, validatorList) {
+        if (!stakeAccount.voter) {
+            throw new Error("Stake account is not delegated");
+        }
+        const accountsInfo = await this.base.provider.connection.getMultipleAccountsInfo([
+            stakeList.account,
+            validatorList.account
+        ]);
+        if (!accountsInfo[0] || !accountsInfo[1]) {
+            throw new Error("Failed to get accounts info of stakeList and validatorList");
+        }
+        const stakeIndex = this.parseAccountList(accountsInfo[0].data, stakeList.itemSize).findIndex((a)=>a.equals(stakeAccount.address));
+        const validatorIndex = this.parseAccountList(accountsInfo[1].data, validatorList.itemSize).findIndex((a)=>a.equals(stakeAccount.voter));
+        return {
+            stakeIndex,
+            validatorIndex
+        };
+    }
+    async withdrawStakeAccountTx(amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const marinadeState = await this.fetchMarinadeState();
+        // Get mariande stake withdraw authority
+        const stakeWithdrawAuthority = await marinadeState.stakeWithdrawAuthority();
+        const stakeDepositAuthority = await marinadeState.stakeDepositAuthority();
+        const stakeList = marinadeState.state.stakeSystem.stakeList;
+        const validatorList = marinadeState.state.validatorSystem.validatorList;
+        // Fetch stake accounts by withdraw authority
+        // Filter by state "active" does not work in localnet tests
+        const stakeAccounts = await getStakeAccountsWithStates(this.base.provider.connection, stakeWithdrawAuthority);
+        const { stakeIndex, validatorIndex } = await this.getIndexes(stakeAccounts[0], stakeList, validatorList);
+        const burnMsolFrom = this.base.getVaultAta(MSOL);
+        const newStake = web3_js.Keypair.generate();
+        const tx = await this.base.program.methods.marinadeWithdrawStakeAccount(stakeIndex, validatorIndex, amount, this.base.vaultPda).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            state: marinadeState.marinadeStateAddress,
+            validatorList: validatorList.account,
+            stakeList: stakeList.account,
+            stakeAccount: stakeAccounts[0].address,
+            stakeWithdrawAuthority,
+            stakeDepositAuthority,
+            treasuryMsolAccount: marinadeState.treasuryMsolAccount,
+            msolMint: MSOL,
+            burnMsolFrom,
+            splitStakeAccount: newStake.publicKey,
+            clock: web3_js.SYSVAR_CLOCK_PUBKEY,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID,
+            stakeProgram: web3_js.StakeProgram.programId
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return [
+            vTx,
+            newStake
+        ];
+    }
     async orderUnstakeTx(amount, txOptions) {
         const glamSigner = txOptions.signer || this.base.getSigner();
-        const marinadeState = this.getMarinadeState();
+        const marinadeState = this.marinadeStateStatic;
         const vaultMsolAta = this.base.getVaultAta(marinadeState.msolMintAddress);
         const ticketSeed = Date.now().toString();
         const ticket = await web3_js.PublicKey.createWithSeed(glamSigner, ticketSeed, MARINADE_PROGRAM_ID);
@@ -16271,7 +16764,7 @@ class MarinadeClient {
             throw new Error("At least one ticket is required");
         }
         const glamSigner = txOptions.signer || this.base.getSigner();
-        const marinadeState = this.getMarinadeState();
+        const marinadeState = this.marinadeStateStatic;
         const instructions = await Promise.all(tickets.map((ticket)=>this.base.program.methods.marinadeClaim().accounts({
                 glamState: this.base.statePda,
                 glamSigner,
@@ -16289,7 +16782,7 @@ class MarinadeClient {
     }
 }
 
-class WSolClient {
+class VaultClient {
     /*
    * Client methods
    */ async wrap(amount, txOptions = {}) {
@@ -16300,6 +16793,26 @@ class WSolClient {
         const tx = await this.unwrapTx(txOptions);
         return await this.base.sendAndConfirm(tx);
     }
+    async systemTransfer(amount, to, txOptions = {}) {
+        const tx = await this.systemTransferTx(new anchor.BN(amount), new web3_js.PublicKey(to), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async closeTokenAccounts(tokenAccounts, txOptions = {}) {
+        const tx = await this.closeTokenAccountsTx(tokenAccounts, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async deposit(asset, amount, txOptions = {}) {
+        const tx = await this.depositTx(new web3_js.PublicKey(asset), amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async depositSol(lamports, wrap = true, txOptions = {}) {
+        const tx = await this.depositSolTx(lamports, wrap, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async withdraw(asset, amount, txOptions = {}) {
+        const tx = await this.withdrawTx(new web3_js.PublicKey(asset), amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
     /*
    * API methods
    */ async wrapTx(amount, txOptions) {
@@ -16328,55 +16841,174 @@ class WSolClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    constructor(base){
-        this.base = base;
-    }
-}
-
-class StakingClient {
-    /*
-   * Client methods
-   */ async unstake(asset, amount, txOptions = {}) {
-        const assetStr = asset.toBase58();
-        // mSOL
-        if (assetStr === MSOL.toBase58()) {
-            const tx = await this.marinade.orderUnstakeTx(new anchor.BN(amount), txOptions);
-            return await this.base.sendAndConfirm(tx);
-        }
-        // Other LSTs
-        const assetMeta = this.base.getAssetMeta(assetStr);
-        if (!assetMeta || !assetMeta.oracle) {
-            throw new Error("Invalid LST: " + asset);
-        }
-        const tx = await this.stakePoolWithdrawStakeTx(assetMeta.oracle, new anchor.BN(amount), true, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async stakePoolDepositSol(stakePool, amount, txOptions = {}) {
-        const tx = await this.stakePoolDepositSolTx(stakePool, amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async stakePoolDepositStake(stakePool, stakeAccount, txOptions = {}) {
-        const tx = await this.stakePoolDepositStakeTx(stakePool, stakeAccount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async stakePoolWithdrawStake(stakePool, amount, txOptions = {}) {
-        const tx = await this.stakePoolWithdrawStakeTx(stakePool, amount, false, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async initializeAndDelegateStake(vote, amount, txOptions = {}) {
-        const tx = await this.initializeAndDelegateStakeTx(vote, amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async deactivate(stakeAccounts, txOptions = {}) {
-        const tx = await this.deactivateStakeTx(stakeAccounts, txOptions);
-        return await this.base.sendAndConfirm(tx);
+    async systemTransferTx(amount, to, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        // @ts-ignore
+        const tx = await this.base.program.methods.systemTransfer(amount).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            to
+        }).transaction();
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async withdraw(stakeAccounts, txOptions = {}) {
-        const tx = await this.withdrawStakeTx(stakeAccounts, txOptions);
-        return await this.base.sendAndConfirm(tx);
+    /**
+   * Returns an instruction that closes multiple vault token accounts
+   * All token accounts must be owned by the same token program
+   */ async closeTokenAccountIx(tokenAccounts, tokenProgram = splToken.TOKEN_PROGRAM_ID, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        return await this.base.program.methods.tokenCloseAccount().accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            tokenAccount: tokenAccounts[0],
+            cpiProgram: tokenProgram
+        }).remainingAccounts(tokenAccounts.slice(1).map((account)=>({
+                pubkey: account,
+                isSigner: false,
+                isWritable: true
+            }))).instruction();
     }
-    async merge(destinationStake, sourceStake, txOptions = {}) {
-        const tx = await this.mergeStakeTx(destinationStake, sourceStake, txOptions);
+    async closeTokenAccountsTx(accounts, txOptions) {
+        const accountsInfo = await this.base.provider.connection.getMultipleAccountsInfo(accounts);
+        if (accounts.length !== accountsInfo.filter((a)=>!!a).length) {
+            throw new Error("Some token accounts do not exist");
+        }
+        // split token accounts into 2 arrays by owner program
+        const tokenAccountsByProgram = new Map([
+            [
+                splToken.TOKEN_PROGRAM_ID,
+                []
+            ],
+            [
+                splToken.TOKEN_2022_PROGRAM_ID,
+                []
+            ]
+        ]);
+        accountsInfo.forEach((accountInfo, i)=>{
+            [
+                splToken.TOKEN_PROGRAM_ID,
+                splToken.TOKEN_2022_PROGRAM_ID
+            ].forEach((programId)=>{
+                if (accountInfo?.owner.equals(programId)) {
+                    tokenAccountsByProgram.get(programId)?.push(accounts[i]);
+                }
+            });
+        });
+        const ixs = (await Promise.all(Array.from(tokenAccountsByProgram.entries()).map(async ([programId, accounts])=>{
+            if (accounts.length === 0) return null;
+            return this.closeTokenAccountIx(accounts, new web3_js.PublicKey(programId), txOptions);
+        }))).filter((ix)=>ix !== null);
+        if (ixs.length === 0) {
+            throw new Error("No token accounts to close");
+        }
+        const tx = new web3_js.Transaction();
+        tx.add(...ixs);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async depositSolTx(lamports, wrap = true, txOptions = {}) {
+        const signer = txOptions.signer || this.base.getSigner();
+        const _lamports = lamports instanceof anchor.BN ? BigInt(lamports.toString()) : lamports;
+        if (!wrap) {
+            const tx = new web3_js.Transaction().add(web3_js.SystemProgram.transfer({
+                fromPubkey: signer,
+                toPubkey: this.base.vaultPda,
+                lamports: _lamports
+            }));
+            return await this.base.intoVersionedTransaction(tx, txOptions);
+        }
+        const vaultAta = this.base.getAta(WSOL, this.base.vaultPda);
+        const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, this.base.vaultPda, WSOL), web3_js.SystemProgram.transfer({
+            fromPubkey: signer,
+            toPubkey: vaultAta,
+            lamports: _lamports
+        }), splToken.createSyncNativeInstruction(vaultAta));
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async depositTx(asset, amount, txOptions) {
+        const signer = txOptions.signer || this.base.getSigner();
+        const { mint, tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const signerAta = this.base.getAta(asset, signer, tokenProgram);
+        const vaultAta = this.base.getAta(asset, this.base.vaultPda, tokenProgram);
+        const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, this.base.vaultPda, asset, tokenProgram), splToken.createTransferCheckedInstruction(signerAta, asset, vaultAta, signer, new anchor.BN(amount).toNumber(), mint.decimals, [], tokenProgram));
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async withdrawIxs(asset, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
+        return [
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram),
+            await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
+                glamState: this.base.statePda,
+                glamSigner,
+                asset,
+                tokenProgram
+            }).instruction()
+        ];
+    }
+    async withdrawTx(asset, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
+        const preInstructions = [
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram)
+        ];
+        const tx = await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            asset,
+            tokenProgram
+        }).preInstructions(preInstructions).transaction();
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    constructor(base){
+        this.base = base;
+    }
+}
+
+class StakingClient {
+    /*
+   * Client methods
+   */ async unstake(asset, amount, txOptions = {}) {
+        const assetStr = asset.toBase58();
+        // mSOL
+        if (assetStr === MSOL.toBase58()) {
+            const tx = await this.marinade.orderUnstakeTx(new anchor.BN(amount), txOptions);
+            return await this.base.sendAndConfirm(tx);
+        }
+        // Other LSTs
+        const assetMeta = this.base.getAssetMeta(assetStr);
+        if (!assetMeta || !assetMeta.oracle) {
+            throw new Error("Invalid LST: " + asset);
+        }
+        const tx = await this.stakePoolWithdrawStakeTx(assetMeta.oracle, new anchor.BN(amount), true, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async stakePoolDepositSol(stakePool, amount, txOptions = {}) {
+        const tx = await this.stakePoolDepositSolTx(stakePool, amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async stakePoolDepositStake(stakePool, stakeAccount, txOptions = {}) {
+        const tx = await this.stakePoolDepositStakeTx(stakePool, stakeAccount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async stakePoolWithdrawStake(stakePool, amount, txOptions = {}) {
+        const tx = await this.stakePoolWithdrawStakeTx(stakePool, amount, false, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async initializeAndDelegateStake(vote, amount, txOptions = {}) {
+        const tx = await this.initializeAndDelegateStakeTx(vote, amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async deactivate(stakeAccounts, txOptions = {}) {
+        const tx = await this.deactivateStakeTx(stakeAccounts, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async withdraw(stakeAccounts, txOptions = {}) {
+        const tx = await this.withdrawStakeTx(stakeAccounts, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async merge(destinationStake, sourceStake, txOptions = {}) {
+        const tx = await this.mergeStakeTx(destinationStake, sourceStake, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async split(existingStake, lamports, txOptions = {}) {
@@ -16397,13 +17029,7 @@ class StakingClient {
     }
     /*
    * Utils
-   */ // getStakeAccountPda(state: PublicKey, accountId: string): [PublicKey, number] {
-    //   return PublicKey.findProgramAddressSync(
-    //     [Buffer.from("stake_account"), Buffer.from(accountId), state.toBuffer()],
-    //     this.base.program.programId,
-    //   );
-    // }
-    getStakePoolWithdrawAuthority(programId, stakePool) {
+   */ getStakePoolWithdrawAuthority(programId, stakePool) {
         const [publicKey] = web3_js.PublicKey.findProgramAddressSync([
             stakePool.toBuffer(),
             Buffer.from("withdraw")
@@ -16417,7 +17043,10 @@ class StakingClient {
         ], programId);
         return publicKey;
     }
+    // FIXME: this is a dupe of getStakeAccountsWithStates in utils/helpers
     async getStakeAccountsWithStates(withdrawAuthority) {
+        // stake authority offset: 12
+        // withdraw authority offset: 44
         const authority = withdrawAuthority || this.base.vaultPda;
         const accounts = await this.base.provider.connection.getParsedProgramAccounts(web3_js.StakeProgram.programId, {
             filters: [
@@ -16426,7 +17055,7 @@ class StakingClient {
                 },
                 {
                     memcmp: {
-                        offset: 12,
+                        offset: 44,
                         bytes: authority.toBase58()
                     }
                 }
@@ -16547,7 +17176,7 @@ class StakingClient {
         const glamVault = this.base.vaultPda;
         const poolTokensTo = this.base.getVaultAta(poolMint, tokenProgram);
         // All stake accounts owned by the stake pool withdraw authority
-        const validatorStakeCandidates = await this.getStakeAccountsWithStates(withdrawAuthority);
+        const validatorStakeCandidates = await getStakeAccountsWithStates(this.base.provider.connection, withdrawAuthority);
         // Find a validator stake account to use from the list of candidates.
         // The vault stake account must have the same vote address as the chosen validator stake account.
         const vote = await this.getStakeAccountVoter(stakeAccount);
@@ -16584,7 +17213,7 @@ class StakingClient {
         this.base.vaultPda;
         const poolTokensFrom = this.base.getVaultAta(poolMint, tokenProgram);
         // The reserve stake account should NOT be used for withdrawals unless we have no other options.
-        const validatorStakeCandidates = (await this.getStakeAccountsWithStates(withdrawAuthority)).filter((s)=>!s.address.equals(reserveStake));
+        const validatorStakeCandidates = (await getStakeAccountsWithStates(this.base.provider.connection, withdrawAuthority)).filter((s)=>!s.address.equals(reserveStake));
         console.log("validatorStakeCandidates", validatorStakeCandidates);
         const validatorStakeAccount = validatorStakeCandidates.length === 0 ? reserveStake : validatorStakeCandidates[0].address;
         const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
@@ -16743,7 +17372,7 @@ class StateClient {
         // No mint, only need to initialize the state
         if (mints && mints.length === 0) {
             // @ts-ignore
-            const tx = await this.base.program.methods.initializeState(stateModel).accountsPartial({
+            const tx = await this.base.program.methods.initializeState(new StateIdlModel(stateModel)).accountsPartial({
                 glamState: statePda,
                 glamSigner,
                 glamVault: this.base.vaultPda
@@ -16755,13 +17384,9 @@ class StateClient {
                 statePda
             ];
         }
-        // let extraMetasAccount =
-        //   mints && mints[0].lockUpPeriod && mints[0].lockUpPeriod > 0
-        //     ? this.base.extraMetasPda
-        //     : null;
         // Initialize state and add mint in one transaction
         if (mints && mints.length > 0 && singleTx) {
-            const initStateIx = await this.base.program.methods.initializeState(stateModel).accountsPartial({
+            const initStateIx = await this.base.program.methods.initializeState(new StateIdlModel(stateModel)).accountsPartial({
                 glamState: statePda,
                 glamSigner,
                 glamVault: this.base.vaultPda
@@ -16782,7 +17407,7 @@ class StateClient {
             ];
         }
         // Initialize state and add mints in separate transactions
-        const tx = await this.base.program.methods.initializeState(stateModel).accountsPartial({
+        const tx = await this.base.program.methods.initializeState(new StateIdlModel(stateModel)).accountsPartial({
             glamState: statePda,
             glamVault: this.base.vaultPda,
             glamSigner,
@@ -16932,140 +17557,6 @@ class StateClient {
             delegateAcls
         }, txOptions);
     }
-    async closeTokenAccounts(tokenAccounts, txOptions = {}) {
-        const tx = await this.closeTokenAccountsTx(tokenAccounts, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    /**
-   * Close vault's token accounts, all token accounts must use the same token program
-   */ async closeTokenAccountIx(tokenAccounts, tokenProgram = splToken.TOKEN_PROGRAM_ID, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.getSigner();
-        return await this.base.program.methods.tokenCloseAccount().accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            tokenAccount: tokenAccounts[0],
-            cpiProgram: tokenProgram
-        }).remainingAccounts(tokenAccounts.slice(1).map((account)=>({
-                pubkey: account,
-                isSigner: false,
-                isWritable: true
-            }))).instruction();
-    }
-    async closeTokenAccountsTx(accounts, txOptions) {
-        const accountsInfo = await this.base.provider.connection.getMultipleAccountsInfo(accounts);
-        if (accounts.length !== accountsInfo.filter((a)=>!!a).length) {
-            throw new Error("Some token accounts do not exist");
-        }
-        // split token accounts into 2 arrays by owner program
-        const tokenAccountsByProgram = new Map([
-            [
-                splToken.TOKEN_PROGRAM_ID,
-                []
-            ],
-            [
-                splToken.TOKEN_2022_PROGRAM_ID,
-                []
-            ]
-        ]);
-        accountsInfo.forEach((accountInfo, i)=>{
-            [
-                splToken.TOKEN_PROGRAM_ID,
-                splToken.TOKEN_2022_PROGRAM_ID
-            ].forEach((programId)=>{
-                if (accountInfo?.owner.equals(programId)) {
-                    tokenAccountsByProgram.get(programId)?.push(accounts[i]);
-                }
-            });
-        });
-        const ixs = (await Promise.all(Array.from(tokenAccountsByProgram.entries()).map(async ([programId, accounts])=>{
-            if (accounts.length === 0) return null;
-            return this.closeTokenAccountIx(accounts, new web3_js.PublicKey(programId), txOptions);
-        }))).filter((ix)=>ix !== null);
-        if (ixs.length === 0) {
-            throw new Error("No token accounts to close");
-        }
-        const tx = new web3_js.Transaction();
-        tx.add(...ixs);
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    /* Deposit & Withdraw */ async deposit(asset, amount, txOptions = {}) {
-        const tx = await this.depositTx(new web3_js.PublicKey(asset), amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async depositSol(lamports, wrap = true, txOptions = {}) {
-        const tx = await this.depositSolTx(lamports, wrap, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async depositSolTx(lamports, wrap = true, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const _lamports = lamports instanceof anchor.BN ? BigInt(lamports.toString()) : lamports;
-        if (!wrap) {
-            const tx = new web3_js.Transaction().add(web3_js.SystemProgram.transfer({
-                fromPubkey: signer,
-                toPubkey: this.base.vaultPda,
-                lamports: _lamports
-            }));
-            return await this.base.intoVersionedTransaction(tx, txOptions);
-        }
-        const vaultAta = this.base.getAta(WSOL, this.base.vaultPda);
-        const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, this.base.vaultPda, WSOL), web3_js.SystemProgram.transfer({
-            fromPubkey: signer,
-            toPubkey: vaultAta,
-            lamports: _lamports
-        }), splToken.createSyncNativeInstruction(vaultAta));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async withdraw(asset, amount, txOptions = {}) {
-        const tx = await this.withdrawTx(new web3_js.PublicKey(asset), amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async depositTx(asset, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const { mint, tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
-        const signerAta = this.base.getAta(asset, signer, tokenProgram);
-        const vaultAta = this.base.getAta(asset, this.base.vaultPda, tokenProgram);
-        const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, this.base.vaultPda, asset, tokenProgram), splToken.createTransferCheckedInstruction(signerAta, asset, vaultAta, signer, new anchor.BN(amount).toNumber(), mint.decimals, [], tokenProgram));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async withdrawIxs(asset, amount, txOptions) {
-        const glamSigner = txOptions.signer || this.base.getSigner();
-        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
-        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
-        return [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram),
-            await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
-                glamState: this.base.statePda,
-                glamSigner,
-                asset,
-                tokenProgram
-            }).instruction()
-        ];
-    }
-    async withdrawTx(asset, amount, txOptions) {
-        const glamSigner = txOptions.signer || this.base.getSigner();
-        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
-        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
-        const preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram)
-        ];
-        const postInstructions = [];
-        if (asset.equals(WSOL)) {
-            const wrapSolIxs = await this.base.maybeWrapSol(amount, glamSigner);
-            preInstructions.push(...wrapSolIxs);
-            // If we need to wrap SOL, it means the wSOL balance will be drained,
-            // and we close the wSOL token account for convenience
-            postInstructions.push(await this.closeTokenAccountIx([
-                this.base.getAta(WSOL, this.base.vaultPda)
-            ]));
-        }
-        const tx = await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            asset,
-            tokenProgram
-        }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
     constructor(base){
         this.base = base;
     }
@@ -17657,12 +18148,11 @@ class KaminoLendingClient {
                 scopePrices: KAMINO_SCOPE_PRICES
             }));
     }
-    refreshObligationFarmsForReserveIxs(obligation, lendingMarket, parsedReserves) {
+    refreshObligationCollateralFarmsForReservesIxs(obligation, lendingMarket, parsedReserves) {
         return parsedReserves.map((parsedReserve)=>{
-            const { farmCollateral, farmDebt } = parsedReserve;
+            const { farmCollateral } = parsedReserve;
             return [
-                farmCollateral,
-                farmDebt
+                farmCollateral
             ].filter((farm)=>!!farm).map((farm)=>{
                 const obligationFarmUserState = this.getObligationFarmState(obligation, farm);
                 return refreshObligationFarmsForReserve({
@@ -17684,28 +18174,31 @@ class KaminoLendingClient {
             });
         }).flat();
     }
-    // If obligation has deposits or borrows, we need the following refresh ixs:
-    // - refreshReserve x N_reserves
-    // - refreshObligation
-    // - refreshObligationFarmsForReserve x M_farms
-    //
-    // For pricing purpose, we don't need to refresh farm states
-    async getRefreshIxs(obligation, refreshFarms = true) {
-        const { lendingMarket, deposits, borrows } = await this.fetchAndParseObligation(obligation);
-        if (!lendingMarket) {
-            throw new Error("Lending market not found");
-        }
-        const reserves = deposits.concat(borrows).map((d)=>d.reserve);
-        const parsedReserves = await this.fetchAndParseReserves(reserves);
-        return [
-            ...this.refreshReserveIxs(lendingMarket, reserves),
-            refreshObligation({
-                lendingMarket,
-                obligation,
-                reserves
-            }),
-            ...refreshFarms ? this.refreshObligationFarmsForReserveIxs(obligation, lendingMarket, parsedReserves) : []
-        ];
+    refreshObligationDebtFarmsForReservesIxs(obligation, lendingMarket, parsedReserves) {
+        return parsedReserves.map((parsedReserve)=>{
+            const { farmDebt } = parsedReserve;
+            return [
+                farmDebt
+            ].filter((farm)=>!!farm).map((farm)=>{
+                const obligationFarmUserState = this.getObligationFarmState(obligation, farm);
+                return refreshObligationFarmsForReserve({
+                    mode: 0
+                }, {
+                    crank: this.base.getSigner(),
+                    baseAccounts: {
+                        obligation,
+                        lendingMarketAuthority: this.getMarketAuthority(lendingMarket),
+                        reserve: parsedReserve.address,
+                        reserveFarmState: farm,
+                        obligationFarmUserState,
+                        lendingMarket
+                    },
+                    farmsProgram: KAMINO_FARM_PROGRAM,
+                    rent: web3_js.SYSVAR_RENT_PUBKEY,
+                    systemProgram: web3_js.SystemProgram.programId
+                });
+            });
+        }).flat();
     }
     getMarketAuthority(market) {
         const [authority, _] = web3_js.PublicKey.findProgramAddressSync([
@@ -17864,10 +18357,19 @@ class KaminoLendingClient {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vault = this.base.vaultPda;
         const userMetadata = this.getUserMetadataPda(vault);
+        const obligation = this.getObligationPda(vault, market, DEFAULT_OBLIGATION_ARGS);
         const preInstructions = [];
         const postInstructions = [];
-        const depositReserve = await this.findAndParseReserve(market, asset);
-        const obligation = this.getObligationPda(vault, market, DEFAULT_OBLIGATION_ARGS);
+        // If user metadata doesn't exist, initialize it
+        const userMetadataAccount = await this.base.provider.connection.getAccountInfo(userMetadata);
+        if (!userMetadataAccount) {
+            preInstructions.push(await this.base.program.methods.kaminoLendingInitUserMetadata(new web3_js.PublicKey(0)).accounts({
+                glamState: this.base.statePda,
+                glamSigner,
+                userMetadata,
+                referrerUserMetadata: null
+            }).instruction());
+        }
         // If obligation doesn't exist, initialize & refresh obligation and collateral farm state first
         const obligationAccount = await this.base.provider.connection.getAccountInfo(obligation);
         if (!obligationAccount) {
@@ -17881,6 +18383,7 @@ class KaminoLendingClient {
                 ownerUserMetadata: userMetadata
             }).instruction());
         }
+        const depositReserve = await this.findAndParseReserve(market, asset);
         // If reserve has collateral farm but obligation farm state doesn't exist, initialize it
         let obligationFarm = null;
         if (depositReserve.farmCollateral) {
@@ -17918,7 +18421,7 @@ class KaminoLendingClient {
             reserves: reservesInUse
         }));
         if (depositReserve.farmCollateral) {
-            const ixs = this.refreshObligationFarmsForReserveIxs(obligation, market, [
+            const ixs = this.refreshObligationCollateralFarmsForReservesIxs(obligation, market, [
                 depositReserve
             ]);
             preInstructions.push(...ixs);
@@ -18014,7 +18517,7 @@ class KaminoLendingClient {
             reserves: reservesInUse
         }));
         if (withdrawReserve.farmCollateral) {
-            const ixs = this.refreshObligationFarmsForReserveIxs(obligation, market, [
+            const ixs = this.refreshObligationCollateralFarmsForReservesIxs(obligation, market, [
                 withdrawReserve
             ]);
             preInstructions.push(...ixs);
@@ -18103,7 +18606,7 @@ class KaminoLendingClient {
             obligation,
             reserves: reservesInUse
         }));
-        // Don't need to refresh debt farm for borrow
+        // FIXME: Don't need to refresh debt farm for borrow?
         /*
     if (borrowReserve.farmDebt) {
       const ixs = this.refreshObligationFarmsForReserveIxs(obligation, market, [
@@ -18404,7 +18907,7 @@ class MeteoraDlmmClient {
         const minBinId = activeBin.binId - DEFAULT_RANGE_INTERVAL;
         const maxBinId = activeBin.binId + DEFAULT_RANGE_INTERVAL;
         const width = maxBinId - minBinId + 1;
-        const position = this.getPositionPda(new web3_js.PublicKey(pool), this.base.vaultPda, minBinId, width);
+        const position = this.getPositionPda(new web3_js.PublicKey(pool), this.base.getSigner(), minBinId, width);
         // @ts-ignore
         const tx = await this.base.program.methods.meteoraDlmmInitializePositionPda(minBinId, width).accounts({
             glamState: this.base.statePda,
@@ -18416,7 +18919,10 @@ class MeteoraDlmmClient {
         const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return await this.base.sendAndConfirm(vTx);
     }
-    async addLiquidityByStrategy(position, amountX, amountY, strategyType, txOptions = {}) {
+    async addLiquidityByStrategy(position, amountX, amountY, strategyType, maxActiveBinSlippage, txOptions = {}) {
+        if (!strategyType.endsWith("ImBalanced")) {
+            throw new Error("Only imbalanced strategy types are supported");
+        }
         const glamSigner = txOptions.signer || this.base.getSigner();
         const { lbPair, lowerBinId, upperBinId, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, new web3_js.PublicKey(position));
         const dlmmPool = await this.getDlmmPool(lbPair);
@@ -18428,7 +18934,7 @@ class MeteoraDlmmClient {
             amountX: new anchor.BN(amountX),
             amountY: new anchor.BN(amountY),
             activeId: activeBinId,
-            maxActiveBinSlippage: 20,
+            maxActiveBinSlippage,
             strategyParameters: {
                 minBinId: lowerBinId,
                 maxBinId: upperBinId,
@@ -18447,7 +18953,7 @@ class MeteoraDlmmClient {
                 isSigner: false,
                 isWritable: true
             }));
-        // TODO: if token X or Y program is token2022 we need to properly constrcut the slides
+        // TODO: if token X or Y program is token2022 we need to properly construct the slices
         // @ts-ignore
         const tx = await this.base.program.methods.meteoraDlmmAddLiquidityByStrategy2(liquidityParameter, {
             slices: []
@@ -18455,7 +18961,7 @@ class MeteoraDlmmClient {
             glamState: this.base.statePda,
             position: new web3_js.PublicKey(position),
             lbPair,
-            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension ? dlmmPool.binArrayBitmapExtension.publicKey : METEORA_DLMM_PROGRAM,
+            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension?.publicKey || null,
             userTokenX: vaultTokenXAta,
             userTokenY: vaultTokenYAta,
             reserveX: dlmmPool.tokenX.reserve,
@@ -18490,7 +18996,7 @@ class MeteoraDlmmClient {
             glamState: this.base.statePda,
             position: new web3_js.PublicKey(position),
             lbPair,
-            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension ? dlmmPool.binArrayBitmapExtension.publicKey : METEORA_DLMM_PROGRAM,
+            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension?.publicKey || null,
             userTokenX: vaultTokenXAta,
             userTokenY: vaultTokenYAta,
             reserveX: dlmmPool.tokenX.reserve,
@@ -18545,16 +19051,20 @@ class MeteoraDlmmClient {
         const { lbPair, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, new web3_js.PublicKey(position));
         console.log(`close position: ${position}, binArrayLower: ${binArrayLower}, binArrayUpper: ${binArrayUpper}`);
         // @ts-ignore
-        const tx = await this.base.program.methods.meteoraDlmmClosePosition().accounts({
+        const tx = await this.base.program.methods.meteoraDlmmClosePosition2().accounts({
             glamState: this.base.statePda,
             position: new web3_js.PublicKey(position),
-            lbPair,
-            binArrayLower,
-            binArrayUpper,
             rentReceiver: this.base.getSigner(),
             eventAuthority: EVENT_AUTHORITY,
             program: METEORA_DLMM_PROGRAM
-        }).transaction();
+        }).remainingAccounts([
+            binArrayLower,
+            binArrayUpper
+        ].map((pubkey)=>({
+                pubkey,
+                isSigner: false,
+                isWritable: true
+            }))).transaction();
         const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return await this.base.sendAndConfirm(vTx);
     }
@@ -18595,31 +19105,28 @@ class InvestorClient {
         const tx = await (queued ? this.queuedSubscribeTx(asset, amount, mintId, txOptions) : this.subscribeTx(asset, amount, mintId, txOptions));
         return await this.base.sendAndConfirm(tx);
     }
-    async queuedRedeem(asset, amount, mintId = 0, txOptions = {}) {
-        const tx = await this.queuedRedeemTx(asset, amount, mintId, txOptions);
+    async queuedRedeem(amount, mintId = 0, txOptions = {}) {
+        const tx = await this.queuedRedeemTx(amount, mintId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    async fulfill(asset, mintId = 0, txOptions = {}) {
-        const tx = await this.fulfillTx(asset, mintId, txOptions);
+    async fulfill(mintId = 0, txOptions = {}) {
+        const tx = await this.fulfillTx(mintId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async claim(asset, mintId = 0, txOptions = {}) {
-        // Claim WSOL from redeemed shares
-        if (asset.equals(WSOL)) {
-            const tx = await this.claimAssetTx(asset, mintId, txOptions);
-            return await this.base.sendAndConfirm(tx);
-        }
         // Claim shares after subscription is fulfilled
         const glamMint = this.base.mintPda;
         if (glamMint.equals(asset)) {
             const tx = await this.claimShareTx(asset, mintId, txOptions);
             return await this.base.sendAndConfirm(tx);
         }
-        throw new Error(`Invalid asset to claim: ${asset.toBase58()}`);
+        // Claim asset redeemed from shares
+        const tx = await this.claimAssetTx(asset, mintId, txOptions);
+        return await this.base.sendAndConfirm(tx);
     }
     async subscribeTx(asset, amount, mintId = 0, txOptions = {}) {
-        if (mintId !== 0 || !asset.equals(WSOL)) {
-            throw new Error("Only WSOL is supported & mintId must be 0");
+        if (mintId !== 0) {
+            throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
         // glam mint token to receive
@@ -18664,8 +19171,8 @@ class InvestorClient {
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async queuedSubscribeTx(asset, amount, mintId = 0, txOptions = {}) {
-        if (mintId !== 0 || !asset.equals(WSOL)) {
-            throw new Error("Only WSOL is supported & mintId must be 0");
+        if (mintId !== 0) {
+            throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
         // asset token to transfer to escrow
@@ -18697,9 +19204,9 @@ class InvestorClient {
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async queuedRedeemTx(asset, amount, mintId = 0, txOptions = {}) {
-        if (mintId !== 0 || !asset.equals(WSOL)) {
-            throw new Error("Only WSOL is supported & mintId must be 0");
+    async queuedRedeemTx(amount, mintId = 0, txOptions = {}) {
+        if (mintId !== 0) {
+            throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
         const glamMint = this.base.mintPda;
@@ -18730,38 +19237,44 @@ class InvestorClient {
             }))).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async fulfillTx(asset, mintId = 0, txOptions = {}) {
-        if (mintId !== 0 || !asset.equals(WSOL)) {
-            throw new Error("Only WSOL is supported & mintId must be 0");
+    async fulfillTx(mintId = 0, txOptions = {}) {
+        if (mintId !== 0) {
+            throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
+        const stateModel = await this.base.fetchStateModel();
+        const baseAsset = stateModel.baseAsset;
         const vault = this.base.vaultPda;
-        const vaultAssetAta = this.base.getAta(asset, vault);
+        const vaultAssetAta = this.base.getAta(baseAsset, vault);
         const glamMint = this.base.mintPda;
         const escrow = this.base.escrowPda;
         const escrowMintAta = this.base.getMintAta(escrow);
-        const escrowAssetAta = this.base.getAta(asset, escrow);
+        const escrowAssetAta = this.base.getAta(baseAsset, escrow);
         let preInstructions = [
             splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowMintAta, escrow, glamMint, splToken.TOKEN_2022_PROGRAM_ID),
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowAssetAta, escrow, asset),
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAssetAta, vault, asset),
+            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowAssetAta, escrow, baseAsset),
+            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAssetAta, vault, baseAsset),
             ...txOptions.preInstructions || []
         ];
         const tx = await this.base.program.methods.fulfill(mintId).accounts({
             glamState: this.base.statePda,
             glamMint,
             signer,
-            asset
+            asset: baseAsset
         }).preInstructions(preInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async claimAssetTx(asset, mintId = 0, txOptions = {}) {
-        if (mintId !== 0 || !asset.equals(WSOL)) {
-            throw new Error("Only WSOL is supported & mintId must be 0");
+        if (mintId !== 0) {
+            throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
         this.base.mintPda;
         const signerAta = this.base.getAta(asset, signer);
+        // Close wSOL ata so user gets SOL
+        const postInstructions = asset.equals(WSOL) ? [
+            splToken.createCloseAccountInstruction(signerAta, signer, signer)
+        ] : [];
         const tx = await this.base.program.methods.claim(0).accounts({
             glamState: this.base.statePda,
             signer,
@@ -18769,9 +19282,7 @@ class InvestorClient {
             tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions([
             splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset)
-        ]).postInstructions([
-            splToken.createCloseAccountInstruction(signerAta, signer, signer)
-        ]).transaction();
+        ]).postInstructions(postInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async claimShareTx(asset, mintId = 0, txOptions = {}) {
@@ -18821,16 +19332,8 @@ class PriceClient {
    */ async getAum() {
         console.warn("getAum() should only be used for testing. It doesn't reflect the actual AUM of the vault in production.");
         // @ts-ignore
-        const glamStateAccount = await this.base.fetchStateAccount();
-        let pricedAssets = [];
-        glamStateAccount.params[0].forEach((param)=>{
-            const name = Object.keys(param.name)[0];
-            if (name === "pricedAssets") {
-                // @ts-ignore
-                pricedAssets = Object.values(param.value)[0].val;
-            }
-        });
-        return pricedAssets.reduce((sum, p)=>new anchor.BN(p.amount).add(sum), new anchor.BN(0));
+        const stateModel = await this.base.fetchStateModel();
+        return (stateModel?.pricedAssets || []).reduce((sum, p)=>new anchor.BN(p.amount).add(sum), new anchor.BN(0));
     }
     async priceKaminoIx(priceDenom) {
         const glamVault = this.base.vaultPda;
@@ -18861,6 +19364,18 @@ class PriceClient {
     }
     async priceVaultIxs(priceDenom) {
         const glamVault = this.base.vaultPda;
+        const priceVaultIx = await this.base.program.methods.priceVault(priceDenom).accounts({
+            glamState: this.base.statePda,
+            solOracle: SOL_ORACLE
+        }).remainingAccounts(await this.remainingAccountsForPricingVaultAssets(priceDenom == PriceDenom.ASSET)).instruction();
+        // If priceDenom is ASSET, only priceVaultIx is returned
+        // We currently don't support pricing other assets in custom base asset
+        // due to the lack of oracles
+        if (priceDenom == PriceDenom.ASSET) {
+            return [
+                priceVaultIx
+            ];
+        }
         const tickets = await fetchMarinadeTicketAccounts(this.base.provider.connection, glamVault);
         // @ts-ignore
         const priceTicketsIx = await this.base.program.methods.priceTickets(priceDenom).accounts({
@@ -18880,10 +19395,6 @@ class PriceClient {
                 isSigner: false,
                 isWritable: false
             }))).instruction();
-        const priceVaultIx = await this.base.program.methods.priceVault(priceDenom).accounts({
-            glamState: this.base.statePda,
-            solOracle: SOL_ORACLE
-        }).remainingAccounts(await this.remainingAccountsForPricingVaultAssets()).instruction();
         const priceMeteoraIx = await this.base.program.methods.priceMeteoraPositions(priceDenom).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
@@ -18943,14 +19454,38 @@ class PriceClient {
             }));
             return chunks.flat();
         };
-        this.remainingAccountsForPricingVaultAssets = async ()=>{
-            const glamStateAccount = await this.base.fetchStateAccount();
-            return glamStateAccount.assets.map((asset)=>[
-                    this.base.getVaultAta(asset),
-                    asset,
-                    // FIXME: check oracle vs LST state?
-                    ASSETS_MAINNET.get(asset.toBase58())?.oracle || new web3_js.PublicKey(0)
-                ]).flat().map((a)=>({
+        this.remainingAccountsForPricingVaultAssets = async (baseAssetOnly = false)=>{
+            const stateModel = await this.base.fetchStateModel();
+            if (baseAssetOnly) {
+                if (!stateModel.baseAsset) {
+                    throw new Error("Base asset not configured for the vault");
+                }
+                // FIXME: support token 2022 base asset
+                const ata = this.base.getVaultAta(stateModel.baseAsset);
+                // Set oracle to default pubkey (aka system program) to indicate oracle isn't needed
+                return [
+                    ata,
+                    stateModel.baseAsset,
+                    web3_js.PublicKey.default
+                ].map((k)=>({
+                        pubkey: k,
+                        isSigner: false,
+                        isWritable: false
+                    }));
+            }
+            const assetsForPricing = (stateModel.borrowableAssets || []).concat(stateModel.assets || []);
+            return assetsForPricing.map((mint)=>{
+                const assetMeta = ASSETS_MAINNET.get(mint.toBase58());
+                if (!assetMeta) {
+                    throw new Error(`Asset meta not found for ${mint}`);
+                }
+                const ata = this.base.getVaultAta(mint, assetMeta?.programId);
+                return [
+                    ata,
+                    mint,
+                    assetMeta?.oracle
+                ];
+            }).flat().map((a)=>({
                     pubkey: a,
                     isSigner: false,
                     isWritable: false
@@ -18994,11 +19529,11 @@ class PriceClient {
         }
         return this._marinade;
     }
-    get wsol() {
-        if (!this._wsol) {
-            this._wsol = new WSolClient(this);
+    get vault() {
+        if (!this._vault) {
+            this._vault = new VaultClient(this);
         }
-        return this._wsol;
+        return this._vault;
     }
     get staking() {
         if (!this._staking) {
@@ -19145,7 +19680,6 @@ exports.GlamIntegrations = GlamIntegrations;
 exports.GlamPermissions = GlamPermissions;
 exports.GlamProtocolIdlJson = GlamProtocolIdlJson;
 exports.InsuranceFundOperation = InsuranceFundOperation;
-exports.JITOSOL = JITOSOL;
 exports.JITO_STAKE_POOL = JITO_STAKE_POOL;
 exports.JITO_TIP_DEFAULT = JITO_TIP_DEFAULT;
 exports.JUP = JUP;
@@ -19161,6 +19695,7 @@ exports.KAMINO_OBTRIGATION_SIZE = KAMINO_OBTRIGATION_SIZE;
 exports.KAMINO_SCOPE_PRICES = KAMINO_SCOPE_PRICES;
 exports.LPAction = LPAction;
 exports.LiquidationType = LiquidationType;
+exports.MARINADE_NATIVE_STAKE_AUTHORITY = MARINADE_NATIVE_STAKE_AUTHORITY;
 exports.MARINADE_PROGRAM_ID = MARINADE_PROGRAM_ID;
 exports.MARINADE_TICKET_SIZE = MARINADE_TICKET_SIZE;
 exports.MEMO_PROGRAM = MEMO_PROGRAM;
@@ -19198,6 +19733,8 @@ exports.SEED_STATE = SEED_STATE;
 exports.SEED_VAULT = SEED_VAULT;
 exports.SOL_ORACLE = SOL_ORACLE;
 exports.STAKE_ACCOUNT_SIZE = STAKE_ACCOUNT_SIZE;
+exports.STAKE_POOLS = STAKE_POOLS;
+exports.STAKE_POOLS_MAP = STAKE_POOLS_MAP;
 exports.SettlePnlExplanation = SettlePnlExplanation;
 exports.SettlePnlMode = SettlePnlMode;
 exports.SpotBalanceType = SpotBalanceType;
@@ -19215,8 +19752,6 @@ exports.TimeUnit = TimeUnit;
 exports.TradeSide = TradeSide;
 exports.USDC = USDC;
 exports.UserStatus = UserStatus;
-exports.WBTC = WBTC;
-exports.WETH = WETH;
 exports.WSOL = WSOL;
 exports.ZERO = ZERO;
 exports.decodeUser = decodeUser;
@@ -19237,6 +19772,7 @@ exports.getOpenfundsPda = getOpenfundsPda;
 exports.getOrderParams = getOrderParams;
 exports.getPriorityFeeEstimate = getPriorityFeeEstimate;
 exports.getSimulationComputeUnits = getSimulationComputeUnits;
+exports.getStakeAccountsWithStates = getStakeAccountsWithStates;
 exports.getStatePda = getStatePda;
 exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;