@glamsystems/glam-sdk 0.1.6 → 0.1.7

package/index.cjs.js

@@ -33,7 +33,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam",
-    version: "0.4.2",
+    version: "0.4.3",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -45,7 +45,7 @@ var instructions = [
             "Adds a new mint.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_model`: An instance of `MintModel` containing the metadata for the new mint.",
             "",
             "# Permission required",
@@ -163,7 +163,7 @@ var instructions = [
             "Burns a specified amount of tokens for the given mint.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to burn tokens for.",
             "- `amount`: The amount of tokens to burn.",
             "",
@@ -272,103 +272,13 @@ var instructions = [
             }
         ]
     },
-    {
-        name: "cast_vote",
-        docs: [
-            "Casts a vote.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `side`: The side to vote for.",
-            "",
-            "# Permission required",
-            "- Permission::VoteOnProposal",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            20,
-            212,
-            15,
-            189,
-            69,
-            180,
-            69,
-            151
-        ],
-        accounts: [
-            {
-                name: "state",
-                writable: true
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "locker"
-            },
-            {
-                name: "escrow"
-            },
-            {
-                name: "proposal",
-                writable: true
-            },
-            {
-                name: "vote",
-                writable: true
-            },
-            {
-                name: "governor"
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "governance_program",
-                address: "GovaE4iu227srtG2s3tZzB4RmWBzw8sTwrCLZz7kN7rY"
-            }
-        ],
-        args: [
-            {
-                name: "side",
-                type: "u8"
-            }
-        ]
-    },
     {
         name: "close_mint",
         docs: [
             "Closes a mint and releases its resources.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to be closed.",
             "",
             "# Permission required",
@@ -499,7 +409,7 @@ var instructions = [
             "Closes a state account and releases its resources.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Owner only, delegates not allowed"
@@ -584,7 +494,7 @@ var instructions = [
             "Closes token accounts owned by the vault.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Owner only, delegates not allowed"
@@ -648,7 +558,7 @@ var instructions = [
             "Deactivates stake accounts.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::Unstake",
@@ -714,7 +624,7 @@ var instructions = [
             "Cancels drift orders.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `market_type`: The type of market (spot or perp) to cancel orders for.",
             "- `market_index`: The index of the market to cancel orders for.",
             "- `direction`: The direction of orders to cancel (long or short).",
@@ -775,9 +685,6 @@ var instructions = [
             {
                 name: "user",
                 writable: true
-            },
-            {
-                name: "authority"
             }
         ],
         args: [
@@ -815,7 +722,7 @@ var instructions = [
             "Cancels drift orders by order IDs.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `order_ids`: A list of order IDs.",
             "",
             "# Permission required",
@@ -874,9 +781,6 @@ var instructions = [
             {
                 name: "user",
                 writable: true
-            },
-            {
-                name: "authority"
             }
         ],
         args: [
@@ -894,7 +798,7 @@ var instructions = [
             "Deletes a drift user (sub account).",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::DriftDeleteUser",
@@ -914,22 +818,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "user_stats",
-                writable: true
-            },
-            {
-                name: "drift_state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 writable: true,
                 pda: {
                     seeds: [
@@ -945,23 +837,31 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
             },
             {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
+                name: "user",
+                writable: true
+            },
+            {
+                name: "user_stats",
+                writable: true
+            },
+            {
+                name: "state",
+                writable: true
             }
         ],
         args: []
@@ -972,7 +872,7 @@ var instructions = [
             "Deposits to drift.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `market_index`: Index of the drift spot market.",
             "- `amount`: Amount of asset to deposit.",
             "",
@@ -994,22 +894,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "user_stats",
-                writable: true
-            },
-            {
-                name: "drift_state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -1024,31 +913,41 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "drift_ata",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "state"
+            },
+            {
+                name: "user",
                 writable: true
             },
             {
-                name: "vault_ata",
+                name: "user_stats",
                 writable: true
             },
             {
-                name: "signer",
-                writable: true,
-                signer: true
+                name: "spot_market_vault",
+                writable: true
             },
             {
-                name: "drift_program",
-                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+                name: "user_token_account",
+                writable: true
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "token_program"
             }
         ],
         args: [
@@ -1059,52 +958,31 @@ var instructions = [
             {
                 name: "amount",
                 type: "u64"
+            },
+            {
+                name: "reduce_only",
+                type: "bool"
             }
         ]
     },
     {
-        name: "drift_initialize",
-        docs: [
-            "Drift",
-            "Initializes a drift account owned by vault and creates a subaccount.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::DriftInitialize",
-            "",
-            "# Integration required",
-            "- Integration::Drift"
-        ],
+        name: "drift_initialize_user",
         discriminator: [
-            21,
-            21,
-            69,
-            55,
-            41,
-            129,
-            44,
-            198
+            107,
+            244,
+            158,
+            15,
+            225,
+            239,
+            98,
+            245
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "user_stats",
-                writable: true
-            },
-            {
-                name: "drift_state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 pda: {
                     seeds: [
                         {
@@ -1119,20 +997,37 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
             },
+            {
+                name: "user",
+                writable: true
+            },
+            {
+                name: "user_stats",
+                writable: true
+            },
+            {
+                name: "state",
+                writable: true
+            },
+            {
+                name: "payer",
+                writable: true,
+                signer: true
+            },
             {
                 name: "rent",
                 address: "SysvarRent111111111111111111111111111111111"
@@ -1142,35 +1037,48 @@ var instructions = [
                 address: "11111111111111111111111111111111"
             }
         ],
-        args: []
+        args: [
+            {
+                name: "sub_account_id",
+                type: "u16"
+            },
+            {
+                name: "name",
+                type: {
+                    array: [
+                        "u8",
+                        32
+                    ]
+                }
+            }
+        ]
     },
     {
-        name: "drift_modify_order",
+        name: "drift_initialize_user_stats",
         docs: [
-            "Modifies an existing drift order.",
+            "Drift",
+            "Initializes a drift account owned by vault and creates a subaccount.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `order_id`: The ID of the order to modify.",
-            "- `modify_order_params`: The parameters to modify the order with.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
-            "- Permission::DriftModifyOrder",
+            "- Permission::DriftInitialize",
             "",
             "# Integration required",
             "- Integration::Drift"
         ],
         discriminator: [
-            235,
-            245,
-            222,
-            58,
-            245,
-            128,
-            19,
-            202
-        ],
-        accounts: [
+            133,
+            185,
+            103,
+            162,
+            90,
+            161,
+            78,
+            143
+        ],
+        accounts: [
             {
                 name: "glam_state"
             },
@@ -1205,14 +1113,95 @@ var instructions = [
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
             },
             {
-                name: "state"
+                name: "user_stats",
+                writable: true
             },
             {
-                name: "user",
+                name: "state",
                 writable: true
             },
             {
-                name: "authority"
+                name: "payer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "rent",
+                address: "SysvarRent111111111111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "drift_modify_order",
+        docs: [
+            "Modifies an existing drift order.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `order_id`: The ID of the order to modify.",
+            "- `modify_order_params`: The parameters to modify the order with.",
+            "",
+            "# Permission required",
+            "- Permission::DriftModifyOrder",
+            "",
+            "# Integration required",
+            "- Integration::Drift"
+        ],
+        discriminator: [
+            235,
+            245,
+            222,
+            58,
+            245,
+            128,
+            19,
+            202
+        ],
+        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: [
@@ -1238,8 +1227,8 @@ var instructions = [
             "Places orders on drift.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `order_params`: A list of orders.",
+            "- `ctx`: The context for the instruction.",
+            "- `params`: A list of orders.",
             "",
             "# Permissions required",
             "- Permission::DriftPlaceOrders",
@@ -1260,18 +1249,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "drift_state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -1286,24 +1268,31 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "state"
+            },
+            {
+                name: "user",
+                writable: true
             }
         ],
         args: [
             {
-                name: "order_params",
+                name: "params",
                 type: {
                     vec: {
                         defined: {
@@ -1320,7 +1309,7 @@ var instructions = [
             "Updates custom margin ratio.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `sub_account_id`: Sub account.",
             "- `margin_ratio`: Margin ratio.",
             "",
@@ -1342,14 +1331,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 pda: {
                     seeds: [
                         {
@@ -1364,19 +1349,23 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "user",
+                writable: true
             }
         ],
         args: [
@@ -1396,7 +1385,7 @@ var instructions = [
             "Sets a delegate on the specified sub account.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `sub_account_id`: Sub account.",
             "- `delegate`: Delegate's wallet address.",
             "",
@@ -1418,14 +1407,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 pda: {
                     seeds: [
                         {
@@ -1440,19 +1425,23 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "user",
+                writable: true
             }
         ],
         args: [
@@ -1472,7 +1461,7 @@ var instructions = [
             "Enables/Disables margin trading.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `sub_account_id`: Sub account.",
             "- `margin_trading_enabled`: Whether to enable or disable margin trading.",
             "",
@@ -1494,14 +1483,10 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
                 pda: {
                     seeds: [
                         {
@@ -1516,19 +1501,23 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "signer",
+                name: "glam_signer",
                 writable: true,
                 signer: true
             },
             {
-                name: "drift_program",
+                name: "cpi_program",
                 address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "user",
+                writable: true
             }
         ],
         args: [
@@ -1548,7 +1537,7 @@ var instructions = [
             "Withdraws from drift.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `market_index`: Index of the drift spot market.",
             "- `amount`: Amount to withdraw.",
             "",
@@ -1570,25 +1559,11 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "state"
-            },
-            {
-                name: "user",
-                writable: true
-            },
-            {
-                name: "user_stats",
-                writable: true
-            },
-            {
-                name: "drift_state",
-                writable: true
-            },
-            {
-                name: "drift_signer"
+                name: "glam_state"
             },
             {
-                name: "vault",
+                name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -1603,31 +1578,44 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "vault_ata",
+                name: "glam_signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "cpi_program",
+                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+            },
+            {
+                name: "state"
+            },
+            {
+                name: "user",
                 writable: true
             },
             {
-                name: "drift_ata",
+                name: "user_stats",
                 writable: true
             },
             {
-                name: "signer",
-                writable: true,
-                signer: true
+                name: "spot_market_vault",
+                writable: true
             },
             {
-                name: "drift_program",
-                address: "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+                name: "drift_signer"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "user_token_account",
+                writable: true
+            },
+            {
+                name: "token_program"
             }
         ],
         args: [
@@ -1638,6 +1626,10 @@ var instructions = [
             {
                 name: "amount",
                 type: "u64"
+            },
+            {
+                name: "reduce_only",
+                type: "bool"
             }
         ]
     },
@@ -1647,7 +1639,7 @@ var instructions = [
             "Forcefully transfers a specified amount of tokens from one account to another.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to transfer tokens for.",
             "- `amount`: The amount of tokens to transfer.",
             "",
@@ -1818,33 +1810,39 @@ var instructions = [
         ]
     },
     {
-        name: "increase_locked_amount",
+        name: "initialize_and_delegate_stake",
         docs: [
-            "Increases the locked amount (aka stakes JUP).",
+            "Initializes a stake account and delegates it to a validator.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `amount`: The amount of JUP to stake.",
+            "- `ctx`: The context for the instruction.",
+            "- `lamports`: The amount of SOL to initialize the stake account with.",
             "",
             "# Permission required",
-            "- Permission::StakeJup",
+            "- Permission::Stake",
             "",
             "# Integration required",
-            "- Integration::JupiterVote"
+            "- Integration::NativeStaking"
         ],
         discriminator: [
-            5,
-            168,
-            118,
-            53,
-            72,
-            46,
-            203,
-            146
+            71,
+            101,
+            230,
+            157,
+            50,
+            23,
+            47,
+            1
         ],
         accounts: [
             {
-                name: "state"
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "state",
+                writable: true
             },
             {
                 name: "vault",
@@ -1869,176 +1867,8 @@ var instructions = [
                 }
             },
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow_jup_ata",
-                writable: true
-            },
-            {
-                name: "vault_jup_ata",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-            }
-        ],
-        args: [
-            {
-                name: "amount",
-                type: "u64"
-            }
-        ]
-    },
-    {
-        name: "init_locked_voter_escrow",
-        docs: [
-            "Initializes a locked voter escrow.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::StakeJup",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            148,
-            74,
-            247,
-            66,
-            206,
-            51,
-            119,
-            243
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            }
-        ],
-        args: []
-    },
-    {
-        name: "initialize_and_delegate_stake",
-        docs: [
-            "Initializes a stake account and delegates it to a validator.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `lamports`: The amount of SOL to initialize the stake account with.",
-            "",
-            "# Permission required",
-            "- Permission::Stake",
-            "",
-            "# Integration required",
-            "- Integration::NativeStaking"
-        ],
-        discriminator: [
-            71,
-            101,
-            230,
-            157,
-            50,
-            23,
-            47,
-            1
-        ],
-        accounts: [
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
-                writable: true
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "vault_stake_account",
-                writable: true
+                name: "vault_stake_account",
+                writable: true
             },
             {
                 name: "vote"
@@ -2081,7 +1911,7 @@ var instructions = [
             "Initializes a state account from the provided StateModel instance.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `state`: An instance of `StateModel` containing the details of the state to be initialized.",
             "",
             "# Permission required",
@@ -2194,42 +2024,35 @@ var instructions = [
         ]
     },
     {
-        name: "jupiter_swap",
+        name: "jupiter_gov_new_vote",
         docs: [
-            "Swaps assets using Jupiter.",
+            "Creates a new vote.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `amount`: The amount of input asset to swap.",
-            "- `data`: The serialized Jupiter route data containing swap instructions and parameters.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
-            "- Any of",
-            "- Permission::JupiterSwapAny: no restrictions.",
-            "- Permission::JupiterSwapAllowlisted: input and output are in the assets allowlist.",
-            "- Permission::JupiterSwapLst: input and output assets are both LST.",
+            "- Permission::VoteOnProposal",
             "",
             "# Integration required",
-            "- Integration::JupiterSwap"
+            "- Integration::JupiterVote"
         ],
         discriminator: [
-            116,
-            207,
-            0,
-            196,
-            252,
-            120,
-            243,
-            18
+            235,
+            179,
+            170,
+            64,
+            64,
+            57,
+            17,
+            69
         ],
         accounts: [
             {
-                name: "state",
-                writable: true
+                name: "glam_state"
             },
             {
-                name: "vault",
-                writable: true,
+                name: "glam_vault",
                 pda: {
                     seeds: [
                         {
@@ -2244,75 +2067,204 @@ var instructions = [
                         },
                         {
                             kind: "account",
-                            path: "state"
+                            path: "glam_state"
                         }
                     ]
                 }
             },
             {
-                name: "input_vault_ata",
+                name: "glam_signer",
                 writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "account",
-                            path: "vault"
-                        },
-                        {
-                            kind: "account",
-                            path: "input_token_program"
-                        },
-                        {
-                            kind: "account",
-                            path: "input_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
-                        ]
-                    }
-                }
+                signer: true
             },
             {
-                name: "output_vault_ata",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "account",
+                name: "cpi_program",
+                address: "GovaE4iu227srtG2s3tZzB4RmWBzw8sTwrCLZz7kN7rY"
+            },
+            {
+                name: "proposal"
+            },
+            {
+                name: "vote",
+                writable: true
+            },
+            {
+                name: "payer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: [
+            {
+                name: "voter",
+                type: "pubkey"
+            }
+        ]
+    },
+    {
+        name: "jupiter_set_max_swap_slippage",
+        docs: [
+            "Sets the max swap slippage.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `slippage`: The maximum allowed slippage in basis points.",
+            "",
+            "# Permission required",
+            "- Owner only, delegates not allowed"
+        ],
+        discriminator: [
+            110,
+            79,
+            13,
+            71,
+            208,
+            111,
+            56,
+            66
+        ],
+        accounts: [
+            {
+                name: "state",
+                writable: true
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            }
+        ],
+        args: [
+            {
+                name: "slippage",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "jupiter_swap",
+        docs: [
+            "Swaps assets using Jupiter.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `amount`: The amount of input asset to swap.",
+            "- `data`: The serialized Jupiter route data containing swap instructions and parameters.",
+            "",
+            "# Permission required",
+            "- Any of",
+            "- Permission::JupiterSwapAny: no restrictions.",
+            "- Permission::JupiterSwapAllowlisted: input and output are in the assets allowlist.",
+            "- Permission::JupiterSwapLst: input and output assets are both LST.",
+            "",
+            "# Integration required",
+            "- Integration::JupiterSwap"
+        ],
+        discriminator: [
+            116,
+            207,
+            0,
+            196,
+            252,
+            120,
+            243,
+            18
+        ],
+        accounts: [
+            {
+                name: "state",
+                writable: true
+            },
+            {
+                name: "vault",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "state"
+                        }
+                    ]
+                }
+            },
+            {
+                name: "input_vault_ata",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "account",
+                            path: "vault"
+                        },
+                        {
+                            kind: "account",
+                            path: "input_token_program"
+                        },
+                        {
+                            kind: "account",
+                            path: "input_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: "output_vault_ata",
+                writable: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "account",
                             path: "vault"
                         },
                         {
@@ -2391,22 +2343,769 @@ var instructions = [
                 address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
             },
             {
-                name: "input_token_program"
+                name: "input_token_program"
+            },
+            {
+                name: "output_token_program"
+            }
+        ],
+        args: [
+            {
+                name: "amount",
+                type: "u64"
+            },
+            {
+                name: "data",
+                type: "bytes"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_cast_vote",
+        docs: [
+            "Casts a vote.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `side`: The side to vote for.",
+            "",
+            "# Permission required",
+            "- Permission::VoteOnProposal",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            11,
+            197,
+            234,
+            57,
+            164,
+            74,
+            181,
+            239
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker"
+            },
+            {
+                name: "escrow"
+            },
+            {
+                name: "proposal",
+                writable: true
+            },
+            {
+                name: "vote",
+                writable: true
+            },
+            {
+                name: "governor"
+            },
+            {
+                name: "govern_program"
+            }
+        ],
+        args: [
+            {
+                name: "side",
+                type: "u8"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_cast_vote_checked",
+        docs: [
+            "Casts a vote, only if expected_side is already recorded.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `side`: The side to vote for.",
+            "- `expected_side`: The expected side to check in the Vote account.",
+            "",
+            "# Permission required",
+            "- Permission::VoteOnProposal",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            247,
+            3,
+            146,
+            233,
+            35,
+            189,
+            192,
+            187
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker"
+            },
+            {
+                name: "escrow"
+            },
+            {
+                name: "proposal",
+                writable: true
+            },
+            {
+                name: "vote",
+                writable: true
+            },
+            {
+                name: "governor"
+            },
+            {
+                name: "govern_program"
+            }
+        ],
+        args: [
+            {
+                name: "side",
+                type: "u8"
+            },
+            {
+                name: "expected_side",
+                type: "u8"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_increase_locked_amount",
+        docs: [
+            "Increases the locked amount (aka stakes JUP).",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `amount`: The amount of JUP to stake.",
+            "",
+            "# Permission required",
+            "- Permission::StakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            225,
+            38,
+            201,
+            123,
+            148,
+            23,
+            47,
+            128
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "escrow_tokens",
+                writable: true
+            },
+            {
+                name: "source_tokens",
+                writable: true
+            },
+            {
+                name: "token_program"
+            }
+        ],
+        args: [
+            {
+                name: "amount",
+                type: "u64"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_merge_partial_unstaking",
+        docs: [
+            "Merges partial unstaking.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "",
+            "# Permission required",
+            "- Permission::UnstakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            93,
+            226,
+            122,
+            120,
+            130,
+            35,
+            189,
+            208
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "partial_unstake",
+                writable: true
+            }
+        ],
+        args: []
+    },
+    {
+        name: "jupiter_vote_new_escrow",
+        docs: [
+            "Initializes a locked voter escrow.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "",
+            "# Permission required",
+            "- Permission::StakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            255,
+            87,
+            157,
+            219,
+            61,
+            178,
+            144,
+            159
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "payer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "jupiter_vote_open_partial_unstaking",
+        docs: [
+            "Partially unstakes JUP.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `amount`: The amount of JUP to partially unstake.",
+            "- `memo`: The memo for the partial unstaking.",
+            "",
+            "# Permission required",
+            "- Permission::UnstakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            84,
+            7,
+            113,
+            220,
+            212,
+            63,
+            237,
+            218
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "partial_unstake",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
+            }
+        ],
+        args: [
+            {
+                name: "amount",
+                type: "u64"
+            },
+            {
+                name: "memo",
+                type: "string"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_toggle_max_lock",
+        docs: [
+            "Toggles max lock.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "- `is_max_lock`: true to allow staking, false to initiate full unstaking.",
+            "",
+            "# Permission required",
+            "- Permission::StakeJup (if is_max_lock == true)",
+            "- Permission::UnstakeJup (if is_max_lock == false)",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            204,
+            158,
+            192,
+            21,
+            219,
+            25,
+            154,
+            87
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker"
+            },
+            {
+                name: "escrow",
+                writable: true
+            }
+        ],
+        args: [
+            {
+                name: "is_max_lock",
+                type: "bool"
+            }
+        ]
+    },
+    {
+        name: "jupiter_vote_withdraw",
+        docs: [
+            "Withdraws all unstaked JUP.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "",
+            "# Permission required",
+            "- Permission::UnstakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            195,
+            172,
+            184,
+            195,
+            23,
+            178,
+            145,
+            191
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "escrow_tokens",
+                writable: true
+            },
+            {
+                name: "destination_tokens",
+                writable: true
+            },
+            {
+                name: "token_program"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "jupiter_vote_withdraw_partial_unstaking",
+        docs: [
+            "Withdraws JUP from partial unstaking.",
+            "",
+            "# Parameters",
+            "- `ctx`: The context for the instruction.",
+            "",
+            "# Permission required",
+            "- Permission::UnstakeJup",
+            "",
+            "# Integration required",
+            "- Integration::JupiterVote"
+        ],
+        discriminator: [
+            109,
+            98,
+            65,
+            252,
+            184,
+            0,
+            216,
+            240
+        ],
+        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: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+            },
+            {
+                name: "locker",
+                writable: true
+            },
+            {
+                name: "escrow",
+                writable: true
+            },
+            {
+                name: "partial_unstake",
+                writable: true
             },
             {
-                name: "output_token_program"
-            }
-        ],
-        args: [
+                name: "escrow_tokens",
+                writable: true
+            },
             {
-                name: "amount",
-                type: "u64"
+                name: "destination_tokens",
+                writable: true
             },
             {
-                name: "data",
-                type: "bytes"
+                name: "token_program"
             }
-        ]
+        ],
+        args: []
     },
     {
         name: "kamino_lending_deposit_reserve_liquidity_and_obligation_collateral",
@@ -2777,7 +3476,7 @@ var instructions = [
             "Claims tickets that were unstaked in the previous epoch to get SOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::Unstake",
@@ -2864,7 +3563,7 @@ var instructions = [
             "Unstakes mSOL to get a ticket that can be claimed at the next epoch.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `msol_amount`: Amount of mSOL to unstake.",
             "",
             "# Permission required",
@@ -2970,7 +3669,7 @@ var instructions = [
             "Deposits SOL to get mSOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `lamports`: The amount of SOL to deposit.",
             "",
             "# Permission required",
@@ -3168,7 +3867,7 @@ var instructions = [
             "Deposits a stake account to get mSOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `validator_idx`: Validator index.",
             "",
             "# Permission required",
@@ -3377,7 +4076,7 @@ var instructions = [
             "Unstakes mSOL to get SOL immediately.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `msol_amount`: Amount of mSOL to unstake.",
             "",
             "# Permission required",
@@ -3475,91 +4174,13 @@ var instructions = [
             }
         ]
     },
-    {
-        name: "merge_partial_unstaking",
-        docs: [
-            "Merges partial unstaking.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::UnstakeJup",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            190,
-            154,
-            163,
-            153,
-            168,
-            115,
-            40,
-            173
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "partial_unstake",
-                writable: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            }
-        ],
-        args: []
-    },
     {
         name: "merge_stake_accounts",
         docs: [
             "Merges two stake accounts.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::Stake",
@@ -3642,7 +4263,7 @@ var instructions = [
             "Mints a specified amount of tokens for the given mint.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to mint tokens for.",
             "- `amount`: The amount of tokens to mint.",
             "",
@@ -3719,199 +4340,36 @@ var instructions = [
                             153,
                             218,
                             255,
-                            16,
-                            132,
-                            4,
-                            142,
-                            123,
-                            216,
-                            219,
-                            233,
-                            248,
-                            89
-                        ]
-                    }
-                }
-            },
-            {
-                name: "recipient"
-            },
-            {
-                name: "token_2022_program",
-                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-            }
-        ],
-        args: [
-            {
-                name: "mint_id",
-                type: "u8"
-            },
-            {
-                name: "amount",
-                type: "u64"
-            }
-        ]
-    },
-    {
-        name: "new_vote",
-        docs: [
-            "Creates a new vote.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::VoteOnProposal",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            163,
-            108,
-            157,
-            189,
-            140,
-            80,
-            13,
-            143
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "proposal",
-                writable: true
-            },
-            {
-                name: "vote",
-                writable: true
-            },
-            {
-                name: "governance_program",
-                address: "GovaE4iu227srtG2s3tZzB4RmWBzw8sTwrCLZz7kN7rY"
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            }
-        ],
-        args: []
-    },
-    {
-        name: "open_partial_unstaking",
-        docs: [
-            "Partially unstakes JUP.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `amount`: The amount of JUP to partially unstake.",
-            "- `memo`: The memo for the partial unstaking.",
-            "",
-            "# Permission required",
-            "- Permission::UnstakeJup",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            201,
-            137,
-            207,
-            175,
-            79,
-            95,
-            220,
-            27
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "partial_unstake",
-                writable: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
+                            16,
+                            132,
+                            4,
+                            142,
+                            123,
+                            216,
+                            219,
+                            233,
+                            248,
+                            89
+                        ]
+                    }
+                }
             },
             {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+                name: "recipient"
             },
             {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
+                name: "token_2022_program",
+                address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
             }
         ],
         args: [
             {
-                name: "amount",
-                type: "u64"
+                name: "mint_id",
+                type: "u8"
             },
             {
-                name: "memo",
-                type: "string"
+                name: "amount",
+                type: "u64"
             }
         ]
     },
@@ -3921,7 +4379,7 @@ var instructions = [
             "Redeems a specified amount of shares.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `amount`: The amount of shares to redeem.",
             "- `in_kind`: Whether to redeem in kind.",
             "- `skip_state`: Should always be true (state check to be implemented)."
@@ -4041,7 +4499,7 @@ var instructions = [
             "Redelegates an existing stake account to a new validator (a new stake account will be created).",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::Unstake",
@@ -4128,7 +4586,7 @@ var instructions = [
             "This allows the owner to pause/unpause subscription and redemption of a fund.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `enabled`: A boolean indicating whether to enable or disable the subscribe and redeem functionality.",
             "",
             "# Permission required",
@@ -4168,7 +4626,7 @@ var instructions = [
             "Sets the frozen state of the token accounts for the specified mint.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to set the frozen state for.",
             "- `frozen`: The new frozen state.",
             "",
@@ -4223,7 +4681,7 @@ var instructions = [
             "Splits from an existing stake account to get a new stake account.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `lamports`: The amount of SOL to split.",
             "",
             "# Permission required",
@@ -4308,7 +4766,7 @@ var instructions = [
             "Deposits SOL to a stake pool to get pool token.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `lamports`: The amount of SOL to deposit.",
             "",
             "# Permission required",
@@ -4495,7 +4953,7 @@ var instructions = [
             "Deposits a stake account to a stake pool to get pool token.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::Stake",
@@ -4704,7 +5162,7 @@ var instructions = [
             "Unstakes from pool token to get SOL immediately.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `pool_token_amount`: Amount of pool token to unstake.",
             "",
             "# Permission required",
@@ -4813,7 +5271,7 @@ var instructions = [
             "Unstakes from pool token into a stake account.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `pool_token_amount`: Amount of pool token to unstake.",
             "",
             "# Permission required",
@@ -4928,7 +5386,7 @@ var instructions = [
             "Subscribes to a specified amount of shares.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `amount`: The amount of shares to subscribe.",
             "- `skip_state`: Should always be true (state check to be implemented)."
         ],
@@ -5109,86 +5567,6 @@ var instructions = [
             }
         ]
     },
-    {
-        name: "toggle_max_lock",
-        docs: [
-            "Toggles max lock.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "- `value`: The value to toggle.",
-            "",
-            "# Permission required",
-            "- Permission::UnstakeJup",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            163,
-            157,
-            161,
-            132,
-            179,
-            107,
-            127,
-            143
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-            }
-        ],
-        args: [
-            {
-                name: "value",
-                type: "bool"
-            }
-        ]
-    },
     {
         name: "transfer_hook",
         discriminator: [
@@ -5326,7 +5704,7 @@ var instructions = [
             "Updates an existing mint with new metadata.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `mint_id`: The id of the mint to be updated.",
             "- `mint_model`: An instance of `MintModel` containing the updated metadata for the new mint.",
             "",
@@ -5383,7 +5761,7 @@ var instructions = [
             "Updates an existing state account with new parameters.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `state`: An instance of `StateModel` containing the updated details of the state.",
             "",
             "# Permission required",
@@ -5427,7 +5805,7 @@ var instructions = [
             "Withdraw asset from vault into owner's wallet.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `amount`: The amount to withdraw.",
             "",
             "# Permission required",
@@ -5587,202 +5965,55 @@ var instructions = [
                     }
                 }
             },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "token_program"
-            }
-        ],
-        args: [
-            {
-                name: "amount",
-                type: "u64"
-            }
-        ]
-    },
-    {
-        name: "withdraw_all_unstaked_jup",
-        docs: [
-            "Withdraws all unstaked JUP.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::UnstakeJup",
-            "",
-            "# Integration required",
-            "- Integration::JupiterVote"
-        ],
-        discriminator: [
-            7,
-            192,
-            129,
-            123,
-            174,
-            255,
-            252,
-            219
-        ],
-        accounts: [
-            {
-                name: "state"
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "escrow_jup_ata",
-                writable: true
-            },
-            {
-                name: "vault_jup_ata",
-                writable: true
-            },
-            {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
-            },
-            {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-            }
-        ],
-        args: []
-    },
-    {
-        name: "withdraw_from_stake_accounts",
-        docs: [
-            "Withdraws SOL from stake accounts.",
-            "",
-            "# Parameters",
-            "- `ctx`: The context for the transaction.",
-            "",
-            "# Permission required",
-            "- Permission::Unstake",
-            "",
-            "# Integration required",
-            "- Integration::NativeStaking"
-        ],
-        discriminator: [
-            93,
-            209,
-            100,
-            231,
-            169,
-            160,
-            192,
-            197
-        ],
-        accounts: [
-            {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "state",
-                writable: true
-            },
-            {
-                name: "vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "state"
-                        }
-                    ]
-                }
-            },
-            {
-                name: "clock",
-                address: "SysvarC1ock11111111111111111111111111111111"
-            },
-            {
-                name: "stake_history",
-                address: "SysvarStakeHistory1111111111111111111111111"
+            {
+                name: "signer",
+                writable: true,
+                signer: true
             },
             {
-                name: "stake_program",
-                address: "Stake11111111111111111111111111111111111111"
+                name: "token_program"
             }
         ],
-        args: []
+        args: [
+            {
+                name: "amount",
+                type: "u64"
+            }
+        ]
     },
     {
-        name: "withdraw_partial_unstaking",
+        name: "withdraw_from_stake_accounts",
         docs: [
-            "Withdraws JUP from partial unstaking.",
+            "Withdraws SOL from stake accounts.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
-            "- Permission::UnstakeJup",
+            "- Permission::Unstake",
             "",
             "# Integration required",
-            "- Integration::JupiterVote"
+            "- Integration::NativeStaking"
         ],
         discriminator: [
-            201,
-            202,
-            137,
-            124,
-            2,
-            3,
-            245,
-            87
+            93,
+            209,
+            100,
+            231,
+            169,
+            160,
+            192,
+            197
         ],
         accounts: [
             {
-                name: "state"
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "state",
+                writable: true
             },
             {
                 name: "vault",
@@ -5807,37 +6038,16 @@ var instructions = [
                 }
             },
             {
-                name: "signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "partial_unstake",
-                writable: true
-            },
-            {
-                name: "locker",
-                writable: true
-            },
-            {
-                name: "escrow",
-                writable: true
-            },
-            {
-                name: "escrow_jup_ata",
-                writable: true
-            },
-            {
-                name: "vault_jup_ata",
-                writable: true
+                name: "clock",
+                address: "SysvarC1ock11111111111111111111111111111111"
             },
             {
-                name: "locked_voter_program",
-                address: "voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj"
+                name: "stake_history",
+                address: "SysvarStakeHistory1111111111111111111111111"
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "stake_program",
+                address: "Stake11111111111111111111111111111111111111"
             }
         ],
         args: []
@@ -5848,7 +6058,7 @@ var instructions = [
             "Unwraps all wSOL to get SOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "",
             "# Permission required",
             "- Permission::WSolUnwrap"
@@ -6001,7 +6211,7 @@ var instructions = [
             "Wraps SOL to get wSOL.",
             "",
             "# Parameters",
-            "- `ctx`: The context for the transaction.",
+            "- `ctx`: The context for the instruction.",
             "- `lamports`: The amount of SOL to wrap.",
             "",
             "# Permission required",
@@ -6164,45 +6374,6 @@ var instructions = [
     }
 ];
 var accounts = [
-    {
-        name: "Escrow",
-        discriminator: [
-            31,
-            213,
-            123,
-            187,
-            186,
-            22,
-            218,
-            155
-        ]
-    },
-    {
-        name: "Governor",
-        discriminator: [
-            37,
-            136,
-            44,
-            80,
-            68,
-            85,
-            213,
-            178
-        ]
-    },
-    {
-        name: "Locker",
-        discriminator: [
-            74,
-            246,
-            6,
-            113,
-            249,
-            228,
-            75,
-            169
-        ]
-    },
     {
         name: "OpenfundsMetadataAccount",
         discriminator: [
@@ -6216,19 +6387,6 @@ var accounts = [
             219
         ]
     },
-    {
-        name: "PartialUnstaking",
-        discriminator: [
-            172,
-            146,
-            58,
-            213,
-            40,
-            250,
-            107,
-            63
-        ]
-    },
     {
         name: "PolicyAccount",
         discriminator: [
@@ -6242,19 +6400,6 @@ var accounts = [
             175
         ]
     },
-    {
-        name: "Proposal",
-        discriminator: [
-            26,
-            94,
-            189,
-            187,
-            116,
-            136,
-            53,
-            33
-        ]
-    },
     {
         name: "StateAccount",
         discriminator: [
@@ -6267,19 +6412,6 @@ var accounts = [
             249,
             103
         ]
-    },
-    {
-        name: "Vote",
-        discriminator: [
-            96,
-            91,
-            104,
-            57,
-            145,
-            35,
-            172,
-            155
-        ]
     }
 ];
 var errors = [
@@ -6393,6 +6525,11 @@ var errors = [
         name: "InvalidTokenAccount",
         msg: "Invalid token account"
     },
+    {
+        code: 50004,
+        name: "InvalidVoteSide",
+        msg: "Invalid vote side"
+    },
     {
         code: 51000,
         name: "InvalidAssetPrice",
@@ -6711,6 +6848,9 @@ var types = [
                 },
                 {
                     name: "DriftOrderTypes"
+                },
+                {
+                    name: "MaxSwapSlippageBps"
                 }
             ]
         }
@@ -6853,70 +6993,6 @@ var types = [
             ]
         }
     },
-    {
-        name: "Escrow",
-        docs: [
-            "Account: Escrow"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "locker",
-                    type: "pubkey"
-                },
-                {
-                    name: "owner",
-                    type: "pubkey"
-                },
-                {
-                    name: "bump",
-                    type: "u8"
-                },
-                {
-                    name: "tokens",
-                    type: "pubkey"
-                },
-                {
-                    name: "amount",
-                    type: "u64"
-                },
-                {
-                    name: "escrow_started_at",
-                    type: "i64"
-                },
-                {
-                    name: "escrow_ends_at",
-                    type: "i64"
-                },
-                {
-                    name: "vote_delegate",
-                    type: "pubkey"
-                },
-                {
-                    name: "is_max_lock",
-                    type: "bool"
-                },
-                {
-                    name: "partial_unstaking_amount",
-                    type: "u64"
-                },
-                {
-                    name: "padding",
-                    type: "u64"
-                },
-                {
-                    name: "buffers",
-                    type: {
-                        array: [
-                            "u128",
-                            9
-                        ]
-                    }
-                }
-            ]
-        }
-    },
     {
         name: "FundField",
         type: {
@@ -7162,143 +7238,63 @@ var types = [
                     }
                 },
                 {
-                    name: "is_etc",
-                    type: {
-                        option: "bool"
-                    }
-                },
-                {
-                    name: "is_eu_directive_relevant",
-                    type: {
-                        option: "bool"
-                    }
-                },
-                {
-                    name: "is_fund_of_funds",
-                    type: {
-                        option: "bool"
-                    }
-                },
-                {
-                    name: "is_passive_fund",
-                    type: {
-                        option: "bool"
-                    }
-                },
-                {
-                    name: "is_reit",
-                    type: {
-                        option: "bool"
-                    }
-                },
-                {
-                    name: "legal_form",
-                    type: {
-                        option: "string"
-                    }
-                },
-                {
-                    name: "legal_fund_name_only",
-                    type: {
-                        option: "string"
-                    }
-                },
-                {
-                    name: "open_ended_or_closed_ended_fund_structure",
-                    type: {
-                        option: "string"
-                    }
-                },
-                {
-                    name: "type_of_eu_directive",
-                    type: {
-                        option: "string"
-                    }
-                },
-                {
-                    name: "ucits_version",
-                    type: {
-                        option: "string"
-                    }
-                }
-            ]
-        }
-    },
-    {
-        name: "GovernanceParameters",
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "voting_delay",
-                    type: "u64"
-                },
-                {
-                    name: "voting_period",
-                    type: "u64"
+                    name: "is_etc",
+                    type: {
+                        option: "bool"
+                    }
                 },
                 {
-                    name: "quorum_votes",
-                    type: "u64"
+                    name: "is_eu_directive_relevant",
+                    type: {
+                        option: "bool"
+                    }
                 },
                 {
-                    name: "timelock_delay_seconds",
-                    type: "i64"
-                }
-            ]
-        }
-    },
-    {
-        name: "Governor",
-        docs: [
-            "Account: Governor"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "base",
-                    type: "pubkey"
+                    name: "is_fund_of_funds",
+                    type: {
+                        option: "bool"
+                    }
                 },
                 {
-                    name: "bump",
-                    type: "u8"
+                    name: "is_passive_fund",
+                    type: {
+                        option: "bool"
+                    }
                 },
                 {
-                    name: "proposal_count",
-                    type: "u64"
+                    name: "is_reit",
+                    type: {
+                        option: "bool"
+                    }
                 },
                 {
-                    name: "locker",
-                    type: "pubkey"
+                    name: "legal_form",
+                    type: {
+                        option: "string"
+                    }
                 },
                 {
-                    name: "smart_wallet",
-                    type: "pubkey"
+                    name: "legal_fund_name_only",
+                    type: {
+                        option: "string"
+                    }
                 },
                 {
-                    name: "params",
+                    name: "open_ended_or_closed_ended_fund_structure",
                     type: {
-                        defined: {
-                            name: "GovernanceParameters"
-                        }
+                        option: "string"
                     }
                 },
                 {
-                    name: "voting_reward",
+                    name: "type_of_eu_directive",
                     type: {
-                        defined: {
-                            name: "VotingReward"
-                        }
+                        option: "string"
                     }
                 },
                 {
-                    name: "buffers",
+                    name: "ucits_version",
                     type: {
-                        array: [
-                            "u128",
-                            32
-                        ]
+                        option: "string"
                     }
                 }
             ]
@@ -7352,82 +7348,6 @@ var types = [
             ]
         }
     },
-    {
-        name: "Locker",
-        docs: [
-            "Account: Locker"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "base",
-                    type: "pubkey"
-                },
-                {
-                    name: "bump",
-                    type: "u8"
-                },
-                {
-                    name: "token_mint",
-                    type: "pubkey"
-                },
-                {
-                    name: "locked_supply",
-                    type: "u64"
-                },
-                {
-                    name: "total_escrow",
-                    type: "u64"
-                },
-                {
-                    name: "governor",
-                    type: "pubkey"
-                },
-                {
-                    name: "params",
-                    type: {
-                        defined: {
-                            name: "LockerParams"
-                        }
-                    }
-                },
-                {
-                    name: "buffers",
-                    type: {
-                        array: [
-                            "u128",
-                            32
-                        ]
-                    }
-                }
-            ]
-        }
-    },
-    {
-        name: "LockerParams",
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "max_stake_vote_multiplier",
-                    type: "u8"
-                },
-                {
-                    name: "min_stake_duration",
-                    type: "u64"
-                },
-                {
-                    name: "max_stake_duration",
-                    type: "u64"
-                },
-                {
-                    name: "proposal_activation_min_votes",
-                    type: "u64"
-                }
-            ]
-        }
-    },
     {
         name: "ManagerKind",
         type: {
@@ -8102,42 +8022,6 @@ var types = [
             ]
         }
     },
-    {
-        name: "PartialUnstaking",
-        docs: [
-            "Account: PartialUnstaking"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "escrow",
-                    type: "pubkey"
-                },
-                {
-                    name: "amount",
-                    type: "u64"
-                },
-                {
-                    name: "expiration",
-                    type: "i64"
-                },
-                {
-                    name: "buffers",
-                    type: {
-                        array: [
-                            "u128",
-                            6
-                        ]
-                    }
-                },
-                {
-                    name: "memo",
-                    type: "string"
-                }
-            ]
-        }
-    },
     {
         name: "Permission",
         docs: [
@@ -8263,161 +8147,15 @@ var types = [
             variants: [
                 {
                     name: "None"
-                },
-                {
-                    name: "MustPostOnly"
-                },
-                {
-                    name: "TryPostOnly"
-                },
-                {
-                    name: "Slide"
-                }
-            ]
-        }
-    },
-    {
-        name: "Proposal",
-        docs: [
-            "Account: Proposal"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "governor",
-                    type: "pubkey"
-                },
-                {
-                    name: "index",
-                    type: "u64"
-                },
-                {
-                    name: "bump",
-                    type: "u8"
-                },
-                {
-                    name: "proposer",
-                    type: "pubkey"
-                },
-                {
-                    name: "quorum_votes",
-                    type: "u64"
-                },
-                {
-                    name: "max_option",
-                    type: "u8"
-                },
-                {
-                    name: "option_votes",
-                    type: {
-                        vec: "u64"
-                    }
-                },
-                {
-                    name: "canceled_at",
-                    type: "i64"
-                },
-                {
-                    name: "created_at",
-                    type: "i64"
-                },
-                {
-                    name: "activated_at",
-                    type: "i64"
-                },
-                {
-                    name: "voting_ends_at",
-                    type: "i64"
-                },
-                {
-                    name: "queued_at",
-                    type: "i64"
-                },
-                {
-                    name: "queued_transaction",
-                    type: "pubkey"
-                },
-                {
-                    name: "voting_reward",
-                    type: {
-                        defined: {
-                            name: "VotingReward"
-                        }
-                    }
-                },
-                {
-                    name: "total_claimed_reward",
-                    type: "u64"
-                },
-                {
-                    name: "proposal_type",
-                    type: "u8"
-                },
-                {
-                    name: "buffers",
-                    type: {
-                        array: [
-                            "u128",
-                            10
-                        ]
-                    }
-                },
-                {
-                    name: "instructions",
-                    type: {
-                        vec: {
-                            defined: {
-                                name: "ProposalInstruction"
-                            }
-                        }
-                    }
-                }
-            ]
-        }
-    },
-    {
-        name: "ProposalAccountMeta",
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "pubkey",
-                    type: "pubkey"
-                },
-                {
-                    name: "is_signer",
-                    type: "bool"
-                },
-                {
-                    name: "is_writable",
-                    type: "bool"
-                }
-            ]
-        }
-    },
-    {
-        name: "ProposalInstruction",
-        type: {
-            kind: "struct",
-            fields: [
+                },
                 {
-                    name: "program_id",
-                    type: "pubkey"
+                    name: "MustPostOnly"
                 },
                 {
-                    name: "keys",
-                    type: {
-                        vec: {
-                            defined: {
-                                name: "ProposalAccountMeta"
-                            }
-                        }
-                    }
+                    name: "TryPostOnly"
                 },
                 {
-                    name: "data",
-                    type: "bytes"
+                    name: "Slide"
                 }
             ]
         }
@@ -8947,70 +8685,6 @@ var types = [
                 }
             ]
         }
-    },
-    {
-        name: "Vote",
-        docs: [
-            "Account: Vote"
-        ],
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "proposal",
-                    type: "pubkey"
-                },
-                {
-                    name: "voter",
-                    type: "pubkey"
-                },
-                {
-                    name: "bump",
-                    type: "u8"
-                },
-                {
-                    name: "side",
-                    type: "u8"
-                },
-                {
-                    name: "voting_power",
-                    type: "u64"
-                },
-                {
-                    name: "claimed",
-                    type: "bool"
-                },
-                {
-                    name: "buffers",
-                    type: {
-                        array: [
-                            "u8",
-                            32
-                        ]
-                    }
-                }
-            ]
-        }
-    },
-    {
-        name: "VotingReward",
-        type: {
-            kind: "struct",
-            fields: [
-                {
-                    name: "reward_mint",
-                    type: "pubkey"
-                },
-                {
-                    name: "reward_vault",
-                    type: "pubkey"
-                },
-                {
-                    name: "reward_per_proposal",
-                    type: "u64"
-                }
-            ]
-        }
     }
 ];
 var constants = [
@@ -9093,14 +8767,11 @@ const DRIFT_PROGRAM_ID = new web3_js.PublicKey("dRiftyHA39MWEi3m9aunc5MzRF1JYuBs
 const JUPITER_PROGRAM_ID = new web3_js.PublicKey("JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4");
 const SANCTUM_STAKE_POOL_PROGRAM_ID = new web3_js.PublicKey("SP12tWFxD9oJsVWNavTTBZvMbA6gkAmxtVgxdqvyvhY");
 const GOVERNANCE_PROGRAM_ID = new web3_js.PublicKey("GovaE4iu227srtG2s3tZzB4RmWBzw8sTwrCLZz7kN7rY");
+const JUP_VOTE_PROGRAM = new web3_js.PublicKey("voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj");
 /**
  * Stake pools
  */ const JITO_STAKE_POOL = new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb");
 const JUPSOL_STAKE_POOL = new web3_js.PublicKey("8VpRhuxa7sUUepdY3kQiTmX9rS5vx4WgaXiAnXq4KCtr");
-/**
- * JUP staking & voting
- */ const JUP_STAKE_LOCKER = new web3_js.PublicKey("CVMdMd79no569tjc5Sq7kzz8isbfCcFyBS5TLGsrZ5dN");
-const JUP_VOTE_PROGRAM = new web3_js.PublicKey("voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj");
 
 const GlamIntegrations = GlamIDLJson?.types?.find((t)=>t.name === "Integration")?.type?.variants?.map((v)=>v.name) ?? [];
 const GlamPermissions = GlamIDLJson?.types?.find((t)=>t.name === "Permission")?.type?.variants?.map((v)=>v.name) ?? [];
@@ -10124,7 +9795,7 @@ class BaseClient {
             })
         ];
     }
-    async intoVersionedTransaction({ tx, lookupTables, signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee, jitoTipLamports, latestBlockhash }) {
+    async intoVersionedTransaction(tx, { lookupTables, signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee = false, jitoTipLamports, simulate = false }) {
         signer = signer || this.getSigner();
         const instructions = tx.instructions;
         // Set Jito tip if provided
@@ -10135,14 +9806,15 @@ class BaseClient {
                 lamports: jitoTipLamports
             }));
         }
-        const recentBlockhash = (latestBlockhash ? latestBlockhash : await this.blockhashWithCache.get()).blockhash;
+        const recentBlockhash = (await this.blockhashWithCache.get()).blockhash;
         try {
             computeUnitLimit = await getSimulationComputeUnits(this.provider.connection, instructions, signer, lookupTables);
         } catch (e) {
-        // TODO: add a flag to control if we should throw error on failed simulation
-        // when we run tests with failure cases, this RPC call fails with
-        // an incorrect error message so we should ignore it
-        // in the regular case, if this errors the tx will have the default CUs
+            // 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) throw e;
         }
         if (computeUnitLimit) {
             const vTx = new web3_js.VersionedTransaction(new web3_js.TransactionMessage({
@@ -10192,6 +9864,7 @@ class BaseClient {
             skipPreflight: true
         });
         // await confirmation
+        console.log("Confirming tx:", txSig);
         const latestBlockhash = await this.blockhashWithCache.get();
         const res = await connection.confirmTransaction({
             ...latestBlockhash,
@@ -10600,99 +10273,97 @@ class DriftClient {
     }
     /*
    * API methods
-   */ async initializeTx(statePda, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user, userStats] = this.getUser(statePda);
-        const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
-        const tx = await this.base.program.methods.driftInitialize().accounts({
-            state: statePda,
+   */ async initializeTx(glamState, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        this.base.getVaultPda(glamState);
+        const [user, userStats] = this.getUser(glamState);
+        const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
+        const GLAM_NAME = "GLAM *.+".split("").concat(Array(24).fill(0));
+        const initializeUserIx = await this.base.program.methods//@ts-ignore
+        .driftInitializeUser(0, GLAM_NAME).accounts({
+            glamState,
             user,
             userStats,
-            driftState,
-            signer
-        }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+            state,
+            glamSigner
+        }).instruction();
+        const tx = await this.base.program.methods.driftInitializeUserStats().accounts({
+            glamState,
+            state,
+            userStats,
+            glamSigner
+        }).postInstructions([
+            initializeUserIx
+        ]).transaction();
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserCustomMarginRatioTx(statePda, maxLeverage, subAccountId = 0, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user] = this.getUser(statePda, subAccountId);
+    async updateUserCustomMarginRatioTx(glamState, maxLeverage, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        this.base.getVaultPda(glamState);
+        const [user] = this.getUser(glamState, subAccountId);
         // https://github.com/drift-labs/protocol-v2/blob/babed162b08b1fe34e49a81c5aa3e4ec0a88ecdf/programs/drift/src/math/constants.rs#L183-L184
         const marginRatio = DRIFT_MARGIN_PRECISION / maxLeverage;
-        const tx = await this.base.program.methods.driftUpdateUserCustomMarginRatio(subAccountId, marginRatio).accountsPartial({
-            state: statePda,
-            user,
-            signer
+        const tx = await this.base.program.methods.driftUpdateUserCustomMarginRatio(subAccountId, marginRatio).accounts({
+            glamState,
+            glamSigner,
+            user
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserMarginTradingEnabledTx(statePda, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user] = this.getUser(statePda, subAccountId);
-        const tx = await this.base.program.methods.driftUpdateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accountsPartial({
-            state: statePda,
-            user,
-            signer
+    async updateUserMarginTradingEnabledTx(glamState, marginTradingEnabled, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const [user] = this.getUser(glamState, subAccountId);
+        const tx = await this.base.program.methods.driftUpdateUserMarginTradingEnabled(subAccountId, marginTradingEnabled).accounts({
+            glamState,
+            glamSigner,
+            user
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async updateUserDelegateTx(statePda, delegate, subAccountId = 0, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user] = this.getUser(statePda, subAccountId);
-        const tx = await this.base.program.methods.driftUpdateUserDelegate(subAccountId, delegate).accountsPartial({
-            state: statePda,
-            user,
-            signer
+    async updateUserDelegateTx(glamState, delegate, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const [user] = this.getUser(glamState, subAccountId);
+        const tx = await this.base.program.methods.driftUpdateUserDelegate(subAccountId, delegate).accounts({
+            glamState,
+            glamSigner,
+            user
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async deleteUserTx(statePda, subAccountId = 0, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user, userStats] = this.getUser(statePda, subAccountId);
-        const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
+    async deleteUserTx(glamState, subAccountId = 0, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const [user, userStats] = this.getUser(glamState, subAccountId);
+        const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const tx = await this.base.program.methods.driftDeleteUser().accounts({
-            state: statePda,
+            glamState,
+            state,
             user,
             userStats,
-            driftState,
-            signer
+            glamSigner
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async depositTx(statePda, amount, marketIndex = 1, subAccountId = 0, marketConfigs, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const [user, userStats] = this.getUser(statePda, subAccountId);
-        const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
+        const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const { mint, oracle, marketPDA, vaultPDA } = marketConfigs.spot[marketIndex];
         const preInstructions = [];
         if (mint === WSOL.toBase58()) {
-            const wrapSolIx = await this.base.maybeWrapSol(statePda, amount, signer);
+            const wrapSolIx = await this.base.maybeWrapSol(statePda, amount, glamSigner);
             if (wrapSolIx) {
                 preInstructions.push(wrapSolIx);
             }
         }
-        const tx = await this.base.program.methods.driftDeposit(marketIndex, amount).accountsPartial({
-            state: statePda,
-            vaultAta: this.base.getVaultAta(statePda, new web3_js.PublicKey(mint)),
-            driftAta: new web3_js.PublicKey(vaultPDA),
+        const tx = await this.base.program.methods.driftDeposit(marketIndex, amount, false).accounts({
+            glamState: statePda,
+            state,
             user,
             userStats,
-            driftState,
-            signer
+            spotMarketVault: new web3_js.PublicKey(vaultPDA),
+            userTokenAccount: this.base.getVaultAta(statePda, new web3_js.PublicKey(mint)),
+            glamSigner,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).remainingAccounts([
             {
                 pubkey: new web3_js.PublicKey(oracle),
@@ -10705,15 +10376,12 @@ class DriftClient {
                 isWritable: true
             }
         ]).preInstructions(preInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async withdrawTx(statePda, amount, marketIndex = 1, subAccountId = 0, marketConfigs, txOptions = {}) {
-        const signer = txOptions.signer || this.base.getSigner();
+        const glamSigner = txOptions.signer || this.base.getSigner();
         const [user, userStats] = this.getUser(statePda, subAccountId);
-        const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
+        const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const { mint: m, vaultPDA: d } = marketConfigs.spot[marketIndex];
         const mint = new web3_js.PublicKey(m);
         const driftAta = new web3_js.PublicKey(d); // drift vault ata
@@ -10723,42 +10391,37 @@ class DriftClient {
         const { tokenProgram } = await this.base.fetchMintWithOwner(mint);
         // Create vault ata in case it doesn't exist
         const preInstructions = [
-            splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, vault, mint, tokenProgram)
+            splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, vaultAta, vault, mint, tokenProgram)
         ];
-        const tx = await this.base.program.methods.driftWithdraw(marketIndex, amount).accountsPartial({
-            state: statePda,
-            vaultAta: vaultAta,
-            driftAta,
+        const tx = await this.base.program.methods.driftWithdraw(marketIndex, amount, false).accounts({
+            glamState: statePda,
+            state,
             user,
             userStats,
-            driftState,
-            signer,
-            driftSigner: DRIFT_VAULT
+            glamSigner,
+            spotMarketVault: driftAta,
+            userTokenAccount: vaultAta,
+            driftSigner: DRIFT_VAULT,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
-    async placeOrderTx(statePda, orderParams, subAccountId = 0, marketConfigs, txOptions = {}) {
+    async placeOrderTx(glamState, orderParams, subAccountId = 0, marketConfigs, txOptions = {}) {
         const { marketIndex, marketType } = orderParams;
-        const remainingAccounts = await this.composeRemainingAccounts(statePda, subAccountId, marketConfigs, marketType, marketIndex);
-        const signer = txOptions.signer || this.base.getSigner();
-        const [user] = this.getUser(statePda, subAccountId);
-        const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
+        const remainingAccounts = await this.composeRemainingAccounts(glamState, subAccountId, marketConfigs, marketType, marketIndex);
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const [user] = this.getUser(glamState, subAccountId);
+        const state = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const tx = await this.base.program.methods// @ts-ignore
         .driftPlaceOrders([
             orderParams
-        ]).accountsPartial({
-            state: statePda,
+        ]).accounts({
+            glamState,
             user,
-            driftState,
-            signer
+            state,
+            glamSigner
         }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async modifyOrderTx(statePda, modifyOrderParams, subAccountId = 0, marketConfigs, txOptions = {}) {
         // const { marketIndex, marketType } = orderParams;
@@ -10773,22 +10436,18 @@ class DriftClient {
         const [user] = this.getUser(statePda, subAccountId);
         const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const tx = await this.base.program.methods// @ts-ignore
-        .driftModifyOrder(1, modifyOrderParams).accountsPartial({
+        .driftModifyOrder(1, modifyOrderParams).accounts({
             glamState: statePda,
             glamSigner: signer,
             user,
-            state: driftState,
-            authority: this.base.getVaultPda(statePda)
+            state: driftState
         })// .remainingAccounts(remainingAccounts)
         .transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async cancelOrdersTx(glamState, marketType, marketIndex, direction, subAccountId = 0, marketConfigs, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
-        const glamVault = this.base.getVaultPda(glamState);
+        this.base.getVaultPda(glamState);
         const [user] = this.getUser(glamState, subAccountId);
         const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const remainingAccounts = await this.composeRemainingAccounts(glamState, subAccountId, marketConfigs, marketType, marketIndex);
@@ -10797,17 +10456,12 @@ class DriftClient {
             glamState,
             glamSigner,
             user,
-            state: driftState,
-            authority: glamVault
+            state: driftState
         }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async cancelOrdersByIdsTx(glamState, orderIds, subAccountId = 0, marketConfigs, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
-        const glamVault = this.base.getVaultPda(glamState);
         const [user] = this.getUser(glamState, subAccountId);
         const driftState = await sdk.getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
         const remainingAccounts = await this.composeRemainingAccounts(glamState, subAccountId, marketConfigs);
@@ -10815,13 +10469,9 @@ class DriftClient {
             glamState,
             glamSigner,
             user,
-            state: driftState,
-            authority: glamVault
+            state: driftState
         }).remainingAccounts(remainingAccounts).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
@@ -10921,10 +10571,7 @@ class InvestorClient {
             // signerAccountPolicy: null,
             signer
         }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async redeemTx(statePda, amount, inKind = false, stateModel, mintId = 0, skipState = true, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -10986,16 +10633,14 @@ class InvestorClient {
             // signerAccountPolicy: null,
             signer
         }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
     }
 }
 
+const BASE = new web3_js.PublicKey("bJ1TRoFo2P6UHVwqdiipp6Qhp2HaaHpLowZ5LHet8Gm");
 class JupiterSwapClient {
     /*
    * Client methods
@@ -11003,6 +10648,10 @@ class JupiterSwapClient {
         const tx = await this.swapTx(statePda, quoteParams, quoteResponse, swapInstructions, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
+    async setMaxSwapSlippage(statePda, slippageBps, txOptions = {}) {
+        const tx = await this.setMaxSwapSlippageTx(statePda, slippageBps, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
     /*
    * API methods
    */ async swapTx(statePda, quoteParams, quoteResponse, swapInstructions, txOptions = {}) {
@@ -11030,32 +10679,38 @@ class JupiterSwapClient {
         }
         const lookupTables = await this.base.getAdressLookupTableAccounts(addressLookupTableAddresses);
         const swapIx = this.toTransactionInstruction(swapInstruction, vault.toBase58());
-        const inputTokenProgram = await this.getTokenProgram(inputMint);
-        const outputTokenProgram = await this.getTokenProgram(outputMint);
+        const [inputTokenProgram, outputTokenProgram] = await Promise.all([
+            this.getTokenProgram(inputMint),
+            this.getTokenProgram(outputMint)
+        ]);
         const inputStakePool = ASSETS_MAINNET.get(inputMint.toBase58())?.stateAccount || null;
         const outputStakePool = ASSETS_MAINNET.get(outputMint.toBase58())?.stateAccount || null;
         const preInstructions = await this.getPreInstructions(statePda, signer, inputMint, outputMint, amount, inputTokenProgram, outputTokenProgram);
-        //@ts-ignore
-        const tx = await this.base.program.methods.jupiterSwap(amount, swapIx.data).accountsPartial({
+        const tx = await this.base.program.methods.jupiterSwap(amount, swapIx.data).accounts({
             state: statePda,
             signer,
-            vault,
-            inputVaultAta: this.base.getVaultAta(statePda, inputMint, inputTokenProgram),
-            outputVaultAta: this.base.getVaultAta(statePda, outputMint, outputTokenProgram),
             inputMint,
             outputMint,
             inputTokenProgram,
             outputTokenProgram,
             inputStakePool,
-            outputStakePool,
-            jupiterProgram: JUPITER_PROGRAM_ID
+            outputStakePool
         }).remainingAccounts(swapIx.keys).preInstructions(preInstructions).transaction();
-        return this.base.intoVersionedTransaction({
-            tx,
+        return this.base.intoVersionedTransaction(tx, {
             lookupTables,
             ...txOptions
         });
     }
+    async setMaxSwapSlippageTx(statePda, slippageBps, txOptions = {}) {
+        const signer = txOptions.signer || this.base.getSigner();
+        const tx = await this.base.program.methods.jupiterSetMaxSwapSlippage(new anchor.BN(slippageBps)).accounts({
+            state: statePda,
+            signer
+        }).transaction();
+        return this.base.intoVersionedTransaction(tx, {
+            ...txOptions
+        });
+    }
     async getQuoteResponse(quoteParams) {
         const res = await fetch(`${this.base.jupiterApi}/quote?` + new URLSearchParams(Object.entries(quoteParams).map(([key, val])=>[
                 key,
@@ -11086,25 +10741,11 @@ class JupiterSwapClient {
         this./*
    * Utils
    */ getPreInstructions = async (statePda, signer, inputMint, outputMint, amount, inputTokenProgram = splToken.TOKEN_PROGRAM_ID, outputTokenProgram = splToken.TOKEN_PROGRAM_ID)=>{
-            let preInstructions = [];
-            const ataParams = [
-                {
-                    payer: signer,
-                    ata: this.base.getVaultAta(statePda, outputMint, outputTokenProgram),
-                    owner: this.base.getVaultPda(statePda),
-                    mint: outputMint,
-                    tokenProgram: outputTokenProgram
-                }
+            const vault = this.base.getVaultPda(statePda);
+            const ata = this.base.getAta(outputMint, vault, outputTokenProgram);
+            const preInstructions = [
+                splToken.createAssociatedTokenAccountIdempotentInstruction(signer, ata, vault, outputMint, outputTokenProgram)
             ];
-            for (const { payer, ata, owner, mint, tokenProgram } of ataParams){
-                // const ataAccountInfo = await this.base.provider.connection.getAccountInfo(
-                //   ata
-                // );
-                // if (ataAccountInfo) {
-                //   continue;
-                // }
-                preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(payer, ata, owner, mint, tokenProgram));
-            }
             // Transfer SOL to wSOL ATA if needed for the vault
             if (inputMint.equals(WSOL)) {
                 const wrapSolIx = await this.base.maybeWrapSol(statePda, amount, signer);
@@ -11163,27 +10804,27 @@ class JupiterVoteClient {
         const preInstructions = txOptions.preInstructions || [];
         if (!escrowCreated) {
             console.log("Will create escrow account:", escrow.toBase58());
-            preInstructions.push(await this.base.program.methods.initLockedVoterEscrow().accounts({
-                state: statePda,
-                locker: JUP_STAKE_LOCKER,
+            preInstructions.push(await this.base.program.methods.jupiterVoteNewEscrow().accounts({
+                glamState: statePda,
+                locker: this.stakeLocker,
                 escrow
             }).instruction());
-            preInstructions.push(await this.base.program.methods.toggleMaxLock(true).accounts({
-                state: statePda,
-                locker: JUP_STAKE_LOCKER,
+            preInstructions.push(await this.base.program.methods.jupiterVoteToggleMaxLock(true).accounts({
+                glamState: statePda,
+                locker: this.stakeLocker,
                 escrow
             }).instruction());
         }
         preInstructions.push(splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), escrowJupAta, escrow, JUP));
-        const tx = await this.base.program.methods.increaseLockedAmount(amount).accounts({
-            state: statePda,
-            locker: JUP_STAKE_LOCKER,
+        const tx = await this.base.program.methods.jupiterVoteIncreaseLockedAmount(amount).accounts({
+            glamState: statePda,
+            locker: this.stakeLocker,
             escrow,
-            escrowJupAta,
-            vaultJupAta
+            escrowTokens: escrowJupAta,
+            sourceTokens: vaultJupAta,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions(preInstructions).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
+        const vTx = await this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
         return await this.base.sendAndConfirm(vTx);
@@ -11198,13 +10839,12 @@ class JupiterVoteClient {
     async unstakeJup(statePda, txOptions = {}) {
         const vault = this.base.getVaultPda(statePda);
         const escrow = this.getEscrowPda(vault);
-        const tx = await this.base.program.methods.toggleMaxLock(false).accounts({
-            state: statePda,
-            locker: JUP_STAKE_LOCKER,
+        const tx = await this.base.program.methods.jupiterVoteToggleMaxLock(false).accounts({
+            glamState: statePda,
+            locker: this.stakeLocker,
             escrow
         }).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
+        const vTx = await this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
         return await this.base.sendAndConfirm(vTx);
@@ -11214,17 +10854,30 @@ class JupiterVoteClient {
         const escrow = this.getEscrowPda(vault);
         const escrowJupAta = this.base.getAta(JUP, escrow);
         const vaultJupAta = this.base.getAta(JUP, vault);
-        const tx = await this.base.program.methods.withdrawAllUnstakedJup().accounts({
-            state: statePda,
-            locker: JUP_STAKE_LOCKER,
+        const tx = await this.base.program.methods.jupiterVoteWithdraw().accounts({
+            glamState: statePda,
+            locker: this.stakeLocker,
             escrow,
-            escrowJupAta,
-            vaultJupAta
+            escrowTokens: escrowJupAta,
+            destinationTokens: vaultJupAta,
+            tokenProgram: splToken.TOKEN_PROGRAM_ID
         }).preInstructions([
             splToken.createAssociatedTokenAccountIdempotentInstruction(this.base.getSigner(), vaultJupAta, vault, JUP)
         ]).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
+        const vTx = await this.base.intoVersionedTransaction(tx, {
+            ...txOptions
+        });
+        return await this.base.sendAndConfirm(vTx);
+    }
+    async cancelUnstake(statePda, txOptions = {}) {
+        const vault = this.base.getVaultPda(statePda);
+        const escrow = this.getEscrowPda(vault);
+        const tx = await this.base.program.methods.jupiterVoteToggleMaxLock(true).accounts({
+            glamState: statePda,
+            locker: this.stakeLocker,
+            escrow
+        }).transaction();
+        const vTx = await this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
         return await this.base.sendAndConfirm(vTx);
@@ -11234,49 +10887,59 @@ class JupiterVoteClient {
    *
    * @param statePda
    * @param proposal
-   * @param governor
    * @param side
    * @param txOptions
    * @returns
-   */ async voteOnProposal(statePda, proposal, governor, side, txOptions = {}) {
-        const vault = this.base.getVaultPda(statePda);
+   */ async voteOnProposal(glamState, proposal, side, txOptions = {}) {
+        const glamVault = this.base.getVaultPda(glamState);
         const [vote] = web3_js.PublicKey.findProgramAddressSync([
             Buffer.from("Vote"),
             proposal.toBuffer(),
-            vault.toBuffer()
+            glamVault.toBuffer()
+        ], GOVERNANCE_PROGRAM_ID);
+        const [governor] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("Governor"),
+            BASE.toBuffer()
         ], GOVERNANCE_PROGRAM_ID);
         const voteAccountInfo = await this.base.provider.connection.getAccountInfo(vote);
         const voteCreated = voteAccountInfo ? true : false;
         const preInstructions = [];
         if (!voteCreated) {
             console.log("Will create vote account:", vote.toBase58());
-            preInstructions.push(await this.base.program.methods.newVote().accounts({
-                state: statePda,
-                vote,
-                proposal
+            preInstructions.push(await this.base.program.methods.jupiterGovNewVote(glamVault).accountsPartial({
+                glamState,
+                proposal,
+                vote
             }).instruction());
         }
-        const escrow = this.getEscrowPda(vault);
-        const tx = await this.base.program.methods.castVote(side).accounts({
-            state: statePda,
+        const escrow = this.getEscrowPda(glamVault);
+        const tx = await this.base.program.methods.jupiterVoteCastVote(side).accounts({
+            glamState,
             escrow,
             proposal,
             vote,
-            locker: JUP_STAKE_LOCKER,
-            governor
+            locker: this.stakeLocker,
+            governor,
+            governProgram: GOVERNANCE_PROGRAM_ID
         }).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
+        const vTx = await this.base.intoVersionedTransaction(tx, {
             ...txOptions
         });
         return await this.base.sendAndConfirm(vTx);
     }
     /*
    * Utils
-   */ getEscrowPda(owner) {
+   */ get stakeLocker() {
+        const [locker] = web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("Locker"),
+            BASE.toBuffer()
+        ], JUP_VOTE_PROGRAM);
+        return locker;
+    }
+    getEscrowPda(owner) {
         const [escrow] = web3_js.PublicKey.findProgramAddressSync([
             Buffer.from("Escrow"),
-            JUP_STAKE_LOCKER.toBuffer(),
+            this.stakeLocker.toBuffer(),
             owner.toBuffer()
         ], JUP_VOTE_PROGRAM);
         return escrow;
@@ -11416,10 +11079,7 @@ class MarinadeClient {
             mintTo: vaultMsolAta,
             marinadeProgram: MARINADE_PROGRAM_ID
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async depositStakeTx(statePda, stakeAccount, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11449,10 +11109,7 @@ class MarinadeClient {
             tokenProgram: splToken.TOKEN_PROGRAM_ID,
             stakeProgram: web3_js.StakeProgram.programId
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async delayedUnstakeTx(state, amount, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11484,10 +11141,7 @@ class MarinadeClient {
         }).preInstructions([
             createTicketIx
         ]).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async claimTicketsTx(state, tickets, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11505,10 +11159,7 @@ class MarinadeClient {
                 isSigner: false,
                 isWritable: true
             }))).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async liquidUnstakeTx(statePda, amount, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11528,10 +11179,7 @@ class MarinadeClient {
             treasuryMsolAccount: marinadeState.treasuryMsolAccount,
             marinadeProgram: MARINADE_PROGRAM_ID
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
@@ -11563,10 +11211,7 @@ class WSolClient {
             wsolMint: WSOL,
             signer
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async unwrapTx(statePda, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11579,10 +11224,7 @@ class WSolClient {
             wsolMint: WSOL,
             signer
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
@@ -11812,10 +11454,7 @@ class StakingClient {
             feeAccount,
             tokenProgram
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async stakePoolDepositStakeTx(statePda, stakePool, stakeAccount, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11853,10 +11492,7 @@ class StakingClient {
             tokenProgram,
             stakeProgram: web3_js.StakeProgram.programId
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async stakePoolWithdrawStakeTx(statePda, stakePool, amount, deactivate = false, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11901,10 +11537,7 @@ class StakingClient {
         }).preInstructions([
             createStakeAccountIx
         ]).postInstructions(postInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async initializeAndDelegateStakeTx(statePda, vote, amount, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11922,10 +11555,7 @@ class StakingClient {
         }).preInstructions([
             createStakeAccountIx
         ]).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async deactivateStakeAccountsTx(statePda, stakeAccounts, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11941,10 +11571,7 @@ class StakingClient {
                 isSigner: false,
                 isWritable: true
             }))).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async withdrawFromStakeAccountsTx(statePda, stakeAccounts, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11961,10 +11588,7 @@ class StakingClient {
                 isSigner: false,
                 isWritable: true
             }))).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async mergeStakeAccountsTx(statePda, toStake, fromStake, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11978,10 +11602,7 @@ class StakingClient {
             stakeProgram: web3_js.StakeProgram.programId,
             stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async splitStakeAccountTx(state, existingStake, lamports, txOptions = {}) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -11997,10 +11618,7 @@ class StakingClient {
         }).preInstructions([
             createStakeAccountIx
         ]).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return {
             tx: vTx,
             newStake
@@ -12022,10 +11640,7 @@ class StakingClient {
         }).preInstructions([
             createStakeAccountIx
         ]).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return {
             tx: vTx,
             newStake
@@ -12119,20 +11734,14 @@ class StateClient {
         const tx = await this.base.program.methods.updateState(new StateModel(updated)).accounts({
             state: statePda
         }).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async closeState(statePda, txOptions = {}) {
         this.base.getOpenfundsPda(statePda);
         const tx = await this.base.program.methods.closeState().accounts({
             state: statePda
         }).preInstructions(txOptions.preInstructions || []).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return await this.base.sendAndConfirm(vTx);
     }
     /**
@@ -12249,10 +11858,7 @@ class StateClient {
                 isSigner: false,
                 isWritable: true
             }))).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     /* Deposit & Withdraw */ async deposit(statePda, asset, amount, txOptions = {}) {
         const tx = await this.depositTx(statePda, asset, amount, txOptions);
@@ -12269,10 +11875,7 @@ class StateClient {
         const signerAta = this.base.getAta(asset, signer, tokenProgram);
         const vaultAta = this.base.getVaultAta(statePda, asset, tokenProgram);
         const tx = new web3_js.Transaction().add(splToken.createAssociatedTokenAccountIdempotentInstruction(signer, vaultAta, vault, asset, tokenProgram), splToken.createTransferCheckedInstruction(signerAta, asset, vaultAta, signer, new anchor.BN(amount).toNumber(), mint.decimals, [], tokenProgram));
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     async withdrawIxs(statePda, asset, amount, txOptions) {
         const signer = txOptions.signer || this.base.getSigner();
@@ -12311,10 +11914,7 @@ class StateClient {
             asset,
             tokenProgram
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        return await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        return await this.base.intoVersionedTransaction(tx, txOptions);
     }
     constructor(base){
         this.base = base;
@@ -12789,10 +12389,7 @@ class KaminoLendingClient {
             initObligationIx,
             initObligationFarmIx
         ]).transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async depositTx(statePda, asset, amount, txOptions) {
@@ -12860,10 +12457,7 @@ class KaminoLendingClient {
             refreshIxs[2]
         ]) // 1 refresh ix
         .transaction();
-        const vTx = await this.base.intoVersionedTransaction({
-            tx,
-            ...txOptions
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     constructor(base){
@@ -12996,7 +12590,6 @@ exports.JUP = JUP;
 exports.JUPITER_API_DEFAULT = JUPITER_API_DEFAULT;
 exports.JUPITER_PROGRAM_ID = JUPITER_PROGRAM_ID;
 exports.JUPSOL_STAKE_POOL = JUPSOL_STAKE_POOL;
-exports.JUP_STAKE_LOCKER = JUP_STAKE_LOCKER;
 exports.JUP_VOTE_PROGRAM = JUP_VOTE_PROGRAM;
 exports.JupiterSwapClient = JupiterSwapClient;
 exports.JupiterVoteClient = JupiterVoteClient;