@glamsystems/glam-sdk 0.1.27 → 0.1.28

package/index.cjs.js

@@ -34,7 +34,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.29",
+    version: "0.4.32",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -279,7 +279,7 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "token_program"
+                            path: "claim_token_program"
                         },
                         {
                             kind: "account",
@@ -336,7 +336,7 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "token_program"
+                            path: "claim_token_program"
                         },
                         {
                             kind: "account",
@@ -387,7 +387,11 @@ var instructions = [
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program"
+                name: "claim_token_program"
+            },
+            {
+                name: "associated_token_program",
+                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
             }
         ],
         args: [
@@ -689,20 +693,21 @@ var instructions = [
         ]
     },
     {
-        name: "drift_cancel_orders",
+        name: "disburse_fees",
         discriminator: [
-            98,
-            107,
-            48,
-            79,
-            97,
-            60,
-            99,
-            58
+            205,
+            56,
+            198,
+            40,
+            225,
+            103,
+            141,
+            219
         ],
         accounts: [
             {
-                name: "glam_state"
+                name: "glam_state",
+                writable: true
             },
             {
                 name: "glam_vault",
@@ -726,79 +731,18 @@ var instructions = [
                 }
             },
             {
-                name: "glam_signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "cpi_program",
-                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-            },
-            {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            }
-        ],
-        args: [
-            {
-                name: "market_type",
-                type: {
-                    option: {
-                        defined: {
-                            name: "MarketType"
-                        }
-                    }
-                }
-            },
-            {
-                name: "market_index",
-                type: {
-                    option: "u16"
-                }
-            },
-            {
-                name: "direction",
-                type: {
-                    option: {
-                        defined: {
-                            name: "PositionDirection"
-                        }
-                    }
-                }
-            }
-        ]
-    },
-    {
-        name: "drift_cancel_orders_by_ids",
-        discriminator: [
-            172,
-            99,
-            108,
-            14,
-            81,
-            89,
-            228,
-            183
-        ],
-        accounts: [
-            {
-                name: "glam_state"
-            },
-            {
-                name: "glam_vault",
+                name: "glam_escrow",
                 pda: {
                     seeds: [
                         {
                             kind: "const",
                             value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
+                                101,
+                                115,
+                                99,
+                                114,
+                                111,
+                                119
                             ]
                         },
                         {
@@ -809,132 +753,579 @@ var instructions = [
                 }
             },
             {
-                name: "glam_signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "cpi_program",
-                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-            },
-            {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            }
-        ],
-        args: [
-            {
-                name: "order_ids",
-                type: {
-                    vec: "u32"
-                }
-            }
-        ]
-    },
-    {
-        name: "drift_delete_user",
-        discriminator: [
-            179,
-            118,
-            20,
-            212,
-            145,
-            146,
-            49,
-            130
-        ],
-        accounts: [
-            {
-                name: "glam_state",
+                name: "glam_mint",
                 writable: true
             },
             {
-                name: "glam_vault",
+                name: "escrow_mint_ata",
                 writable: true,
                 pda: {
                     seeds: [
                         {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
+                            kind: "account",
+                            path: "glam_escrow"
                         },
                         {
                             kind: "account",
-                            path: "glam_state"
+                            path: "token_2022_program"
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_mint"
                         }
-                    ]
+                    ],
+                    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: "glam_signer",
+                name: "signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "cpi_program",
-                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "user_stats",
-                writable: true
-            },
-            {
-                name: "state",
-                writable: true
-            }
-        ],
-        args: []
-    },
-    {
-        name: "drift_deposit",
-        discriminator: [
-            252,
-            63,
-            250,
-            201,
-            98,
-            55,
-            130,
-            12
-        ],
-        accounts: [
-            {
-                name: "glam_state"
+                name: "deposit_asset"
             },
             {
-                name: "glam_vault",
+                name: "vault_deposit_ata",
                 writable: true,
                 pda: {
                     seeds: [
                         {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
+                            kind: "account",
+                            path: "glam_vault"
                         },
                         {
                             kind: "account",
-                            path: "glam_state"
+                            path: "deposit_token_program"
+                        },
+                        {
+                            kind: "account",
+                            path: "deposit_asset"
                         }
-                    ]
-                }
-            },
+                    ],
+                    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: "protocol_fee_authority_ata",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "account",
+                            path: "glam_config.fee_authority",
+                            account: "GlobalConfig"
+                        },
+                        {
+                            kind: "account",
+                            path: "deposit_token_program"
+                        },
+                        {
+                            kind: "account",
+                            path: "deposit_asset"
+                        }
+                    ],
+                    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: "manager_fee_authority_ata",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "account",
+                            path: "glam_state.owner",
+                            account: "StateAccount"
+                        },
+                        {
+                            kind: "account",
+                            path: "deposit_token_program"
+                        },
+                        {
+                            kind: "account",
+                            path: "deposit_asset"
+                        }
+                    ],
+                    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: "glam_config",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                103,
+                                108,
+                                111,
+                                98,
+                                97,
+                                108,
+                                95,
+                                99,
+                                111,
+                                110,
+                                102,
+                                105,
+                                103
+                            ]
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            11,
+                            0,
+                            83,
+                            72,
+                            16,
+                            46,
+                            144,
+                            46,
+                            42,
+                            79,
+                            22,
+                            157,
+                            123,
+                            21,
+                            242,
+                            192,
+                            146,
+                            1,
+                            78,
+                            88,
+                            59,
+                            102,
+                            9,
+                            190,
+                            226,
+                            92,
+                            189,
+                            187,
+                            232,
+                            83,
+                            220
+                        ]
+                    }
+                }
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "associated_token_program",
+                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+            },
+            {
+                name: "deposit_token_program"
+            },
+            {
+                name: "token_2022_program",
+                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+            }
+        ],
+        args: [
+            {
+                name: "mint_id",
+                type: "u8"
+            }
+        ]
+    },
+    {
+        name: "drift_cancel_orders",
+        discriminator: [
+            98,
+            107,
+            48,
+            79,
+            97,
+            60,
+            99,
+            58
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
+                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: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "state"
+            },
+            {
+                name: "user",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "market_type",
+                type: {
+                    option: {
+                        defined: {
+                            name: "MarketType"
+                        }
+                    }
+                }
+            },
+            {
+                name: "market_index",
+                type: {
+                    option: "u16"
+                }
+            },
+            {
+                name: "direction",
+                type: {
+                    option: {
+                        defined: {
+                            name: "PositionDirection"
+                        }
+                    }
+                }
+            }
+        ]
+    },
+    {
+        name: "drift_cancel_orders_by_ids",
+        discriminator: [
+            172,
+            99,
+            108,
+            14,
+            81,
+            89,
+            228,
+            183
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
+                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: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "state"
+            },
+            {
+                name: "user",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "order_ids",
+                type: {
+                    vec: "u32"
+                }
+            }
+        ]
+    },
+    {
+        name: "drift_delete_user",
+        discriminator: [
+            179,
+            118,
+            20,
+            212,
+            145,
+            146,
+            49,
+            130
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "user",
+                writable: true
+            },
+            {
+                name: "user_stats",
+                writable: true
+            },
+            {
+                name: "state",
+                writable: true
+            }
+        ],
+        args: []
+    },
+    {
+        name: "drift_deposit",
+        discriminator: [
+            252,
+            63,
+            250,
+            201,
+            98,
+            55,
+            130,
+            12
+        ],
+        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,
@@ -982,6 +1373,99 @@ var instructions = [
             }
         ]
     },
+    {
+        name: "drift_distributor_new_claim",
+        discriminator: [
+            204,
+            159,
+            250,
+            46,
+            124,
+            193,
+            250,
+            10
+        ],
+        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: "E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x"
+            },
+            {
+                name: "distributor",
+                writable: true
+            },
+            {
+                name: "claim_status",
+                writable: true
+            },
+            {
+                name: "from",
+                writable: true
+            },
+            {
+                name: "to",
+                writable: true
+            },
+            {
+                name: "token_program"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: [
+            {
+                name: "amount_unlocked",
+                type: "u64"
+            },
+            {
+                name: "amount_locked",
+                type: "u64"
+            },
+            {
+                name: "proof",
+                type: {
+                    vec: {
+                        array: [
+                            "u8",
+                            32
+                        ]
+                    }
+                }
+            }
+        ]
+    },
     {
         name: "drift_initialize_user",
         discriminator: [
@@ -1537,22 +2021,84 @@ var instructions = [
                 type: "u16"
             },
             {
-                name: "delegate",
-                type: "pubkey"
+                name: "delegate",
+                type: "pubkey"
+            }
+        ]
+    },
+    {
+        name: "drift_update_user_margin_trading_enabled",
+        discriminator: [
+            157,
+            175,
+            12,
+            19,
+            202,
+            114,
+            17,
+            36
+        ],
+        accounts: [
+            {
+                name: "glam_state"
+            },
+            {
+                name: "glam_vault",
+                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: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "user",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "sub_account_id",
+                type: "u16"
+            },
+            {
+                name: "margin_trading_enabled",
+                type: "bool"
             }
         ]
     },
     {
-        name: "drift_update_user_margin_trading_enabled",
+        name: "drift_update_user_pool_id",
         discriminator: [
-            157,
-            175,
-            12,
-            19,
-            202,
-            114,
-            17,
-            36
+            44,
+            176,
+            143,
+            200,
+            153,
+            248,
+            221,
+            218
         ],
         accounts: [
             {
@@ -1599,8 +2145,8 @@ var instructions = [
                 type: "u16"
             },
             {
-                name: "margin_trading_enabled",
-                type: "bool"
+                name: "pool_id",
+                type: "u8"
             }
         ]
     },
@@ -2505,41 +3051,8 @@ var instructions = [
                             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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -2595,41 +3108,8 @@ var instructions = [
                             path: "glam_escrow"
                         },
                         {
-                            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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -2680,8 +3160,7 @@ var instructions = [
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "deposit_token_program"
             },
             {
                 name: "token_2022_program",
@@ -6288,6 +6767,12 @@ var instructions = [
     },
     {
         name: "price_drift_users",
+        docs: [
+            "Extra accounts for pricing N drift users under the same user stats:",
+            "- user_stats x 1",
+            "- drift_user x N",
+            "- markets and oracles used by all drift users (no specific order)"
+        ],
         discriminator: [
             12,
             5,
@@ -6403,11 +6888,20 @@ var instructions = [
                         name: "PriceDenom"
                     }
                 }
+            },
+            {
+                name: "num_users",
+                type: "u8"
             }
         ]
     },
     {
         name: "price_drift_vault_depositors",
+        docs: [
+            "Extra accounts for pricing N vault depositors:",
+            "- (vault_depositor, drift_vault, drift_user) x N",
+            "- markets and oracles used by all drift users (no specific order)"
+        ],
         discriminator: [
             234,
             16,
@@ -6523,6 +7017,10 @@ var instructions = [
                         name: "PriceDenom"
                     }
                 }
+            },
+            {
+                name: "num_vault_depositors",
+                type: "u8"
             }
         ]
     },
@@ -7409,41 +7907,8 @@ var instructions = [
                             path: "glam_escrow"
                         },
                         {
-                            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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -7499,41 +7964,8 @@ var instructions = [
                             path: "signer"
                         },
                         {
-                            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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -7584,8 +8016,7 @@ var instructions = [
                 address: "11111111111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "deposit_token_program"
             },
             {
                 name: "associated_token_program",
@@ -9367,41 +9798,8 @@ var instructions = [
                             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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -9457,41 +9855,8 @@ var instructions = [
                             path: "signer"
                         },
                         {
-                            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: "account",
+                            path: "deposit_token_program"
                         },
                         {
                             kind: "account",
@@ -9538,53 +9903,230 @@ var instructions = [
                 }
             },
             {
-                name: "signer_policy",
+                name: "signer_policy",
+                writable: true,
+                optional: true
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "deposit_token_program"
+            },
+            {
+                name: "token_2022_program",
+                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+            },
+            {
+                name: "associated_token_program",
+                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+            },
+            {
+                name: "policies_program",
+                address: "po1iCYakK3gHCLbuju4wGzFowTMpAJxkqK1iwUqMonY"
+            }
+        ],
+        args: [
+            {
+                name: "mint_id",
+                type: "u8"
+            },
+            {
+                name: "amount_in",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "system_transfer",
+        discriminator: [
+            167,
+            164,
+            195,
+            155,
+            219,
+            152,
+            191,
+            230
+        ],
+        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: "11111111111111111111111111111111"
+            },
+            {
+                name: "to",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "lamports",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "token_close_account",
+        discriminator: [
+            240,
+            32,
+            179,
+            154,
+            96,
+            110,
+            43,
+            79
+        ],
+        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"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            },
+            {
+                name: "token_account",
+                writable: true
+            }
+        ],
+        args: []
+    },
+    {
+        name: "token_transfer",
+        discriminator: [
+            210,
+            16,
+            52,
+            5,
+            247,
+            164,
+            59,
+            18
+        ],
+        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,
-                optional: true
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            },
-            {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                signer: true
             },
             {
-                name: "token_2022_program",
-                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+                name: "cpi_program"
             },
             {
-                name: "associated_token_program",
-                address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                name: "from",
+                writable: true
             },
             {
-                name: "policies_program",
-                address: "po1iCYakK3gHCLbuju4wGzFowTMpAJxkqK1iwUqMonY"
+                name: "to",
+                writable: true
             }
         ],
         args: [
             {
-                name: "mint_id",
-                type: "u8"
-            },
-            {
-                name: "amount_in",
+                name: "lamports",
                 type: "u64"
             }
         ]
     },
     {
-        name: "system_transfer",
+        name: "token_transfer_checked",
         discriminator: [
-            167,
-            164,
-            195,
-            155,
-            219,
-            152,
+            169,
+            178,
+            117,
+            156,
+            169,
             191,
-            230
+            199,
+            116
         ],
         accounts: [
             {
@@ -9618,8 +10160,14 @@ var instructions = [
                 signer: true
             },
             {
-                name: "cpi_program",
-                address: "11111111111111111111111111111111"
+                name: "cpi_program"
+            },
+            {
+                name: "from",
+                writable: true
+            },
+            {
+                name: "mint"
             },
             {
                 name: "to",
@@ -9630,20 +10178,167 @@ var instructions = [
             {
                 name: "lamports",
                 type: "u64"
+            },
+            {
+                name: "decimals",
+                type: "u8"
             }
         ]
     },
     {
-        name: "token_close_account",
+        name: "update_mint",
         discriminator: [
-            240,
-            32,
-            179,
-            154,
-            96,
-            110,
-            43,
-            79
+            212,
+            203,
+            57,
+            78,
+            75,
+            245,
+            222,
+            5
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "glam_mint",
+                writable: true
+            },
+            {
+                name: "token_2022_program",
+                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+            }
+        ],
+        args: [
+            {
+                name: "mint_id",
+                type: "u8"
+            },
+            {
+                name: "mint_model",
+                type: {
+                    defined: {
+                        name: "MintModel"
+                    }
+                }
+            }
+        ]
+    },
+    {
+        name: "update_mint_apply_timelock",
+        discriminator: [
+            223,
+            241,
+            80,
+            24,
+            120,
+            25,
+            82,
+            134
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "glam_mint",
+                writable: true
+            },
+            {
+                name: "token_2022_program",
+                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+            }
+        ],
+        args: [
+            {
+                name: "mint_id",
+                type: "u8"
+            }
+        ]
+    },
+    {
+        name: "update_state",
+        discriminator: [
+            135,
+            112,
+            215,
+            75,
+            247,
+            185,
+            53,
+            176
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            }
+        ],
+        args: [
+            {
+                name: "state",
+                type: {
+                    defined: {
+                        name: "StateModel"
+                    }
+                }
+            }
+        ]
+    },
+    {
+        name: "update_state_apply_timelock",
+        discriminator: [
+            66,
+            12,
+            138,
+            80,
+            133,
+            85,
+            46,
+            220
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            }
+        ],
+        args: []
+    },
+    {
+        name: "vote_authorize",
+        discriminator: [
+            61,
+            48,
+            136,
+            95,
+            88,
+            65,
+            161,
+            215
         ],
         accounts: [
             {
@@ -9677,30 +10372,44 @@ var instructions = [
                 signer: true
             },
             {
-                name: "cpi_program"
+                name: "cpi_program",
+                address: "Vote111111111111111111111111111111111111111"
             },
             {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
+                name: "vote",
+                writable: true
             },
             {
-                name: "token_account",
-                writable: true
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
             }
         ],
-        args: []
+        args: [
+            {
+                name: "new_authority",
+                type: "pubkey"
+            },
+            {
+                name: "vote_authorize",
+                type: {
+                    defined: {
+                        name: "VoteAuthorizeEnum"
+                    }
+                }
+            }
+        ]
     },
     {
-        name: "token_transfer",
-        discriminator: [
-            210,
-            16,
-            52,
-            5,
-            247,
-            164,
-            59,
-            18
+        name: "vote_update_commission",
+        discriminator: [
+            193,
+            83,
+            224,
+            17,
+            218,
+            144,
+            211,
+            60
         ],
         accounts: [
             {
@@ -9734,35 +10443,32 @@ var instructions = [
                 signer: true
             },
             {
-                name: "cpi_program"
-            },
-            {
-                name: "from",
-                writable: true
+                name: "cpi_program",
+                address: "Vote111111111111111111111111111111111111111"
             },
             {
-                name: "to",
+                name: "vote",
                 writable: true
             }
         ],
         args: [
             {
-                name: "lamports",
-                type: "u64"
+                name: "new_commission",
+                type: "u8"
             }
         ]
     },
     {
-        name: "token_transfer_checked",
+        name: "vote_update_validator_identity",
         discriminator: [
-            169,
-            178,
-            117,
-            156,
-            169,
-            191,
-            199,
-            116
+            164,
+            111,
+            105,
+            150,
+            248,
+            104,
+            150,
+            8
         ],
         accounts: [
             {
@@ -9796,93 +10502,58 @@ var instructions = [
                 signer: true
             },
             {
-                name: "cpi_program"
+                name: "cpi_program",
+                address: "Vote111111111111111111111111111111111111111"
             },
             {
-                name: "from",
+                name: "vote",
                 writable: true
             },
             {
-                name: "mint"
-            },
-            {
-                name: "to",
-                writable: true
+                name: "identity",
+                writable: true,
+                signer: true
             }
         ],
-        args: [
-            {
-                name: "lamports",
-                type: "u64"
-            },
-            {
-                name: "decimals",
-                type: "u8"
-            }
-        ]
+        args: []
     },
     {
-        name: "update_mint",
+        name: "vote_withdraw",
         discriminator: [
-            212,
-            203,
-            57,
-            78,
-            75,
-            245,
-            222,
-            5
+            193,
+            3,
+            236,
+            192,
+            122,
+            146,
+            217,
+            149
         ],
         accounts: [
             {
-                name: "glam_state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "glam_signer",
+                name: "glam_vault",
                 writable: true,
-                signer: true
-            },
-            {
-                name: "glam_mint",
-                writable: true
-            },
-            {
-                name: "token_2022_program",
-                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-            }
-        ],
-        args: [
-            {
-                name: "mint_id",
-                type: "u8"
-            },
-            {
-                name: "mint_model",
-                type: {
-                    defined: {
-                        name: "MintModel"
-                    }
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ]
                 }
-            }
-        ]
-    },
-    {
-        name: "update_mint_apply_timelock",
-        discriminator: [
-            223,
-            241,
-            80,
-            24,
-            120,
-            25,
-            82,
-            134
-        ],
-        accounts: [
-            {
-                name: "glam_state",
-                writable: true
             },
             {
                 name: "glam_signer",
@@ -9890,80 +10561,25 @@ var instructions = [
                 signer: true
             },
             {
-                name: "glam_mint",
-                writable: true
+                name: "cpi_program",
+                address: "Vote111111111111111111111111111111111111111"
             },
             {
-                name: "token_2022_program",
-                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-            }
-        ],
-        args: [
-            {
-                name: "mint_id",
-                type: "u8"
-            }
-        ]
-    },
-    {
-        name: "update_state",
-        discriminator: [
-            135,
-            112,
-            215,
-            75,
-            247,
-            185,
-            53,
-            176
-        ],
-        accounts: [
-            {
-                name: "glam_state",
+                name: "vote",
                 writable: true
             },
             {
-                name: "glam_signer",
-                writable: true,
-                signer: true
+                name: "recipient",
+                writable: true
             }
         ],
         args: [
             {
-                name: "state",
-                type: {
-                    defined: {
-                        name: "StateModel"
-                    }
-                }
+                name: "lamports",
+                type: "u64"
             }
         ]
     },
-    {
-        name: "update_state_apply_timelock",
-        discriminator: [
-            66,
-            12,
-            138,
-            80,
-            133,
-            85,
-            46,
-            220
-        ],
-        accounts: [
-            {
-                name: "glam_state",
-                writable: true
-            },
-            {
-                name: "glam_signer",
-                writable: true,
-                signer: true
-            }
-        ],
-        args: []
-    },
     {
         name: "withdraw",
         discriminator: [
@@ -10211,16 +10827,21 @@ var errors = [
     },
     {
         code: 48006,
+        name: "CannotApplyChanges",
+        msg: "Pending changes cannot be applied due to unfulfilled subscriptions or redemptions"
+    },
+    {
+        code: 48007,
         name: "AssetNotBorrowable",
         msg: "Asset is not allowed to borrow"
     },
     {
-        code: 48007,
+        code: 48008,
         name: "InvalidAccountOwner",
         msg: "Account owned by an invalid program"
     },
     {
-        code: 48008,
+        code: 48009,
         name: "InvalidAuthority",
         msg: "Invalid authority"
     },
@@ -10928,7 +11549,7 @@ var types = [
                     name: "MinRedemption"
                 },
                 {
-                    name: "NotifyAndSettle"
+                    name: "RedemptionNotifyAndSettle"
                 },
                 {
                     name: "Ledger"
@@ -10995,6 +11616,12 @@ var types = [
                 },
                 {
                     name: "BorrowableAssets"
+                },
+                {
+                    name: "DriftVaultsAllowlist"
+                },
+                {
+                    name: "KaminoVaultsAllowlist"
                 }
             ]
         }
@@ -11781,6 +12408,9 @@ var types = [
                 },
                 {
                     name: "KaminoVaults"
+                },
+                {
+                    name: "Validator"
                 }
             ]
         }
@@ -12366,9 +12996,9 @@ var types = [
                     }
                 },
                 {
-                    name: "immediate_or_cancel",
+                    name: "bit_flags",
                     type: {
-                        option: "bool"
+                        option: "u8"
                     }
                 },
                 {
@@ -12663,8 +13293,8 @@ var types = [
                     }
                 },
                 {
-                    name: "immediate_or_cancel",
-                    type: "bool"
+                    name: "bit_flags",
+                    type: "u8"
                 },
                 {
                     name: "max_ts",
@@ -12822,7 +13452,7 @@ var types = [
                     name: "Unstake"
                 },
                 {
-                    name: "__DeprecatedLiquidUnstake"
+                    name: "DriftCancelOrders"
                 },
                 {
                     name: "JupiterSwapAllowlisted"
@@ -12834,7 +13464,7 @@ var types = [
                     name: "WSol"
                 },
                 {
-                    name: "__DeprecatedWSolUnwrap"
+                    name: "DriftClaim"
                 },
                 {
                     name: "MintMintTokens"
@@ -12913,6 +13543,21 @@ var types = [
                 },
                 {
                     name: "KaminoVaultsWithdraw"
+                },
+                {
+                    name: "ValidatorAdmin"
+                },
+                {
+                    name: "ValidatorWithdraw"
+                },
+                {
+                    name: "ValidatorWithdrawToAny"
+                },
+                {
+                    name: "ValidatorWithdrawToIdentity"
+                },
+                {
+                    name: "Fulfill"
                 }
             ]
         }
@@ -13651,6 +14296,22 @@ var types = [
                         option: "u32"
                     }
                 },
+                {
+                    name: "drift_vaults_allowlist",
+                    type: {
+                        option: {
+                            vec: "pubkey"
+                        }
+                    }
+                },
+                {
+                    name: "kamino_vaults_allowlist",
+                    type: {
+                        option: {
+                            vec: "pubkey"
+                        }
+                    }
+                },
                 {
                     name: "metadata",
                     type: {
@@ -13770,6 +14431,20 @@ var types = [
             ]
         }
     },
+    {
+        name: "VoteAuthorizeEnum",
+        type: {
+            kind: "enum",
+            variants: [
+                {
+                    name: "Voter"
+                },
+                {
+                    name: "Withdrawer"
+                }
+            ]
+        }
+    },
     {
         name: "WithdrawUnit",
         type: {
@@ -13856,6 +14531,7 @@ const STAKE_ACCOUNT_SIZE = 200;
 const METEORA_POSITION_SIZE = 8120;
 const KAMINO_OBTRIGATION_SIZE = 3344;
 const DRIFT_VAULT_DEPOSITOR_SIZE = 272;
+const JUPITER_API_DEFAULT = "https://lite-api.jup.ag";
 const JITO_TIP_DEFAULT = new web3_js.PublicKey("96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5");
 const KAMINO_SCOPE_PRICES = new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C");
 const MARINADE_NATIVE_STAKE_AUTHORITY = new web3_js.PublicKey("stWirqFCf2Uts1JBL1Jsd3r6VBWhgnpdPxCTe1MFjrq");
@@ -13923,6 +14599,8 @@ class StateIdlModel {
         this.kaminoLendingMarkets = data.kaminoLendingMarkets ?? null;
         this.meteoraDlmmPools = data.meteoraDlmmPools ?? null;
         this.maxSwapSlippageBps = data.maxSwapSlippageBps ?? null;
+        this.driftVaultsAllowlist = data.driftVaultsAllowlist ?? null;
+        this.kaminoVaultsAllowlist = data.kaminoVaultsAllowlist ?? null;
         this.metadata = data.metadata ?? null;
         this.rawOpenfunds = data.rawOpenfunds ?? null;
     }
@@ -14274,6 +14952,14 @@ TimeUnit.Slot = {
 TimeUnit.Second = {
     second: {}
 };
+class VoteAuthorize {
+}
+VoteAuthorize.Voter = {
+    voter: {}
+};
+VoteAuthorize.Withdrawer = {
+    withdrawer: {}
+};
 
 var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
     ClusterNetwork["Mainnet"] = "mainnet-beta";
@@ -14283,6 +14969,12 @@ var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
     return ClusterNetwork;
 }({});
 
+const LOOKUP_TABLES_MAP = new Map([
+    [
+        "3tfbxaHBDjczQo3eyNJGGG64ChZ9nG4V3Gywa4k59d5a",
+        new web3_js.PublicKey("8HUXT9abWS2z3z92QyDzg51nMcc18LyWFvaEQZJMPixu")
+    ]
+]);
 const findStakeAccounts = async (connection, withdrawAuthority)=>{
     // stake authority offset: 12
     // withdraw authority offset: 44
@@ -14388,22 +15080,42 @@ const parseMeteoraPosition = async (connection, position)=>{
     };
 };
 async function fetchLookupTables(connection, authority, firstEntry) {
-    new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
-    // Fetch all accounts owned by the ALT program
-    // This is currently disabled due to RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
-    // const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
-    //   filters: [
-    //     { memcmp: { offset: 22, bytes: authority.toBase58() } },
-    //     { memcmp: { offset: 56, bytes: firstEntry.toBase58() } }, // 1st entry in the table
-    //   ],
-    // });
-    // return accounts.map(
-    //   ({ pubkey, account }) =>
-    //     new AddressLookupTableAccount({
-    //       key: pubkey,
-    //       state: AddressLookupTableAccount.deserialize(account.data),
-    //     }),
-    // );
+    const ALT_PROGRAM_ID = new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
+    const tablePubkey = LOOKUP_TABLES_MAP.get(firstEntry.toBase58());
+    if (tablePubkey) {
+        const accountInfo = await connection.getAccountInfo(tablePubkey);
+        if (accountInfo) {
+            return [
+                new web3_js.AddressLookupTableAccount({
+                    key: tablePubkey,
+                    state: web3_js.AddressLookupTableAccount.deserialize(accountInfo.data)
+                })
+            ];
+        }
+    } else {
+        // Fetch all accounts owned by the ALT program
+        // This is currently disabled due to RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
+        const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
+            filters: [
+                {
+                    memcmp: {
+                        offset: 22,
+                        bytes: authority.toBase58()
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 56,
+                        bytes: firstEntry.toBase58()
+                    }
+                }
+            ]
+        });
+        return accounts.map(({ pubkey, account })=>new web3_js.AddressLookupTableAccount({
+                key: pubkey,
+                state: web3_js.AddressLookupTableAccount.deserialize(account.data)
+            }));
+    }
     return [];
 }
 /**
@@ -14422,8 +15134,8 @@ async function fetchLookupTables(connection, authority, firstEntry) {
     }
     return "Unknown error";
 }
-const getSimulationComputeUnits = async (connection, instructions, payer, lookupTables)=>{
-    const testInstructions = [
+const getSimulationResult = async (connection, instructions, payer, lookupTables)=>{
+    const testIxs = [
         // Set an arbitrarily high number in simulation
         // so we can be sure the transaction will succeed
         // and get the real compute units used
@@ -14432,19 +15144,30 @@ const getSimulationComputeUnits = async (connection, instructions, payer, lookup
         }),
         ...instructions
     ];
-    const testTransaction = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
-        instructions: testInstructions,
+    const testTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
+        instructions: testIxs,
         payerKey: payer,
         // RecentBlockhash can by any public key during simulation
         // since 'replaceRecentBlockhash' is set to 'true' below
         recentBlockhash: web3_js.PublicKey.default.toString()
     }).compileToV0Message(lookupTables));
-    const rpcResponse = await connection.simulateTransaction(testTransaction, {
-        replaceRecentBlockhash: true,
-        sigVerify: false
-    });
-    getErrorFromRPCResponse(rpcResponse);
-    return rpcResponse.value.unitsConsumed || undefined;
+    const serializedTx = Buffer.from(testTx.serialize()).toString("base64");
+    try {
+        const rpcResponse = await connection.simulateTransaction(testTx, {
+            replaceRecentBlockhash: true,
+            sigVerify: false
+        });
+        getErrorFromRPCResponse(rpcResponse);
+        return {
+            unitsConsumed: rpcResponse.value.unitsConsumed,
+            serializedTx
+        };
+    } catch (e) {
+        return {
+            error: e,
+            serializedTx
+        };
+    }
 };
 const getErrorFromRPCResponse = (rpcResponse)=>{
     // Note: `confirmTransaction` does not throw an error if the confirmation does not succeed,
@@ -14798,7 +15521,6 @@ function getAccountPolicyPda(tokenAccount) {
     ], TRANSFER_HOOK_PROGRAM)[0];
 }
 
-const JUPITER_API_DEFAULT = "https://lite-api.jup.ag";
 const DEFAULT_PRIORITY_FEE = 10000; // microLamports
 const LOOKUP_TABLES = [
     new web3_js.PublicKey("284iwGtA9X9aLy3KsyV8uT2pXLARhYbiSi5SiM2g47M2"),
@@ -14829,10 +15551,15 @@ class BaseClient {
     get isMainnet() {
         return this.cluster === ClusterNetwork.Mainnet;
     }
-    isPhantom() {
+    isPhantomConnected() {
         if (!isBrowser) return false;
-        // TODO: remove when we can bypass from settings
-        return false;
+        // Phantom automatically estimates fees
+        // https://docs.phantom.app/developer-powertools/solana-priority-fees#how-phantom-applies-priority-fees-to-dapp-transactions
+        // @ts-ignore
+        const isPhantom = !!window?.phantom?.solana?.isPhantom;
+        // @ts-ignore
+        const isConnected = !!window?.phantom?.solana?.isConnected;
+        return isPhantom && isConnected;
     }
     /**
    * Get metadata of an asset for pricing
@@ -14850,9 +15577,6 @@ class BaseClient {
         return assetMeta;
     }
     async getComputeBudgetIxs(vTx, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee) {
-        if (this.isPhantom()) {
-            return [];
-        }
         // ComputeBudgetProgram.setComputeUnitLimit costs 150 CUs
         // Add 20% more CUs to account for variable execution
         computeUnitLimit += 150;
@@ -14897,24 +15621,17 @@ class BaseClient {
         }
         lookupTables.push(...await this.getAdressLookupTableAccounts(LOOKUP_TABLES));
         const recentBlockhash = (await this.blockhashWithCache.get()).blockhash;
-        try {
-            computeUnitLimit = await getSimulationComputeUnits(this.provider.connection, instructions, signer, lookupTables);
-        } catch (e) {
-            // by default, a simulation error doesn't prevent the tx from being sent
-            // - 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) {
-                const vTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
-                    instructions,
-                    payerKey: signer,
-                    recentBlockhash: web3_js.PublicKey.default.toString()
-                }).compileToV0Message(lookupTables));
-                console.log("Lookup tables:", lookupTables.map((lt)=>lt.key.toString()));
-                console.log("Tx (base64):", Buffer.from(vTx.serialize()).toString("base64"));
-                console.error("Simulation failed. If error message is too obscure, inspect and simulate the tx in explorer: https://explorer.solana.com/tx/inspector");
-                throw e;
-            }
+        const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTables);
+        computeUnitLimit = unitsConsumed;
+        // by default, a simulation error doesn't prevent the tx from being sent
+        // - gui: wallet apps usually do the simulation themselves, we should ignore the simulation error here by default
+        // - cli: we should set simulate=true
+        if (error && simulate) {
+            console.log("Lookup tables:", lookupTables.map((lt)=>lt.key.toString()));
+            console.log("Tx (base64):", serializedTx);
+            console.error("Simulation failed:", error.message);
+            console.error("If error message is too obscure, inspect and simulate the tx in explorer: https://explorer.solana.com/tx/inspector");
+            throw error;
         }
         if (computeUnitLimit) {
             const vTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
@@ -15086,7 +15803,7 @@ class BaseClient {
         try {
             const account = await splToken.getAccount(this.provider.connection, ata, "confirmed", tokenProgram);
             return {
-                amount: new anchor.BN(account.amount),
+                amount: new anchor.BN(account.amount.toString()),
                 uiAmount: Number(account.amount) / Math.pow(10, mint.decimals)
             };
         } catch (e) {
@@ -15099,6 +15816,21 @@ class BaseClient {
             throw e;
         }
     }
+    async fetchMintsAndTokenPrograms(mintPubkeys) {
+        const connection = this.provider.connection;
+        const accountsInfo = await connection.getMultipleAccountsInfo(mintPubkeys, "confirmed");
+        return accountsInfo.map((info, i)=>{
+            if (!info) {
+                throw new Error(`Mint ${mintPubkeys[i]} not found`);
+            }
+            const tokenProgram = info.owner;
+            const mint = splToken.unpackMint(mintPubkeys[i], info, tokenProgram);
+            return {
+                mint,
+                tokenProgram
+            };
+        });
+    }
     async fetchMintAndTokenProgram(mintPubkey) {
         const connection = this.provider.connection;
         const info = await connection.getAccountInfo(mintPubkey, "confirmed");
@@ -15128,6 +15860,7 @@ class BaseClient {
         if (!this.statePda) {
             throw new Error("State PDA is not specified");
         }
+        // @ts-ignore
         const state = await this.fetchStateAccount();
         if (state.params.length < 2) {
             throw new Error("Invalid mint index");
@@ -15283,7 +16016,6 @@ class BaseClient {
         if (config?.statePda) {
             this.statePda = config.statePda;
         }
-        this.jupiterApi = config?.jupiterApi || JUPITER_API_DEFAULT;
         this.blockhashWithCache = new BlockhashWithCache(this.provider, false);
     }
 }
@@ -16264,6 +16996,8 @@ function decodeUser(buffer) {
     };
 }
 
+const DRIFT_DISTRIBUTOR_PROGRAM = new web3_js.PublicKey("E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x");
+const DRIFT = new web3_js.PublicKey("DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7");
 const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
 const DRIFT_MARGIN_PRECISION = 10000;
 class DriftClient {
@@ -16420,7 +17154,7 @@ class DriftClient {
         // If not, it means some market indexes are invalid and we throw an error
         const spotMarkets = marketIndexes.map((marketIndex)=>this.spotMarkets.get(marketIndex)).filter((m)=>m);
         const invalidIndexes = marketIndexes.filter((marketIndex)=>!this.spotMarkets.has(marketIndex));
-        if (invalidIndexes.length > 0) {
+        if (invalidIndexes.length > 0 && process.env.NODE_ENV === "development") {
             console.warn(`The following spot markets could not be found: ${invalidIndexes.join(", ")}`);
         }
         return spotMarkets;
@@ -16470,7 +17204,7 @@ class DriftClient {
             }
             const data = await response.json();
             const { orderConstants, perp, spot } = data;
-            // Transform perp market from API to `PerpMarket` type
+            // Transform market data from API to `PerpMarket`/`SpotMarket` objects
             const perpMarkets = perp.map((m)=>({
                     name: m.symbol,
                     marketIndex: m.marketIndex,
@@ -16478,10 +17212,6 @@ class DriftClient {
                     oracle: new web3_js.PublicKey(m.oracle),
                     oracleSource: OracleSource.fromString(m.oracleSource)
                 }));
-            perpMarkets.forEach((m)=>{
-                this.perpMarkets.set(m.marketIndex, m);
-            });
-            // Transform spot market from API to `SpotMarket` type
             const spotMarkets = spot.map((m)=>({
                     name: m.symbol,
                     marketIndex: m.marketIndex,
@@ -16495,6 +17225,10 @@ class DriftClient {
                     cumulativeDepositInterest: new anchor.BN(m.cumulativeDepositInterest),
                     cumulativeBorrowInterest: new anchor.BN(m.cumulativeBorrowInterest)
                 }));
+            // Cache market objects
+            perpMarkets.forEach((m)=>{
+                this.perpMarkets.set(m.marketIndex, m);
+            });
             spotMarkets.forEach((m)=>{
                 this.spotMarkets.set(m.marketIndex, m);
             });
@@ -16507,7 +17241,8 @@ class DriftClient {
             return marketConfigs;
         }
         // If glam API is not available, fetch market configs from RPC
-        if (!this.marketConfigs) {
+        // Force refetching if skipCache is true
+        if (!this.marketConfigs || skipCache) {
             const perpMarkets = await this.fetchAndParsePerpMarkets(Array.from(Array(100).keys()), skipCache);
             const spotMarkets = await this.fetchAndParseSpotMarkets(Array.from(Array(100).keys()), skipCache);
             this.marketConfigs = {
@@ -16524,18 +17259,19 @@ class DriftClient {
     charsToName(chars) {
         return String.fromCharCode(...chars).replace(/\0/g, "").trim();
     }
-    async fetchDriftUser(subAccountId = 0, skipCache = false) {
-        const { user } = this.getDriftUserPdas(subAccountId);
-        const accountInfo = await this.base.provider.connection.getAccountInfo(user);
-        if (!accountInfo) {
-            return null;
-        }
-        const { delegate, name, spotPositions, marginMode, perpPositions, isMarginTradingEnabled, maxMarginRatio, orders } = decodeUser(accountInfo.data);
-        // Prefetch market configs
-        const marketConfigs = await this.fetchMarketConfigs(skipCache);
+    async parseDriftUser(accountInfo, subAccountId) {
+        const { delegate, name, spotPositions, marginMode, perpPositions, isMarginTradingEnabled, maxMarginRatio, orders, poolId } = decodeUser(accountInfo.data);
+        // Fetch spot and perp markets used by this user
+        const spotMarketIndexes = spotPositions.map((p)=>p.marketIndex);
+        const perpMarketIndexes = perpPositions.map((p)=>p.marketIndex);
+        await Promise.all([
+            this.fetchAndParseSpotMarkets(spotMarketIndexes),
+            this.fetchAndParsePerpMarkets(perpMarketIndexes)
+        ]);
+        // Extend spot positions with market info
         const spotPositionsExt = await Promise.all(spotPositions.map(async (p)=>{
             const { amount, uiAmount } = await this.calcSpotBalance(p.marketIndex, p.scaledBalance, p.balanceType);
-            const spotMarket = marketConfigs.spotMarkets.find((m)=>m.marketIndex === p.marketIndex);
+            const spotMarket = this.spotMarkets.get(p.marketIndex);
             return {
                 ...p,
                 amount,
@@ -16554,9 +17290,39 @@ class DriftClient {
             marginMode,
             subAccountId,
             isMarginTradingEnabled,
-            maxMarginRatio
+            maxMarginRatio,
+            poolId
         };
     }
+    async fetchDriftUser(subAccountId = 0, skipCache = false) {
+        const { user } = this.getDriftUserPdas(subAccountId);
+        const accountInfo = await this.base.provider.connection.getAccountInfo(user);
+        if (!accountInfo) {
+            return null;
+        }
+        // Prefetch market configs
+        await this.fetchMarketConfigs(skipCache);
+        return await this.parseDriftUser(accountInfo, subAccountId);
+    }
+    async fetchDriftUsers(skipCache = false) {
+        const userPdas = Array.from(Array(8).keys()).map((subAccountId)=>{
+            const { user } = this.getDriftUserPdas(subAccountId);
+            return user;
+        });
+        const accountsInfo = await this.base.provider.connection.getMultipleAccountsInfo(userPdas);
+        const subAccountsInfoAndIds = [];
+        accountsInfo.forEach((a, i)=>{
+            if (a) {
+                subAccountsInfoAndIds.push([
+                    a,
+                    i
+                ]);
+            }
+        });
+        // Prefetch market configs
+        await this.fetchMarketConfigs(skipCache);
+        return await Promise.all(subAccountsInfoAndIds.map(([accountInfo, subAccountId])=>this.parseDriftUser(accountInfo, subAccountId)));
+    }
     /**
    * @deprecated
    */ async fetchPolicyConfig(stateModel) {
@@ -16616,6 +17382,36 @@ class DriftClient {
                 isSigner: false
             })));
     }
+    getClaimStatus(claimant, distributor) {
+        const [claimStatus] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("ClaimStatus"),
+            claimant.toBuffer(),
+            distributor.toBuffer()
+        ], DRIFT_DISTRIBUTOR_PROGRAM);
+        return claimStatus;
+    }
+    async claim(distributor, amountUnlocked, amountLocked, proof, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const vault = this.base.vaultPda;
+        const vaultAta = this.base.getVaultAta(DRIFT);
+        const distributorAta = this.base.getAta(DRIFT, distributor);
+        const preInstructions = [
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, vaultAta, vault, DRIFT)
+        ];
+        const tx = await this.base.program.methods.driftDistributorNewClaim(amountUnlocked, amountLocked, proof).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            distributor,
+            claimStatus: this.getClaimStatus(vault, distributor),
+            from: distributorAta,
+            to: vaultAta,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
+        }).preInstructions(preInstructions).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, {
+            ...txOptions
+        });
+        return await this.base.sendAndConfirm(vTx);
+    }
     async initializeUserStatsIx(glamSigner) {
         const { userStats } = this.getDriftUserPdas();
         // @ts-ignore
@@ -16650,6 +17446,13 @@ class DriftClient {
             glamSigner
         }).remainingAccounts(remainingAccounts).instruction();
     }
+    async updateUserPoolIdIx(subAccountId, poolId) {
+        const { user } = this.getDriftUserPdas(subAccountId);
+        return await this.base.program.methods.driftUpdateUserPoolId(subAccountId, poolId).accounts({
+            glamState: this.base.statePda,
+            user
+        }).instruction();
+    }
     async initializeTx(subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const tx = new web3_js.Transaction();
@@ -16720,13 +17523,23 @@ class DriftClient {
     async depositTx(amount, marketIndex = 1, subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const { user, userStats } = this.getDriftUserPdas(subAccountId);
-        const { mint, oracle, tokenProgram, marketPda, vault: driftVault } = await this.fetchAndParseSpotMarket(marketIndex);
+        const { mint, oracle, tokenProgram, marketPda, vault: driftVault, name } = await this.fetchAndParseSpotMarket(marketIndex);
         console.log(`Spot market ${marketIndex} mint ${mint}, oracle: ${oracle}, marketPda: ${marketPda}, vault: ${driftVault}`);
         const preInstructions = [];
         const postInstructions = [];
-        // If drift user doesn't exist, prepend initializeUserStats and initializeUser instructions
+        // If drift user doesn't exist, prepend initialization ixs
         if (!await this.fetchDriftUser(subAccountId)) {
-            preInstructions.push(await this.initializeUserStatsIx(glamSigner), await this.initializeUserIx(glamSigner, subAccountId));
+            preInstructions.push(await this.initializeUserIx(glamSigner, subAccountId));
+            // Only add ix to initialize user stats if subAccountId is 0
+            if (subAccountId === 0) {
+                preInstructions.push(await this.initializeUserStatsIx(glamSigner));
+            }
+            // If market name ends with "-N", it means we're depositing to an isolated pool
+            const isolatedPoolMatch = name.match(/-(\d+)$/);
+            if (isolatedPoolMatch) {
+                const poolId = parseInt(isolatedPoolMatch[1]);
+                preInstructions.push(await this.updateUserPoolIdIx(subAccountId, poolId));
+            }
         }
         if (mint.equals(WSOL)) {
             const wrapSolIxs = await this.base.maybeWrapSol(amount, glamSigner);
@@ -17103,6 +17916,35 @@ class DriftVaultsClient {
 }
 
 const BASE = new web3_js.PublicKey("bJ1TRoFo2P6UHVwqdiipp6Qhp2HaaHpLowZ5LHet8Gm");
+const JUPITER_API = process.env.NEXT_PUBLIC_JUPITER_API || process.env.JUPITER_API || JUPITER_API_DEFAULT;
+async function fetchProgramLabels() {
+    const res = await fetch(`${JUPITER_API}/swap/v1/program-id-to-label`);
+    const data = await res.json();
+    return data;
+}
+async function fetchTokenPrices(pubkeys) {
+    const res = await fetch(`${JUPITER_API}/price/v3?ids=${pubkeys.join(",")}`);
+    const data = await res.json();
+    return Object.entries(data).map(([key, val])=>{
+        return {
+            mint: key,
+            price: val.usdPrice
+        };
+    });
+}
+async function fetchTokensList() {
+    const response = await fetch(`${JUPITER_API}/tokens/v2/tag?query=verified`);
+    const data = await response.json();
+    const tokenList = data?.map((t)=>({
+            address: t.id,
+            name: t.name,
+            symbol: t.symbol,
+            decimals: t.decimals,
+            logoURI: t.icon,
+            tags: t.tags
+        }));
+    return tokenList;
+}
 class JupiterSwapClient {
     /*
    * Client methods
@@ -17114,16 +17956,6 @@ class JupiterSwapClient {
         const tx = await this.setMaxSwapSlippageTx(slippageBps, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    async fetchProgramLabels() {
-        const res = await fetch(`${this.base.jupiterApi}/swap/v1/program-id-to-label`);
-        const data = await res.json();
-        return data;
-    }
-    async fetchTokenPrices(pubkeys) {
-        const res = await fetch(`${this.base.jupiterApi}/price/v2?ids=${pubkeys.join(",")}`);
-        const data = await res.json();
-        return data;
-    }
     /*
    * API methods
    */ async swapTx(options, txOptions = {}) {
@@ -17167,11 +17999,10 @@ class JupiterSwapClient {
         }
         const lookupTables = await this.base.getAdressLookupTableAccounts(addressLookupTableAddresses);
         const swapIx = this.toTransactionInstruction(swapInstruction, glamVault.toBase58());
-        // TODO: Optimize by using batch RPC
-        const [inputTokenProgram, outputTokenProgram] = await Promise.all([
-            this.getTokenProgram(inputMint),
-            this.getTokenProgram(outputMint)
-        ]);
+        const [inputTokenProgram, outputTokenProgram] = (await this.base.fetchMintsAndTokenPrograms([
+            inputMint,
+            outputMint
+        ])).map((x)=>x.tokenProgram);
         const inputStakePool = STAKE_POOLS_MAP.get(inputMint.toBase58())?.poolState || null;
         const outputStakePool = STAKE_POOLS_MAP.get(outputMint.toBase58())?.poolState || null;
         const preInstructions = await this.getPreInstructions(glamSigner, inputMint, outputMint, amount, inputTokenProgram, outputTokenProgram);
@@ -17206,7 +18037,7 @@ class JupiterSwapClient {
         return tx.instructions[0];
     }
     async getQuoteResponse(quoteParams) {
-        const res = await fetch(`${this.base.jupiterApi}/swap/v1/quote?` + new URLSearchParams(Object.entries(quoteParams).map(([key, val])=>[
+        const res = await fetch(`${JUPITER_API}/swap/v1/quote?` + new URLSearchParams(Object.entries(quoteParams).map(([key, val])=>[
                 key,
                 String(val)
             ])));
@@ -17217,7 +18048,7 @@ class JupiterSwapClient {
         return data;
     }
     async getSwapInstructions(quoteResponse, from) {
-        const res = await fetch(`${this.base.jupiterApi}/swap/v1/swap-instructions`, {
+        const res = await fetch(`${JUPITER_API}/swap/v1/swap-instructions`, {
             method: "POST",
             headers: {
                 Accept: "application/json",
@@ -18305,6 +19136,7 @@ class StateClient {
     async create(partialStateModel, singleTx = false, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         let stateModel = this.enrichStateModel(partialStateModel);
+        // @ts-ignore
         const statePda = getStatePda(stateModel, this.base.program.programId);
         this.base.statePda = statePda;
         console.log(`State PDA set to GlamClient: ${statePda}`);
@@ -18586,6 +19418,7 @@ class MintClient {
         });
     }
     async update(mintModel, txOptions = {}) {
+        // @ts-ignore
         const tx = await this.base.program.methods.updateMint(0, new MintIdlModel(mintModel)).accounts({
             glamState: this.base.statePda,
             glamMint: this.base.mintPda
@@ -19390,6 +20223,7 @@ class KaminoLendingClient {
         const vault = this.base.vaultPda;
         const userMetadata = this.getUserMetadataPda(vault);
         const lookupTable = new web3_js.PublicKey(0); // FIXME: create lookup table
+        // @ts-ignore
         const tx = await this.base.program.methods.kaminoLendingInitUserMetadata(lookupTable).accounts({
             glamState: this.base.statePda,
             glamSigner,
@@ -19914,11 +20748,11 @@ class KaminoFarmClient {
 }
 class KaminoVaultsClient {
     async deposit(vault, amount, txOptions = {}) {
-        const tx = await this.depositTx(vault, amount, txOptions);
+        const tx = await this.depositTx(vault, new anchor.BN(amount), txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async withdraw(vault, amount, txOptions = {}) {
-        const tx = await this.withdrawTx(vault, amount, txOptions);
+        const tx = await this.withdrawTx(vault, new anchor.BN(amount), txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     async findAndParseKaminoVaults() {
@@ -19984,7 +20818,7 @@ class KaminoVaultsClient {
     async depositTx(vault, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vaultState = await this.fetchAndParseVaultState(vault);
-        const amountBN = new anchor.BN(amount * 10 ** vaultState.tokenMintDecimals.toNumber());
+        const amountBN = amount.mul(new anchor.BN(10).pow(vaultState.tokenMintDecimals));
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
@@ -20019,7 +20853,7 @@ class KaminoVaultsClient {
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
-        const amountBN = new anchor.BN(amount * 10 ** vaultState.sharesMintDecimals.toNumber());
+        const amountBN = amount.mul(new anchor.BN(10).pow(vaultState.sharesMintDecimals));
         const reserves = vaultState.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(web3_js.PublicKey.default));
         // Withdraw from the first reserve when kvault does not have enough liquidity
         const idx = 0;
@@ -20300,7 +21134,7 @@ class MeteoraDlmmClient {
     }
 }
 
-class InvestorClient {
+class InvestClient {
     async subscribe(asset, amount, mintId = 0, queued = false, txOptions = {}) {
         const tx = await (queued ? this.queuedSubscribeTx(asset, amount, mintId, txOptions) : this.subscribeTx(asset, amount, mintId, txOptions));
         return await this.base.sendAndConfirm(tx);
@@ -20333,26 +21167,22 @@ class InvestorClient {
         const glamMint = this.base.mintPda;
         const mintTo = this.base.getMintAta(signer);
         // asset token to transfer to vault
-        const vault = this.base.vaultPda;
-        const vaultInput = this.base.getAta(asset, vault);
-        const signerInput = this.base.getAta(asset, signer);
+        const signerAta = this.base.getAta(asset, signer);
         const wrapSolIxs = asset.equals(WSOL) ? [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerInput, signer, asset),
+            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset),
             web3_js.SystemProgram.transfer({
                 fromPubkey: signer,
-                toPubkey: signerInput,
+                toPubkey: signerAta,
                 lamports: amount.toNumber()
             }),
-            splToken.createSyncNativeInstruction(signerInput)
+            splToken.createSyncNativeInstruction(signerAta)
         ] : [];
-        let preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultInput, vault, asset),
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, mintTo, signer, glamMint, splToken.TOKEN_2022_PROGRAM_ID),
+        const preInstructions = [
             ...wrapSolIxs,
             ...txOptions.preInstructions || []
         ];
         const postInstructions = asset.equals(WSOL) ? [
-            splToken.createCloseAccountInstruction(signerInput, signer, signer)
+            splToken.createCloseAccountInstruction(signerAta, signer, signer)
         ] : [];
         // Check if lockup is enabled on the fund, if so, add signerPolicy
         let signerPolicy = null;
@@ -20366,7 +21196,8 @@ class InvestorClient {
             glamMint,
             signer,
             depositAsset: asset,
-            signerPolicy
+            signerPolicy,
+            depositTokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
@@ -20376,8 +21207,6 @@ class InvestorClient {
         }
         const signer = txOptions.signer || this.base.getSigner();
         // asset token to transfer to escrow
-        const escrow = this.base.escrowPda;
-        const escrowAta = this.base.getAta(asset, escrow);
         const signerAta = this.base.getAta(asset, signer);
         const wrapSolIxs = asset.equals(WSOL) ? [
             splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset),
@@ -20388,19 +21217,18 @@ class InvestorClient {
             }),
             splToken.createSyncNativeInstruction(signerAta)
         ] : [];
-        let preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowAta, escrow, asset),
+        const preInstructions = [
             ...wrapSolIxs,
             ...txOptions.preInstructions || []
         ];
         const postInstructions = asset.equals(WSOL) ? [
             splToken.createCloseAccountInstruction(signerAta, signer, signer)
         ] : [];
-        // @ts-ignore
         const tx = await this.base.program.methods.queuedSubscribe(0, amount).accounts({
             glamState: this.base.statePda,
             signer,
-            depositAsset: asset
+            depositAsset: asset,
+            depositTokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
@@ -20410,9 +21238,6 @@ class InvestorClient {
         }
         const signer = txOptions.signer || this.base.getSigner();
         const glamMint = this.base.mintPda;
-        const preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, this.base.getMintAta(signer), signer, glamMint, splToken.TOKEN_2022_PROGRAM_ID)
-        ];
         const remainingAccounts = [];
         if (await this.base.isLockupEnabled()) {
             const extraMetasAccount = this.base.extraMetasPda;
@@ -20430,7 +21255,7 @@ class InvestorClient {
             glamState: this.base.statePda,
             glamMint,
             signer
-        }).preInstructions(preInstructions).remainingAccounts(remainingAccounts.map((pubkey)=>({
+        }).remainingAccounts(remainingAccounts.map((pubkey)=>({
                 pubkey,
                 isSigner: false,
                 isWritable: false
@@ -20444,24 +21269,14 @@ class InvestorClient {
         const signer = txOptions.signer || this.base.getSigner();
         const stateModel = await this.base.fetchStateModel();
         const baseAsset = stateModel.baseAsset;
-        const vault = this.base.vaultPda;
-        const vaultAssetAta = this.base.getAta(baseAsset, vault);
         const glamMint = this.base.mintPda;
-        const escrow = this.base.escrowPda;
-        const escrowMintAta = this.base.getMintAta(escrow);
-        const escrowAssetAta = this.base.getAta(baseAsset, escrow);
-        let preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowMintAta, escrow, glamMint, splToken.TOKEN_2022_PROGRAM_ID),
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, escrowAssetAta, escrow, baseAsset),
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAssetAta, vault, baseAsset),
-            ...txOptions.preInstructions || []
-        ];
         const tx = await this.base.program.methods.fulfill(mintId).accounts({
             glamState: this.base.statePda,
             glamMint,
             signer,
-            asset: baseAsset
-        }).preInstructions(preInstructions).transaction();
+            asset: baseAsset,
+            depositTokenProgram: splToken.TOKEN_PROGRAM_ID
+        }).preInstructions(txOptions.preInstructions || []).transaction();
         return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async claimAssetTx(asset, mintId = 0, txOptions = {}) {
@@ -20469,7 +21284,6 @@ class InvestorClient {
             throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
-        this.base.mintPda;
         const signerAta = this.base.getAta(asset, signer);
         // Close wSOL ata so user gets SOL
         const postInstructions = asset.equals(WSOL) ? [
@@ -20479,7 +21293,7 @@ class InvestorClient {
             glamState: this.base.statePda,
             signer,
             tokenMint: asset,
-            tokenProgram: splToken.TOKEN_PROGRAM_ID
+            claimTokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions([
             splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset)
         ]).postInstructions(postInstructions).transaction();
@@ -20490,8 +21304,6 @@ class InvestorClient {
             throw new Error("mintId must be 0");
         }
         const signer = txOptions.signer || this.base.getSigner();
-        this.base.mintPda;
-        const signerAta = this.base.getAta(asset, signer, splToken.TOKEN_2022_PROGRAM_ID);
         const escrow = this.base.escrowPda;
         const remainingAccounts = [];
         if (await this.base.isLockupEnabled()) {
@@ -20509,10 +21321,8 @@ class InvestorClient {
             glamState: this.base.statePda,
             signer,
             tokenMint: asset,
-            tokenProgram: splToken.TOKEN_2022_PROGRAM_ID
-        }).preInstructions([
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, signerAta, signer, asset, splToken.TOKEN_2022_PROGRAM_ID)
-        ]).remainingAccounts(remainingAccounts.map((pubkey)=>({
+            claimTokenProgram: splToken.TOKEN_2022_PROGRAM_ID
+        }).remainingAccounts(remainingAccounts.map((pubkey)=>({
                 pubkey,
                 isSigner: false,
                 isWritable: false
@@ -20554,6 +21364,7 @@ class PriceClient {
                 isSigner: false,
                 isWritable: true
             }));
+        // @ts-ignore
         const priceIx = await this.base.program.methods.priceKaminoObligations(priceDenom).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE,
@@ -20605,33 +21416,62 @@ class PriceClient {
         return priceIx;
     }
     /**
-   * Returns an instruction that prices the all Drift users (aka sub-accounts) controlled by the GLAM vault.
-   * These Drift users must share the same user_stats that's also controlled by the GLAM vault.
+   * Returns an instruction that prices all Drift users (aka sub-accounts) controlled by the GLAM vault.
    */ async priceDriftUsersIx(priceDenom) {
-        // FIXME: check more users than #0
-        const { user, userStats } = this.drift.getDriftUserPdas();
-        try {
-            const remainingAccounts = await this.drift.composeRemainingAccounts(0);
-            const priceDriftUsersIx = await this.base.program.methods.priceDriftUsers(priceDenom).accounts({
-                glamState: this.base.statePda,
-                solOracle: SOL_ORACLE
-            }).remainingAccounts([
-                {
-                    pubkey: userStats,
-                    isSigner: false,
-                    isWritable: false
-                },
-                {
-                    pubkey: user,
+        // 1st remaining account is user_stats
+        const { userStats } = this.drift.getDriftUserPdas();
+        const remainingAccounts = [
+            {
+                pubkey: userStats,
+                isSigner: false,
+                isWritable: false
+            }
+        ];
+        // Fetch first 8 sub accounts
+        const userPdas = Array.from(Array(8).keys()).map((subAccountId)=>{
+            const { user } = this.drift.getDriftUserPdas(subAccountId);
+            return user;
+        });
+        const accountsInfo = await this.base.provider.connection.getMultipleAccountsInfo(userPdas);
+        // Parse valid sub accounts
+        const driftUsers = [];
+        for(let i = 0; i < accountsInfo.length; i++){
+            const accountInfo = accountsInfo[i];
+            if (accountInfo) {
+                const user = await this.drift.parseDriftUser(accountInfo, i);
+                driftUsers.push(user);
+                remainingAccounts.push({
+                    pubkey: userPdas[i],
                     isSigner: false,
                     isWritable: false
-                },
-                ...remainingAccounts
-            ]).instruction();
-            return priceDriftUsersIx;
-        } catch (error) {
-            return null;
+                });
+            }
         }
+        // Build a set of markets and oracles that are used by all sub accounts
+        const marketsAndOracles = new Set();
+        const spotMarketIndexes = new Set(driftUsers.map((u)=>u.spotPositions.map((p)=>p.marketIndex)).flat());
+        const perpMarketIndexes = new Set(driftUsers.map((u)=>u.perpPositions.map((p)=>p.marketIndex)).flat());
+        const spotMarkets = await this.drift.fetchAndParseSpotMarkets(Array.from(spotMarketIndexes));
+        const perpMarkets = await this.drift.fetchAndParsePerpMarkets(Array.from(perpMarketIndexes));
+        spotMarkets.forEach((m)=>{
+            marketsAndOracles.add(m.oracle.toBase58());
+            marketsAndOracles.add(m.marketPda.toBase58());
+        });
+        perpMarkets.forEach((m)=>{
+            marketsAndOracles.add(m.oracle.toBase58());
+            marketsAndOracles.add(m.marketPda.toBase58());
+        });
+        // Add markets and oracles to remaining accounts
+        Array.from(marketsAndOracles).map((pubkey)=>remainingAccounts.push({
+                pubkey: new web3_js.PublicKey(pubkey),
+                isSigner: false,
+                isWritable: false
+            }));
+        const priceDriftUsersIx = await this.base.program.methods.priceDriftUsers(priceDenom, driftUsers.length).accounts({
+            glamState: this.base.statePda,
+            solOracle: SOL_ORACLE
+        }).remainingAccounts(remainingAccounts).instruction();
+        return priceDriftUsersIx;
     }
     /**
    * Returns an instruction that prices a drift vault depositor.
@@ -20648,23 +21488,36 @@ class PriceClient {
         // - oracles
         // - spot & perp markets
         // There might be overlaps between markets and oracles so we use a set to avoid duplicates
-        const remainingAccountsKeys = new Set();
+        const remainingAccounts = [];
+        const marketsAndOracles = new Set();
         for (const depositor of parsedVaultDepositors){
-            remainingAccountsKeys.add(depositor.address.toBase58());
-            remainingAccountsKeys.add(depositor.driftVault.toBase58());
             const { user: driftUser } = await this.dvaults.parseDriftVault(depositor.driftVault);
-            remainingAccountsKeys.add(driftUser.toBase58());
+            remainingAccounts.push({
+                pubkey: depositor.address,
+                isSigner: false,
+                isWritable: false
+            });
+            remainingAccounts.push({
+                pubkey: depositor.driftVault,
+                isSigner: false,
+                isWritable: false
+            });
+            remainingAccounts.push({
+                pubkey: driftUser,
+                isSigner: false,
+                isWritable: false
+            });
             const markets_and_oracles = (await this.dvaults.composeRemainingAccounts(driftUser)).map((a)=>a.pubkey.toBase58());
             for (const k of markets_and_oracles){
-                remainingAccountsKeys.add(k);
+                marketsAndOracles.add(k);
             }
         }
-        const remainingAccounts = Array.from(remainingAccountsKeys).map((k)=>({
+        Array.from(marketsAndOracles).forEach((k)=>remainingAccounts.push({
                 pubkey: new web3_js.PublicKey(k),
                 isSigner: false,
                 isWritable: false
             }));
-        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom).accounts({
+        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom, parsedVaultDepositors.length).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -20729,19 +21582,22 @@ class PriceClient {
                 priceVaultIx
             ];
         }
-        const priceStakesIx = await this.priceStakesIx(priceDenom);
-        const priceMeteoraIx = await this.priceMeteoraPositionsIx(priceDenom);
-        const priceKaminoIx = await this.priceKaminoObligationsIx(priceDenom);
-        const priceDriftUsersIx = await this.priceDriftUsersIx(priceDenom);
-        const priceDriftVaultDepositorsIx = await this.priceDriftVaultDepositorsIx(priceDenom);
-        return [
-            priceVaultIx,
-            priceStakesIx,
-            priceMeteoraIx,
-            priceKaminoIx,
-            priceDriftUsersIx,
-            priceDriftVaultDepositorsIx
-        ].filter((ix)=>ix !== null);
+        const integrations = (stateModel.integrations || []).map((i)=>Object.keys(i)[0]);
+        const integrationsToPricingFns = {
+            drift: this.priceDriftUsersIx.bind(this),
+            kaminoLending: this.priceKaminoObligationsIx.bind(this),
+            nativeStaking: this.priceStakesIx.bind(this),
+            meteoraDlmm: this.priceMeteoraPositionsIx.bind(this),
+            driftVaults: this.priceDriftVaultDepositorsIx.bind(this),
+            kaminoVaults: this.priceKaminoVaultSharesIx.bind(this)
+        };
+        const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
+        const pricingIxs = [];
+        for (const fn of pricingFns){
+            const ix = await fn(priceDenom);
+            pricingIxs.push(ix);
+        }
+        return pricingIxs.filter(Boolean);
     }
     constructor(base, klend, kvaults, drift, dvaults){
         this.base = base;
@@ -20808,6 +21664,116 @@ class PriceClient {
     }
 }
 
+class ValidatorClient {
+    /**
+   * Authorize a new authority for the vote account.
+   */ async voteAuthorize(vote, newAuthority, voteAuthorize, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        // @ts-ignore
+        const tx = await this.base.program.methods.voteAuthorize(newAuthority, voteAuthorize).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            vote
+        }).transaction();
+        return await this.base.sendAndConfirm(await this.base.intoVersionedTransaction(tx, txOptions));
+    }
+    /**
+   * Update the validator identity for the vote account.
+   */ async voteUpdateValidatorIdentity(vote, identity, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const tx = await this.base.program.methods.voteUpdateValidatorIdentity().accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            vote,
+            identity: identity.publicKey
+        }).transaction();
+        return await this.base.sendAndConfirm(await this.base.intoVersionedTransaction(tx, txOptions), [
+            identity
+        ]);
+    }
+    /**
+   * Update the commission for the vote account.
+   */ async voteUpdateCommission(vote, newCommission, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const tx = await this.base.program.methods.voteUpdateCommission(newCommission).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            vote
+        }).transaction();
+        return await this.base.sendAndConfirm(await this.base.intoVersionedTransaction(tx, txOptions));
+    }
+    /**
+   * Withdraw lamports from the vote account to a recipient.
+   */ async voteWithdraw(vote, recipient, lamports, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const tx = await this.base.program.methods.voteWithdraw(new anchor.BN(lamports)).accounts({
+            glamState: this.base.statePda,
+            glamSigner,
+            vote,
+            recipient
+        }).transaction();
+        return await this.base.sendAndConfirm(await this.base.intoVersionedTransaction(tx, txOptions));
+    }
+    constructor(base){
+        this.base = base;
+    }
+}
+
+class FeesClient {
+    async crystallizeFees(txOptions = {}) {
+        const stateModel = await this.base.fetchStateModel();
+        const { baseAsset } = stateModel;
+        if (!baseAsset) {
+            throw new Error("Base asset not found");
+        }
+        const priceVaultIxs = await this.price.priceVaultIxs(PriceDenom.fromAsset(baseAsset));
+        const tx = await this.base.program.methods.crystallizeFees(0).accounts({
+            glamState: this.base.statePda,
+            glamMint: this.base.mintPda
+        }).preInstructions(priceVaultIxs).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
+    }
+    async disburseFees(txOptions = {}) {
+        const signer = txOptions.signer || this.base.getSigner();
+        const stateModel = await this.base.fetchStateModel();
+        const { baseAsset } = stateModel;
+        if (!baseAsset) {
+            throw new Error("Base asset not found");
+        }
+        // TODO: parse from glam config account
+        const protocolFeeAuthority = new web3_js.PublicKey("gLJHKPrZLGBiBZ33hFgZh6YnsEhTVxuRT17UCqNp6ff");
+        const managerFeeAuthority = stateModel?.owner?.pubkey;
+        if (!managerFeeAuthority) {
+            throw new Error("Manager fee authority not found");
+        }
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(baseAsset);
+        const protocolFeeAuthorityAta = this.base.getAta(baseAsset, protocolFeeAuthority, tokenProgram);
+        const managerFeeAuthorityAta = this.base.getAta(baseAsset, managerFeeAuthority, tokenProgram);
+        const priceVaultIxs = await this.price.priceVaultIxs(PriceDenom.fromAsset(baseAsset));
+        const preInstructions = [
+            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, protocolFeeAuthorityAta, protocolFeeAuthority, baseAsset, tokenProgram),
+            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, managerFeeAuthorityAta, managerFeeAuthority, baseAsset, tokenProgram),
+            ...priceVaultIxs
+        ];
+        const tx = await this.base.program.methods.disburseFees(0).accounts({
+            glamState: this.base.statePda,
+            glamMint: this.base.mintPda,
+            // @ts-ignore
+            protocolFeeAuthorityAta,
+            managerFeeAuthorityAta,
+            depositAsset: baseAsset,
+            depositTokenProgram: tokenProgram
+        }).preInstructions(preInstructions).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
+        return await this.base.sendAndConfirm(vTx);
+    }
+    constructor(base, price){
+        this.base = base;
+        this.price = price;
+    }
+}
+
 /**
  * Main entrypoint for the GLAM SDK
  *
@@ -20825,11 +21791,17 @@ class PriceClient {
         }
         return this._driftVaults;
     }
-    get investor() {
-        if (!this._investor) {
-            this._investor = new InvestorClient(this);
+    get invest() {
+        if (!this._invest) {
+            this._invest = new InvestClient(this);
         }
-        return this._investor;
+        return this._invest;
+    }
+    get fees() {
+        if (!this._fees) {
+            this._fees = new FeesClient(this, this.price);
+        }
+        return this._fees;
     }
     get jupiterSwap() {
         if (!this._jupiterSwap) {
@@ -20903,6 +21875,12 @@ class PriceClient {
         }
         return this._meteoraDlmm;
     }
+    get validator() {
+        if (!this._validator) {
+            this._validator = new ValidatorClient(this);
+        }
+        return this._validator;
+    }
     constructor(config){
         super(config);
     }
@@ -21082,11 +22060,15 @@ exports.TradeSide = TradeSide;
 exports.USDC = USDC;
 exports.USDC_ORACLE = USDC_ORACLE;
 exports.UserStatus = UserStatus;
+exports.VoteAuthorize = VoteAuthorize;
 exports.WSOL = WSOL;
 exports.ZERO = ZERO;
 exports.decodeUser = decodeUser;
 exports.fetchLookupTables = fetchLookupTables;
 exports.fetchMeteoraPositions = fetchMeteoraPositions;
+exports.fetchProgramLabels = fetchProgramLabels;
+exports.fetchTokenPrices = fetchTokenPrices;
+exports.fetchTokensList = fetchTokensList;
 exports.findStakeAccounts = findStakeAccounts;
 exports.getAccountPolicyPda = getAccountPolicyPda;
 exports.getEscrowPda = getEscrowPda;
@@ -21099,7 +22081,7 @@ exports.getMintPda = getMintPda;
 exports.getOpenfundsPda = getOpenfundsPda;
 exports.getOrderParams = getOrderParams;
 exports.getPriorityFeeEstimate = getPriorityFeeEstimate;
-exports.getSimulationComputeUnits = getSimulationComputeUnits;
+exports.getSimulationResult = getSimulationResult;
 exports.getStakeAccountsWithStates = getStakeAccountsWithStates;
 exports.getStatePda = getStatePda;
 exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;