@glamsystems/glam-sdk 1.0.3-alpha.6 → 1.0.3

package/index.cjs.js

@@ -778,6 +778,535 @@ var instructions$8 = [
             }
         ]
     },
+    {
+        name: "stake_authorize",
+        discriminator: [
+            127,
+            247,
+            88,
+            164,
+            201,
+            0,
+            79,
+            7
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            }
+        ],
+        args: [
+            {
+                name: "new_authority",
+                type: "pubkey"
+            },
+            {
+                name: "staker_or_withdrawer",
+                type: "u32"
+            }
+        ]
+    },
+    {
+        name: "stake_deactivate",
+        discriminator: [
+            224,
+            10,
+            93,
+            175,
+            175,
+            145,
+            237,
+            169
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "stake_delegate_stake",
+        discriminator: [
+            202,
+            40,
+            152,
+            239,
+            175,
+            251,
+            66,
+            228
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "vote"
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            },
+            {
+                name: "stake_history",
+                address: "SysvarStakeHistory1111111111111111111111111"
+            },
+            {
+                name: "stake_config"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "stake_initialize",
+        discriminator: [
+            68,
+            66,
+            118,
+            79,
+            15,
+            144,
+            190,
+            190
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "rent",
+                address: "SysvarRent111111111111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "stake_merge",
+        discriminator: [
+            46,
+            181,
+            125,
+            12,
+            51,
+            179,
+            134,
+            176
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "destination_stake",
+                writable: true
+            },
+            {
+                name: "source_stake",
+                writable: true
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            },
+            {
+                name: "stake_history",
+                address: "SysvarStakeHistory1111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "stake_move",
+        discriminator: [
+            165,
+            157,
+            188,
+            245,
+            244,
+            234,
+            42,
+            186
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "source_stake",
+                writable: true
+            },
+            {
+                name: "destination_stake",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "move_stake",
+                type: "bool"
+            },
+            {
+                name: "lamports",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "stake_split",
+        discriminator: [
+            63,
+            128,
+            169,
+            206,
+            158,
+            60,
+            135,
+            48
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "split_stake",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "lamports",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "stake_withdraw",
+        discriminator: [
+            199,
+            13,
+            168,
+            20,
+            92,
+            151,
+            29,
+            56
+        ],
+        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: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "stake",
+                writable: true
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            },
+            {
+                name: "stake_history",
+                address: "SysvarStakeHistory1111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: [
+            {
+                name: "lamports",
+                type: "u64"
+            }
+        ]
+    },
     {
         name: "system_transfer",
         discriminator: [
@@ -6076,6 +6605,229 @@ var instructions$6 = [
             }
         ]
     },
+    {
+        name: "price_stake_accounts",
+        discriminator: [
+            119,
+            137,
+            9,
+            15,
+            196,
+            73,
+            30,
+            27
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            227,
+                            199,
+                            235,
+                            230,
+                            176,
+                            132,
+                            243,
+                            117,
+                            43,
+                            131,
+                            173,
+                            18,
+                            78,
+                            255,
+                            26,
+                            50,
+                            209,
+                            135,
+                            86,
+                            219,
+                            140,
+                            126,
+                            61,
+                            255,
+                            0,
+                            218,
+                            252,
+                            224,
+                            172,
+                            8,
+                            223,
+                            207
+                        ]
+                    }
+                }
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "sol_usd_oracle"
+            },
+            {
+                name: "base_asset_oracle"
+            },
+            {
+                name: "integration_authority",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                105,
+                                110,
+                                116,
+                                101,
+                                103,
+                                114,
+                                97,
+                                116,
+                                105,
+                                111,
+                                110,
+                                45,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_config",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                103,
+                                108,
+                                111,
+                                98,
+                                97,
+                                108,
+                                45,
+                                99,
+                                111,
+                                110,
+                                102,
+                                105,
+                                103
+                            ]
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            11,
+                            0,
+                            83,
+                            72,
+                            16,
+                            46,
+                            144,
+                            46,
+                            42,
+                            79,
+                            22,
+                            157,
+                            123,
+                            21,
+                            242,
+                            192,
+                            146,
+                            1,
+                            78,
+                            88,
+                            59,
+                            102,
+                            9,
+                            190,
+                            226,
+                            92,
+                            189,
+                            187,
+                            232,
+                            83,
+                            220
+                        ]
+                    }
+                }
+            },
+            {
+                name: "glam_protocol",
+                address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
+            },
+            {
+                name: "event_authority",
+                optional: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                95,
+                                95,
+                                101,
+                                118,
+                                101,
+                                110,
+                                116,
+                                95,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "event_program",
+                optional: true,
+                address: "GM1NtvvnSXUptTrMCqbogAdZJydZSNv98DoU5AZVLmGh"
+            }
+        ],
+        args: []
+    },
     {
         name: "price_vault_tokens",
         docs: [
@@ -19200,6 +19952,10 @@ var instructions$1 = [
                 name: "glam_protocol_program",
                 address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
             },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
             {
                 name: "stake_pool",
                 writable: true
@@ -19219,18 +19975,10 @@ var instructions$1 = [
                 name: "fee_account",
                 writable: true
             },
-            {
-                name: "referrer_pool_tokens_account",
-                writable: true
-            },
             {
                 name: "pool_mint",
                 writable: true
             },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            },
             {
                 name: "token_program"
             }
@@ -19342,6 +20090,9 @@ var instructions$1 = [
                 name: "validator_list",
                 writable: true
             },
+            {
+                name: "stake_pool_deposit_authority"
+            },
             {
                 name: "stake_pool_withdraw_authority"
             },
@@ -19365,10 +20116,6 @@ var instructions$1 = [
                 name: "fee_account",
                 writable: true
             },
-            {
-                name: "referrer_pool_tokens_account",
-                writable: true
-            },
             {
                 name: "pool_mint",
                 writable: true
@@ -20655,29 +21402,14 @@ var constants$1 = [
         value: "2"
     },
     {
-        name: "PROTO_STAKE_POOL",
+        name: "PROTO_SANCTUM_MULTI",
         type: "u16",
-        value: "1"
-    },
-    {
-        name: "SANCTUM_PERM_DEPOSIT_SOL",
-        type: "u64",
-        value: "1"
-    },
-    {
-        name: "SANCTUM_PERM_DEPOSIT_STAKE",
-        type: "u64",
-        value: "2"
-    },
-    {
-        name: "SANCTUM_PERM_WITHDRAW_SOL",
-        type: "u64",
         value: "4"
     },
     {
-        name: "SANCTUM_PERM_WITHDRAW_STAKE",
-        type: "u64",
-        value: "8"
+        name: "PROTO_STAKE_POOL",
+        type: "u16",
+        value: "1"
     },
     {
         name: "STAKE_POOL_PERM_DEPOSIT_SOL",
@@ -22318,7 +23050,6 @@ const KAMINO_RESERVE_SIZE = 8624;
 const DRIFT_VAULT_DEPOSITOR_SIZE = 272;
 const JUPITER_API_DEFAULT = "https://lite-api.jup.ag";
 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.
@@ -22336,7 +23067,6 @@ const JUP = new web3_js.PublicKey("JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN")
  */ const MARINADE_PROGRAM_ID = new web3_js.PublicKey("MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD");
 const DRIFT_PROGRAM_ID = new web3_js.PublicKey("dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH");
 const DRIFT_VAULTS_PROGRAM_ID = new web3_js.PublicKey("vAuLTsyrvSfZRuRB3XgvkPwNGgYSs9YRYymVebLKoxR");
-const DRIFT_DISTRIBUTOR_PROGRAM = new web3_js.PublicKey("E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x");
 const JUPITER_PROGRAM_ID = new web3_js.PublicKey("JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4");
 const SANCTUM_STAKE_POOL_PROGRAM_ID = new web3_js.PublicKey("SP12tWFxD9oJsVWNavTTBZvMbA6gkAmxtVgxdqvyvhY");
 const GOVERNANCE_PROGRAM_ID = new web3_js.PublicKey("GovaE4iu227srtG2s3tZzB4RmWBzw8sTwrCLZz7kN7rY");
@@ -22351,10 +23081,6 @@ const MEMO_PROGRAM = new web3_js.PublicKey("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgD
 const ALT_PROGRAM_ID = new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
 const TOKEN_MESSENGER_MINTER_V2 = new web3_js.PublicKey("CCTPV2vPZJS2u2BBsUoscuikbYjnpFmbFsvVuJdgUMQe");
 const MESSAGE_TRANSMITTER_V2 = new web3_js.PublicKey("CCTPV2Sm4AdWt5296sk4P66VBZ7bEhcARwFaaS9YPbeC");
-/**
- * Stake pools
- */ const JITO_STAKE_POOL = new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb");
-const JUPSOL_STAKE_POOL = new web3_js.PublicKey("8VpRhuxa7sUUepdY3kQiTmX9rS5vx4WgaXiAnXq4KCtr");
 /**
  * Referrers
  */ const GLAM_REFERRER = new web3_js.PublicKey("GLAMrG37ZqioqvzBNQGCfCUueDz3tsr7MwMFyRk9PS89");
@@ -24649,7 +25375,7 @@ function decodeUser(buffer) {
     };
 }
 
-const FractionDecimal$1 = Decimal.clone({
+const FractionDecimal = Decimal.clone({
     precision: 40
 });
 /**
@@ -24657,7 +25383,7 @@ const FractionDecimal$1 = Decimal.clone({
  * https://github.com/Kamino-Finance/klend-sdk/blob/2fbc31a5b165aca3e2ca2e3d0e6162848743192d/src/classes/fraction.ts#L26
  */ class Fraction {
     toDecimal() {
-        return new FractionDecimal$1(this.valueSf.toString()).div(Fraction.MULTIPLIER);
+        return new FractionDecimal(this.valueSf.toString()).div(Fraction.MULTIPLIER);
     }
     getValue() {
         return this.valueSf;
@@ -24687,7 +25413,7 @@ const FractionDecimal$1 = Decimal.clone({
 Fraction.MAX_SIZE_F = 128;
 Fraction.MAX_SIZE_BF = 256;
 Fraction.FRACTIONS = 60;
-Fraction.MULTIPLIER = new FractionDecimal$1(2).pow(Fraction.FRACTIONS);
+Fraction.MULTIPLIER = new FractionDecimal(2).pow(Fraction.FRACTIONS);
 Fraction.MAX_F_BN = new anchor.BN(2).pow(new anchor.BN(Fraction.MAX_SIZE_F)).sub(new anchor.BN(1));
 Fraction.MAX_BF_BN = new anchor.BN(2).pow(new anchor.BN(Fraction.MAX_SIZE_BF)).sub(new anchor.BN(1));
 Fraction.MIN_BN = new anchor.BN(0);
@@ -25458,8 +26184,10 @@ class BaseClient {
     }
 }
 class BaseTxBuilder {
-    build(ix, txOptions = {}) {
-        const tx = new web3_js.Transaction().add(...txOptions.preInstructions || [], ix, ...txOptions.postInstructions || []);
+    /**
+   * Build a transaction with the given instructions. Pre and post instructions in txOptions are preserved.
+   */ build(ixs, txOptions = {}) {
+        const tx = new web3_js.Transaction().add(...txOptions.preInstructions || [], ...ixs, ...txOptions.postInstructions || []);
         return tx;
     }
     constructor(base){
@@ -25551,97 +26279,448 @@ class DriftSpotMarket extends Decodable {
     get nameStr() {
         return charsToName(this.name);
     }
-}
-DriftSpotMarket._layout = borsh.struct([
-    borsh.array(borsh.u8(), 8, "discriminator"),
-    borsh.publicKey("marketPda"),
-    borsh.publicKey("oracle"),
-    borsh.publicKey("mint"),
-    borsh.publicKey("vault"),
-    borsh.array(borsh.u8(), 32, "name"),
-    // Padding for bytes between name and cumulativeDepositInterest
-    borsh.array(borsh.u8(), 464 - 168, "padding1"),
-    borsh.u128("cumulativeDepositInterest"),
-    borsh.u128("cumulativeBorrowInterest"),
-    // Padding for bytes between cumulativeBorrowInterest and decimals
-    borsh.array(borsh.u8(), 680 - 496, "padding2"),
-    borsh.u32("decimals"),
-    borsh.u16("marketIndex"),
-    borsh.u8("padding3"),
-    borsh.u8("oracleSource"),
-    borsh.array(borsh.u8(), 46, "padding4"),
-    borsh.u8("tokenProgram"),
-    borsh.u8("poolId"),
-    borsh.array(borsh.u8(), 40, "padding5")
-]);
-class DriftPerpMarket extends Decodable {
-    get nameStr() {
-        return charsToName(this.name);
+}
+DriftSpotMarket._layout = borsh.struct([
+    borsh.array(borsh.u8(), 8, "discriminator"),
+    borsh.publicKey("marketPda"),
+    borsh.publicKey("oracle"),
+    borsh.publicKey("mint"),
+    borsh.publicKey("vault"),
+    borsh.array(borsh.u8(), 32, "name"),
+    // Padding for bytes between name and cumulativeDepositInterest
+    borsh.array(borsh.u8(), 464 - 168, "padding1"),
+    borsh.u128("cumulativeDepositInterest"),
+    borsh.u128("cumulativeBorrowInterest"),
+    // Padding for bytes between cumulativeBorrowInterest and decimals
+    borsh.array(borsh.u8(), 680 - 496, "padding2"),
+    borsh.u32("decimals"),
+    borsh.u16("marketIndex"),
+    borsh.u8("padding3"),
+    borsh.u8("oracleSource"),
+    borsh.array(borsh.u8(), 46, "padding4"),
+    borsh.u8("tokenProgram"),
+    borsh.u8("poolId"),
+    borsh.array(borsh.u8(), 40, "padding5")
+]);
+class DriftPerpMarket extends Decodable {
+    get nameStr() {
+        return charsToName(this.name);
+    }
+}
+DriftPerpMarket._layout = borsh.struct([
+    borsh.array(borsh.u8(), 8, "discriminator"),
+    borsh.publicKey("marketPda"),
+    borsh.publicKey("oracle"),
+    borsh.array(borsh.u8(), 854, "padding1"),
+    borsh.u8("oracleSource"),
+    borsh.array(borsh.u8(), 73, "padding2"),
+    borsh.array(borsh.u8(), 32, "name"),
+    borsh.array(borsh.u8(), 128, "padding3"),
+    borsh.u16("marketIndex")
+]);
+
+const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
+const DRIFT_MARGIN_PRECISION = 10000;
+let TxBuilder$6 = class TxBuilder extends BaseTxBuilder {
+    async initializeUserStatsIx(glamSigner) {
+        const { userStats } = this.drift.getDriftUserPdas();
+        return await this.base.extDriftProgram.methods.initializeUserStats().accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            state: this.drift.driftStatePda,
+            userStats
+        }).instruction();
+    }
+    async initializeUserIx(glamSigner, subAccountId) {
+        const name = `GLAM *.+ ${subAccountId}`.split("").map((char)=>char.charCodeAt(0)).concat(Array(24).fill(0));
+        const { user, userStats } = this.drift.getDriftUserPdas(subAccountId);
+        const { user: referrer, userStats: referrerStats } = this.drift.getGlamReferrerPdas();
+        const remainingAccounts = [
+            {
+                pubkey: referrer,
+                isWritable: true,
+                isSigner: false
+            },
+            {
+                pubkey: referrerStats,
+                isWritable: true,
+                isSigner: false
+            }
+        ];
+        return await this.base.extDriftProgram.methods.initializeUser(subAccountId, name).accounts({
+            glamState: this.base.statePda,
+            user,
+            userStats,
+            state: this.drift.driftStatePda,
+            glamSigner
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async updateUserPoolIdIx(subAccountId, poolId) {
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.updateUserPoolId(subAccountId, poolId).accounts({
+            glamState: this.base.statePda,
+            user
+        }).instruction();
+    }
+    async initializeIxs(subAccountId, glamSigner) {
+        const ixs = [];
+        // Create userStats account if it doesn't exist
+        const { userStats } = this.drift.getDriftUserPdas();
+        const userStatsInfo = await this.base.provider.connection.getAccountInfo(userStats);
+        if (!userStatsInfo) {
+            ixs.push(await this.initializeUserStatsIx(glamSigner));
+        }
+        // Initialize user (aka sub-account)
+        ixs.push(await this.initializeUserIx(glamSigner, subAccountId));
+        return ixs;
+    }
+    async initializeTx(subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.initializeIxs(subAccountId, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async depositIxs(amount, marketIndex, subAccountId, glamSigner) {
+        const { user, userStats } = this.drift.getDriftUserPdas(subAccountId);
+        const { mint, oracle, tokenProgram, marketPda, vault: driftVault, name } = await this.drift.fetchAndParseSpotMarket(marketIndex);
+        console.log(`Spot market ${marketIndex} mint ${mint}, oracle: ${oracle}, marketPda: ${marketPda}, vault: ${driftVault}`);
+        const preInstructions = [];
+        const postInstructions = [];
+        // If drift user doesn't exist, prepend initialization ixs
+        if (!await this.drift.fetchDriftUser(subAccountId)) {
+            // Only add ix to initialize user stats if subAccountId is 0
+            if (subAccountId === 0) {
+                preInstructions.push(await this.initializeUserStatsIx(glamSigner));
+            }
+            preInstructions.push(await this.initializeUserIx(glamSigner, subAccountId));
+            // If market name ends with "-N", it means we're depositing to an isolated pool
+            const isolatedPoolMatch = name.match(/-(\d+)$/);
+            if (isolatedPoolMatch) {
+                const poolId = parseInt(isolatedPoolMatch[1]);
+                preInstructions.push(await this.updateUserPoolIdIx(subAccountId, poolId));
+            }
+        }
+        if (mint.equals(WSOL)) {
+            const wrapSolIxs = await this.vault.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
+            const tokenAccount = this.base.getVaultAta(WSOL);
+            const closeTokenAccountIx = await this.base.extSplProgram.methods.tokenCloseAccount().accounts({
+                glamState: this.base.statePda,
+                glamSigner,
+                tokenAccount,
+                cpiProgram: splToken.TOKEN_PROGRAM_ID
+            }).instruction();
+            postInstructions.push(closeTokenAccountIx);
+        }
+        const remainingAccounts = [
+            {
+                pubkey: new web3_js.PublicKey(oracle),
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: new web3_js.PublicKey(marketPda),
+                isSigner: false,
+                isWritable: true
+            }
+        ];
+        if (tokenProgram.equals(splToken.TOKEN_2022_PROGRAM_ID)) {
+            remainingAccounts.push({
+                pubkey: mint,
+                isSigner: false,
+                isWritable: false
+            });
+        }
+        const ix = await this.base.extDriftProgram.methods.deposit(marketIndex, amount, false).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            state: this.drift.driftStatePda,
+            user,
+            userStats,
+            spotMarketVault: driftVault,
+            userTokenAccount: this.base.getVaultAta(mint, tokenProgram),
+            tokenProgram
+        }).remainingAccounts(remainingAccounts).instruction();
+        return [
+            ...preInstructions,
+            ix,
+            ...postInstructions
+        ];
+    }
+    async depositTx(amount, marketIndex, subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.depositIxs(amount, marketIndex, subAccountId, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async withdrawIxs(amount, marketIndex, subAccountId, glamSigner) {
+        const { user, userStats } = this.drift.getDriftUserPdas(subAccountId);
+        const { mint, tokenProgram, vault: driftVault } = await this.drift.fetchAndParseSpotMarket(marketIndex);
+        const glamVault = this.base.vaultPda;
+        const glamVaultAta = this.base.getVaultAta(mint, tokenProgram);
+        const remainingAccounts = await this.drift.composeRemainingAccounts(subAccountId, MarketType.SPOT, marketIndex);
+        if (tokenProgram.equals(splToken.TOKEN_2022_PROGRAM_ID)) {
+            remainingAccounts.push({
+                pubkey: mint,
+                isSigner: false,
+                isWritable: false
+            });
+        }
+        // Create vault ata in case it doesn't exist
+        const preIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, glamVaultAta, glamVault, mint, tokenProgram);
+        const ix = await this.base.extDriftProgram.methods.withdraw(marketIndex, amount, false).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            state: this.drift.driftStatePda,
+            user,
+            userStats,
+            spotMarketVault: driftVault,
+            userTokenAccount: glamVaultAta,
+            driftSigner: DRIFT_SIGNER,
+            tokenProgram
+        }).remainingAccounts(remainingAccounts).instruction();
+        return [
+            preIx,
+            ix
+        ];
+    }
+    async withdrawTx(amount, marketIndex, subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.withdrawIxs(amount, marketIndex, subAccountId, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async updateUserCustomMarginRatioIx(maxLeverage, subAccountId, glamSigner) {
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        // https://github.com/drift-labs/protocol-v2/blob/babed162b08b1fe34e49a81c5aa3e4ec0a88ecdf/programs/drift/src/math/constants.rs#L183-L184
+        // 0 means No Limit
+        const marginRatio = maxLeverage === 0 ? 0 : DRIFT_MARGIN_PRECISION / maxLeverage;
+        return await this.base.extDriftProgram.methods.updateUserCustomMarginRatio(subAccountId, marginRatio).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user
+        }).instruction();
+    }
+    async updateUserCustomMarginRatioTx(maxLeverage, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.updateUserCustomMarginRatioIx(maxLeverage, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async updateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId, glamSigner) {
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user
+        }).instruction();
+    }
+    async updateUserMarginTradingEnabledTx(marginTradingEnabled, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.updateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async updateUserDelegateIx(delegate, subAccountId, glamSigner) {
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.updateUserDelegate(subAccountId, new web3_js.PublicKey(delegate)).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user
+        }).instruction();
+    }
+    async updateUserDelegateTx(delegate, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.updateUserDelegateIx(delegate, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async deleteUserIx(subAccountId, glamSigner) {
+        const { user, userStats } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.deleteUser().accounts({
+            glamState: this.base.statePda,
+            state: this.drift.driftStatePda,
+            user,
+            userStats,
+            glamSigner
+        }).instruction();
+    }
+    async deleteUserTx(subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.deleteUserIx(subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async placeOrderIx(orderParams, subAccountId, glamSigner) {
+        const { marketIndex, marketType } = orderParams;
+        const { user: referrer, userStats: referrerStats } = this.drift.getGlamReferrerPdas();
+        const remainingAccounts = (await this.drift.composeRemainingAccounts(subAccountId, marketType, marketIndex)).concat([
+            {
+                pubkey: referrer,
+                isWritable: true,
+                isSigner: false
+            },
+            {
+                pubkey: referrerStats,
+                isWritable: true,
+                isSigner: false
+            }
+        ]);
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.placeOrders([
+            orderParams
+        ]).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user,
+            state: this.drift.driftStatePda
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async placeOrderTx(orderParams, subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.placeOrderIx(orderParams, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-}
-DriftPerpMarket._layout = borsh.struct([
-    borsh.array(borsh.u8(), 8, "discriminator"),
-    borsh.publicKey("marketPda"),
-    borsh.publicKey("oracle"),
-    borsh.array(borsh.u8(), 854, "padding1"),
-    borsh.u8("oracleSource"),
-    borsh.array(borsh.u8(), 73, "padding2"),
-    borsh.array(borsh.u8(), 32, "name"),
-    borsh.array(borsh.u8(), 128, "padding3"),
-    borsh.u16("marketIndex")
-]);
-
-const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
-const DRIFT_MARGIN_PRECISION = 10000;
+    async modifyOrderIx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId, glamSigner) {
+        const remainingAccounts = await this.drift.composeRemainingAccounts(subAccountId, marketType, marketIndex);
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.modifyOrder(orderId, modifyOrderParams).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user,
+            state: this.drift.driftStatePda
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async modifyOrderTx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.modifyOrderIx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async cancelOrdersIx(marketType, marketIndex, direction, subAccountId, glamSigner) {
+        const remainingAccounts = await this.drift.composeRemainingAccounts(subAccountId, marketType, marketIndex);
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.cancelOrders(marketType, marketIndex, direction).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user,
+            state: this.drift.driftStatePda
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async cancelOrdersTx(marketType, marketIndex, direction, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.cancelOrdersIx(marketType, marketIndex, direction, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async cancelOrdersByIdsIx(orderIds, subAccountId, glamSigner) {
+        const remainingAccounts = await this.drift.composeRemainingAccounts(subAccountId);
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.cancelOrdersByIds(orderIds).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user,
+            state: this.drift.driftStatePda
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async cancelOrdersByIdsTx(orderIds, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.cancelOrdersByIdsIx(orderIds, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async settlePnlIx(marketIndex, subAccountId, glamSigner) {
+        const { vault: driftVault } = await this.drift.fetchAndParseSpotMarket(0);
+        const remainingAccounts = await this.drift.composeRemainingAccounts(subAccountId, MarketType.PERP, marketIndex);
+        const { user } = this.drift.getDriftUserPdas(subAccountId);
+        return await this.base.extDriftProgram.methods.settlePnl(marketIndex).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            user,
+            state: this.drift.driftStatePda,
+            spotMarketVault: driftVault
+        }).remainingAccounts(remainingAccounts).instruction();
+    }
+    async settlePnlTx(marketIndex, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ix = await this.settlePnlIx(marketIndex, subAccountId, glamSigner);
+        const tx = this.build([
+            ix
+        ], txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    constructor(base, vault, drift){
+        super(base), this.base = base, this.vault = vault, this.drift = drift;
+    }
+};
 class DriftClient {
     /*
    * Client methods
    */ async initialize(subAccountId = 0, txOptions = {}) {
-        const tx = await this.initializeTx(subAccountId, txOptions);
+        const tx = await this.txBuilder.initializeTx(subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async updateUserCustomMarginRatio(maxLeverage, subAccountId = 0) {
-        const tx = await this.updateUserCustomMarginRatioTx(maxLeverage, subAccountId);
+        const tx = await this.txBuilder.updateUserCustomMarginRatioTx(maxLeverage, subAccountId);
         return await this.base.sendAndConfirm(tx);
     }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0, txOptions = {}) {
-        const tx = await this.updateUserMarginTradingEnabledTx(marginTradingEnabled, subAccountId, txOptions);
+        const tx = await this.txBuilder.updateUserMarginTradingEnabledTx(marginTradingEnabled, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async updateUserDelegate(delegate, subAccountId = 0) {
-        const tx = await this.updateUserDelegateTx(new web3_js.PublicKey(delegate), subAccountId);
+        const tx = await this.txBuilder.updateUserDelegateTx(new web3_js.PublicKey(delegate), subAccountId);
         return await this.base.sendAndConfirm(tx);
     }
     async deleteUser(subAccountId = 0, txOptions = {}) {
-        const tx = await this.deleteUserTx(subAccountId, txOptions);
+        const tx = await this.txBuilder.deleteUserTx(subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async deposit(amount, marketIndex = 1, subAccountId = 0, txOptions = {}) {
-        const tx = await this.depositTx(amount, marketIndex, subAccountId, txOptions);
+        const tx = await this.txBuilder.depositTx(amount, marketIndex, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async withdraw(amount, marketIndex = 1, subAccountId = 0, txOptions = {}) {
-        const tx = await this.withdrawTx(amount, marketIndex, subAccountId, txOptions);
+        const tx = await this.txBuilder.withdrawTx(amount, marketIndex, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async placeOrder(orderParams, subAccountId = 0, txOptions = {}) {
-        const tx = await this.placeOrderTx(orderParams, subAccountId, txOptions);
+        const tx = await this.txBuilder.placeOrderTx(orderParams, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async modifyOrder(modifyOrderParams, orderId, marketIndex, marketType, subAccountId = 0, txOptions = {}) {
-        const tx = await this.modifyOrderTx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId, txOptions);
+        const tx = await this.txBuilder.modifyOrderTx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async cancelOrders(marketType, marketIndex, direction, subAccountId = 0, txOptions = {}) {
-        const tx = await this.cancelOrdersTx(marketType, marketIndex, direction, subAccountId, txOptions);
+        const tx = await this.txBuilder.cancelOrdersTx(marketType, marketIndex, direction, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async cancelOrdersByIds(orderIds, subAccountId = 0, txOptions = {}) {
-        const tx = await this.cancelOrdersByIdsTx(orderIds, subAccountId, txOptions);
+        const tx = await this.txBuilder.cancelOrdersByIdsTx(orderIds, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async settlePnl(marketIndex, subAccountId = 0, txOptions = {}) {
-        const tx = await this.settlePnlTx(marketIndex, subAccountId, txOptions);
+        const tx = await this.txBuilder.settlePnlTx(marketIndex, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     getGlamReferrerPdas() {
@@ -25923,350 +27002,26 @@ class DriftClient {
                 spotMarketIndexes.push(0);
             }
         }
-        const spotMarkets = await this.fetchAndParseSpotMarkets(spotMarketIndexes);
-        const perpMarkets = await this.fetchAndParsePerpMarkets(perpMarketIndexes);
-        if (process.env.NODE_ENV === "development") {
-            console.log("[composeRemainingAccounts] perpMarkets:", perpMarkets);
-        }
-        const oracles = spotMarkets.map((m)=>m.oracle).concat(perpMarkets.map((m)=>m.oracle));
-        const markets = spotMarkets.map((m)=>m.marketPda).concat(perpMarkets.map((m)=>m.marketPda));
-        if (process.env.NODE_ENV === "development") {
-            console.log("[composeRemainingAccounts] markets:", markets.map((m)=>m.toBase58()));
-            console.log("[composeRemainingAccounts] oracles:", oracles.map((o)=>o.toBase58()));
-        }
-        return oracles.map((o)=>({
-                pubkey: new web3_js.PublicKey(o),
-                isWritable: false,
-                isSigner: false
-            })).concat(markets.map((m)=>({
-                pubkey: new web3_js.PublicKey(m),
-                isWritable: true,
-                isSigner: false
-            })));
-    }
-    getClaimStatus(claimant, distributor) {
-        const [claimStatus] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("ClaimStatus"),
-            claimant.toBuffer(),
-            distributor.toBuffer()
-        ], DRIFT_DISTRIBUTOR_PROGRAM);
-        return claimStatus;
-    }
-    // public async claim(
-    //   distributor: PublicKey,
-    //   amountUnlocked: BN,
-    //   amountLocked: BN,
-    //   proof: number[][],
-    //   txOptions: TxOptions = {},
-    // ) {
-    //   const glamSigner = txOptions.signer || this.base.signer;
-    //   const vault = this.base.vaultPda;
-    //   const vaultAta = this.base.getVaultAta(DRIFT);
-    //   const distributorAta = this.base.getAta(DRIFT, distributor);
-    //   const preInstructions = [
-    //     createAssociatedTokenAccountIdempotentInstruction(
-    //       glamSigner,
-    //       vaultAta,
-    //       vault,
-    //       DRIFT,
-    //     ),
-    //   ];
-    //   const tx = await this.base.extDriftProgram.methods
-    //     .distributorNewClaim(amountUnlocked, amountLocked, proof)
-    //     .accounts({
-    //       glamState: this.base.statePda,
-    //       glamSigner,
-    //       distributor,
-    //       claimStatus: this.getClaimStatus(vault, distributor),
-    //       from: distributorAta,
-    //       to: vaultAta,
-    //       tokenProgram: TOKEN_PROGRAM_ID,
-    //     })
-    //     .preInstructions(preInstructions)
-    //     .transaction();
-    //   const vTx = await this.base.intoVersionedTransaction(tx, { ...txOptions });
-    //   return await this.base.sendAndConfirm(vTx);
-    // }
-    async initializeUserStatsIx(glamSigner) {
-        const { userStats } = this.getDriftUserPdas();
-        return await this.base.extDriftProgram.methods.initializeUserStats().accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            state: this.driftStatePda,
-            userStats
-        }).instruction();
-    }
-    async initializeUserIx(glamSigner, subAccountId) {
-        const name = `GLAM *.+ ${subAccountId}`.split("").map((char)=>char.charCodeAt(0)).concat(Array(24).fill(0));
-        const { user, userStats } = this.getDriftUserPdas(subAccountId);
-        const { user: referrer, userStats: referrerStats } = this.getGlamReferrerPdas();
-        const remainingAccounts = [
-            {
-                pubkey: referrer,
-                isWritable: true,
-                isSigner: false
-            },
-            {
-                pubkey: referrerStats,
-                isWritable: true,
-                isSigner: false
-            }
-        ];
-        return await this.base.extDriftProgram.methods.initializeUser(subAccountId, name).accounts({
-            glamState: this.base.statePda,
-            user,
-            userStats,
-            state: this.driftStatePda,
-            glamSigner
-        }).remainingAccounts(remainingAccounts).instruction();
-    }
-    async updateUserPoolIdIx(subAccountId, poolId) {
-        const { user } = this.getDriftUserPdas(subAccountId);
-        return await this.base.extDriftProgram.methods.updateUserPoolId(subAccountId, poolId).accounts({
-            glamState: this.base.statePda,
-            user
-        }).instruction();
-    }
-    async initializeTx(subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const tx = new web3_js.Transaction();
-        // Create userStats account if it doesn't exist
-        const { userStats } = this.getDriftUserPdas();
-        const userStatsInfo = await this.base.provider.connection.getAccountInfo(userStats);
-        if (!userStatsInfo) {
-            tx.add(await this.initializeUserStatsIx(glamSigner));
-        }
-        // Initialize user (aka sub-account)
-        tx.add(await this.initializeUserIx(glamSigner, subAccountId));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async updateUserCustomMarginRatioIx(maxLeverage, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        // https://github.com/drift-labs/protocol-v2/blob/babed162b08b1fe34e49a81c5aa3e4ec0a88ecdf/programs/drift/src/math/constants.rs#L183-L184
-        // 0 means No Limit
-        const marginRatio = maxLeverage === 0 ? 0 : DRIFT_MARGIN_PRECISION / maxLeverage;
-        return await this.base.extDriftProgram.methods.updateUserCustomMarginRatio(subAccountId, marginRatio).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user
-        }).instruction();
-    }
-    async updateUserCustomMarginRatioTx(maxLeverage, subAccountId = 0, txOptions = {}) {
-        const tx = new web3_js.Transaction().add(await this.updateUserCustomMarginRatioIx(maxLeverage, subAccountId, txOptions));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async updateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        return await this.base.extDriftProgram.methods.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user
-        }).instruction();
-    }
-    async updateUserMarginTradingEnabledTx(marginTradingEnabled, subAccountId = 0, txOptions = {}) {
-        const tx = new web3_js.Transaction().add(...txOptions.preInstructions || [], await this.updateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId, txOptions));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async updateUserDelegateIx(delegate, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        return await this.base.extDriftProgram.methods.updateUserDelegate(subAccountId, new web3_js.PublicKey(delegate)).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user
-        }).instruction();
-    }
-    async updateUserDelegateTx(delegate, subAccountId = 0, txOptions = {}) {
-        const tx = new web3_js.Transaction().add(await this.updateUserDelegateIx(delegate, subAccountId, txOptions));
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async deleteUserTx(subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user, userStats } = this.getDriftUserPdas(subAccountId);
-        const tx = await this.base.extDriftProgram.methods.deleteUser().accounts({
-            glamState: this.base.statePda,
-            state: this.driftStatePda,
-            user,
-            userStats,
-            glamSigner
-        }).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async depositTx(amount, marketIndex = 1, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user, userStats } = this.getDriftUserPdas(subAccountId);
-        const { mint, oracle, tokenProgram, marketPda, vault: driftVault, name } = await this.fetchAndParseSpotMarket(marketIndex);
-        console.log(`Spot market ${marketIndex} mint ${mint}, oracle: ${oracle}, marketPda: ${marketPda}, vault: ${driftVault}`);
-        const preInstructions = [];
-        const postInstructions = [];
-        // If drift user doesn't exist, prepend initialization ixs
-        if (!await this.fetchDriftUser(subAccountId)) {
-            // Only add ix to initialize user stats if subAccountId is 0
-            if (subAccountId === 0) {
-                preInstructions.push(await this.initializeUserStatsIx(glamSigner));
-            }
-            preInstructions.push(await this.initializeUserIx(glamSigner, subAccountId));
-            // If market name ends with "-N", it means we're depositing to an isolated pool
-            const isolatedPoolMatch = name.match(/-(\d+)$/);
-            if (isolatedPoolMatch) {
-                const poolId = parseInt(isolatedPoolMatch[1]);
-                preInstructions.push(await this.updateUserPoolIdIx(subAccountId, poolId));
-            }
-        }
-        if (mint.equals(WSOL)) {
-            const wrapSolIxs = await this.vault.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
-            const tokenAccount = this.base.getVaultAta(WSOL);
-            const closeTokenAccountIx = await this.base.extSplProgram.methods.tokenCloseAccount().accounts({
-                glamState: this.base.statePda,
-                glamSigner,
-                tokenAccount,
-                cpiProgram: splToken.TOKEN_PROGRAM_ID
-            }).instruction();
-            postInstructions.push(closeTokenAccountIx);
-        }
-        const remainingAccounts = [
-            {
-                pubkey: new web3_js.PublicKey(oracle),
-                isSigner: false,
-                isWritable: false
-            },
-            {
-                pubkey: new web3_js.PublicKey(marketPda),
-                isSigner: false,
-                isWritable: true
-            }
-        ];
-        if (tokenProgram.equals(splToken.TOKEN_2022_PROGRAM_ID)) {
-            remainingAccounts.push({
-                pubkey: mint,
-                isSigner: false,
-                isWritable: false
-            });
-        }
-        const tx = await this.base.extDriftProgram.methods.deposit(marketIndex, amount, false).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            state: this.driftStatePda,
-            user,
-            userStats,
-            spotMarketVault: driftVault,
-            userTokenAccount: this.base.getVaultAta(mint, tokenProgram),
-            tokenProgram
-        }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async withdrawTx(amount, marketIndex = 1, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user, userStats } = this.getDriftUserPdas(subAccountId);
-        const { mint, tokenProgram, vault: driftVault } = await this.fetchAndParseSpotMarket(marketIndex);
-        const glamVault = this.base.vaultPda;
-        const glamVaultAta = this.base.getVaultAta(mint, tokenProgram);
-        const remainingAccounts = await this.composeRemainingAccounts(subAccountId, MarketType.SPOT, marketIndex);
-        if (tokenProgram.equals(splToken.TOKEN_2022_PROGRAM_ID)) {
-            remainingAccounts.push({
-                pubkey: mint,
-                isSigner: false,
-                isWritable: false
-            });
+        const spotMarkets = await this.fetchAndParseSpotMarkets(spotMarketIndexes);
+        const perpMarkets = await this.fetchAndParsePerpMarkets(perpMarketIndexes);
+        if (process.env.NODE_ENV === "development") {
+            console.log("[composeRemainingAccounts] perpMarkets:", perpMarkets);
         }
-        // Create vault ata in case it doesn't exist
-        const preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, glamVaultAta, glamVault, mint, tokenProgram)
-        ];
-        const tx = await this.base.extDriftProgram.methods.withdraw(marketIndex, amount, false).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            state: this.driftStatePda,
-            user,
-            userStats,
-            spotMarketVault: driftVault,
-            userTokenAccount: glamVaultAta,
-            driftSigner: DRIFT_SIGNER,
-            tokenProgram
-        }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async placeOrderTx(orderParams, subAccountId = 0, txOptions = {}) {
-        const { marketIndex, marketType } = orderParams;
-        const { user: referrer, userStats: referrerStats } = this.getGlamReferrerPdas();
-        const remainingAccounts = (await this.composeRemainingAccounts(subAccountId, marketType, marketIndex)).concat([
-            {
-                pubkey: referrer,
-                isWritable: true,
+        const oracles = spotMarkets.map((m)=>m.oracle).concat(perpMarkets.map((m)=>m.oracle));
+        const markets = spotMarkets.map((m)=>m.marketPda).concat(perpMarkets.map((m)=>m.marketPda));
+        if (process.env.NODE_ENV === "development") {
+            console.log("[composeRemainingAccounts] markets:", markets.map((m)=>m.toBase58()));
+            console.log("[composeRemainingAccounts] oracles:", oracles.map((o)=>o.toBase58()));
+        }
+        return oracles.map((o)=>({
+                pubkey: new web3_js.PublicKey(o),
+                isWritable: false,
                 isSigner: false
-            },
-            {
-                pubkey: referrerStats,
+            })).concat(markets.map((m)=>({
+                pubkey: new web3_js.PublicKey(m),
                 isWritable: true,
                 isSigner: false
-            }
-        ]);
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const tx = await this.base.extDriftProgram.methods.placeOrders([
-            orderParams
-        ]).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user,
-            state: this.driftStatePda
-        }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async modifyOrderTx(modifyOrderParams, orderId, marketIndex, marketType, subAccountId = 0, txOptions = {}) {
-        const remainingAccounts = await this.composeRemainingAccounts(subAccountId, marketType, marketIndex);
-        const signer = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const tx = await this.base.extDriftProgram.methods.modifyOrder(orderId, modifyOrderParams).accounts({
-            glamState: this.base.statePda,
-            glamSigner: signer,
-            user,
-            state: this.driftStatePda
-        }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async cancelOrdersTx(marketType, marketIndex, direction, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const remainingAccounts = await this.composeRemainingAccounts(subAccountId, marketType, marketIndex);
-        const tx = await this.base.extDriftProgram.methods.cancelOrders(marketType, marketIndex, direction).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user,
-            state: this.driftStatePda
-        }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async cancelOrdersByIdsTx(orderIds, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const remainingAccounts = await this.composeRemainingAccounts(subAccountId);
-        const tx = await this.base.extDriftProgram.methods.cancelOrdersByIds(orderIds).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user,
-            state: this.driftStatePda
-        }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
-    }
-    async settlePnlTx(marketIndex, subAccountId = 0, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const { vault: driftVault } = await this.fetchAndParseSpotMarket(0);
-        const remainingAccounts = await this.composeRemainingAccounts(subAccountId, MarketType.PERP, marketIndex);
-        const tx = await this.base.extDriftProgram.methods.settlePnl(marketIndex).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            user,
-            state: this.driftStatePda,
-            spotMarketVault: driftVault
-        }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction(tx, txOptions);
+            })));
     }
     constructor(base, vault){
         this.base = base;
@@ -26290,6 +27045,7 @@ class DriftClient {
                 authority.toBuffer()
             ], DRIFT_PROGRAM_ID)[0];
         this.marketTypeEquals = (a, b)=>a && Object.keys(a)[0] === Object.keys(b)[0];
+        this.txBuilder = new TxBuilder$6(base, vault, this);
     }
 }
 class DriftVaultsClient {
@@ -27012,7 +27768,7 @@ async function getSwapInstructions(quoteResponse, from) {
     });
     return await res.json();
 }
-let TxBuilder$4 = class TxBuilder {
+let TxBuilder$5 = class TxBuilder {
     async swap(options, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
         const glamVault = this.base.vaultPda;
@@ -27114,7 +27870,7 @@ class JupiterSwapClient {
     constructor(base, vault){
         this.base = base;
         this.vault = vault;
-        this.txBuilder = new TxBuilder$4(base, vault);
+        this.txBuilder = new TxBuilder$5(base, vault);
     }
 }
 
@@ -27599,7 +28355,7 @@ class VaultClient {
     }
 }
 
-let TxBuilder$3 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$4 = class TxBuilder extends BaseTxBuilder {
     async initialize(params, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
         // stateInitKey = hash state name and get first 8 bytes
@@ -27630,7 +28386,9 @@ let TxBuilder$3 = class TxBuilder extends BaseTxBuilder {
     }
     async update(params, txOptions) {
         const ix = await this.updateIx(params, txOptions.signer);
-        const tx = this.build(ix, txOptions);
+        const tx = this.build([
+            ix
+        ], txOptions);
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async updateIx(params, signer) {
@@ -27702,7 +28460,7 @@ class StateClient {
     }
     constructor(base){
         this.base = base;
-        this.txBuilder = new TxBuilder$3(base);
+        this.txBuilder = new TxBuilder$4(base);
     }
 }
 
@@ -27926,164 +28684,67 @@ Obligation._layout = borsh.struct([
         borsh.u8("stale"),
         borsh.u8("priceStatus"),
         borsh.array(borsh.u8(), 6, "placeholder")
-    ], "lastUpdate"),
-    borsh.publicKey("lendingMarket"),
-    borsh.publicKey("owner"),
-    borsh.array(borsh.struct([
-        borsh.publicKey("depositReserve"),
-        borsh.u64("depositedAmount"),
-        borsh.u128("marketValueSf"),
-        borsh.u64("borrowedAmountAgainstThisCollateralInElevationGroup"),
-        borsh.array(borsh.u64(), 9, "padding")
-    ]), 8, "deposits"),
-    borsh.u64("lowestReserveDepositLiquidationLtv"),
-    borsh.u128("depositedValueSf"),
-    borsh.array(borsh.struct([
-        borsh.publicKey("borrowReserve"),
-        borsh.struct([
-            borsh.array(borsh.u64(), 4, "value"),
-            borsh.array(borsh.u64(), 2, "padding")
-        ], "cumulativeBorrowRateBsf"),
-        borsh.u64("padding"),
-        borsh.u128("borrowedAmountSf"),
-        borsh.u128("marketValueSf"),
-        borsh.u128("borrowFactorAdjustedMarketValueSf"),
-        borsh.u64("borrowedAmountOutsideElevationGroups"),
-        borsh.array(borsh.u64(), 7, "padding2")
-    ]), 5, "borrows"),
-    borsh.u128("borrowFactorAdjustedDebtValueSf"),
-    borsh.u128("borrowedAssetsMarketValueSf"),
-    borsh.u128("allowedBorrowValueSf"),
-    borsh.u128("unhealthyBorrowValueSf"),
-    borsh.array(borsh.u8(), 8, "depositsAssetTiers"),
-    borsh.array(borsh.u8(), 5, "borrowsAssetTiers"),
-    borsh.u8("elevationGroup"),
-    borsh.u8("numOfObsoleteDepositReserves"),
-    borsh.u8("hasDebt"),
-    borsh.publicKey("referrer"),
-    borsh.u8("borrowingDisabled"),
-    borsh.u8("autodeleverageTargetLtvPct"),
-    borsh.u8("lowestReserveDepositMaxLtvPct"),
-    borsh.u8("numOfObsoleteBorrowReserves"),
-    borsh.array(borsh.u8(), 4, "reserved"),
-    borsh.u64("highestBorrowFactorPct"),
-    borsh.u64("autodeleverageMarginCallStartedTimestamp"),
-    borsh.array(borsh.struct([
-        borsh.u128("conditionThresholdSf"),
-        borsh.u128("opportunityParameterSf"),
-        borsh.u16("minExecutionBonusBps"),
-        borsh.u16("maxExecutionBonusBps"),
-        borsh.u8("conditionType"),
-        borsh.u8("opportunityType"),
-        borsh.array(borsh.u8(), 2, "padding1"),
-        borsh.array(borsh.u64(), 8, "padding2")
-    ]), 2, "orders"),
-    borsh.array(borsh.u64(), 93, "padding3")
-]);
-
-const FractionDecimal = Decimal.clone({
-    precision: 40
-});
-new FractionDecimal(2).pow(60);
-const DEFAULT_OBLIGATION_ARGS = {
-    tag: 0,
-    id: 0
-};
-const EVENT_AUTHORITY = new web3_js.PublicKey("24tHwQyJJ9akVXxnvkekGfAoeUJXXS7mE6kQNioNySsK");
-class KaminoLendingClient {
-    /**
-   * Initializes Kamino user metadata
-   *
-   * @param market Lending market
-   * @param referrer Referrer user metadata
-   * @param txOptions
-   * @returns
-   */ async initUserMetadata(txOptions = {}) {
-        const tx = await this.initUserMetadataTx(txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    /**
-   * Deposits asset to the lending market.
-   *
-   * @param market Lending market
-   * @param asset Asset mint
-   * @param amount Amount to deposit
-   * @param txOptions
-   * @returns
-   */ async deposit(market, asset, amount, txOptions = {}) {
-        const tx = await this.depositTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    /**
-   * Withdraws asset from the lending market.
-   *
-   * @param market Lending market
-   * @param asset Asset mint
-   * @param amount Amount to deposit
-   * @param txOptions
-   * @returns
-   */ async withdraw(market, asset, amount, txOptions = {}) {
-        const tx = await this.withdrawTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    /**
-   * Borrows asset from the lending market.
-   *
-   * @param market Lending market
-   * @param asset Asset mint
-   * @param amount Amount to borrow
-   * @param txOptions
-   * @returns
-   */ async borrow(market, asset, amount, txOptions = {}) {
-        const tx = await this.borrowTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    /**
-   * Repays asset to the lending market.
-   *
-   * @param market
-   * @param asset
-   * @param amount
-   * @param txOptions
-   * @returns
-   */ async repay(market, asset, amount, txOptions = {}) {
-        const tx = await this.repayTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    getUserMetadataPda(owner) {
-        const [userMetadataPda] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("user_meta"),
-            owner.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        return userMetadataPda;
-    }
-    getObligationPda(owner, market, args = DEFAULT_OBLIGATION_ARGS) {
-        const seed = [
-            Buffer.from([
-                args.tag
-            ]),
-            Buffer.from([
-                args.id
-            ]),
-            owner.toBuffer(),
-            market.toBuffer(),
-            web3_js.PublicKey.default.toBuffer(),
-            web3_js.PublicKey.default.toBuffer()
-        ];
-        const [obligation, _] = web3_js.PublicKey.findProgramAddressSync(seed, KAMINO_LENDING_PROGRAM);
-        return obligation;
-    }
-    // seeds = [BASE_SEED_USER_STATE, farm_state.key().as_ref(), delegatee.key().as_ref()],
-    // for a delegated farm, the delegatee is the obligation, the owner (of farm user state) is the vault PDA
-    // for an un-delegated farm, the delegatee and the owner are the same (vault PDA)
-    getFarmUserState(farmUser, farm) {
-        const [obligationFarm] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("user"),
-            farm.toBuffer(),
-            farmUser.toBuffer()
-        ], KAMINO_FARM_PROGRAM);
-        return obligationFarm;
-    }
+    ], "lastUpdate"),
+    borsh.publicKey("lendingMarket"),
+    borsh.publicKey("owner"),
+    borsh.array(borsh.struct([
+        borsh.publicKey("depositReserve"),
+        borsh.u64("depositedAmount"),
+        borsh.u128("marketValueSf"),
+        borsh.u64("borrowedAmountAgainstThisCollateralInElevationGroup"),
+        borsh.array(borsh.u64(), 9, "padding")
+    ]), 8, "deposits"),
+    borsh.u64("lowestReserveDepositLiquidationLtv"),
+    borsh.u128("depositedValueSf"),
+    borsh.array(borsh.struct([
+        borsh.publicKey("borrowReserve"),
+        borsh.struct([
+            borsh.array(borsh.u64(), 4, "value"),
+            borsh.array(borsh.u64(), 2, "padding")
+        ], "cumulativeBorrowRateBsf"),
+        borsh.u64("padding"),
+        borsh.u128("borrowedAmountSf"),
+        borsh.u128("marketValueSf"),
+        borsh.u128("borrowFactorAdjustedMarketValueSf"),
+        borsh.u64("borrowedAmountOutsideElevationGroups"),
+        borsh.array(borsh.u64(), 7, "padding2")
+    ]), 5, "borrows"),
+    borsh.u128("borrowFactorAdjustedDebtValueSf"),
+    borsh.u128("borrowedAssetsMarketValueSf"),
+    borsh.u128("allowedBorrowValueSf"),
+    borsh.u128("unhealthyBorrowValueSf"),
+    borsh.array(borsh.u8(), 8, "depositsAssetTiers"),
+    borsh.array(borsh.u8(), 5, "borrowsAssetTiers"),
+    borsh.u8("elevationGroup"),
+    borsh.u8("numOfObsoleteDepositReserves"),
+    borsh.u8("hasDebt"),
+    borsh.publicKey("referrer"),
+    borsh.u8("borrowingDisabled"),
+    borsh.u8("autodeleverageTargetLtvPct"),
+    borsh.u8("lowestReserveDepositMaxLtvPct"),
+    borsh.u8("numOfObsoleteBorrowReserves"),
+    borsh.array(borsh.u8(), 4, "reserved"),
+    borsh.u64("highestBorrowFactorPct"),
+    borsh.u64("autodeleverageMarginCallStartedTimestamp"),
+    borsh.array(borsh.struct([
+        borsh.u128("conditionThresholdSf"),
+        borsh.u128("opportunityParameterSf"),
+        borsh.u16("minExecutionBonusBps"),
+        borsh.u16("maxExecutionBonusBps"),
+        borsh.u8("conditionType"),
+        borsh.u8("opportunityType"),
+        borsh.array(borsh.u8(), 2, "padding1"),
+        borsh.array(borsh.u64(), 8, "padding2")
+    ]), 2, "orders"),
+    borsh.array(borsh.u64(), 93, "padding3")
+]);
+
+const DEFAULT_OBLIGATION_ARGS = {
+    tag: 0,
+    id: 0
+};
+const EVENT_AUTHORITY = new web3_js.PublicKey("24tHwQyJJ9akVXxnvkekGfAoeUJXXS7mE6kQNioNySsK");
+let TxBuilder$3 = class TxBuilder extends BaseTxBuilder {
     refreshObligationIx(accounts, programId = KAMINO_LENDING_PROGRAM) {
         const keys = [
             {
@@ -28320,14 +28981,14 @@ class KaminoLendingClient {
             return [
                 farmCollateral
             ].filter((farm)=>!!farm).map((farm)=>{
-                const obligationFarmUserState = this.getFarmUserState(obligation, farm);
+                const obligationFarmUserState = this.klend.getFarmUserState(obligation, farm);
                 return this.refreshObligationFarmsForReserveIx({
                     mode: 0
                 }, {
                     crank: this.base.signer,
                     baseAccounts: {
                         obligation,
-                        lendingMarketAuthority: this.getMarketAuthority(lendingMarket),
+                        lendingMarketAuthority: this.klend.getMarketAuthority(lendingMarket),
                         reserve: parsedReserve.address,
                         reserveFarmState: farm,
                         obligationFarmUserState,
@@ -28346,215 +29007,37 @@ class KaminoLendingClient {
             return [
                 farmDebt
             ].filter((farm)=>!!farm).map((farm)=>{
-                const obligationFarmUserState = this.getFarmUserState(obligation, farm);
-                return this.refreshObligationFarmsForReserveIx({
-                    mode: 1
-                }, {
-                    crank: this.base.signer,
-                    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([
-            Buffer.from("lma"),
-            market.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        return authority;
-    }
-    reservePdas(market, mint) {
-        const [liquiditySupplyVault] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("reserve_liq_supply"),
-            market.toBuffer(),
-            mint.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        const [collateralMint] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("reserve_coll_mint"),
-            market.toBuffer(),
-            mint.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        const [collateralSupplyVault] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("reserve_coll_supply"),
-            market.toBuffer(),
-            mint.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        const [feeVault] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("fee_receiver"),
-            market.toBuffer(),
-            mint.toBuffer()
-        ], KAMINO_LENDING_PROGRAM);
-        return {
-            liquiditySupplyVault,
-            collateralMint,
-            collateralSupplyVault,
-            feeVault
-        };
-    }
-    parseObligation(obligation, data) {
-        const { lendingMarket, deposits: _deposits, borrows: _borrows } = Obligation.decode(obligation, data);
-        // Map decoded deposits to the expected format, filtering out empty deposits
-        const deposits = _deposits.filter(({ depositReserve })=>!depositReserve.equals(web3_js.PublicKey.default)).map(({ depositReserve, depositedAmount, marketValueSf })=>{
-            return {
-                reserve: depositReserve,
-                depositedAmount,
-                marketValueSf
-            };
-        });
-        // Map decoded borrows to the expected format, filtering out empty borrows
-        const borrows = _borrows.filter(({ borrowReserve })=>!borrowReserve.equals(web3_js.PublicKey.default)).map(({ borrowReserve, borrowedAmountSf, marketValueSf, cumulativeBorrowRateBsf })=>{
-            return {
-                reserve: borrowReserve,
-                borrowedAmountSf,
-                marketValueSf,
-                cumulativeBorrowRateBsf
-            };
-        });
-        return {
-            address: obligation,
-            lendingMarket,
-            deposits,
-            borrows
-        };
-    }
-    /**
-   * Fetches and parses an obligation account
-   */ async fetchAndParseObligation(obligation) {
-        const cached = this.obligations.get(obligation);
-        if (cached) {
-            return cached;
-        }
-        const obligationAccount = await this.base.provider.connection.getAccountInfo(obligation);
-        if (!obligationAccount) {
-            throw new Error("Obligation account not found");
-        }
-        const parsedObligation = this.parseObligation(obligation, obligationAccount.data);
-        this.obligations.set(obligation, parsedObligation);
-        return parsedObligation;
-    }
-    parseReserve(pubkey, data) {
-        const { lendingMarket, farmCollateral, farmDebt, liquidity: { mintPubkey, mintDecimals }, config: { tokenInfo: { scopeConfiguration: { priceFeed } } }, collateralExchangeRate, cumulativeBorrowRate } = Reserve.decode(pubkey, data);
-        return {
-            address: pubkey,
-            market: lendingMarket,
-            farmCollateral: farmCollateral.equals(web3_js.PublicKey.default) ? null : farmCollateral,
-            farmDebt: farmDebt.equals(web3_js.PublicKey.default) ? null : farmDebt,
-            liquidityMint: mintPubkey,
-            liquidityMintDecimals: mintDecimals.toNumber(),
-            scopePriceFeed: priceFeed,
-            ...this.reservePdas(lendingMarket, mintPubkey),
-            collateralExchangeRate,
-            cumulativeBorrowRate
-        };
-    }
-    async fetchAndParseReserves(reserves) {
-        const requestReservesSet = new PkSet(reserves);
-        const cachedReservesSet = new PkSet(Array.from(this.reserves.pkKeys()));
-        // If all requested reserves are cached, return data from cache
-        if (cachedReservesSet.includes(requestReservesSet)) {
-            return Array.from(this.reserves.values()).filter(({ address })=>requestReservesSet.has(address));
-        }
-        // Only fetch reserves that are not cached
-        const reservesToFetch = Array.from(requestReservesSet).filter((r)=>!cachedReservesSet.has(r));
-        if (process.env.NODE_ENV !== "production") {
-            console.log("Fetching reserves:", reservesToFetch.map((r)=>r.toBase58()));
-        }
-        const reserveAccounts = await this.base.provider.connection.getMultipleAccountsInfo(reservesToFetch);
-        if (reserveAccounts.some((a)=>!a)) {
-            throw new Error("Not all reserves can be found");
-        }
-        reserveAccounts.forEach((account, i)=>{
-            const parsedReserve = this.parseReserve(reservesToFetch[i], account.data);
-            this.reserves.set(reservesToFetch[i], parsedReserve);
-        });
-        // Return requested reserves
-        return Array.from(this.reserves.values()).filter(({ address })=>requestReservesSet.has(address));
-    }
-    /**
-   * Finds and parses a reserve account for a given market and asset
-   *
-   * @param market The lending market public key
-   * @param asset The asset public key
-   * @returns The parsed reserve account
-   */ async findAndParseReserve(market, asset) {
-        const accounts = await this.base.provider.connection.getProgramAccounts(KAMINO_LENDING_PROGRAM, {
-            filters: [
-                {
-                    dataSize: KAMINO_RESERVE_SIZE
-                },
-                {
-                    memcmp: {
-                        offset: 32,
-                        bytes: market.toBase58()
-                    }
-                },
-                {
-                    memcmp: {
-                        offset: 128,
-                        bytes: asset.toBase58()
-                    }
-                }
-            ]
-        });
-        if (accounts.length === 0) {
-            throw new Error("Reserve not found");
-        }
-        const parsedReserve = this.parseReserve(accounts[0].pubkey, accounts[0].account.data);
-        this.reserves.set(accounts[0].pubkey, parsedReserve);
-        return parsedReserve;
-    }
-    /**
-   * Finds and parses Kamino obligations for a given owner and market (optional)
-   */ async findAndParseObligations(owner, market) {
-        const accounts = await this.base.provider.connection.getProgramAccounts(KAMINO_LENDING_PROGRAM, {
-            filters: [
-                {
-                    dataSize: KAMINO_OBTRIGATION_SIZE
-                },
-                {
-                    memcmp: {
-                        offset: 64,
-                        bytes: owner.toBase58()
-                    }
-                },
-                ...market ? [
-                    {
-                        memcmp: {
-                            offset: 32,
-                            bytes: market.toBase58()
-                        }
-                    }
-                ] : []
-            ]
-        });
-        // Parse obligations and cache them
-        return accounts.map((a)=>{
-            const parsedObligation = this.parseObligation(a.pubkey, a.account.data);
-            this.obligations.set(a.pubkey, parsedObligation);
-            return parsedObligation;
-        });
+                const obligationFarmUserState = this.klend.getFarmUserState(obligation, farm);
+                return this.refreshObligationFarmsForReserveIx({
+                    mode: 1
+                }, {
+                    crank: this.base.signer,
+                    baseAccounts: {
+                        obligation,
+                        lendingMarketAuthority: this.klend.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();
     }
     /**
    * Returns two instructions that refresh reserves in batch and refresh obligation
    */ async refreshReservesAndObligationIxs(obligation, targetReserve) {
         // Get a set of reserves to refresh
-        const { deposits, borrows, lendingMarket } = await this.fetchAndParseObligation(obligation);
+        const { deposits, borrows, lendingMarket } = await this.klend.fetchAndParseObligation(obligation);
         const reservesInUse = deposits.map(({ reserve })=>reserve).concat(borrows.map(({ reserve })=>reserve));
         // Refresh all reserves, including those in use and target reserve
         const reservesSet = new PkSet();
         reservesInUse.forEach((reserve)=>reservesSet.add(reserve));
         reservesSet.add(targetReserve.address);
-        const parsedReserves = await this.fetchAndParseReserves(Array.from(reservesSet));
+        const parsedReserves = await this.klend.fetchAndParseReserves(Array.from(reservesSet));
         const refreshReservesIx = this.refreshReservesBatchIx(parsedReserves, false);
         // Refresh obligation with reserves in use (exclude target reserve)
         const refreshObligationIx = this.refreshObligationIx({
@@ -28579,13 +29062,13 @@ class KaminoLendingClient {
                 initIx: null
             };
         }
-        const farmUser = this.getFarmUserState(obligation, farmState);
+        const farmUser = this.klend.getFarmUserState(obligation, farmState);
         const farmUserAccount = await this.base.provider.connection.getAccountInfo(farmUser);
         const initIx = farmUserAccount ? null : await this.base.extKaminoProgram.methods.lendingInitObligationFarmsForReserve(mode).accounts({
             glamState: this.base.statePda,
             glamSigner: signer || this.base.signer,
             obligation,
-            lendingMarketAuthority: this.getMarketAuthority(market),
+            lendingMarketAuthority: this.klend.getMarketAuthority(market),
             reserve: address,
             reserveFarmState: farmState,
             obligationFarm: farmUser,
@@ -28600,7 +29083,7 @@ class KaminoLendingClient {
     async initUserMetadataTx(txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
         const vault = this.base.vaultPda;
-        const userMetadata = this.getUserMetadataPda(vault);
+        const userMetadata = this.klend.getUserMetadataPda(vault);
         const lookupTable = new web3_js.PublicKey(0); // FIXME: create lookup table
         const tx = await this.base.extKaminoProgram.methods.lendingInitUserMetadata(lookupTable).accounts({
             glamState: this.base.statePda,
@@ -28608,16 +29091,14 @@ class KaminoLendingClient {
             userMetadata,
             referrerUserMetadata: null
         }).transaction();
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return vTx;
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async depositTx(market, asset, amount, txOptions) {
-        const glamSigner = txOptions.signer || this.base.signer;
+    async depositIxs(market, asset, amount, glamSigner) {
         const vault = this.base.vaultPda;
-        const userMetadata = this.getUserMetadataPda(vault);
-        const obligation = this.getObligationPda(vault, market);
-        const preInstructions = txOptions.preInstructions || [];
-        const postInstructions = txOptions.postInstructions || [];
+        const userMetadata = this.klend.getUserMetadataPda(vault);
+        const obligation = this.klend.getObligationPda(vault, market);
+        const preInstructions = [];
+        const postInstructions = [];
         const [userMetadataAccount, obligationAccount] = await this.base.provider.connection.getMultipleAccountsInfo([
             userMetadata,
             obligation
@@ -28643,7 +29124,7 @@ class KaminoLendingClient {
                 ownerUserMetadata: userMetadata
             }).instruction());
         }
-        const depositReserve = await this.findAndParseReserve(market, asset);
+        const depositReserve = await this.klend.findAndParseReserve(market, asset);
         const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, depositReserve, 0, glamSigner);
         if (initIx) {
             preInstructions.push(initIx);
@@ -28690,12 +29171,12 @@ class KaminoLendingClient {
         //   postInstructions.push(closeIx);
         // }
         }
-        const tx = await this.base.extKaminoProgram.methods.lendingDepositReserveLiquidityAndObligationCollateralV2(amount).accounts({
+        const ix = await this.base.extKaminoProgram.methods.lendingDepositReserveLiquidityAndObligationCollateralV2(amount).accounts({
             glamState: this.base.statePda,
             glamSigner,
             obligation,
             lendingMarket: market,
-            lendingMarketAuthority: this.getMarketAuthority(market),
+            lendingMarketAuthority: this.klend.getMarketAuthority(market),
             reserve: depositReserve.address,
             reserveLiquidityMint: asset,
             reserveLiquiditySupply: depositReserve.liquiditySupplyVault,
@@ -28709,17 +29190,25 @@ class KaminoLendingClient {
             obligationFarmUserState: obligationFarmUser,
             reserveFarmState: depositReserve.farmCollateral,
             farmsProgram: KAMINO_FARM_PROGRAM
-        }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return vTx;
+        }).instruction();
+        return [
+            ...preInstructions,
+            ix,
+            ...postInstructions
+        ];
     }
-    async withdrawTx(market, asset, amount, txOptions) {
+    async depositTx(market, asset, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.depositIxs(market, asset, amount, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async withdrawIxs(market, asset, amount, glamSigner) {
         const vault = this.base.vaultPda;
-        const obligation = this.getObligationPda(vault, market);
+        const obligation = this.klend.getObligationPda(vault, market);
         const preInstructions = [];
         const postInstructions = [];
-        const withdrawReserve = await this.findAndParseReserve(market, asset);
+        const withdrawReserve = await this.klend.findAndParseReserve(market, asset);
         const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, withdrawReserve, 0, glamSigner);
         if (initIx) {
             preInstructions.push(initIx);
@@ -28746,7 +29235,7 @@ class KaminoLendingClient {
             glamSigner,
             obligation,
             lendingMarket: market,
-            lendingMarketAuthority: this.getMarketAuthority(market),
+            lendingMarketAuthority: this.klend.getMarketAuthority(market),
             withdrawReserve: withdrawReserve.address,
             reserveLiquidityMint: asset,
             reserveSourceCollateral: withdrawReserve.collateralSupplyVault,
@@ -28773,106 +29262,392 @@ class KaminoLendingClient {
         // - refreshObligationFarmsForReserve (if farm exists)
         // - withdrawIx
         // - refreshObligationFarmsForReserve (if farm exists)
-        const tx = new web3_js.Transaction();
-        tx.add(...preInstructions, withdrawIx, ...postInstructions);
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return vTx;
+        return [
+            ...preInstructions,
+            withdrawIx,
+            ...postInstructions
+        ];
+    }
+    async withdrawTx(market, asset, amount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.withdrawIxs(market, asset, amount, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async borrowIxs(market, asset, amount, glamSigner) {
+        const vault = this.base.vaultPda;
+        const obligation = this.klend.getObligationPda(vault, market);
+        const preInstructions = [];
+        const postInstructions = [];
+        const borrowReserve = await this.klend.findAndParseReserve(market, asset);
+        const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, borrowReserve, 1, glamSigner);
+        if (initIx) {
+            preInstructions.push(initIx);
+        }
+        const ixs = await this.refreshReservesAndObligationIxs(obligation, borrowReserve);
+        preInstructions.push(...ixs);
+        if (borrowReserve.farmDebt) {
+            const ixs = this.refreshObligationDebtFarmsForReservesIxs(obligation, market, [
+                borrowReserve
+            ]);
+            preInstructions.push(...ixs);
+            postInstructions.push(...ixs); // farms must be refreshed after borrow
+        }
+        // Create asset ATA in case it doesn't exist. Add it to the beginning of preInstructions
+        const { tokenProgram } = await fetchMintAndTokenProgram(this.base.provider.connection, asset);
+        const userDestinationLiquidity = this.base.getVaultAta(asset, tokenProgram);
+        const createAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, userDestinationLiquidity, vault, asset, tokenProgram);
+        preInstructions.unshift(createAtaIx);
+        const borrowIx = await this.base.extKaminoProgram.methods.lendingBorrowObligationLiquidityV2(amount).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            obligation,
+            lendingMarket: market,
+            lendingMarketAuthority: this.klend.getMarketAuthority(market),
+            borrowReserve: borrowReserve.address,
+            borrowReserveLiquidityMint: asset,
+            reserveSourceLiquidity: borrowReserve.liquiditySupplyVault,
+            borrowReserveLiquidityFeeReceiver: borrowReserve.feeVault,
+            userDestinationLiquidity,
+            referrerTokenState: null,
+            instructionSysvarAccount: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
+            tokenProgram,
+            obligationFarmUserState: obligationFarmUser,
+            reserveFarmState: borrowReserve.farmDebt,
+            farmsProgram: KAMINO_FARM_PROGRAM
+        }).instruction();
+        return [
+            ...preInstructions,
+            borrowIx
+        ];
+    }
+    async borrowTx(market, asset, amount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.borrowIxs(market, asset, amount, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async repayIxs(market, asset, amount, glamSigner) {
+        const vault = this.base.vaultPda;
+        const obligation = this.klend.getObligationPda(vault, market);
+        const preInstructions = [];
+        const repayReserve = await this.klend.findAndParseReserve(market, asset);
+        const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, repayReserve, 1, glamSigner);
+        if (initIx) {
+            preInstructions.push(initIx);
+        }
+        const ixs = await this.refreshReservesAndObligationIxs(obligation, repayReserve);
+        preInstructions.push(...ixs);
+        const { tokenProgram } = await fetchMintAndTokenProgram(this.base.provider.connection, asset);
+        const repayIx = await this.base.extKaminoProgram.methods.lendingRepayObligationLiquidityV2(amount).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            obligation,
+            lendingMarket: market,
+            lendingMarketAuthority: this.klend.getMarketAuthority(market),
+            repayReserve: repayReserve.address,
+            reserveLiquidityMint: asset,
+            reserveDestinationLiquidity: repayReserve.liquiditySupplyVault,
+            userSourceLiquidity: this.base.getVaultAta(asset, tokenProgram),
+            instructionSysvarAccount: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
+            tokenProgram,
+            obligationFarmUserState: obligationFarmUser,
+            reserveFarmState: repayReserve.farmDebt,
+            farmsProgram: KAMINO_FARM_PROGRAM
+        }).instruction();
+        return [
+            ...preInstructions,
+            repayIx
+        ];
+    }
+    async repayTx(market, asset, amount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.signer;
+        const ixs = await this.repayIxs(market, asset, amount, glamSigner);
+        const tx = this.build(ixs, txOptions);
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    constructor(base, vault, klend){
+        super(base), this.base = base, this.vault = vault, this.klend = klend;
+    }
+};
+class KaminoLendingClient {
+    /**
+   * Initializes Kamino user metadata
+   *
+   * @param market Lending market
+   * @param referrer Referrer user metadata
+   * @param txOptions
+   * @returns
+   */ async initUserMetadata(txOptions = {}) {
+        const tx = await this.txBuilder.initUserMetadataTx(txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    /**
+   * Deposits asset to the lending market.
+   *
+   * @param market Lending market
+   * @param asset Asset mint
+   * @param amount Amount to deposit
+   * @param txOptions
+   * @returns
+   */ async deposit(market, asset, amount, txOptions = {}) {
+        const tx = await this.txBuilder.depositTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    /**
+   * Withdraws asset from the lending market.
+   *
+   * @param market Lending market
+   * @param asset Asset mint
+   * @param amount Amount to deposit
+   * @param txOptions
+   * @returns
+   */ async withdraw(market, asset, amount, txOptions = {}) {
+        const tx = await this.txBuilder.withdrawTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    /**
+   * Borrows asset from the lending market.
+   *
+   * @param market Lending market
+   * @param asset Asset mint
+   * @param amount Amount to borrow
+   * @param txOptions
+   * @returns
+   */ async borrow(market, asset, amount, txOptions = {}) {
+        const tx = await this.txBuilder.borrowTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    /**
+   * Repays asset to the lending market.
+   *
+   * @param market
+   * @param asset
+   * @param amount
+   * @param txOptions
+   * @returns
+   */ async repay(market, asset, amount, txOptions = {}) {
+        const tx = await this.txBuilder.repayTx(new web3_js.PublicKey(market), new web3_js.PublicKey(asset), new anchor.BN(amount), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    getUserMetadataPda(owner) {
+        const [userMetadataPda] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("user_meta"),
+            owner.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        return userMetadataPda;
+    }
+    getObligationPda(owner, market, args = DEFAULT_OBLIGATION_ARGS) {
+        const seed = [
+            Buffer.from([
+                args.tag
+            ]),
+            Buffer.from([
+                args.id
+            ]),
+            owner.toBuffer(),
+            market.toBuffer(),
+            web3_js.PublicKey.default.toBuffer(),
+            web3_js.PublicKey.default.toBuffer()
+        ];
+        const [obligation, _] = web3_js.PublicKey.findProgramAddressSync(seed, KAMINO_LENDING_PROGRAM);
+        return obligation;
+    }
+    // seeds = [BASE_SEED_USER_STATE, farm_state.key().as_ref(), delegatee.key().as_ref()],
+    // for a delegated farm, the delegatee is the obligation, the owner (of farm user state) is the vault PDA
+    // for an un-delegated farm, the delegatee and the owner are the same (vault PDA)
+    getFarmUserState(farmUser, farm) {
+        const [obligationFarm] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("user"),
+            farm.toBuffer(),
+            farmUser.toBuffer()
+        ], KAMINO_FARM_PROGRAM);
+        return obligationFarm;
+    }
+    getMarketAuthority(market) {
+        const [authority, _] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("lma"),
+            market.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        return authority;
+    }
+    reservePdas(market, mint) {
+        const [liquiditySupplyVault] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("reserve_liq_supply"),
+            market.toBuffer(),
+            mint.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        const [collateralMint] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("reserve_coll_mint"),
+            market.toBuffer(),
+            mint.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        const [collateralSupplyVault] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("reserve_coll_supply"),
+            market.toBuffer(),
+            mint.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        const [feeVault] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("fee_receiver"),
+            market.toBuffer(),
+            mint.toBuffer()
+        ], KAMINO_LENDING_PROGRAM);
+        return {
+            liquiditySupplyVault,
+            collateralMint,
+            collateralSupplyVault,
+            feeVault
+        };
+    }
+    parseObligation(obligation, data) {
+        const { lendingMarket, deposits: _deposits, borrows: _borrows } = Obligation.decode(obligation, data);
+        // Map decoded deposits to the expected format, filtering out empty deposits
+        const deposits = _deposits.filter(({ depositReserve })=>!depositReserve.equals(web3_js.PublicKey.default)).map(({ depositReserve, depositedAmount, marketValueSf })=>{
+            return {
+                reserve: depositReserve,
+                depositedAmount,
+                marketValueSf
+            };
+        });
+        // Map decoded borrows to the expected format, filtering out empty borrows
+        const borrows = _borrows.filter(({ borrowReserve })=>!borrowReserve.equals(web3_js.PublicKey.default)).map(({ borrowReserve, borrowedAmountSf, marketValueSf, cumulativeBorrowRateBsf })=>{
+            return {
+                reserve: borrowReserve,
+                borrowedAmountSf,
+                marketValueSf,
+                cumulativeBorrowRateBsf
+            };
+        });
+        return {
+            address: obligation,
+            lendingMarket,
+            deposits,
+            borrows
+        };
     }
-    async borrowTx(market, asset, amount, txOptions) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const vault = this.base.vaultPda;
-        const obligation = this.getObligationPda(vault, market);
-        const preInstructions = [];
-        const postInstructions = [];
-        const borrowReserve = await this.findAndParseReserve(market, asset);
-        const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, borrowReserve, 1, glamSigner);
-        if (initIx) {
-            preInstructions.push(initIx);
+    /**
+   * Fetches and parses an obligation account
+   */ async fetchAndParseObligation(obligation) {
+        const cached = this.obligations.get(obligation);
+        if (cached) {
+            return cached;
         }
-        const ixs = await this.refreshReservesAndObligationIxs(obligation, borrowReserve);
-        preInstructions.push(...ixs);
-        if (borrowReserve.farmDebt) {
-            const ixs = this.refreshObligationDebtFarmsForReservesIxs(obligation, market, [
-                borrowReserve
-            ]);
-            preInstructions.push(...ixs);
-            postInstructions.push(...ixs); // farms must be refreshed after borrow
+        const obligationAccount = await this.base.provider.connection.getAccountInfo(obligation);
+        if (!obligationAccount) {
+            throw new Error("Obligation account not found");
         }
-        // Create asset ATA in case it doesn't exist. Add it to the beginning of preInstructions
-        const { tokenProgram } = await fetchMintAndTokenProgram(this.base.provider.connection, asset);
-        const userDestinationLiquidity = this.base.getVaultAta(asset, tokenProgram);
-        const createAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, userDestinationLiquidity, vault, asset, tokenProgram);
-        preInstructions.unshift(createAtaIx);
-        const borrowIx = await this.base.extKaminoProgram.methods.lendingBorrowObligationLiquidityV2(amount).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            obligation,
-            lendingMarket: market,
-            lendingMarketAuthority: this.getMarketAuthority(market),
-            borrowReserve: borrowReserve.address,
-            borrowReserveLiquidityMint: asset,
-            reserveSourceLiquidity: borrowReserve.liquiditySupplyVault,
-            borrowReserveLiquidityFeeReceiver: borrowReserve.feeVault,
-            userDestinationLiquidity,
-            referrerTokenState: null,
-            instructionSysvarAccount: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
-            tokenProgram,
-            obligationFarmUserState: obligationFarmUser,
-            reserveFarmState: borrowReserve.farmDebt,
-            farmsProgram: KAMINO_FARM_PROGRAM
-        }).instruction();
-        // The final instructions in the tx:
-        // - refreshReserve * N
-        // - refreshObligation
-        // - borrowObligationLiquidityV2
-        const tx = new web3_js.Transaction();
-        tx.add(...preInstructions, borrowIx);
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return vTx;
+        const parsedObligation = this.parseObligation(obligation, obligationAccount.data);
+        this.obligations.set(obligation, parsedObligation);
+        return parsedObligation;
     }
-    async repayTx(market, asset, amount, txOptions = {}) {
-        const glamSigner = txOptions.signer || this.base.signer;
-        const vault = this.base.vaultPda;
-        const obligation = this.getObligationPda(vault, market);
-        const preInstructions = [];
-        const repayReserve = await this.findAndParseReserve(market, asset);
-        const { farmUser: obligationFarmUser, initIx } = await this.initObligationFarmUserForReserveIx(obligation, repayReserve, 1, glamSigner);
-        if (initIx) {
-            preInstructions.push(initIx);
+    parseReserve(pubkey, data) {
+        const { lendingMarket, farmCollateral, farmDebt, liquidity: { mintPubkey, mintDecimals }, config: { tokenInfo: { scopeConfiguration: { priceFeed } } }, collateralExchangeRate, cumulativeBorrowRate } = Reserve.decode(pubkey, data);
+        return {
+            address: pubkey,
+            market: lendingMarket,
+            farmCollateral: farmCollateral.equals(web3_js.PublicKey.default) ? null : farmCollateral,
+            farmDebt: farmDebt.equals(web3_js.PublicKey.default) ? null : farmDebt,
+            liquidityMint: mintPubkey,
+            liquidityMintDecimals: mintDecimals.toNumber(),
+            scopePriceFeed: priceFeed,
+            ...this.reservePdas(lendingMarket, mintPubkey),
+            collateralExchangeRate,
+            cumulativeBorrowRate
+        };
+    }
+    async fetchAndParseReserves(reserves) {
+        const requestReservesSet = new PkSet(reserves);
+        const cachedReservesSet = new PkSet(Array.from(this.reserves.pkKeys()));
+        // If all requested reserves are cached, return data from cache
+        if (cachedReservesSet.includes(requestReservesSet)) {
+            return Array.from(this.reserves.values()).filter(({ address })=>requestReservesSet.has(address));
         }
-        const ixs = await this.refreshReservesAndObligationIxs(obligation, repayReserve);
-        preInstructions.push(...ixs);
-        const { tokenProgram } = await fetchMintAndTokenProgram(this.base.provider.connection, asset);
-        const repayIx = await this.base.extKaminoProgram.methods.lendingRepayObligationLiquidityV2(amount).accounts({
-            glamState: this.base.statePda,
-            glamSigner,
-            obligation,
-            lendingMarket: market,
-            lendingMarketAuthority: this.getMarketAuthority(market),
-            repayReserve: repayReserve.address,
-            reserveLiquidityMint: asset,
-            reserveDestinationLiquidity: repayReserve.liquiditySupplyVault,
-            userSourceLiquidity: this.base.getVaultAta(asset, tokenProgram),
-            instructionSysvarAccount: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
-            tokenProgram,
-            obligationFarmUserState: obligationFarmUser,
-            reserveFarmState: repayReserve.farmDebt,
-            farmsProgram: KAMINO_FARM_PROGRAM
-        }).instruction();
-        // The final instructions in the tx:
-        // - refreshReserve * N
-        // - refreshObligation
-        // - repayObligationLiquidityV2
-        const tx = new web3_js.Transaction();
-        tx.add(...preInstructions, repayIx);
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return vTx;
+        // Only fetch reserves that are not cached
+        const reservesToFetch = Array.from(requestReservesSet).filter((r)=>!cachedReservesSet.has(r));
+        if (process.env.NODE_ENV !== "production") {
+            console.log("Fetching reserves:", reservesToFetch.map((r)=>r.toBase58()));
+        }
+        const reserveAccounts = await this.base.provider.connection.getMultipleAccountsInfo(reservesToFetch);
+        if (reserveAccounts.some((a)=>!a)) {
+            throw new Error("Not all reserves can be found");
+        }
+        reserveAccounts.forEach((account, i)=>{
+            const parsedReserve = this.parseReserve(reservesToFetch[i], account.data);
+            this.reserves.set(reservesToFetch[i], parsedReserve);
+        });
+        // Return requested reserves
+        return Array.from(this.reserves.values()).filter(({ address })=>requestReservesSet.has(address));
+    }
+    /**
+   * Finds and parses a reserve account for a given market and asset
+   *
+   * @param market The lending market public key
+   * @param asset The asset public key
+   * @returns The parsed reserve account
+   */ async findAndParseReserve(market, asset) {
+        const accounts = await this.base.provider.connection.getProgramAccounts(KAMINO_LENDING_PROGRAM, {
+            filters: [
+                {
+                    dataSize: KAMINO_RESERVE_SIZE
+                },
+                {
+                    memcmp: {
+                        offset: 32,
+                        bytes: market.toBase58()
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 128,
+                        bytes: asset.toBase58()
+                    }
+                }
+            ]
+        });
+        if (accounts.length === 0) {
+            throw new Error("Reserve not found");
+        }
+        const parsedReserve = this.parseReserve(accounts[0].pubkey, accounts[0].account.data);
+        this.reserves.set(accounts[0].pubkey, parsedReserve);
+        return parsedReserve;
+    }
+    /**
+   * Finds and parses Kamino obligations for a given owner and market (optional)
+   */ async findAndParseObligations(owner, market) {
+        const accounts = await this.base.provider.connection.getProgramAccounts(KAMINO_LENDING_PROGRAM, {
+            filters: [
+                {
+                    dataSize: KAMINO_OBTRIGATION_SIZE
+                },
+                {
+                    memcmp: {
+                        offset: 64,
+                        bytes: owner.toBase58()
+                    }
+                },
+                ...market ? [
+                    {
+                        memcmp: {
+                            offset: 32,
+                            bytes: market.toBase58()
+                        }
+                    }
+                ] : []
+            ]
+        });
+        // Parse obligations and cache them
+        return accounts.map((a)=>{
+            const parsedObligation = this.parseObligation(a.pubkey, a.account.data);
+            this.obligations.set(a.pubkey, parsedObligation);
+            return parsedObligation;
+        });
     }
     constructor(base, vault){
         this.base = base;
         this.vault = vault;
         this.reserves = new PkMap();
         this.obligations = new PkMap();
+        this.txBuilder = new TxBuilder$3(base, vault, this);
     }
 }
 class KaminoFarmClient {
@@ -29844,10 +30619,10 @@ class PriceClient {
         });
         // Refresh reserves in batch
         const parsedReserves = await this.klend.fetchAndParseReserves(Array.from(reservesSet));
-        ixs.push(this.klend.refreshReservesBatchIx(parsedReserves, false));
+        ixs.push(this.klend.txBuilder.refreshReservesBatchIx(parsedReserves, false));
         // Refresh obligations
         parsedObligations.forEach(({ address: obligation, lendingMarket })=>{
-            ixs.push(this.klend.refreshObligationIx({
+            ixs.push(this.klend.txBuilder.refreshObligationIx({
                 obligation,
                 lendingMarket,
                 reserves: Array.from(obligationReservesMap.get(obligation) || [])
@@ -29930,7 +30705,7 @@ class PriceClient {
             }
         }
         const parsedReserves = await this.klend.fetchAndParseReserves(reserves);
-        const refreshReservesIx = this.klend.refreshReservesBatchIx(parsedReserves, false);
+        const refreshReservesIx = this.klend.txBuilder.refreshReservesBatchIx(parsedReserves, false);
         const preInstructions = [
             refreshReservesIx
         ];
@@ -30057,33 +30832,23 @@ class PriceClient {
     /**
    * Returns an instruction that prices stake accounts.
    * If there are no stake accounts, returns null.
-   */ /*
-  async priceStakeAccountsIx(): Promise<TransactionInstruction | null> {
-    const stakes = await findStakeAccounts(
-      this.base.provider.connection,
-      this.base.vaultPda,
-    );
-    if (stakes.length === 0) {
-      return null;
+   */ async priceStakeAccountsIx() {
+        const stakes = await findStakeAccounts(this.base.connection, this.base.vaultPda);
+        if (stakes.length === 0) {
+            return null;
+        }
+        const priceStakesIx = await this.base.mintProgram.methods.priceStakeAccounts().accounts({
+            glamState: this.base.statePda,
+            solUsdOracle: SOL_ORACLE,
+            baseAssetOracle: await this.getbaseAssetOracle()
+        }).remainingAccounts(stakes.map((pubkey)=>({
+                pubkey,
+                isSigner: false,
+                isWritable: false
+            }))).instruction();
+        return priceStakesIx;
     }
-    const priceStakesIx = await this.base.mintProgram.methods
-      .priceStakeAccounts()
-      .accounts({
-        glamState: this.base.statePda,
-        solUsdOracle: SOL_ORACLE,
-        baseAssetOracle: await this.getbaseAssetOracle(),
-      })
-      .remainingAccounts(
-        stakes.map((pubkey) => ({
-          pubkey,
-          isSigner: false,
-          isWritable: false,
-        })),
-      )
-      .instruction();
-    return priceStakesIx;
-  }
-  */ /**
+    /**
    * Returns an instruction that prices Meteora positions.
    * If there are no Meteora positions, returns null.
    */ /*
@@ -30144,6 +30909,14 @@ class PriceClient {
                 if (ixs) pricingIxs.push(...ixs);
             }
         }
+        const nativeIntegrationAcl = integrationAcls.find((acl)=>acl.integrationProgram.equals(this.base.protocolProgram.programId));
+        if (nativeIntegrationAcl) {
+            // stake program
+            if (nativeIntegrationAcl.protocolsBitmask & 0b10) {
+                const ix = await this.priceStakeAccountsIx();
+                if (ix) pricingIxs.push(ix);
+            }
+        }
         return pricingIxs.filter(Boolean);
     }
     async validateAumIx() {
@@ -30647,7 +31420,9 @@ let TxBuilder$2 = class TxBuilder extends BaseTxBuilder {
     }
     async closeMint(txOptions = {}) {
         const ix = await this.closeMintIx(txOptions.signer);
-        const tx = this.build(ix, txOptions);
+        const tx = this.build([
+            ix
+        ], txOptions);
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
 };
@@ -30788,7 +31563,9 @@ class MintClient {
 let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
     async emergencyAccessUpdate(args, txOptions = {}) {
         const ix = await this.emergencyAccessUpdateIx(args, txOptions.signer);
-        const tx = this.build(ix, txOptions);
+        const tx = this.build([
+            ix
+        ], txOptions);
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async emergencyAccessUpdateIx(args, signer) {
@@ -30999,13 +31776,9 @@ class StakingClient {
             txSig
         };
     }
-    async redelegate(existingStake, vote, txOptions = {}) {
-        const { newStake, tx } = await this.redelegateStakeTx(existingStake, vote, txOptions);
-        const txSig = await this.base.sendAndConfirm(tx);
-        return {
-            newStake,
-            txSig
-        };
+    async move(sourceStake, destinationStake, amount, txOptions = {}) {
+        const tx = await this.moveStakeTx(sourceStake, destinationStake, amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
     }
     /*
    * Utils
@@ -31140,7 +31913,6 @@ class StakingClient {
             stakePoolWithdrawAuthority: withdrawAuthority,
             reserveStake,
             feeAccount,
-            referrerPoolTokensAccount: poolTokensTo,
             poolTokensTo,
             poolMint,
             tokenProgram
@@ -31151,7 +31923,7 @@ class StakingClient {
     }
     async stakePoolDepositStakeTx(stakePool, stakeAccount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
-        const { programId: stakePoolProgram, poolMint, withdrawAuthority, feeAccount, validatorList, tokenProgramId: tokenProgram, reserveStake } = await this.getStakePoolAccountData(stakePool);
+        const { programId: stakePoolProgram, poolMint, depositAuthority, withdrawAuthority, feeAccount, validatorList, tokenProgramId: tokenProgram, reserveStake } = await this.getStakePoolAccountData(stakePool);
         const glamVault = this.base.vaultPda;
         const poolTokensTo = this.base.getVaultAta(poolMint, tokenProgram);
         // All stake accounts owned by the stake pool withdraw authority
@@ -31171,6 +31943,7 @@ class StakingClient {
             glamState: this.base.statePda,
             cpiProgram: stakePoolProgram,
             stakePool,
+            stakePoolDepositAuthority: depositAuthority,
             stakePoolWithdrawAuthority: withdrawAuthority,
             validatorList,
             validatorStakeAccount,
@@ -31179,7 +31952,6 @@ class StakingClient {
             poolTokensTo,
             poolMint,
             feeAccount,
-            referrerPoolTokensAccount: poolTokensTo,
             tokenProgram
         }).preInstructions([
             splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, poolTokensTo, glamVault, poolMint, tokenProgram)
@@ -31196,8 +31968,7 @@ class StakingClient {
         const validatorStakeAccount = validatorStakeCandidates.length === 0 ? reserveStake : validatorStakeCandidates[0].address;
         const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
         const postInstructions = deactivate ? [
-            await this.base.protocolProgram.methods// @ts-ignore
-            .stakeDeactivate().accounts({
+            await this.base.protocolProgram.methods.stakeDeactivate().accounts({
                 glamSigner,
                 glamState: this.base.statePda,
                 stake: stakeAccount
@@ -31224,8 +31995,7 @@ class StakingClient {
     async initializeAndDelegateStakeTx(vote, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
         const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
-        const initStakeIx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeInitialize().accounts({
+        const initStakeIx = await this.base.protocolProgram.methods.stakeInitialize().accounts({
             glamState: this.base.statePda,
             glamSigner,
             stake: stakeAccount
@@ -31235,8 +32005,7 @@ class StakingClient {
             glamSigner,
             to: stakeAccount
         }).instruction();
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeDelegateStake().accounts({
+        const tx = await this.base.protocolProgram.methods.stakeDelegateStake().accounts({
             glamState: this.base.statePda,
             glamSigner,
             stake: stakeAccount,
@@ -31254,8 +32023,7 @@ class StakingClient {
             throw new Error("At least one stake account is required");
         }
         const glamSigner = txOptions.signer || this.base.signer;
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeDeactivate().accounts({
+        const tx = await this.base.protocolProgram.methods.stakeDeactivate().accounts({
             glamState: this.base.statePda,
             glamSigner,
             stake: stakeAccounts[0]
@@ -31276,8 +32044,7 @@ class StakingClient {
             lamports = accontInfo ? new anchor.BN(accontInfo.lamports) : new anchor.BN(0);
         }
         const glamSigner = txOptions.signer || this.base.signer;
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeWithdraw(lamports).accounts({
+        const tx = await this.base.protocolProgram.methods.stakeWithdraw(lamports).accounts({
             glamSigner,
             glamState: this.base.statePda,
             stake: stakeAccounts[0]
@@ -31290,8 +32057,7 @@ class StakingClient {
     }
     async mergeStakeTx(destinationStake, sourceStake, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeMerge().accounts({
+        const tx = await this.base.protocolProgram.methods.stakeMerge().accounts({
             glamSigner,
             glamState: this.base.statePda,
             destinationStake,
@@ -31302,8 +32068,7 @@ class StakingClient {
     async splitStakeTx(existingStake, lamports, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
         const [newStake, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeSplit(lamports).accounts({
+        const tx = await this.base.protocolProgram.methods.stakeSplit(lamports).accounts({
             glamSigner,
             glamState: this.base.statePda,
             stake: existingStake,
@@ -31317,25 +32082,15 @@ class StakingClient {
             newStake
         };
     }
-    async redelegateStakeTx(existingStake, vote, txOptions = {}) {
+    async moveStakeTx(sourceStake, destinationStake, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.signer;
-        const [newStake, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
-        const tx = await this.base.protocolProgram.methods// @ts-ignore
-        .stakeRedelegate().accounts({
+        const tx = await this.base.protocolProgram.methods.stakeMove(true, amount).accounts({
             glamSigner,
             glamState: this.base.statePda,
-            vote,
-            stake: existingStake,
-            newStake,
-            stakeConfig: web3_js.STAKE_CONFIG_ID
-        }).preInstructions([
-            createStakeAccountIx
-        ]).transaction();
-        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
-        return {
-            tx: vTx,
-            newStake
-        };
+            sourceStake,
+            destinationStake
+        }).transaction();
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base, marinade){
         this.base = base;
@@ -32025,7 +32780,6 @@ exports.CctpPolicy = CctpPolicy;
 exports.ContractTier = ContractTier;
 exports.ContractType = ContractType;
 exports.CreatedModel = CreatedModel;
-exports.DRIFT_DISTRIBUTOR_PROGRAM = DRIFT_DISTRIBUTOR_PROGRAM;
 exports.DRIFT_POOL_MAPPING = DRIFT_POOL_MAPPING;
 exports.DRIFT_PROGRAM_ID = DRIFT_PROGRAM_ID;
 exports.DRIFT_VAULTS_PROGRAM_ID = DRIFT_VAULTS_PROGRAM_ID;
@@ -32054,12 +32808,10 @@ exports.GlamProtocolIdlJson = GlamProtocolIdlJson;
 exports.InsuranceFundOperation = InsuranceFundOperation;
 exports.IntegrationAcl = IntegrationAcl;
 exports.IntegrationPermissions = IntegrationPermissions;
-exports.JITO_STAKE_POOL = JITO_STAKE_POOL;
 exports.JITO_TIP_DEFAULT = JITO_TIP_DEFAULT;
 exports.JUP = JUP;
 exports.JUPITER_API_DEFAULT = JUPITER_API_DEFAULT;
 exports.JUPITER_PROGRAM_ID = JUPITER_PROGRAM_ID;
-exports.JUPSOL_STAKE_POOL = JUPSOL_STAKE_POOL;
 exports.JUP_VOTE_PROGRAM = JUP_VOTE_PROGRAM;
 exports.JupiterSwapClient = JupiterSwapClient;
 exports.JupiterSwapPolicy = JupiterSwapPolicy;
@@ -32067,7 +32819,6 @@ exports.KAMINO_FARM_PROGRAM = KAMINO_FARM_PROGRAM;
 exports.KAMINO_LENDING_PROGRAM = KAMINO_LENDING_PROGRAM;
 exports.KAMINO_OBTRIGATION_SIZE = KAMINO_OBTRIGATION_SIZE;
 exports.KAMINO_RESERVE_SIZE = KAMINO_RESERVE_SIZE;
-exports.KAMINO_SCOPE_PRICES = KAMINO_SCOPE_PRICES;
 exports.KAMINO_VAULTS_PROGRAM = KAMINO_VAULTS_PROGRAM;
 exports.KaminoLendingPolicy = KaminoLendingPolicy;
 exports.KaminoVaultsPolicy = KaminoVaultsPolicy;