@glamsystems/glam-sdk 0.1.7 → 0.1.8

package/index.cjs.js

@@ -9,6 +9,7 @@ var sdk = require('@drift-labs/sdk');
 var marinadeTsSdk = require('@marinade.finance/marinade-ts-sdk');
 var splStakePool = require('@solana/spl-stake-pool');
 var borsh = require('@coral-xyz/borsh');
+var DLMM = require('@meteora-ag/dlmm');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -33,7 +34,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam",
-    version: "0.4.3",
+    version: "0.4.6",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -41,7 +42,6 @@ var instructions = [
     {
         name: "add_mint",
         docs: [
-            "Mint",
             "Adds a new mint.",
             "",
             "# Parameters",
@@ -67,14 +67,14 @@ var instructions = [
                 writable: true
             },
             {
-                name: "new_mint",
-                writable: true
-            },
-            {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
+            {
+                name: "new_mint",
+                writable: true
+            },
             {
                 name: "extra_account_meta_list",
                 writable: true,
@@ -187,6 +187,11 @@ var instructions = [
             {
                 name: "glam_state"
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "glam_mint",
                 writable: true
@@ -251,11 +256,6 @@ var instructions = [
             {
                 name: "from"
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "token_2022_program",
                 address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -300,7 +300,7 @@ var instructions = [
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -321,6 +321,11 @@ var instructions = [
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "glam_mint",
                 writable: true
@@ -386,11 +391,6 @@ var instructions = [
                     ]
                 }
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "token_2022_program",
                 address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -426,61 +426,61 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "metadata",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
                         {
                             kind: "const",
                             value: [
-                                109,
-                                101,
-                                116,
-                                97,
-                                100,
+                                118,
                                 97,
-                                116,
-                                97
+                                117,
+                                108,
+                                116
                             ]
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "vault",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "metadata",
                 writable: true,
                 pda: {
                     seeds: [
                         {
                             kind: "const",
                             value: [
-                                118,
+                                109,
+                                101,
+                                116,
                                 97,
-                                117,
-                                108,
-                                116
+                                100,
+                                97,
+                                116,
+                                97
                             ]
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
@@ -511,11 +511,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -531,13 +531,13 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
@@ -578,15 +578,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -602,11 +597,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "clock",
                 address: "SysvarC1ock11111111111111111111111111111111"
@@ -1056,7 +1056,6 @@ var instructions = [
     {
         name: "drift_initialize_user_stats",
         docs: [
-            "Drift",
             "Initializes a drift account owned by vault and creates a subaccount.",
             "",
             "# Parameters",
@@ -1664,6 +1663,11 @@ var instructions = [
                 name: "glam_state",
                 writable: true
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "glam_mint",
                 writable: true
@@ -1788,11 +1792,6 @@ var instructions = [
             {
                 name: "to"
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "token_2022_program",
                 address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -1836,16 +1835,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -1861,11 +1855,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "vault_stake_account",
                 writable: true
@@ -1907,7 +1906,6 @@ var instructions = [
     {
         name: "initialize_state",
         docs: [
-            "State",
             "Initializes a state account from the provided StateModel instance.",
             "",
             "# Parameters",
@@ -1929,7 +1927,7 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true,
                 pda: {
                     seeds: [
@@ -1945,7 +1943,7 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "signer"
+                            path: "glam_signer"
                         },
                         {
                             kind: "arg",
@@ -1955,7 +1953,7 @@ var instructions = [
                 }
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -1971,13 +1969,13 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
@@ -2002,7 +2000,7 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
@@ -2129,11 +2127,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             }
@@ -2176,11 +2174,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -2196,11 +2194,20 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"
+            },
             {
                 name: "input_vault_ata",
                 writable: true,
@@ -2208,7 +2215,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "account",
@@ -2265,7 +2272,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "account",
@@ -2321,11 +2328,6 @@ var instructions = [
             {
                 name: "output_mint"
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "input_stake_pool",
                 optional: true
@@ -2334,10 +2336,6 @@ var instructions = [
                 name: "output_stake_pool",
                 optional: true
             },
-            {
-                name: "jupiter_program",
-                address: "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"
-            },
             {
                 name: "associated_token_program",
                 address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
@@ -3471,12 +3469,12 @@ var instructions = [
         ]
     },
     {
-        name: "marinade_claim_tickets",
+        name: "marinade_claim",
         docs: [
             "Claims tickets that were unstaked in the previous epoch to get SOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the instruction.",
+            "- `ctx`: The context containing the required accounts.",
             "",
             "# Permission required",
             "- Permission::Unstake",
@@ -3485,27 +3483,22 @@ var instructions = [
             "- Integration::Marinade"
         ],
         discriminator: [
-            14,
-            146,
-            182,
-            30,
-            205,
-            47,
-            134,
-            189
+            54,
+            44,
+            48,
+            204,
+            218,
+            141,
+            36,
+            5
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -3521,13 +3514,22 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "marinade_state",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+            },
+            {
+                name: "state",
                 writable: true
             },
             {
@@ -3535,65 +3537,50 @@ var instructions = [
                 writable: true
             },
             {
-                name: "rent",
-                address: "SysvarRent111111111111111111111111111111111"
+                name: "ticket_account",
+                writable: true
             },
             {
-                name: "clock",
-                address: "SysvarC1ock11111111111111111111111111111111"
+                name: "clock"
             },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
-            },
-            {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-            },
-            {
-                name: "marinade_program",
-                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
             }
         ],
         args: []
     },
     {
-        name: "marinade_delayed_unstake",
+        name: "marinade_deposit",
         docs: [
-            "Unstakes mSOL to get a ticket that can be claimed at the next epoch.",
+            "Deposits SOL to get mSOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the instruction.",
-            "- `msol_amount`: Amount of mSOL to unstake.",
+            "- `ctx`: The context containing the required accounts.",
+            "- `lamports`: The amount of SOL (in lamports) to deposit.",
             "",
             "# Permission required",
-            "- Permission::Unstake",
+            "- Permission::Stake",
             "",
             "# Integration required",
             "- Integration::Marinade"
         ],
         discriminator: [
-            117,
-            66,
-            3,
+            62,
+            236,
+            248,
+            28,
             222,
-            230,
-            94,
-            129,
-            95
+            232,
+            182,
+            73
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -3609,13 +3596,22 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "ticket",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+            },
+            {
+                name: "state",
                 writable: true
             },
             {
@@ -3623,54 +3619,50 @@ var instructions = [
                 writable: true
             },
             {
-                name: "burn_msol_from",
+                name: "liq_pool_sol_leg_pda",
                 writable: true
             },
             {
-                name: "marinade_state",
+                name: "liq_pool_msol_leg",
                 writable: true
             },
+            {
+                name: "liq_pool_msol_leg_authority"
+            },
             {
                 name: "reserve_pda",
                 writable: true
             },
             {
-                name: "rent",
-                address: "SysvarRent111111111111111111111111111111111"
+                name: "mint_to",
+                writable: true
             },
             {
-                name: "clock",
-                address: "SysvarC1ock11111111111111111111111111111111"
+                name: "msol_mint_authority"
             },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-            },
-            {
-                name: "marinade_program",
-                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+                name: "token_program"
             }
         ],
         args: [
             {
-                name: "msol_amount",
+                name: "lamports",
                 type: "u64"
             }
         ]
     },
     {
-        name: "marinade_deposit_sol",
+        name: "marinade_deposit_stake_account",
         docs: [
-            "Marinade",
-            "Deposits SOL to get mSOL.",
+            "Deposits a stake account to get mSOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the instruction.",
-            "- `lamports`: The amount of SOL to deposit.",
+            "- `ctx`: The context containing the required accounts.",
+            "- `validator_idx`: Validator index in Marinade's validator list.",
             "",
             "# Permission required",
             "- Permission::Stake",
@@ -3679,26 +3671,22 @@ var instructions = [
             "- Integration::Marinade"
         ],
         discriminator: [
-            64,
-            140,
-            200,
-            40,
-            56,
-            218,
-            181,
-            68
+            141,
+            230,
+            58,
+            103,
+            56,
+            205,
+            159,
+            138
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state",
+                writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -3714,189 +3702,207 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "marinade_state",
-                writable: true
+                name: "glam_signer",
+                writable: true,
+                signer: true
             },
             {
-                name: "reserve_pda",
+                name: "cpi_program",
+                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+            },
+            {
+                name: "state",
                 writable: true
             },
             {
-                name: "msol_mint",
+                name: "validator_list",
                 writable: true
             },
             {
-                name: "msol_mint_authority",
+                name: "stake_list",
                 writable: true
             },
             {
-                name: "liq_pool_msol_leg",
+                name: "stake_account",
                 writable: true
             },
             {
-                name: "liq_pool_msol_leg_authority",
+                name: "duplication_flag",
                 writable: true
             },
             {
-                name: "liq_pool_sol_leg_pda",
+                name: "msol_mint",
                 writable: true
             },
             {
                 name: "mint_to",
+                writable: true
+            },
+            {
+                name: "msol_mint_authority"
+            },
+            {
+                name: "clock"
+            },
+            {
+                name: "rent",
+                address: "SysvarRent111111111111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "token_program"
+            },
+            {
+                name: "stake_program"
+            }
+        ],
+        args: [
+            {
+                name: "validator_idx",
+                type: "u32"
+            }
+        ]
+    },
+    {
+        name: "marinade_liquid_unstake",
+        docs: [
+            "Unstakes mSOL to get SOL immediately with a small fee.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context containing the required accounts.",
+            "- `msol_amount`: Amount of mSOL to unstake.",
+            "",
+            "# Permission required",
+            "- Permission::Unstake",
+            "",
+            "# Integration required",
+            "- Integration::Marinade"
+        ],
+        discriminator: [
+            29,
+            146,
+            34,
+            21,
+            26,
+            68,
+            141,
+            161
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
-                        {
-                            kind: "account",
-                            path: "vault"
-                        },
                         {
                             kind: "const",
                             value: [
-                                6,
-                                221,
-                                246,
-                                225,
-                                215,
-                                101,
-                                161,
-                                147,
-                                217,
-                                203,
-                                225,
-                                70,
-                                206,
-                                235,
-                                121,
-                                172,
-                                28,
-                                180,
-                                133,
-                                237,
-                                95,
-                                91,
-                                55,
-                                145,
-                                58,
-                                140,
-                                245,
-                                133,
-                                126,
-                                255,
-                                0,
-                                169
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
                             ]
                         },
                         {
                             kind: "account",
-                            path: "msol_mint"
+                            path: "glam_state"
                         }
-                    ],
-                    program: {
-                        kind: "const",
-                        value: [
-                            140,
-                            151,
-                            37,
-                            143,
-                            78,
-                            36,
-                            137,
-                            241,
-                            187,
-                            61,
-                            16,
-                            41,
-                            20,
-                            142,
-                            13,
-                            131,
-                            11,
-                            90,
-                            19,
-                            153,
-                            218,
-                            255,
-                            16,
-                            132,
-                            4,
-                            142,
-                            123,
-                            216,
-                            219,
-                            233,
-                            248,
-                            89
-                        ]
-                    }
+                    ]
                 }
             },
             {
-                name: "marinade_program",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
                 address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
             },
             {
-                name: "associated_token_program",
-                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                name: "state",
+                writable: true
+            },
+            {
+                name: "msol_mint",
+                writable: true
+            },
+            {
+                name: "liq_pool_sol_leg_pda",
+                writable: true
+            },
+            {
+                name: "liq_pool_msol_leg",
+                writable: true
+            },
+            {
+                name: "treasury_msol_account",
+                writable: true
+            },
+            {
+                name: "get_msol_from",
+                writable: true
             },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "token_program"
             }
         ],
         args: [
             {
-                name: "lamports",
+                name: "msol_amount",
                 type: "u64"
             }
         ]
     },
     {
-        name: "marinade_deposit_stake",
+        name: "marinade_order_unstake",
         docs: [
-            "Deposits a stake account to get mSOL.",
+            "Unstakes mSOL to get a ticket that can be claimed at the next epoch.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the instruction.",
-            "- `validator_idx`: Validator index.",
+            "- `ctx`: The context containing the required accounts.",
+            "- `msol_amount`: Amount of mSOL to unstake.",
             "",
             "# Permission required",
-            "- Permission::Stake",
+            "- Permission::Unstake",
             "",
             "# Integration required",
             "- Integration::Marinade"
         ],
         discriminator: [
-            69,
-            207,
-            194,
-            211,
-            186,
-            55,
-            199,
-            130
+            202,
+            3,
+            33,
+            27,
+            183,
+            156,
+            57,
+            231
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state",
+                writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -3912,200 +3918,523 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "marinade_state",
-                writable: true
+                name: "glam_signer",
+                writable: true,
+                signer: true
             },
             {
-                name: "validator_list",
-                writable: true
+                name: "cpi_program",
+                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
             },
             {
-                name: "stake_list",
+                name: "state",
                 writable: true
             },
             {
-                name: "vault_stake_account",
+                name: "msol_mint",
                 writable: true
             },
             {
-                name: "duplication_flag",
+                name: "burn_msol_from",
                 writable: true
             },
             {
-                name: "msol_mint",
+                name: "new_ticket_account",
                 writable: true
             },
             {
-                name: "msol_mint_authority"
+                name: "clock"
             },
             {
-                name: "mint_to",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
+                name: "rent",
+                address: "SysvarRent111111111111111111111111111111111"
+            },
+            {
+                name: "token_program"
+            }
+        ],
+        args: [
+            {
+                name: "msol_amount",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "merge_stake_accounts",
+        docs: [
+            "Merges two stake accounts.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "",
+            "# Permission required",
+            "- Permission::Stake",
+            "",
+            "# Integration required",
+            "- Integration::NativeStaking"
+        ],
+        discriminator: [
+            173,
+            206,
+            10,
+            246,
+            109,
+            50,
+            244,
+            110
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_state"
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "to_stake",
+                writable: true
+            },
+            {
+                name: "from_stake",
+                writable: true
+            },
+            {
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
+            },
+            {
+                name: "stake_history",
+                address: "SysvarStakeHistory1111111111111111111111111"
+            },
+            {
+                name: "stake_program",
+                address: "Stake11111111111111111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "meteora_dlmm_add_liquidity_by_strategy",
+        discriminator: [
+            81,
+            139,
+            59,
+            146,
+            176,
+            196,
+            240,
+            216
+        ],
+        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: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
+            },
+            {
+                name: "position",
+                writable: true
+            },
+            {
+                name: "lb_pair",
+                writable: true
+            },
+            {
+                name: "bin_array_bitmap_extension",
+                writable: true
+            },
+            {
+                name: "user_token_x",
+                writable: true
+            },
+            {
+                name: "user_token_y",
+                writable: true
+            },
+            {
+                name: "reserve_x",
+                writable: true
+            },
+            {
+                name: "reserve_y",
+                writable: true
+            },
+            {
+                name: "token_x_mint"
+            },
+            {
+                name: "token_y_mint"
+            },
+            {
+                name: "bin_array_lower",
+                writable: true
+            },
+            {
+                name: "bin_array_upper",
+                writable: true
+            },
+            {
+                name: "token_x_program"
+            },
+            {
+                name: "token_y_program"
+            },
+            {
+                name: "event_authority"
+            },
+            {
+                name: "program"
+            }
+        ],
+        args: [
+            {
+                name: "params",
+                type: {
+                    defined: {
+                        name: "LiquidityParameterByStrategy"
+                    }
+                }
+            }
+        ]
+    },
+    {
+        name: "meteora_dlmm_claim_fee",
+        discriminator: [
+            78,
+            116,
+            98,
+            78,
+            50,
+            82,
+            72,
+            37
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
+                writable: true,
+                pda: {
+                    seeds: [
                         {
                             kind: "const",
                             value: [
-                                6,
-                                221,
-                                246,
-                                225,
-                                215,
-                                101,
-                                161,
-                                147,
-                                217,
-                                203,
-                                225,
-                                70,
-                                206,
-                                235,
-                                121,
-                                172,
-                                28,
-                                180,
-                                133,
-                                237,
-                                95,
-                                91,
-                                55,
-                                145,
-                                58,
-                                140,
-                                245,
-                                133,
-                                126,
-                                255,
-                                0,
-                                169
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
+            },
+            {
+                name: "lb_pair",
+                writable: true
+            },
+            {
+                name: "position",
+                writable: true
+            },
+            {
+                name: "bin_array_lower",
+                writable: true
+            },
+            {
+                name: "bin_array_upper",
+                writable: true
+            },
+            {
+                name: "reserve_x",
+                writable: true
+            },
+            {
+                name: "reserve_y",
+                writable: true
+            },
+            {
+                name: "user_token_x",
+                writable: true
+            },
+            {
+                name: "user_token_y",
+                writable: true
+            },
+            {
+                name: "token_x_mint"
+            },
+            {
+                name: "token_y_mint"
+            },
+            {
+                name: "token_program"
+            },
+            {
+                name: "event_authority"
+            },
+            {
+                name: "program"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "meteora_dlmm_close_position",
+        discriminator: [
+            186,
+            117,
+            42,
+            24,
+            221,
+            194,
+            34,
+            143
+        ],
+        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: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
+            },
+            {
+                name: "position",
+                writable: true
+            },
+            {
+                name: "lb_pair",
+                writable: true
+            },
+            {
+                name: "bin_array_lower",
+                writable: true
+            },
+            {
+                name: "bin_array_upper",
+                writable: true
+            },
+            {
+                name: "event_authority"
+            },
+            {
+                name: "program"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "meteora_dlmm_initialize_position",
+        discriminator: [
+            223,
+            94,
+            215,
+            96,
+            175,
+            181,
+            195,
+            204
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
                             ]
                         },
                         {
                             kind: "account",
-                            path: "msol_mint"
+                            path: "glam_state"
                         }
-                    ],
-                    program: {
-                        kind: "const",
-                        value: [
-                            140,
-                            151,
-                            37,
-                            143,
-                            78,
-                            36,
-                            137,
-                            241,
-                            187,
-                            61,
-                            16,
-                            41,
-                            20,
-                            142,
-                            13,
-                            131,
-                            11,
-                            90,
-                            19,
-                            153,
-                            218,
-                            255,
-                            16,
-                            132,
-                            4,
-                            142,
-                            123,
-                            216,
-                            219,
-                            233,
-                            248,
-                            89
-                        ]
-                    }
+                    ]
                 }
             },
             {
-                name: "clock",
-                address: "SysvarC1ock11111111111111111111111111111111"
+                name: "glam_signer",
+                writable: true,
+                signer: true
             },
             {
-                name: "rent",
-                address: "SysvarRent111111111111111111111111111111111"
+                name: "cpi_program",
+                address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
             },
             {
-                name: "marinade_program",
-                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+                name: "payer",
+                writable: true,
+                signer: true
             },
             {
-                name: "associated_token_program",
-                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                name: "position",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "lb_pair"
             },
             {
                 name: "system_program",
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "rent",
+                address: "SysvarRent111111111111111111111111111111111"
             },
             {
-                name: "stake_program",
-                address: "Stake11111111111111111111111111111111111111"
+                name: "event_authority"
+            },
+            {
+                name: "program"
             }
         ],
         args: [
             {
-                name: "validator_idx",
-                type: "u32"
+                name: "lower_bin_id",
+                type: "i32"
+            },
+            {
+                name: "width",
+                type: "i32"
             }
         ]
     },
     {
-        name: "marinade_liquid_unstake",
-        docs: [
-            "Unstakes mSOL to get SOL immediately.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the instruction.",
-            "- `msol_amount`: Amount of mSOL to unstake.",
-            "",
-            "# Permission required",
-            "- Permission::LiquidUnstake",
-            "",
-            "# Integration required",
-            "- Integration::Marinade"
-        ],
+        name: "meteora_dlmm_remove_liquidity_by_range",
         discriminator: [
-            29,
-            146,
-            34,
-            21,
-            26,
-            68,
-            141,
-            161
+            223,
+            12,
+            177,
+            181,
+            96,
+            109,
+            60,
+            124
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4121,95 +4450,108 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "marinade_state",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
+            },
+            {
+                name: "position",
                 writable: true
             },
             {
-                name: "msol_mint",
+                name: "lb_pair",
                 writable: true
             },
             {
-                name: "liq_pool_sol_leg_pda",
+                name: "bin_array_bitmap_extension",
                 writable: true
             },
             {
-                name: "liq_pool_msol_leg",
+                name: "user_token_x",
                 writable: true
             },
             {
-                name: "treasury_msol_account",
+                name: "user_token_y",
                 writable: true
             },
             {
-                name: "get_msol_from",
+                name: "reserve_x",
                 writable: true
             },
             {
-                name: "get_msol_from_authority",
+                name: "reserve_y",
                 writable: true
             },
             {
-                name: "marinade_program",
-                address: "MarBmsSgKXdrN1egZf5sqe1TMai9K1rChYNDJgjq7aD"
+                name: "token_x_mint"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "token_y_mint"
             },
             {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
+                name: "bin_array_lower",
+                writable: true
+            },
+            {
+                name: "bin_array_upper",
+                writable: true
+            },
+            {
+                name: "token_x_program"
+            },
+            {
+                name: "token_y_program"
+            },
+            {
+                name: "event_authority"
+            },
+            {
+                name: "program"
             }
         ],
         args: [
             {
-                name: "msol_amount",
-                type: "u64"
+                name: "from_bin_id",
+                type: "i32"
+            },
+            {
+                name: "to_bin_id",
+                type: "i32"
+            },
+            {
+                name: "bps_to_remove",
+                type: "u16"
             }
         ]
     },
     {
-        name: "merge_stake_accounts",
-        docs: [
-            "Merges two stake accounts.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the instruction.",
-            "",
-            "# Permission required",
-            "- Permission::Stake",
-            "",
-            "# Integration required",
-            "- Integration::NativeStaking"
-        ],
+        name: "meteora_dlmm_swap",
         discriminator: [
+            127,
+            64,
+            37,
+            138,
             173,
-            206,
-            10,
-            246,
-            109,
-            50,
-            244,
-            110
+            243,
+            207,
+            84
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4225,37 +4567,80 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "to_stake",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"
+            },
+            {
+                name: "lb_pair",
                 writable: true
             },
             {
-                name: "from_stake",
+                name: "bin_array_bitmap_extension"
+            },
+            {
+                name: "reserve_x",
                 writable: true
             },
             {
-                name: "clock",
-                address: "SysvarC1ock11111111111111111111111111111111"
+                name: "reserve_y",
+                writable: true
             },
             {
-                name: "stake_history",
-                address: "SysvarStakeHistory1111111111111111111111111"
+                name: "user_token_in",
+                writable: true
             },
             {
-                name: "stake_program",
-                address: "Stake11111111111111111111111111111111111111"
+                name: "user_token_out",
+                writable: true
             },
             {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
+                name: "token_x_mint"
+            },
+            {
+                name: "token_y_mint"
+            },
+            {
+                name: "oracle",
+                writable: true
+            },
+            {
+                name: "host_fee_in",
+                writable: true
+            },
+            {
+                name: "token_x_program"
+            },
+            {
+                name: "token_y_program"
+            },
+            {
+                name: "event_authority"
+            },
+            {
+                name: "program"
             }
         ],
-        args: []
+        args: [
+            {
+                name: "amount_in",
+                type: "u64"
+            },
+            {
+                name: "min_amount_out",
+                type: "u64"
+            }
+        ]
     },
     {
         name: "mint_tokens",
@@ -4289,14 +4674,14 @@ var instructions = [
                 writable: true
             },
             {
-                name: "glam_mint",
-                writable: true
-            },
-            {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
+            {
+                name: "glam_mint",
+                writable: true
+            },
             {
                 name: "mint_to",
                 writable: true,
@@ -4519,16 +4904,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4544,11 +4924,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "existing_stake",
                 writable: true
@@ -4604,11 +4989,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             }
@@ -4651,14 +5036,14 @@ var instructions = [
                 name: "glam_state"
             },
             {
-                name: "glam_mint",
-                writable: true
-            },
-            {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
+            {
+                name: "glam_mint",
+                writable: true
+            },
             {
                 name: "token_2022_program",
                 address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -4702,16 +5087,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4727,11 +5107,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "existing_stake",
                 writable: true
@@ -4787,15 +5172,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4811,11 +5191,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "stake_pool",
                 writable: true
@@ -4842,7 +5227,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "const",
@@ -4973,16 +5358,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -4998,11 +5378,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "vault_stake_account",
                 writable: true
@@ -5014,7 +5399,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "const",
@@ -5183,15 +5568,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -5207,11 +5587,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "stake_pool",
                 writable: true
@@ -5292,16 +5677,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -5317,11 +5697,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "vault_stake_account",
                 writable: true
@@ -5382,7 +5767,6 @@ var instructions = [
     {
         name: "subscribe",
         docs: [
-            "Investor",
             "Subscribes to a specified amount of shares.",
             "",
             "# Parameters",
@@ -5698,6 +6082,202 @@ var instructions = [
             }
         ]
     },
+    {
+        name: "transfer_sol_to_wsol",
+        docs: [
+            "Transfer vault SOL to wSOL token account.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `lamports`: The amount of SOL to transfer.",
+            "",
+            "# Permission required",
+            "- Permission::WSolWrap"
+        ],
+        discriminator: [
+            42,
+            189,
+            85,
+            229,
+            150,
+            198,
+            3,
+            195
+        ],
+        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: "to",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "account",
+                            path: "glam_vault"
+                        },
+                        {
+                            kind: "const",
+                            value: [
+                                6,
+                                221,
+                                246,
+                                225,
+                                215,
+                                101,
+                                161,
+                                147,
+                                217,
+                                203,
+                                225,
+                                70,
+                                206,
+                                235,
+                                121,
+                                172,
+                                28,
+                                180,
+                                133,
+                                237,
+                                95,
+                                91,
+                                55,
+                                145,
+                                58,
+                                140,
+                                245,
+                                133,
+                                126,
+                                255,
+                                0,
+                                169
+                            ]
+                        },
+                        {
+                            kind: "const",
+                            value: [
+                                6,
+                                155,
+                                136,
+                                87,
+                                254,
+                                171,
+                                129,
+                                132,
+                                251,
+                                104,
+                                127,
+                                99,
+                                70,
+                                24,
+                                192,
+                                53,
+                                218,
+                                196,
+                                57,
+                                220,
+                                26,
+                                235,
+                                59,
+                                85,
+                                152,
+                                160,
+                                240,
+                                0,
+                                0,
+                                0,
+                                0,
+                                1
+                            ]
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            140,
+                            151,
+                            37,
+                            143,
+                            78,
+                            36,
+                            137,
+                            241,
+                            187,
+                            61,
+                            16,
+                            41,
+                            20,
+                            142,
+                            13,
+                            131,
+                            11,
+                            90,
+                            19,
+                            153,
+                            218,
+                            255,
+                            16,
+                            132,
+                            4,
+                            142,
+                            123,
+                            216,
+                            219,
+                            233,
+                            248,
+                            89
+                        ]
+                    }
+                }
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "token_program",
+                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+            },
+            {
+                name: "associated_token_program",
+                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+            }
+        ],
+        args: [
+            {
+                name: "lamports",
+                type: "u64"
+            }
+        ]
+    },
     {
         name: "update_mint",
         docs: [
@@ -5723,18 +6303,18 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "glam_state",
-                writable: true
-            },
-            {
-                name: "glam_mint",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
+            {
+                name: "glam_mint",
+                writable: true
+            },
             {
                 name: "token_2022_program",
                 address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
@@ -5779,11 +6359,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             }
@@ -5823,11 +6403,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -5843,11 +6423,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "asset"
             },
@@ -5858,7 +6443,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "account",
@@ -5915,7 +6500,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "signer"
+                            path: "glam_signer"
                         },
                         {
                             kind: "account",
@@ -5965,11 +6550,6 @@ var instructions = [
                     }
                 }
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "token_program"
             }
@@ -6007,16 +6587,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
+                name: "glam_state",
                 writable: true
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -6032,11 +6607,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "clock",
                 address: "SysvarC1ock11111111111111111111111111111111"
@@ -6075,10 +6655,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -6094,11 +6674,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "vault_wsol_ata",
                 writable: true,
@@ -6106,7 +6691,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "const",
@@ -6146,8 +6731,41 @@ var instructions = [
                             ]
                         },
                         {
-                            kind: "account",
-                            path: "wsol_mint"
+                            kind: "const",
+                            value: [
+                                6,
+                                155,
+                                136,
+                                87,
+                                254,
+                                171,
+                                129,
+                                132,
+                                251,
+                                104,
+                                127,
+                                99,
+                                70,
+                                24,
+                                192,
+                                53,
+                                218,
+                                196,
+                                57,
+                                220,
+                                26,
+                                235,
+                                59,
+                                85,
+                                152,
+                                160,
+                                240,
+                                0,
+                                0,
+                                0,
+                                0,
+                                1
+                            ]
                         }
                     ],
                     program: {
@@ -6189,15 +6807,6 @@ var instructions = [
                     }
                 }
             },
-            {
-                name: "wsol_mint",
-                address: "So11111111111111111111111111111111111111112"
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
             {
                 name: "token_program",
                 address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -6229,10 +6838,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -6248,11 +6857,16 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "vault_wsol_ata",
                 writable: true,
@@ -6260,7 +6874,7 @@ var instructions = [
                     seeds: [
                         {
                             kind: "account",
-                            path: "vault"
+                            path: "glam_vault"
                         },
                         {
                             kind: "const",
@@ -6344,13 +6958,7 @@ var instructions = [
                 }
             },
             {
-                name: "wsol_mint",
-                address: "So11111111111111111111111111111111111111112"
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
+                name: "wsol_mint"
             },
             {
                 name: "system_program",
@@ -6543,7 +7151,7 @@ var errors = [
     {
         code: 51002,
         name: "SubscribeRedeemDisable",
-        msg: "Fund is disabled for subscription and redemption"
+        msg: "Subscription and redemption disabled"
     },
     {
         code: 51003,
@@ -7344,6 +7952,41 @@ var types = [
                 },
                 {
                     name: "KaminoLending"
+                },
+                {
+                    name: "MeteoraDlmm"
+                }
+            ]
+        }
+    },
+    {
+        name: "LiquidityParameterByStrategy",
+        type: {
+            kind: "struct",
+            fields: [
+                {
+                    name: "amount_x",
+                    type: "u64"
+                },
+                {
+                    name: "amount_y",
+                    type: "u64"
+                },
+                {
+                    name: "active_id",
+                    type: "i32"
+                },
+                {
+                    name: "max_active_bin_slippage",
+                    type: "i32"
+                },
+                {
+                    name: "strategy_parameters",
+                    type: {
+                        defined: {
+                            name: "StrategyParameters"
+                        }
+                    }
                 }
             ]
         }
@@ -8110,6 +8753,18 @@ var types = [
                 },
                 {
                     name: "DriftModifyOrders"
+                },
+                {
+                    name: "MeteoraDlmmInitPosition"
+                },
+                {
+                    name: "MeteoraDlmmClosePosition"
+                },
+                {
+                    name: "MeteoraDlmmLiquidity"
+                },
+                {
+                    name: "MeteoraDlmmSwap"
                 }
             ]
         }
@@ -8685,6 +9340,74 @@ var types = [
                 }
             ]
         }
+    },
+    {
+        name: "StrategyParameters",
+        type: {
+            kind: "struct",
+            fields: [
+                {
+                    name: "min_bin_id",
+                    type: "i32"
+                },
+                {
+                    name: "max_bin_id",
+                    type: "i32"
+                },
+                {
+                    name: "strategy_type",
+                    type: {
+                        defined: {
+                            name: "StrategyType"
+                        }
+                    }
+                },
+                {
+                    name: "parameteres",
+                    type: {
+                        array: [
+                            "u8",
+                            64
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    {
+        name: "StrategyType",
+        type: {
+            kind: "enum",
+            variants: [
+                {
+                    name: "SpotOneSide"
+                },
+                {
+                    name: "CurveOneSide"
+                },
+                {
+                    name: "BidAskOneSide"
+                },
+                {
+                    name: "SpotBalanced"
+                },
+                {
+                    name: "CurveBalanced"
+                },
+                {
+                    name: "BidAskBalanced"
+                },
+                {
+                    name: "SpotImBalanced"
+                },
+                {
+                    name: "CurveImBalanced"
+                },
+                {
+                    name: "BidAskImBalanced"
+                }
+            ]
+        }
     }
 ];
 var constants = [
@@ -8909,7 +9632,7 @@ class StateModel extends StateIdlModel {
                     // @ts-ignore
                     mintOpenfundsFields[name] = value;
                 });
-                mintIdlModel["rawOpenfunds"] = new MintClassOpenfundsModel(mintOpenfundsFields);
+                mintIdlModel["rawOpenfunds"] = new MintOpenfundsModel(mintOpenfundsFields);
             }
             if (glamMint) {
                 const extMetadata = splToken.getExtensionData(splToken.ExtensionType.TokenMetadata, glamMint.tlvData);
@@ -8987,7 +9710,7 @@ class MintModel extends MintIdlModel {
         super(data);
     }
 }
-class MintClassOpenfundsModel {
+class MintOpenfundsModel {
     constructor(obj){
         this.isin = obj.isin ?? null;
         this.shareClassCurrency = obj.shareClassCurrency ?? null;
@@ -9289,10 +10012,10 @@ const getErrorFromRPCResponse = (rpcResponse)=>{
         }
     ],
     [
-        // mallowSOL - mallowSOL
-        "MLLWWq9TLHK3oQznWqwPyqD7kH4LXTHSKXK4yLz7LjD",
+        // BNSOL - Binance Staked SOL
+        "BNso1VUJnh4zcfpZa6986Ea66P6TCp59hvtNJ8b1X85",
         {
-            stateAccount: new web3_js.PublicKey("7thbAQrn9oRJsbz2CchoPSujGYpu4hCHnVrniBHupQsx")
+            stateAccount: new web3_js.PublicKey("Hr9pzexrBge3vgmBNRR8u42CNQgBXdHm4UkUN2DH4a7r")
         }
     ],
     [
@@ -9814,7 +10537,15 @@ class BaseClient {
             // - when we run tests with failure cases, this RPC call fails with an incorrect error message so we should ignore it by default
             // - gui: wallet apps usually do the simulation themselves, we should ignore the simulation error here by default
             // - cli: we should set simulate=true
-            if (simulate) throw e;
+            if (simulate) {
+                tx.recentBlockhash = recentBlockhash;
+                tx.feePayer = signer;
+                console.log("Tx payload:", tx.serialize({
+                    verifySignatures: false
+                }).toString("base64"));
+                console.error("Simulation failed.");
+                throw e;
+            }
         }
         if (computeUnitLimit) {
             const vTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
@@ -9831,7 +10562,7 @@ class BaseClient {
             instructions
         }).compileToV0Message(lookupTables));
     }
-    async sendAndConfirm(tx, signerOverride) {
+    async sendAndConfirm(tx, additionalSigners = []) {
         const connection = this.provider.connection;
         // Mainnet only: use dedicated connection for sending transactions if available
         const txConnection = this.cluster === exports.ClusterNetwork.Mainnet ? new web3_js.Connection(process.env?.NEXT_PUBLIC_TX_RPC || process.env.TX_RPC || connection.rpcEndpoint, {
@@ -9841,22 +10572,19 @@ class BaseClient {
         // txs, for example transfer SOL, create ATA, etc.
         if (tx instanceof web3_js.Transaction) {
             return await web3_js.sendAndConfirmTransaction(txConnection, tx, [
-                signerOverride || this.getWallet().payer
+                this.getWallet().payer,
+                ...additionalSigners
             ]);
         }
         let serializedTx;
-        if (signerOverride) {
-            tx.sign([
-                signerOverride
-            ]);
-            serializedTx = tx.serialize();
-        } else {
-            // Anchor provider.sendAndConfirm forces a signature with the wallet, which we don't want
-            // https://github.com/coral-xyz/anchor/blob/v0.30.0/ts/packages/anchor/src/provider.ts#L159
-            const wallet = this.getWallet();
-            const signedTx = await wallet.signTransaction(tx);
-            serializedTx = signedTx.serialize();
-        }
+        // Anchor provider.sendAndConfirm forces a signature with the wallet, which we don't want
+        // https://github.com/coral-xyz/anchor/blob/v0.30.0/ts/packages/anchor/src/provider.ts#L159
+        const wallet = this.getWallet();
+        const signedTx = await wallet.signTransaction(tx);
+        if (additionalSigners && additionalSigners.length > 0) {
+            signedTx.sign(additionalSigners);
+        }
+        serializedTx = signedTx.serialize();
         const txSig = await txConnection.sendRawTransaction(serializedTx, {
             // skip simulation since we just did it to compute CUs
             // however this means that we need to reconstruct the error, if
@@ -9936,8 +10664,8 @@ class BaseClient {
         ], this.program.programId);
         return pda;
     }
-    getVaultAta(statePda, mint, programId) {
-        return this.getAta(mint, this.getVaultPda(statePda), programId);
+    getVaultAta(glamState, mint, programId) {
+        return this.getAta(mint, this.getVaultPda(glamState), programId);
     }
     /**
    * Fetch all the token accounts (including token program and token 2022 program) owned by a public key.
@@ -9976,8 +10704,8 @@ class BaseClient {
         const lamports = await this.provider.connection.getBalance(vault);
         return lamports / web3_js.LAMPORTS_PER_SOL;
     }
-    async getVaultTokenBalance(statePda, mint, programId) {
-        const ata = this.getVaultAta(statePda, mint);
+    async getVaultTokenBalance(glamState, mint, programId) {
+        const ata = this.getVaultAta(glamState, mint);
         const _mint = await splToken.getMint(this.provider.connection, mint);
         try {
             const account = await splToken.getAccount(this.provider.connection, ata);
@@ -10045,25 +10773,25 @@ class BaseClient {
    *
    * @param lamports Desired amount of wSOL
    * @returns
-   */ async maybeWrapSol(state, amount, signer) {
-        const vaultPda = this.getVaultPda(state);
-        const vaultWsolAta = this.getVaultAta(state, WSOL);
+   */ async maybeWrapSol(glamState, amount, signer) {
+        const glamVault = this.getVaultPda(glamState);
+        const vaultWsolAta = this.getVaultAta(glamState, WSOL);
         let wsolBalance = new anchor__namespace.BN(0);
         try {
             wsolBalance = new anchor__namespace.BN((await this.provider.connection.getTokenAccountBalance(vaultWsolAta)).value.amount);
         } catch (err) {}
-        const solBalance = new anchor__namespace.BN(await this.provider.connection.getBalance(vaultPda));
+        const solBalance = new anchor__namespace.BN(await this.provider.connection.getBalance(glamVault));
         const delta = new anchor__namespace.BN(amount).sub(wsolBalance); // wSOL amount needed
         if (solBalance.lt(delta)) {
             throw new Error("Insufficient funds in vault to complete the transaction");
         }
         if (delta.gt(new anchor__namespace.BN(0)) && solBalance.gte(delta)) {
             return await this.program.methods.wsolWrap(delta).accountsPartial({
-                state,
-                vault: vaultPda,
+                glamState,
+                glamVault,
+                glamSigner: signer || this.getSigner(),
                 vaultWsolAta,
-                wsolMint: WSOL,
-                signer: signer || this.getSigner()
+                wsolMint: WSOL
             }).instruction();
         }
         return null;
@@ -10116,22 +10844,32 @@ class BaseClient {
         }
         return StateModel.fromOnchainAccounts(statePda, stateAccount, openfundsMetadataAccount, undefined, this.program.programId);
     }
-    async fetchAllGlamStates() {
+    /**
+   * Fetch all glam states if no filter options provided
+   *
+   * @param filterOptions
+   * @returns
+   */ async fetchGlamStates(filterOptions) {
+        const { owner, delegate, type } = filterOptions || {};
         const stateAccounts = await this.program.account.stateAccount.all();
         const openfundsMetadataAccounts = await this.program.account.openfundsMetadataAccount.all();
+        const filteredStateAccounts = stateAccounts.filter((s)=>!type || Object.keys(s.account.accountType)[0] === type).filter((s)=>// if neither owner nor delegate is set, return all
+            // if owner is set, return states owned by the owner
+            // if delegate is set, return states with the delegate
+            !owner && !delegate || owner && s.account.owner.equals(owner) || delegate && s.account.delegateAcls.some((acl)=>acl.pubkey.equals(delegate)));
         let openfundsCache = new Map();
         openfundsMetadataAccounts.forEach((of)=>{
             openfundsCache.set(of.publicKey.toBase58(), of.account);
         });
         /* fetch first mint */ let mintCache = new Map();
         const connection = this.provider.connection;
-        const mintAddresses = stateAccounts.map((s)=>s.account.mints[0]).filter((addr)=>!!addr);
+        const mintAddresses = filteredStateAccounts.map((s)=>s.account.mints[0]).filter((addr)=>!!addr);
         const mintAccounts = await connection.getMultipleAccountsInfo(mintAddresses);
         mintAccounts.forEach((info, j)=>{
             const mintInfo = splToken.unpackMint(mintAddresses[j], info, splToken.TOKEN_2022_PROGRAM_ID);
             mintCache.set(mintAddresses[j].toBase58(), mintInfo);
         });
-        return stateAccounts.map((s)=>StateModel.fromOnchainAccounts(s.publicKey, s.account, openfundsCache.get(s.account.metadata?.pubkey.toBase58() || ""), mintCache.get(s.account.mints[0]?.toBase58() || ""), this.program.programId));
+        return filteredStateAccounts.map((s)=>StateModel.fromOnchainAccounts(s.publicKey, s.account, openfundsCache.get(s.account.metadata?.pubkey.toBase58() || ""), mintCache.get(s.account.mints[0]?.toBase58() || ""), this.program.programId));
     }
     constructor(config){
         if (config?.provider) {
@@ -10169,8 +10907,8 @@ class DriftClient {
         const tx = await this.updateUserCustomMarginRatioTx(statePda, maxLeverage, subAccountId);
         return await this.base.sendAndConfirm(tx);
     }
-    async updateUserMarginTradingEnabled(statePda, marginTradingEnabled, subAccountId = 0) {
-        const tx = await this.updateUserMarginTradingEnabledTx(statePda, marginTradingEnabled, subAccountId);
+    async updateUserMarginTradingEnabled(statePda, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
+        const tx = await this.updateUserMarginTradingEnabledTx(statePda, marginTradingEnabled, subAccountId, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async updateUserDelegate(statePda, delegate, subAccountId = 0) {
@@ -10278,7 +11016,7 @@ class DriftClient {
         this.base.getVaultPda(glamState);
         const [user, userStats] = this.getUser(glamState);
         const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
-        const GLAM_NAME = "GLAM *.+".split("").concat(Array(24).fill(0));
+        const GLAM_NAME = "GLAM *.+".split("").map((char)=>char.charCodeAt(0)).concat(Array(24).fill(0));
         const initializeUserIx = await this.base.program.methods//@ts-ignore
         .driftInitializeUser(0, GLAM_NAME).accounts({
             glamState,
@@ -10297,37 +11035,45 @@ class DriftClient {
         ]).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserCustomMarginRatioTx(glamState, maxLeverage, subAccountId = 0, txOptions = {}) {
+    async updateUserCustomMarginRatioIx(glamState, maxLeverage, subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
-        this.base.getVaultPda(glamState);
         const [user] = this.getUser(glamState, subAccountId);
         // https://github.com/drift-labs/protocol-v2/blob/babed162b08b1fe34e49a81c5aa3e4ec0a88ecdf/programs/drift/src/math/constants.rs#L183-L184
         const marginRatio = DRIFT_MARGIN_PRECISION / maxLeverage;
-        const tx = await this.base.program.methods.driftUpdateUserCustomMarginRatio(subAccountId, marginRatio).accounts({
+        return await this.base.program.methods.driftUpdateUserCustomMarginRatio(subAccountId, marginRatio).accounts({
             glamState,
             glamSigner,
             user
-        }).transaction();
+        }).instruction();
+    }
+    async updateUserCustomMarginRatioTx(glamState, maxLeverage, subAccountId = 0, txOptions = {}) {
+        const tx = new web3_js.Transaction().add(await this.updateUserCustomMarginRatioIx(glamState, maxLeverage, subAccountId, txOptions));
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserMarginTradingEnabledTx(glamState, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
+    async updateUserMarginTradingEnabledIx(glamState, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const [user] = this.getUser(glamState, subAccountId);
-        const tx = await this.base.program.methods.driftUpdateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accounts({
+        return await this.base.program.methods.driftUpdateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accounts({
             glamState,
             glamSigner,
             user
-        }).transaction();
+        }).instruction();
+    }
+    async updateUserMarginTradingEnabledTx(glamState, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
+        const tx = new web3_js.Transaction().add(...txOptions.preInstructions || [], await this.updateUserMarginTradingEnabledIx(glamState, marginTradingEnabled, subAccountId, txOptions));
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserDelegateTx(glamState, delegate, subAccountId = 0, txOptions = {}) {
+    async updateUserDelegateIx(glamState, delegate, subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const [user] = this.getUser(glamState, subAccountId);
-        const tx = await this.base.program.methods.driftUpdateUserDelegate(subAccountId, delegate).accounts({
+        return await this.base.program.methods.driftUpdateUserDelegate(subAccountId, new web3_js.PublicKey(delegate)).accounts({
             glamState,
             glamSigner,
             user
-        }).transaction();
+        }).instruction();
+    }
+    async updateUserDelegateTx(glamState, delegate, subAccountId = 0, txOptions = {}) {
+        const tx = new web3_js.Transaction().add(await this.updateUserDelegateIx(glamState, delegate, subAccountId, txOptions));
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async deleteUserTx(glamState, subAccountId = 0, txOptions = {}) {
@@ -10343,25 +11089,46 @@ class DriftClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async depositTx(statePda, amount, marketIndex = 1, subAccountId = 0, marketConfigs, txOptions = {}) {
+    async depositTx(glamState, amount, marketIndex = 1, subAccountId = 0, marketConfigs, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
-        const [user, userStats] = this.getUser(statePda, subAccountId);
+        const [user, userStats] = this.getUser(glamState, subAccountId);
         const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const { mint, oracle, marketPDA, vaultPDA } = marketConfigs.spot[marketIndex];
         const preInstructions = [];
+        // If drift user doesn't exist, create it first
+        const vault = this.base.getVaultPda(glamState);
+        const response = await fetch(`https://api.glam.systems/v0/drift/user?authority=${vault.toBase58()}&accountId=${subAccountId}`);
+        const data = await response.json();
+        if (!data) {
+            const initializeUserStatsIx = await this.base.program.methods.driftInitializeUserStats().accounts({
+                glamState,
+                state,
+                userStats,
+                glamSigner
+            }).instruction();
+            const GLAM_NAME = "GLAM *.+".split("").map((char)=>char.charCodeAt(0)).concat(Array(24).fill(0));
+            const initializeUserIx = await this.base.program.methods.driftInitializeUser(0, GLAM_NAME).accounts({
+                glamState,
+                user,
+                userStats,
+                state,
+                glamSigner
+            }).instruction();
+            preInstructions.push(initializeUserStatsIx, initializeUserIx); // init user stats first
+        }
         if (mint === WSOL.toBase58()) {
-            const wrapSolIx = await this.base.maybeWrapSol(statePda, amount, glamSigner);
+            const wrapSolIx = await this.base.maybeWrapSol(glamState, amount, glamSigner);
             if (wrapSolIx) {
                 preInstructions.push(wrapSolIx);
             }
         }
         const tx = await this.base.program.methods.driftDeposit(marketIndex, amount, false).accounts({
-            glamState: statePda,
+            glamState: glamState,
             state,
             user,
             userStats,
             spotMarketVault: new web3_js.PublicKey(vaultPDA),
-            userTokenAccount: this.base.getVaultAta(statePda, new web3_js.PublicKey(mint)),
+            userTokenAccount: this.base.getVaultAta(glamState, new web3_js.PublicKey(mint)),
             glamSigner,
             tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).remainingAccounts([
@@ -10644,8 +11411,8 @@ const BASE = new web3_js.PublicKey("bJ1TRoFo2P6UHVwqdiipp6Qhp2HaaHpLowZ5LHet8Gm"
 class JupiterSwapClient {
     /*
    * Client methods
-   */ async swap(statePda, quoteParams, quoteResponse, swapInstructions, txOptions = {}) {
-        const tx = await this.swapTx(statePda, quoteParams, quoteResponse, swapInstructions, txOptions);
+   */ async swap(glamState, quoteParams, quoteResponse, swapInstructions, txOptions = {}) {
+        const tx = await this.swapTx(glamState, quoteParams, quoteResponse, swapInstructions, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async setMaxSwapSlippage(statePda, slippageBps, txOptions = {}) {
@@ -10654,9 +11421,9 @@ class JupiterSwapClient {
     }
     /*
    * API methods
-   */ async swapTx(statePda, quoteParams, quoteResponse, swapInstructions, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+   */ async swapTx(glamState, quoteParams, quoteResponse, swapInstructions, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         let swapInstruction;
         let addressLookupTableAddresses;
         const inputMint = new web3_js.PublicKey(quoteParams?.inputMint || quoteResponse.inputMint);
@@ -10670,7 +11437,7 @@ class JupiterSwapClient {
                 }
                 quoteResponse = await this.getQuoteResponse(quoteParams);
             }
-            const ins = await this.getSwapInstructions(quoteResponse, vault);
+            const ins = await this.getSwapInstructions(quoteResponse, glamVault);
             swapInstruction = ins.swapInstruction;
             addressLookupTableAddresses = ins.addressLookupTableAddresses;
         } else {
@@ -10678,17 +11445,17 @@ class JupiterSwapClient {
             addressLookupTableAddresses = swapInstructions.addressLookupTableAddresses;
         }
         const lookupTables = await this.base.getAdressLookupTableAccounts(addressLookupTableAddresses);
-        const swapIx = this.toTransactionInstruction(swapInstruction, vault.toBase58());
+        const swapIx = this.toTransactionInstruction(swapInstruction, glamVault.toBase58());
         const [inputTokenProgram, outputTokenProgram] = await Promise.all([
             this.getTokenProgram(inputMint),
             this.getTokenProgram(outputMint)
         ]);
         const inputStakePool = ASSETS_MAINNET.get(inputMint.toBase58())?.stateAccount || null;
         const outputStakePool = ASSETS_MAINNET.get(outputMint.toBase58())?.stateAccount || null;
-        const preInstructions = await this.getPreInstructions(statePda, signer, inputMint, outputMint, amount, inputTokenProgram, outputTokenProgram);
+        const preInstructions = await this.getPreInstructions(glamState, glamSigner, inputMint, outputMint, amount, inputTokenProgram, outputTokenProgram);
         const tx = await this.base.program.methods.jupiterSwap(amount, swapIx.data).accounts({
-            state: statePda,
-            signer,
+            glamState,
+            glamSigner,
             inputMint,
             outputMint,
             inputTokenProgram,
@@ -10701,16 +11468,23 @@ class JupiterSwapClient {
             ...txOptions
         });
     }
-    async setMaxSwapSlippageTx(statePda, slippageBps, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
+    async setMaxSwapSlippageTx(glamState, slippageBps, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const tx = await this.base.program.methods.jupiterSetMaxSwapSlippage(new anchor.BN(slippageBps)).accounts({
-            state: statePda,
-            signer
+            glamState,
+            glamSigner
         }).transaction();
         return this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
     }
+    async setMaxSwapSlippageIx(glamState, slippageBps, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        return await this.base.program.methods.jupiterSetMaxSwapSlippage(new anchor.BN(slippageBps)).accounts({
+            glamState,
+            glamSigner
+        }).instruction();
+    }
     async getQuoteResponse(quoteParams) {
         const res = await fetch(`${this.base.jupiterApi}/quote?` + new URLSearchParams(Object.entries(quoteParams).map(([key, val])=>[
                 key,
@@ -10892,15 +11666,8 @@ class JupiterVoteClient {
    * @returns
    */ async voteOnProposal(glamState, proposal, side, txOptions = {}) {
         const glamVault = this.base.getVaultPda(glamState);
-        const [vote] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("Vote"),
-            proposal.toBuffer(),
-            glamVault.toBuffer()
-        ], GOVERNANCE_PROGRAM_ID);
-        const [governor] = web3_js.PublicKey.findProgramAddressSync([
-            Buffer.from("Governor"),
-            BASE.toBuffer()
-        ], GOVERNANCE_PROGRAM_ID);
+        const vote = this.getVotePda(proposal, glamVault);
+        const governor = this.getGovernorPda();
         const voteAccountInfo = await this.base.provider.connection.getAccountInfo(vote);
         const voteCreated = voteAccountInfo ? true : false;
         const preInstructions = [];
@@ -10921,7 +11688,7 @@ class JupiterVoteClient {
             locker: this.stakeLocker,
             governor,
             governProgram: GOVERNANCE_PROGRAM_ID
-        }).transaction();
+        }).preInstructions(preInstructions).transaction();
         const vTx = await this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
@@ -10929,7 +11696,23 @@ class JupiterVoteClient {
     }
     /*
    * Utils
-   */ get stakeLocker() {
+   */ async fetchVotes(glamState, proposals) {
+        const glamVault = this.base.getVaultPda(glamState);
+        const votes = proposals.map((proposal)=>this.getVotePda(new web3_js.PublicKey(proposal), glamVault));
+        const votesAccountInfo = await this.base.provider.connection.getMultipleAccountsInfo(votes);
+        return votesAccountInfo.filter((accountInfo)=>accountInfo !== null).map((accountInfo)=>({
+                // offsets:
+                // 8 (discriminator)
+                // 32 (proposal)
+                // 32 (voter)
+                // 1 (bump)
+                // 1 (side)
+                proposal: new web3_js.PublicKey(accountInfo.data.subarray(8, 40)),
+                voter: new web3_js.PublicKey(accountInfo.data.subarray(40, 72)),
+                side: accountInfo.data.readUInt8(73)
+            }));
+    }
+    get stakeLocker() {
         const [locker] = web3_js.PublicKey.findProgramAddressSync([
             Buffer.from("Locker"),
             BASE.toBuffer()
@@ -10944,6 +11727,21 @@ class JupiterVoteClient {
         ], JUP_VOTE_PROGRAM);
         return escrow;
     }
+    getVotePda(proposal, voter) {
+        const [vote] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("Vote"),
+            proposal.toBuffer(),
+            voter.toBuffer()
+        ], GOVERNANCE_PROGRAM_ID);
+        return vote;
+    }
+    getGovernorPda() {
+        const [governor] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("Governor"),
+            BASE.toBuffer()
+        ], GOVERNANCE_PROGRAM_ID);
+        return governor;
+    }
     constructor(base){
         this.base = base;
     }
@@ -10953,73 +11751,43 @@ const TICKET_SIZE = 88;
 class MarinadeClient {
     /*
    * Client methods
-   */ async depositSol(statePda, amount) {
-        const tx = await this.depositSolTx(statePda, amount, {});
+   */ async deposit(statePda, amount) {
+        const tx = await this.depositTx(statePda, amount, {});
         return await this.base.sendAndConfirm(tx);
     }
-    async depositStake(statePda, stakeAccount) {
-        const tx = await this.depositStakeTx(statePda, stakeAccount, {});
+    async depositStakeAccount(statePda, stakeAccount) {
+        const tx = await this.depositStakeAccountTx(statePda, stakeAccount, {});
         return await this.base.sendAndConfirm(tx);
     }
     async liquidUnstake(statePda, amount) {
         const tx = await this.liquidUnstakeTx(statePda, amount, {});
         return await this.base.sendAndConfirm(tx);
     }
-    async delayedUnstake(statePda, amount, txOptions = {}) {
-        const tx = await this.delayedUnstakeTx(statePda, amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async claimTickets(statePda, tickets) {
-        const tx = await this.claimTicketsTx(statePda, tickets, {});
+    async orderUnstake(statePda, amount, txOptions = {}) {
+        const tx = await this.orderUnstakeTx(statePda, amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async claim(statePda, tickets, txOptions = {}) {
+        const tx = await this.claimTx(statePda, tickets, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    /*
-   * Utils
-   */ async getExistingTickets(state) {
-        const accounts = await this.base.provider.connection.getParsedProgramAccounts(MARINADE_PROGRAM_ID, {
-            filters: [
-                {
-                    dataSize: 88
-                },
-                {
-                    memcmp: {
-                        offset: 40,
-                        bytes: this.base.getVaultPda(state).toBase58()
-                    }
-                }
-            ]
-        });
-        return accounts.map((a)=>a.pubkey);
-    }
     async getTickets(state) {
-        // TicketAccount {
-        //   stateAddress: web3.PublicKey; // offset 8
-        //   beneficiary: web3.PublicKey;  // offset 40
-        //   lamportsAmount: BN;           // offset 72
-        //   createdEpoch: BN;
-        // }
-        const accounts = await this.base.provider.connection.getParsedProgramAccounts(MARINADE_PROGRAM_ID, {
-            filters: [
-                {
-                    dataSize: TICKET_SIZE
-                },
-                {
-                    memcmp: {
-                        offset: 40,
-                        bytes: this.base.getVaultPda(state).toBase58()
-                    }
-                }
-            ]
-        });
+        const accounts = await this._getTicketsAccounts(state);
+        return accounts.map((a)=>a.pubkey);
+    }
+    async getParsedTickets(state) {
+        const accounts = await this._getTicketsAccounts(state);
         const currentEpoch = await this.base.provider.connection.getEpochInfo();
         return accounts.map((a)=>{
             const lamports = Number(a.account.data.readBigInt64LE(72));
             const createdEpoch = Number(a.account.data.readBigInt64LE(80));
+            const isDue = currentEpoch.epoch > createdEpoch;
             return {
                 address: a.pubkey,
                 lamports,
                 createdEpoch,
-                isDue: currentEpoch.epoch > createdEpoch
+                isDue,
+                isClaimable: isDue && currentEpoch.slotIndex > 5000
             };
         });
     }
@@ -11060,30 +11828,31 @@ class MarinadeClient {
     }
     /*
    * API methods
-   */ async depositSolTx(statePda, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+   */ async depositTx(glamState, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const vault = this.base.getVaultPda(glamState);
         const marinadeState = this.getMarinadeState();
         const vaultMsolAta = this.base.getAta(marinadeState.msolMintAddress, vault);
-        const tx = await this.base.program.methods.marinadeDepositSol(amount).accountsPartial({
-            state: statePda,
-            vault,
-            signer,
+        const createMsolAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, vaultMsolAta, vault, marinadeState.msolMintAddress);
+        const tx = await this.base.program.methods.marinadeDeposit(amount).accounts({
+            glamState,
+            glamSigner,
             reservePda: marinadeState.reserveAddress,
-            marinadeState: marinadeState.marinadeStateAddress,
+            state: marinadeState.marinadeStateAddress,
             msolMint: marinadeState.msolMintAddress,
             msolMintAuthority: marinadeState.mSolMintAuthority,
             liqPoolMsolLeg: marinadeState.msolLeg,
             liqPoolMsolLegAuthority: marinadeState.msolLegAuthority,
             liqPoolSolLegPda: marinadeState.solLeg,
             mintTo: vaultMsolAta,
-            marinadeProgram: MARINADE_PROGRAM_ID
-        }).transaction();
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
+        }).preInstructions([
+            createMsolAtaIx
+        ]).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async depositStakeTx(statePda, stakeAccount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async depositStakeAccountTx(glamState, stakeAccount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const stakeAccountInfo = await this.getParsedStakeAccountInfo(stakeAccount);
         console.log("Stake account info", stakeAccountInfo);
         const marinadeState = await new marinadeTsSdk.Marinade().getMarinadeState();
@@ -11091,138 +11860,140 @@ class MarinadeClient {
         const validatorLookupIndex = validatorRecords.findIndex(({ validatorAccount })=>validatorAccount.equals(stakeAccountInfo.voter));
         const validatorIndex = validatorLookupIndex === -1 ? marinadeState.state.validatorSystem.validatorList.count : validatorLookupIndex;
         const duplicationFlag = await marinadeState.validatorDuplicationFlag(stakeAccountInfo.voter);
-        const tx = await this.base.program.methods.marinadeDepositStake(validatorIndex).accountsPartial({
-            state: statePda,
-            vault,
-            signer,
-            marinadeState: marinadeState.marinadeStateAddress,
+        const tx = await this.base.program.methods.marinadeDepositStakeAccount(validatorIndex).accounts({
+            glamState,
+            glamSigner,
+            state: marinadeState.marinadeStateAddress,
             validatorList: marinadeState.state.validatorSystem.validatorList.account,
             stakeList: marinadeState.state.stakeSystem.stakeList.account,
-            vaultStakeAccount: stakeAccount,
+            stakeAccount,
             duplicationFlag,
             msolMint: MSOL,
             msolMintAuthority: await marinadeState.mSolMintAuthority(),
-            mintTo: this.base.getVaultAta(statePda, MSOL),
-            marinadeProgram: MARINADE_PROGRAM_ID,
+            mintTo: this.base.getVaultAta(glamState, MSOL),
             clock: web3_js.SYSVAR_CLOCK_PUBKEY,
-            rent: web3_js.SYSVAR_RENT_PUBKEY,
             tokenProgram: splToken.TOKEN_PROGRAM_ID,
             stakeProgram: web3_js.StakeProgram.programId
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async delayedUnstakeTx(state, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(state);
+    async orderUnstakeTx(glamState, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const marinadeState = this.getMarinadeState();
-        const vaultMsolAta = this.base.getVaultAta(state, marinadeState.msolMintAddress);
+        const vaultMsolAta = this.base.getVaultAta(glamState, marinadeState.msolMintAddress);
         const ticketSeed = Date.now().toString();
-        const ticket = await web3_js.PublicKey.createWithSeed(signer, ticketSeed, MARINADE_PROGRAM_ID);
+        const ticket = await web3_js.PublicKey.createWithSeed(glamSigner, ticketSeed, MARINADE_PROGRAM_ID);
         const lamports = await this.base.provider.connection.getMinimumBalanceForRentExemption(TICKET_SIZE);
         const createTicketIx = web3_js.SystemProgram.createAccountWithSeed({
-            fromPubkey: signer,
+            fromPubkey: glamSigner,
             newAccountPubkey: ticket,
-            basePubkey: signer,
+            basePubkey: glamSigner,
             seed: ticketSeed,
             lamports,
             space: TICKET_SIZE,
             programId: MARINADE_PROGRAM_ID
         });
-        const tx = await this.base.program.methods.marinadeDelayedUnstake(amount).accountsPartial({
-            state,
-            vault,
-            signer,
-            ticket,
+        const tx = await this.base.program.methods.marinadeOrderUnstake(amount).accounts({
+            glamState,
+            glamSigner,
+            newTicketAccount: ticket,
             msolMint: marinadeState.msolMintAddress,
             burnMsolFrom: vaultMsolAta,
-            marinadeState: marinadeState.marinadeStateAddress,
-            reservePda: marinadeState.reserveAddress,
-            marinadeProgram: MARINADE_PROGRAM_ID
+            state: marinadeState.marinadeStateAddress,
+            clock: web3_js.SYSVAR_CLOCK_PUBKEY,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions([
             createTicketIx
         ]).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async claimTicketsTx(state, tickets, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(state);
+    async claimTx(glamState, tickets, txOptions) {
+        if (tickets.length < 1) {
+            throw new Error("At least one ticket is required");
+        }
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const marinadeState = this.getMarinadeState();
-        const tx = await this.base.program.methods.marinadeClaimTickets().accountsPartial({
-            state,
-            vault,
-            signer,
-            marinadeState: marinadeState.marinadeStateAddress,
+        const tx = await this.base.program.methods.marinadeClaim().accounts({
+            glamState,
+            glamSigner,
+            ticketAccount: tickets[0],
+            state: marinadeState.marinadeStateAddress,
             reservePda: marinadeState.reserveAddress,
-            marinadeProgram: MARINADE_PROGRAM_ID
-        }).remainingAccounts(tickets.map((t)=>({
+            clock: web3_js.SYSVAR_CLOCK_PUBKEY
+        }).remainingAccounts(tickets.slice(1).map((t)=>({
                 pubkey: t,
                 isSigner: false,
                 isWritable: true
             }))).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async liquidUnstakeTx(statePda, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async liquidUnstakeTx(glamState, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const vault = this.base.getVaultPda(glamState);
         const marinadeState = this.getMarinadeState();
         const vaultMsolAta = this.base.getAta(marinadeState.msolMintAddress, vault);
-        const tx = await this.base.program.methods.marinadeLiquidUnstake(amount).accountsPartial({
-            state: statePda,
-            vault,
-            signer,
-            marinadeState: marinadeState.marinadeStateAddress,
+        const tx = await this.base.program.methods.marinadeLiquidUnstake(amount).accounts({
+            glamState,
+            glamSigner,
+            state: marinadeState.marinadeStateAddress,
             msolMint: marinadeState.msolMintAddress,
             liqPoolSolLegPda: marinadeState.solLeg,
             liqPoolMsolLeg: marinadeState.msolLeg,
             getMsolFrom: vaultMsolAta,
-            getMsolFromAuthority: vault,
             treasuryMsolAccount: marinadeState.treasuryMsolAccount,
-            marinadeProgram: MARINADE_PROGRAM_ID
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
+        this./*
+   * Utils
+   */ _getTicketsAccounts = async (state)=>await this.base.provider.connection.getParsedProgramAccounts(MARINADE_PROGRAM_ID, {
+                filters: [
+                    {
+                        dataSize: TICKET_SIZE
+                    },
+                    {
+                        memcmp: {
+                            offset: 40,
+                            bytes: this.base.getVaultPda(state).toBase58()
+                        }
+                    }
+                ]
+            });
     }
 }
 
 class WSolClient {
     /*
    * Client methods
-   */ async wrap(statePda, amount, txOptions = {}) {
-        const tx = await this.wrapTx(statePda, amount, txOptions);
+   */ async wrap(glamState, amount, txOptions = {}) {
+        const tx = await this.wrapTx(glamState, amount, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    async unwrap(statePda, txOptions = {}) {
-        const tx = await this.unwrapTx(statePda, txOptions);
+    async unwrap(glamState, txOptions = {}) {
+        const tx = await this.unwrapTx(glamState, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     /*
    * API methods
-   */ async wrapTx(statePda, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
-        const vaultWsolAta = this.base.getVaultAta(statePda, WSOL);
-        // @ts-ignore
+   */ async wrapTx(glamState, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const vaultWsolAta = this.base.getVaultAta(glamState, WSOL);
         const tx = await this.base.program.methods.wsolWrap(amount).accountsPartial({
-            state: statePda,
-            vault,
+            glamState,
+            glamSigner,
             vaultWsolAta,
-            wsolMint: WSOL,
-            signer
+            wsolMint: WSOL
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async unwrapTx(statePda, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
-        const vaultWsolAta = this.base.getVaultAta(statePda, WSOL);
-        const tx = await this.base.program.methods.wsolUnwrap().accountsPartial({
-            state: statePda,
-            vault,
-            vaultWsolAta,
-            wsolMint: WSOL,
-            signer
+    async unwrapTx(glamState, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const tx = await this.base.program.methods.wsolUnwrap().accounts({
+            glamState,
+            glamSigner
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
@@ -11235,62 +12006,62 @@ const STAKE_ACCOUNT_SIZE = 200;
 class StakingClient {
     /*
    * High-level API methods
-   */ async unstake(statePda, asset, amount, txOptions = {}) {
+   */ async unstake(glamState, asset, amount, txOptions = {}) {
         const assetStr = asset.toBase58();
         let tx;
         if (assetStr === MSOL.toBase58()) {
             // Marinade
-            tx = await this.marinade.delayedUnstakeTx(statePda, new anchor.BN(amount), txOptions);
+            tx = await this.marinade.orderUnstakeTx(glamState, new anchor.BN(amount), txOptions);
         } else {
             // Other LSTs
             const assetMeta = this.base.getAssetMeta(assetStr);
             if (!assetMeta || !assetMeta.stateAccount) {
                 throw new Error("Invalid LST: " + asset);
             }
-            tx = await this.stakePoolWithdrawStakeTx(statePda, assetMeta.stateAccount, new anchor.BN(amount), true, txOptions);
+            tx = await this.stakePoolWithdrawStakeTx(glamState, assetMeta.stateAccount, new anchor.BN(amount), true, txOptions);
         }
         return await this.base.sendAndConfirm(tx);
     }
     /*
    * Client methods
-   */ async stakePoolDepositSol(statePda, stakePool, amount, txOptions = {}) {
-        const tx = await this.stakePoolDepositSolTx(statePda, stakePool, amount);
+   */ async stakePoolDepositSol(glamState, stakePool, amount, txOptions = {}) {
+        const tx = await this.stakePoolDepositSolTx(glamState, stakePool, amount);
         return await this.base.sendAndConfirm(tx);
     }
-    async stakePoolDepositStake(statePda, stakePool, stakeAccount) {
-        const tx = await this.stakePoolDepositStakeTx(statePda, stakePool, stakeAccount);
+    async stakePoolDepositStake(glamState, stakePool, stakeAccount) {
+        const tx = await this.stakePoolDepositStakeTx(glamState, stakePool, stakeAccount);
         return await this.base.sendAndConfirm(tx);
     }
-    async stakePoolWithdrawStake(statePda, stakePool, amount) {
-        const tx = await this.stakePoolWithdrawStakeTx(statePda, stakePool, amount);
+    async stakePoolWithdrawStake(glamState, stakePool, amount) {
+        const tx = await this.stakePoolWithdrawStakeTx(glamState, stakePool, amount);
         return await this.base.sendAndConfirm(tx);
     }
-    async initializeAndDelegateStake(statePda, vote, amount) {
-        const tx = await this.initializeAndDelegateStakeTx(statePda, vote, amount);
+    async initializeAndDelegateStake(glamState, vote, amount) {
+        const tx = await this.initializeAndDelegateStakeTx(glamState, vote, amount);
         return await this.base.sendAndConfirm(tx);
     }
-    async deactivateStakeAccounts(statePda, stakeAccounts) {
-        const tx = await this.deactivateStakeAccountsTx(statePda, stakeAccounts);
+    async deactivateStakeAccounts(glamState, stakeAccounts) {
+        const tx = await this.deactivateStakeAccountsTx(glamState, stakeAccounts);
         return await this.base.sendAndConfirm(tx);
     }
-    async withdrawFromStakeAccounts(statePda, stakeAccounts) {
-        const tx = await this.withdrawFromStakeAccountsTx(statePda, stakeAccounts);
+    async withdrawFromStakeAccounts(glamState, stakeAccounts) {
+        const tx = await this.withdrawFromStakeAccountsTx(glamState, stakeAccounts);
         return await this.base.sendAndConfirm(tx);
     }
-    async mergeStakeAccounts(statePda, toStake, fromStake) {
-        const tx = await this.mergeStakeAccountsTx(statePda, toStake, fromStake);
+    async mergeStakeAccounts(glamState, toStake, fromStake) {
+        const tx = await this.mergeStakeAccountsTx(glamState, toStake, fromStake);
         return await this.base.sendAndConfirm(tx);
     }
-    async splitStakeAccount(statePda, existingStake, lamports) {
-        const { tx, newStake } = await this.splitStakeAccountTx(statePda, existingStake, lamports);
+    async splitStakeAccount(glamState, existingStake, lamports) {
+        const { tx, newStake } = await this.splitStakeAccountTx(glamState, existingStake, lamports);
         const txSig = await this.base.sendAndConfirm(tx);
         return {
             newStake,
             txSig
         };
     }
-    async redelegateStake(statePda, existingStake, vote) {
-        const { newStake, tx } = await this.redelegateStakeTx(statePda, existingStake, vote);
+    async redelegateStake(glamState, existingStake, vote) {
+        const { newStake, tx } = await this.redelegateStakeTx(glamState, existingStake, vote);
         const txSig = await this.base.sendAndConfirm(tx);
         return {
             newStake,
@@ -11436,16 +12207,16 @@ class StakingClient {
     }
     /*
    * API methods
-   */ async stakePoolDepositSolTx(statePda, stakePool, amount, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+   */ async stakePoolDepositSolTx(glamState, stakePool, amount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const { programId: stakePoolProgram, poolMint, withdrawAuthority, feeAccount, tokenProgramId: tokenProgram, reserveStake } = await this.getStakePoolAccountData(stakePool);
         console.log(`stakePool ${stakePool}, programId: ${stakePoolProgram}`);
         const tx = await this.base.program.methods.stakePoolDepositSol(amount).accountsPartial({
-            signer,
-            state: statePda,
-            vault,
-            mintTo: this.base.getVaultAta(statePda, poolMint),
+            glamSigner,
+            glamState,
+            glamVault,
+            mintTo: this.base.getVaultAta(glamState, poolMint),
             stakePoolProgram,
             stakePool,
             poolMint: poolMint,
@@ -11456,9 +12227,9 @@ class StakingClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async stakePoolDepositStakeTx(statePda, stakePool, stakeAccount, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async stakePoolDepositStakeTx(glamState, stakePool, stakeAccount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const { programId: stakePoolProgram, poolMint, depositAuthority, withdrawAuthority, feeAccount, validatorList, tokenProgramId: tokenProgram, reserveStake } = await this.getStakePoolAccountData(stakePool);
         // All stake accounts owned by the stake pool withdraw authority
         const validatorStakeCandidates = await this.getStakeAccountsWithStates(withdrawAuthority);
@@ -11473,11 +12244,11 @@ class StakingClient {
             throw new Error("Stake account cannot be deposited to the pool");
         }
         const tx = await this.base.program.methods.stakePoolDepositStake().accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             vaultStakeAccount: stakeAccount,
-            mintTo: this.base.getVaultAta(statePda, poolMint),
+            mintTo: this.base.getVaultAta(glamState, poolMint),
             poolMint,
             feeAccount,
             stakePool,
@@ -11494,20 +12265,20 @@ class StakingClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async stakePoolWithdrawStakeTx(statePda, stakePool, amount, deactivate = false, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async stakePoolWithdrawStakeTx(glamState, stakePool, amount, deactivate = false, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const { programId: stakePoolProgram, poolMint, withdrawAuthority, feeAccount, tokenProgramId: tokenProgram, validatorList, reserveStake } = await this.getStakePoolAccountData(stakePool);
         // The reserve stake account should NOT be used for withdrawals unless we have no other options.
         const validatorStakeCandidates = (await this.getStakeAccountsWithStates(withdrawAuthority)).filter((s)=>!s.address.equals(reserveStake));
         console.log("validatorStakeCandidates", validatorStakeCandidates);
         const validatorStakeAccount = validatorStakeCandidates.length === 0 ? reserveStake : validatorStakeCandidates[0].address;
-        const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(signer);
+        const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
         const postInstructions = deactivate ? [
             await this.base.program.methods.deactivateStakeAccounts().accountsPartial({
-                signer,
-                state: statePda,
-                vault,
+                glamSigner,
+                glamState,
+                glamVault,
                 clock: web3_js.SYSVAR_CLOCK_PUBKEY,
                 stakeProgram: web3_js.StakeProgram.programId
             }).remainingAccounts([
@@ -11519,14 +12290,14 @@ class StakingClient {
             ]).instruction()
         ] : [];
         const tx = await this.base.program.methods.stakePoolWithdrawStake(amount).accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             vaultStakeAccount: stakeAccount,
             stakePoolProgram,
             stakePool,
             poolMint,
-            poolTokenAta: this.base.getVaultAta(statePda, poolMint),
+            poolTokenAta: this.base.getVaultAta(glamState, poolMint),
             validatorList,
             validatorStakeAccount,
             withdrawAuthority,
@@ -11539,14 +12310,14 @@ class StakingClient {
         ]).postInstructions(postInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async initializeAndDelegateStakeTx(statePda, vote, amount, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
-        const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(signer);
+    async initializeAndDelegateStakeTx(glamState, vote, amount, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
+        const [stakeAccount, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
         const tx = await this.base.program.methods.initializeAndDelegateStake(amount).accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamState,
+            glamSigner,
+            glamVault,
             vaultStakeAccount: stakeAccount,
             vote,
             stakeConfig: web3_js.STAKE_CONFIG_ID,
@@ -11557,13 +12328,13 @@ class StakingClient {
         ]).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async deactivateStakeAccountsTx(statePda, stakeAccounts, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async deactivateStakeAccountsTx(glamState, stakeAccounts, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const tx = await this.base.program.methods.deactivateStakeAccounts().accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamState,
+            glamSigner,
+            glamVault,
             clock: web3_js.SYSVAR_CLOCK_PUBKEY,
             stakeProgram: web3_js.StakeProgram.programId
         }).remainingAccounts(stakeAccounts.map((a)=>({
@@ -11573,13 +12344,13 @@ class StakingClient {
             }))).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async withdrawFromStakeAccountsTx(statePda, stakeAccounts, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async withdrawFromStakeAccountsTx(glamState, stakeAccounts, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const tx = await this.base.program.methods.withdrawFromStakeAccounts().accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             clock: web3_js.SYSVAR_CLOCK_PUBKEY,
             stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY,
             stakeProgram: web3_js.StakeProgram.programId
@@ -11590,13 +12361,13 @@ class StakingClient {
             }))).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async mergeStakeAccountsTx(statePda, toStake, fromStake, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
+    async mergeStakeAccountsTx(glamState, toStake, fromStake, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
         const tx = await this.base.program.methods.mergeStakeAccounts().accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             toStake,
             fromStake,
             stakeProgram: web3_js.StakeProgram.programId,
@@ -11604,14 +12375,14 @@ class StakingClient {
         }).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async splitStakeAccountTx(state, existingStake, lamports, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(state);
-        const [newStake, createStakeAccountIx] = await this.createStakeAccount(signer);
+    async splitStakeAccountTx(glamState, existingStake, lamports, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
+        const [newStake, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
         const tx = await this.base.program.methods.splitStakeAccount(lamports).accountsPartial({
-            signer,
-            state,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             existingStake,
             newStake,
             stakeProgram: web3_js.StakeProgram.programId
@@ -11624,14 +12395,14 @@ class StakingClient {
             newStake
         };
     }
-    async redelegateStakeTx(statePda, existingStake, vote, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const vault = this.base.getVaultPda(statePda);
-        const [newStake, createStakeAccountIx] = await this.createStakeAccount(signer);
+    async redelegateStakeTx(glamState, existingStake, vote, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamVault = this.base.getVaultPda(glamState);
+        const [newStake, createStakeAccountIx] = await this.createStakeAccount(glamSigner);
         const tx = await this.base.program.methods.redelegateStake().accountsPartial({
-            signer,
-            state: statePda,
-            vault,
+            glamSigner,
+            glamState,
+            glamVault,
             vote,
             existingStake,
             newStake,
@@ -11657,10 +12428,11 @@ function getPublicKey(input) {
 }
 class StateClient {
     async createState(partialStateModel, singleTx = false, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         let stateModel = this.enrichStateModel(partialStateModel);
-        const statePda = this.base.getStatePda(stateModel);
-        const vault = this.base.getVaultPda(statePda);
-        const openfunds = this.base.getOpenfundsPda(statePda);
+        const glamState = this.base.getStatePda(stateModel);
+        const glamVault = this.base.getVaultPda(glamState);
+        const openfunds = this.base.getOpenfundsPda(glamState);
         const mints = stateModel.mints;
         stateModel.mints = [];
         if (mints && mints.length > 1) {
@@ -11669,49 +12441,52 @@ class StateClient {
         // No share class, only need to initialize the fund
         if (mints && mints.length === 0) {
             const txSig = await this.base.program.methods.initializeState(stateModel).accountsPartial({
-                state: statePda,
-                vault,
-                openfundsMetadata: openfunds
+                glamState,
+                glamSigner,
+                glamVault
             }).rpc();
             return [
                 txSig,
-                statePda
+                glamState
             ];
         }
         if (mints && mints.length > 0 && singleTx) {
             const initStateIx = await this.base.program.methods.initializeState(stateModel).accountsPartial({
-                state: statePda,
-                vault,
-                openfundsMetadata: openfunds
+                glamState,
+                glamSigner,
+                glamVault
             }).instruction();
             // FIXME: setting rawOpenfunds to null is a workarond for
             // Access violation in stack frame 5 at address 0x200005ff8 of size 8
             mints[0].rawOpenfunds = null;
-            const mintPda = this.base.getMintPda(statePda, 0);
+            const newMint = this.base.getMintPda(glamState, 0);
             const txSig = await this.base.program.methods.addMint(mints[0]).accounts({
-                glamState: statePda,
-                newMint: mintPda
+                glamState,
+                glamSigner,
+                newMint
             }).preInstructions([
                 initStateIx
             ]).rpc();
             return [
                 txSig,
-                statePda
+                glamState
             ];
         }
         const txSig = await this.base.program.methods.initializeState(stateModel).accountsPartial({
-            state: statePda,
-            vault,
+            glamState,
+            glamVault,
+            glamSigner,
             openfundsMetadata: openfunds
         }).rpc();
         const addMintTxs = await Promise.all((mints || []).map(async (mint, j)=>{
-            const mintPda = this.base.getMintPda(statePda, j);
+            const newMint = this.base.getMintPda(glamState, j);
             // FIXME: setting rawOpenfunds to null is a workarond for
             // Access violation in stack frame 5 at address 0x200005ff8 of size 8
             mint.rawOpenfunds = null;
             return await this.base.program.methods.addMint(mint).accounts({
-                glamState: statePda,
-                newMint: mintPda
+                glamState,
+                glamSigner,
+                newMint
             }).preInstructions([
                 // FIXME: estimate compute units
                 web3_js.ComputeBudgetProgram.setComputeUnitLimit({
@@ -11722,24 +12497,27 @@ class StateClient {
         console.log("addMintTxs", addMintTxs);
         return [
             txSig,
-            statePda
+            glamState
         ];
     }
-    async updateState(statePda, updated, txOptions = {}) {
-        console.log(`await glam.state.updateState("${statePda.toString()}", ${JSON.stringify(updated)}, ${JSON.stringify(txOptions)});`);
-        const tx = await this.updateStateTx(getPublicKey(statePda), updated, txOptions);
+    async updateState(glamState, updated, txOptions = {}) {
+        console.log(`await glam.state.updateState("${glamState.toString()}", ${JSON.stringify(updated)}, ${JSON.stringify(txOptions)});`);
+        const tx = await this.updateStateTx(getPublicKey(glamState), updated, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    async updateStateTx(statePda, updated, txOptions) {
+    async updateStateTx(glamState, updated, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const tx = await this.base.program.methods.updateState(new StateModel(updated)).accounts({
-            state: statePda
-        }).transaction();
+            glamState,
+            glamSigner
+        }).preInstructions(txOptions.preInstructions || []).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async closeState(statePda, txOptions = {}) {
-        this.base.getOpenfundsPda(statePda);
+    async closeState(glamState, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const tx = await this.base.program.methods.closeState().accounts({
-            state: statePda
+            glamState,
+            glamSigner
         }).preInstructions(txOptions.preInstructions || []).transaction();
         const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return await this.base.sendAndConfirm(vTx);
@@ -11790,7 +12568,7 @@ class StateClient {
                 if (mint.rawOpenfunds.shareClassLifecycle === "active") {
                     mint.rawOpenfunds.shareClassLaunchDate = mint.rawOpenfunds.shareClassLaunchDate || defaultDate;
                 }
-                mint.rawOpenfunds = new MintClassOpenfundsModel(mint.rawOpenfunds);
+                mint.rawOpenfunds = new MintOpenfundsModel(mint.rawOpenfunds);
                 mint.isRawOpenfunds = true;
             } else {
                 mint.isRawOpenfunds = false;
@@ -11820,39 +12598,43 @@ class StateClient {
         });
         return await this.updateState(statePda, updated, txOptions);
     }
-    async upsertDelegateAcls(statePda, delegateAcls, txOptions = {}) {
-        return await this.updateState(statePda, {
+    async upsertDelegateAcls(glamState, delegateAcls, txOptions = {}) {
+        return await this.updateState(glamState, {
             delegateAcls
         }, txOptions);
     }
-    async setSubscribeRedeemEnabled(statePda, enabled, txOptions = {}) {
+    async setSubscribeRedeemEnabled(glamState, enabled, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         return await this.base.program.methods.setSubscribeRedeemEnabled(enabled).accounts({
-            state: statePda
+            glamState,
+            glamSigner
         }).rpc();
     }
-    async closeTokenAccounts(statePda, tokenAccounts, txOptions = {}) {
-        const tx = await this.closeTokenAccountsTx(statePda, tokenAccounts, txOptions);
+    async closeTokenAccounts(glamState, tokenAccounts, txOptions = {}) {
+        const tx = await this.closeTokenAccountsTx(glamState, tokenAccounts, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     /**
    * Close fund treasury's token accounts
    *
-   * @param statePda
+   * @param glamState
    * @param tokenAccounts
    * @param txOptions
    * @returns
-   */ async closeTokenAccountsIx(statePda, tokenAccounts) {
+   */ async closeTokenAccountsIx(glamState, tokenAccounts) {
         return await this.base.program.methods.closeTokenAccounts().accounts({
-            state: statePda
+            glamState
         }).remainingAccounts(tokenAccounts.map((account)=>({
                 pubkey: account,
                 isSigner: false,
                 isWritable: true
             }))).instruction();
     }
-    async closeTokenAccountsTx(statePda, tokenAccounts, txOptions) {
+    async closeTokenAccountsTx(glamState, tokenAccounts, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const tx = await this.base.program.methods.closeTokenAccounts().accounts({
-            state: statePda
+            glamState,
+            glamSigner
         }).remainingAccounts(tokenAccounts.map((account)=>({
                 pubkey: account,
                 isSigner: false,
@@ -11860,12 +12642,36 @@ class StateClient {
             }))).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    /* Deposit & Withdraw */ async deposit(statePda, asset, amount, txOptions = {}) {
-        const tx = await this.depositTx(statePda, asset, amount, txOptions);
+    /* Deposit & Withdraw */ async deposit(glamState, asset, amount, txOptions = {}) {
+        const tx = await this.depositTx(new web3_js.PublicKey(glamState), new web3_js.PublicKey(asset), amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async depositSol(glamState, lamports, wrap = true, txOptions = {}) {
+        const tx = await this.depositSolTx(glamState, lamports, wrap, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    async withdraw(statePda, asset, amount, txOptions = {}) {
-        const tx = await this.withdrawTx(statePda, asset, amount, txOptions);
+    async depositSolTx(glamState, lamports, wrap = true, txOptions = {}) {
+        const signer = txOptions.signer || this.base.getSigner();
+        const vault = this.base.getVaultPda(glamState);
+        const _lamports = lamports instanceof anchor.BN ? BigInt(lamports.toString()) : lamports;
+        if (!wrap) {
+            const tx = new web3_js.Transaction().add(web3_js.SystemProgram.transfer({
+                fromPubkey: signer,
+                toPubkey: vault,
+                lamports: _lamports
+            }));
+            return await this.base.intoVersionedTransaction(tx, txOptions);
+        }
+        const vaultAta = this.base.getAta(WSOL, vault);
+        const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, vault, WSOL), web3_js.SystemProgram.transfer({
+            fromPubkey: signer,
+            toPubkey: vaultAta,
+            lamports: _lamports
+        }), splToken.createSyncNativeInstruction(vaultAta));
+        return await this.base.intoVersionedTransaction(tx, txOptions);
+    }
+    async withdraw(glamState, asset, amount, txOptions = {}) {
+        const tx = await this.withdrawTx(glamState, new web3_js.PublicKey(asset), amount, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async depositTx(statePda, asset, amount, txOptions) {
@@ -11877,40 +12683,42 @@ class StateClient {
         const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, vault, asset, tokenProgram), splToken.createTransferCheckedInstruction(signerAta, asset, vaultAta, signer, new anchor.BN(amount).toNumber(), mint.decimals, [], tokenProgram));
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async withdrawIxs(statePda, asset, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
+    async withdrawIxs(glamState, asset, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const { tokenProgram } = await this.base.fetchMintWithOwner(asset);
-        const signerAta = this.base.getAta(asset, signer, tokenProgram);
+        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
         return [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset, tokenProgram),
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram),
             await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
-                state: statePda,
+                glamState,
+                glamSigner,
                 asset,
                 tokenProgram
             }).instruction()
         ];
     }
-    async withdrawTx(statePda, asset, amount, txOptions) {
-        const signer = txOptions.signer || this.base.getSigner();
+    async withdrawTx(glamState, asset, amount, txOptions) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const { tokenProgram } = await this.base.fetchMintWithOwner(asset);
-        const signerAta = this.base.getAta(asset, signer, tokenProgram);
+        const signerAta = this.base.getAta(asset, glamSigner, tokenProgram);
         const preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset, tokenProgram)
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, signerAta, glamSigner, asset, tokenProgram)
         ];
         const postInstructions = [];
         if (asset.equals(WSOL)) {
-            const wrapSolIx = await this.base.maybeWrapSol(statePda, amount, signer);
+            const wrapSolIx = await this.base.maybeWrapSol(glamState, amount, glamSigner);
             if (wrapSolIx) {
                 preInstructions.push(wrapSolIx);
                 // If we need to wrap SOL, it means the wSOL balance will be drained,
                 // and we close the wSOL token account for convenience
-                postInstructions.push(await this.closeTokenAccountsIx(statePda, [
-                    this.base.getVaultAta(statePda, WSOL)
+                postInstructions.push(await this.closeTokenAccountsIx(glamState, [
+                    this.base.getVaultAta(glamState, WSOL)
                 ]));
             }
         }
         const tx = await this.base.program.methods.withdraw(new anchor.BN(amount)).accounts({
-            state: statePda,
+            glamState,
+            glamSigner,
             asset,
             tokenProgram
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
@@ -11925,8 +12733,13 @@ class MintClient {
     async getHolders(state, mintId = 0) {
         const mintPda = this.base.getMintPda(state, mintId);
         const connection = this.base.provider.connection;
-        const mint = await splToken.getMint(connection, mintPda, connection.commitment, splToken.TOKEN_2022_PROGRAM_ID);
-        // Size of a glam share class with perment delegate extension enabled
+        let mint;
+        try {
+            mint = await splToken.getMint(connection, mintPda, connection.commitment, splToken.TOKEN_2022_PROGRAM_ID);
+        } catch (e) {
+            return [];
+        }
+        // Size of a glam mint with perment delegate extension enabled
         const dataSize = 175;
         const accounts = await connection.getProgramAccounts(splToken.TOKEN_2022_PROGRAM_ID, {
             filters: [
@@ -11956,35 +12769,38 @@ class MintClient {
             };
         });
     }
-    async closeMintIx(state, mintId = 0) {
-        this.base.getOpenfundsPda(state);
-        const mintPda = this.base.getMintPda(state, mintId);
+    async closeMintIx(glamState, mintId = 0) {
+        const glamMint = this.base.getMintPda(glamState, mintId);
         return await this.base.program.methods.closeMint(mintId).accounts({
-            glamState: state,
-            glamMint: mintPda
+            glamState,
+            glamMint
         }).instruction();
     }
-    async closeMint(state, mintId = 0, txOptions = {}) {
-        this.base.getOpenfundsPda(state);
-        const mintPda = this.base.getMintPda(state, mintId);
-        return await this.base.program.methods.closeMint(mintId).accounts({
-            glamState: state,
-            glamMint: mintPda
-        }).rpc();
+    async closeMint(glamState, mintId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const tx = await this.base.program.methods.closeMint(mintId).accounts({
+            glamState,
+            glamSigner,
+            glamMint
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
     }
     /**
    * Create a share class token account for a specific user
    *
-   * @param state
+   * @param glamState
    * @param owner
    * @param mintId
    * @param txOptions
    * @returns
-   */ async createTokenAccount(state, owner, mintId = 0, setFrozen = true, txOptions = {}) {
-        const mintPda = this.base.getMintPda(state, mintId);
-        const ata = this.base.getMintAta(owner, mintPda);
-        const ixCreateAta = splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), ata, owner, mintPda, splToken.TOKEN_2022_PROGRAM_ID);
-        return await this.setTokenAccountsStates(state, mintId, [
+   */ async createTokenAccount(glamState, owner, mintId = 0, setFrozen = true, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const ata = this.base.getMintAta(owner, glamMint);
+        const ixCreateAta = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, ata, owner, glamMint, splToken.TOKEN_2022_PROGRAM_ID);
+        return await this.setTokenAccountsStates(glamState, mintId, [
             ata
         ], setFrozen, {
             preInstructions: [
@@ -11996,41 +12812,47 @@ class MintClient {
     /**
    * Freeze or thaw token accounts of a share class
    *
-   * @param state
+   * @param glamState
    * @param mintId
    * @param frozen
    * @param txOptions
    * @returns
-   */ async setTokenAccountsStates(state, mintId, tokenAccounts, frozen, txOptions = {}) {
-        const mintPda = this.base.getMintPda(state, mintId);
-        return await this.base.program.methods.setTokenAccountsStates(mintId, frozen).accounts({
-            glamState: state,
-            glamMint: mintPda
+   */ async setTokenAccountsStates(glamState, mintId, tokenAccounts, frozen, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const tx = await this.base.program.methods.setTokenAccountsStates(mintId, frozen).accounts({
+            glamState,
+            glamSigner,
+            glamMint
         }).remainingAccounts(tokenAccounts.map((account)=>({
                 pubkey: account,
                 isSigner: false,
                 isWritable: true
-            }))).preInstructions(txOptions.preInstructions || []).rpc();
+            }))).preInstructions(txOptions.preInstructions || []).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
     }
     /**
    * Mint share to recipient
    *
-   * @param state
+   * @param glamState
    * @param mintId
    * @param recipient Recipient's wallet address
    * @param amount Amount of shares to mint
    * @param forceThaw If true, force unfreezing token account before minting
    * @param txOptions
    * @returns Transaction signature
-   */ async mint(state, mintId, recipient, amount, forceThaw = false, txOptions = {}) {
-        const mintPda = this.base.getMintPda(state, mintId);
-        const mintTo = this.base.getMintAta(recipient, mintPda);
+   */ async mint(glamState, mintId, recipient, amount, forceThaw = false, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const mintTo = this.base.getMintAta(recipient, glamMint);
         const preInstructions = [];
-        preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), mintTo, recipient, mintPda, splToken.TOKEN_2022_PROGRAM_ID));
+        preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, mintTo, recipient, glamMint, splToken.TOKEN_2022_PROGRAM_ID));
         if (forceThaw) {
             preInstructions.push(await this.base.program.methods.setTokenAccountsStates(mintId, false).accounts({
-                glamState: state,
-                glamMint: mintPda
+                glamState,
+                glamSigner,
+                glamMint
             }).remainingAccounts([
                 {
                     pubkey: mintTo,
@@ -12039,20 +12861,25 @@ class MintClient {
                 }
             ]).instruction());
         }
-        return await this.base.program.methods.mintTokens(0, amount).accounts({
-            recipient,
-            glamState: state,
-            glamMint: mintPda
-        }).preInstructions(preInstructions).rpc();
+        const tx = await this.base.program.methods.mintTokens(0, amount).accounts({
+            glamState,
+            glamSigner,
+            glamMint,
+            recipient
+        }).preInstructions(preInstructions).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
     }
-    async burn(state, mintId, amount, from, forceThaw = false, txOptions = {}) {
-        const mintPda = this.base.getMintPda(state, mintId);
-        const ata = this.base.getMintAta(from, mintPda);
+    async burn(glamState, mintId, amount, from, forceThaw = false, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const ata = this.base.getMintAta(from, glamMint);
         const preInstructions = [];
         if (forceThaw) {
             preInstructions.push(await this.base.program.methods.setTokenAccountsStates(mintId, false).accounts({
-                glamState: state,
-                glamMint: mintPda
+                glamState,
+                glamSigner,
+                glamMint
             }).remainingAccounts([
                 {
                     pubkey: ata,
@@ -12061,22 +12888,27 @@ class MintClient {
                 }
             ]).instruction());
         }
-        return await this.base.program.methods.burnTokens(mintId, amount).accounts({
-            glamState: state,
-            glamMint: mintPda,
+        const tx = await this.base.program.methods.burnTokens(mintId, amount).accounts({
+            glamState,
+            glamSigner,
+            glamMint,
             from
-        }).preInstructions(preInstructions).rpc();
+        }).preInstructions(preInstructions).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
     }
-    async forceTransfer(state, mintId, amount, from, to, forceThaw = false, txOptions = {}) {
-        const mintPda = this.base.getMintPda(state, mintId);
-        const fromAta = this.base.getMintAta(from, mintPda);
-        const toAta = this.base.getMintAta(to, mintPda);
+    async forceTransfer(glamState, mintId, amount, from, to, forceThaw = false, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const glamMint = this.base.getMintPda(glamState, mintId);
+        const fromAta = this.base.getMintAta(from, glamMint);
+        const toAta = this.base.getMintAta(to, glamMint);
         const preInstructions = [];
-        preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), toAta, to, mintPda, splToken.TOKEN_2022_PROGRAM_ID));
+        preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), toAta, to, glamMint, splToken.TOKEN_2022_PROGRAM_ID));
         if (forceThaw) {
             preInstructions.push(await this.base.program.methods.setTokenAccountsStates(mintId, false).accounts({
-                glamState: state,
-                glamMint: mintPda
+                glamState,
+                glamSigner,
+                glamMint
             }).remainingAccounts([
                 // fromAta is already unfrozen, still add it to test the ix is idempotent
                 {
@@ -12091,12 +12923,15 @@ class MintClient {
                 }
             ]).instruction());
         }
-        return await this.base.program.methods.forceTransferTokens(mintId, amount).accounts({
-            glamState: state,
-            glamMint: mintPda,
+        const tx = await this.base.program.methods.forceTransferTokens(mintId, amount).accounts({
+            glamState,
+            glamSigner,
+            glamMint,
             from,
             to
-        }).preInstructions(preInstructions).rpc();
+        }).preInstructions(preInstructions).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
     }
     constructor(base){
         this.base = base;
@@ -12465,6 +13300,185 @@ class KaminoLendingClient {
     }
 }
 
+const METEORA_DLMM = new web3_js.PublicKey("LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo");
+new web3_js.PublicKey("5rCf1DM8LjKTw4YqhnoLcngyZYeNnQqztScTogYHAS6");
+const EVENT_AUTHORITY = new web3_js.PublicKey("D1ZN9Wj1fRSUQfCjhvnu1hqDMT7hzjzBBpi12nVniYD6");
+const DEFAULT_RANGE_INTERVAL = 34; // 34 bins on each side of the active bin, 69 bins in total
+class MeteoraDlmmClient {
+    async getDlmmPool(pool) {
+        const key = typeof pool === "string" ? pool : pool.toString();
+        if (!this._dlmmPool.get(key)) {
+            this._dlmmPool.set(key, await DLMM.create(this.base.provider.connection, new web3_js.PublicKey(pool)));
+        }
+        const dlmmPool = this._dlmmPool.get(key);
+        if (!dlmmPool) {
+            throw new Error(`DLMM pool ${key} not found`);
+        }
+        return dlmmPool;
+    }
+    async initializePosition(statePda, pool, txOptions = {}) {
+        const glamState = new web3_js.PublicKey(statePda);
+        const dlmmPool = await this.getDlmmPool(pool);
+        const activeBin = await dlmmPool.getActiveBin();
+        const minBinId = activeBin.binId - DEFAULT_RANGE_INTERVAL;
+        const maxBinId = activeBin.binId + DEFAULT_RANGE_INTERVAL;
+        const position = web3_js.Keypair.generate();
+        const tx = await this.base.program.methods.meteoraDlmmInitializePosition(minBinId, maxBinId - minBinId + 1).accounts({
+            glamState,
+            lbPair: new web3_js.PublicKey(pool),
+            position: position.publicKey,
+            eventAuthority: EVENT_AUTHORITY,
+            program: METEORA_DLMM
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx, [
+            position
+        ]);
+    }
+    async addLiquidity(statePda, position, amountX, strategyType, txOptions = {}) {
+        const { lbPair, lowerBinId, upperBinId, binArrayLower, binArrayUpper } = await this.parsePosition(new web3_js.PublicKey(position));
+        const dlmmPool = await this.getDlmmPool(lbPair);
+        const { amountY, activeBinId } = await this.getAmounts(dlmmPool, new anchor.BN(amountX));
+        const glamState = new web3_js.PublicKey(statePda);
+        const vaultTokenXAta = this.base.getVaultAta(glamState, dlmmPool.tokenX.publicKey);
+        const vaultTokenYAta = this.base.getVaultAta(glamState, dlmmPool.tokenY.publicKey);
+        const strategy = {
+            amountX: new anchor.BN(amountX),
+            amountY,
+            activeId: activeBinId,
+            maxActiveBinSlippage: 20,
+            strategyParameters: {
+                minBinId: lowerBinId,
+                maxBinId: upperBinId,
+                strategyType: DLMM.Strategy[strategyType],
+                parameteres: Array(64).fill(0)
+            }
+        };
+        const tx = await this.base.program.methods.meteoraDlmmAddLiquidityByStrategy(strategy).accounts({
+            glamState,
+            position: new web3_js.PublicKey(position),
+            lbPair,
+            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension ? dlmmPool.binArrayBitmapExtension.publicKey : METEORA_DLMM,
+            userTokenX: vaultTokenXAta,
+            userTokenY: vaultTokenYAta,
+            reserveX: dlmmPool.tokenX.reserve,
+            reserveY: dlmmPool.tokenY.reserve,
+            tokenXMint: dlmmPool.tokenX.publicKey,
+            tokenYMint: dlmmPool.tokenY.publicKey,
+            binArrayLower,
+            binArrayUpper,
+            tokenXProgram: splToken.TOKEN_PROGRAM_ID,
+            tokenYProgram: splToken.TOKEN_PROGRAM_ID,
+            eventAuthority: EVENT_AUTHORITY,
+            program: METEORA_DLMM
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return this.base.sendAndConfirm(vTx);
+    }
+    async removeLiquidity(statePda, position, bpsToRemove, txOptions = {}) {
+        const { lbPair, lowerBinId, upperBinId, binArrayLower, binArrayUpper } = await this.parsePosition(new web3_js.PublicKey(position));
+        const dlmmPool = await this.getDlmmPool(lbPair);
+        const glamState = new web3_js.PublicKey(statePda);
+        const vaultTokenXAta = this.base.getVaultAta(glamState, dlmmPool.tokenX.publicKey);
+        const vaultTokenYAta = this.base.getVaultAta(glamState, dlmmPool.tokenY.publicKey);
+        const tx = await this.base.program.methods.meteoraDlmmRemoveLiquidityByRange(lowerBinId, upperBinId, bpsToRemove).accounts({
+            glamState,
+            position: new web3_js.PublicKey(position),
+            lbPair,
+            binArrayBitmapExtension: dlmmPool.binArrayBitmapExtension ? dlmmPool.binArrayBitmapExtension.publicKey : METEORA_DLMM,
+            userTokenX: vaultTokenXAta,
+            userTokenY: vaultTokenYAta,
+            reserveX: dlmmPool.tokenX.reserve,
+            reserveY: dlmmPool.tokenY.reserve,
+            tokenXMint: dlmmPool.tokenX.publicKey,
+            tokenYMint: dlmmPool.tokenY.publicKey,
+            binArrayLower,
+            binArrayUpper,
+            tokenXProgram: splToken.TOKEN_PROGRAM_ID,
+            tokenYProgram: splToken.TOKEN_PROGRAM_ID,
+            eventAuthority: EVENT_AUTHORITY,
+            program: METEORA_DLMM
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return this.base.sendAndConfirm(vTx);
+    }
+    async claimFee(statePda, position, txOptions = {}) {
+        const { lbPair, binArrayLower, binArrayUpper } = await this.parsePosition(new web3_js.PublicKey(position));
+        const dlmmPool = await this.getDlmmPool(lbPair);
+        const glamState = new web3_js.PublicKey(statePda);
+        const vaultTokenXAta = this.base.getVaultAta(glamState, dlmmPool.tokenX.publicKey);
+        const vaultTokenYAta = this.base.getVaultAta(glamState, dlmmPool.tokenY.publicKey);
+        const tx = await this.base.program.methods.meteoraDlmmClaimFee().accounts({
+            glamState,
+            position: new web3_js.PublicKey(position),
+            lbPair,
+            binArrayLower,
+            binArrayUpper,
+            reserveX: dlmmPool.tokenX.reserve,
+            reserveY: dlmmPool.tokenY.reserve,
+            userTokenX: vaultTokenXAta,
+            userTokenY: vaultTokenYAta,
+            tokenXMint: dlmmPool.tokenX.publicKey,
+            tokenYMint: dlmmPool.tokenY.publicKey,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID,
+            eventAuthority: EVENT_AUTHORITY,
+            program: METEORA_DLMM
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
+    }
+    async closePosition(statePda, position, txOptions = {}) {
+        const { lbPair, binArrayLower, binArrayUpper } = await this.parsePosition(new web3_js.PublicKey(position));
+        const glamState = new web3_js.PublicKey(statePda);
+        const tx = await this.base.program.methods.meteoraDlmmClosePosition().accounts({
+            glamState,
+            position: new web3_js.PublicKey(position),
+            lbPair,
+            binArrayLower,
+            binArrayUpper,
+            eventAuthority: EVENT_AUTHORITY,
+            program: METEORA_DLMM
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
+    }
+    async parsePosition(position) {
+        const positionAccountInfo = await this.base.provider.connection.getAccountInfo(position);
+        if (!positionAccountInfo) {
+            throw new Error("Position not found");
+        }
+        const positionData = positionAccountInfo.data;
+        const lbPair = new web3_js.PublicKey(positionData.subarray(8, 40));
+        const lowerBinId = positionData.subarray(7912, 7916).readInt32LE();
+        const upperBinId = positionData.subarray(7916, 7920).readInt32LE();
+        const lowerBinArrayIndex = DLMM.binIdToBinArrayIndex(new anchor.BN(lowerBinId));
+        const [binArrayLower] = DLMM.deriveBinArray(lbPair, lowerBinArrayIndex, METEORA_DLMM);
+        const upperBinArrayIndex = anchor.BN.max(lowerBinArrayIndex.add(new anchor.BN(1)), DLMM.binIdToBinArrayIndex(new anchor.BN(upperBinId)));
+        const [binArrayUpper] = DLMM.deriveBinArray(lbPair, upperBinArrayIndex, METEORA_DLMM);
+        return {
+            lowerBinId,
+            upperBinId,
+            binArrayLower,
+            binArrayUpper,
+            lbPair
+        };
+    }
+    async getAmounts(dlmmPool, amountX) {
+        const activeBin = await dlmmPool.getActiveBin();
+        const activeBinPricePerToken = dlmmPool.fromPricePerLamport(Number(activeBin.price));
+        const amountY = amountX.mul(new anchor.BN(Number(activeBinPricePerToken)));
+        return {
+            amountX,
+            amountY,
+            activeBinId: activeBin.binId
+        };
+    }
+    constructor(base){
+        this.base = base;
+        this._dlmmPool = new Map();
+    }
+}
+
 /**
  * Main entrypoint for the GLAM SDK
  *
@@ -12530,6 +13544,12 @@ class KaminoLendingClient {
         }
         return this._kaminoLending;
     }
+    get meteoraDlmm() {
+        if (!this._meteoraDlmm) {
+            this._meteoraDlmm = new MeteoraDlmmClient(this);
+        }
+        return this._meteoraDlmm;
+    }
     constructor(config){
         super(config);
     }
@@ -12571,6 +13591,7 @@ const getPriorityFeeEstimate = async (heliusApiKey, tx, accountKeys, priorityLev
     return data.result.priorityFeeEstimate;
 };
 
+exports.BaseClient = BaseClient;
 exports.CompanyModel = CompanyModel;
 exports.CreatedModel = CreatedModel;
 exports.DRIFT_PROGRAM_ID = DRIFT_PROGRAM_ID;
@@ -12586,6 +13607,7 @@ exports.GlamIntegrations = GlamIntegrations;
 exports.GlamPermissions = GlamPermissions;
 exports.JITOSOL = JITOSOL;
 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;
@@ -12597,9 +13619,9 @@ exports.MARINADE_PROGRAM_ID = MARINADE_PROGRAM_ID;
 exports.MSOL = MSOL;
 exports.ManagerModel = ManagerModel;
 exports.Metadata = Metadata;
-exports.MintClassOpenfundsModel = MintClassOpenfundsModel;
 exports.MintIdlModel = MintIdlModel;
 exports.MintModel = MintModel;
+exports.MintOpenfundsModel = MintOpenfundsModel;
 exports.SANCTUM_STAKE_POOL_PROGRAM_ID = SANCTUM_STAKE_POOL_PROGRAM_ID;
 exports.SEED_METADATA = SEED_METADATA;
 exports.SEED_MINT = SEED_MINT;
@@ -12615,3 +13637,4 @@ exports.getGlamProgram = getGlamProgram;
 exports.getGlamProgramId = getGlamProgramId;
 exports.getPriorityFeeEstimate = getPriorityFeeEstimate;
 exports.getSimulationComputeUnits = getSimulationComputeUnits;
+exports.isBrowser = isBrowser;