@velocity-exchange/sdk 0.1.0 → 0.2.0

package/lib/node/idl/velocity.json

@@ -443,250 +443,6 @@
                 }
             ]
         },
-        {
-            "name": "admin_withdraw_from_insurance_fund_vault",
-            "discriminator": [
-                228,
-                208,
-                191,
-                246,
-                169,
-                58,
-                189,
-                213
-            ],
-            "accounts": [
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "authority",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "spot_market",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "recipient_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "token_program"
-                },
-                {
-                    "name": "velocity_signer"
-                }
-            ],
-            "args": [
-                {
-                    "name": "market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "amount",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "begin_insurance_fund_swap",
-            "discriminator": [
-                176,
-                69,
-                143,
-                205,
-                32,
-                132,
-                163,
-                0
-            ],
-            "accounts": [
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "authority",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "out_insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "out_market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "in_insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "in_market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "out_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "in_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "if_rebalance_config",
-                    "writable": true
-                },
-                {
-                    "name": "token_program"
-                },
-                {
-                    "name": "velocity_signer"
-                },
-                {
-                    "name": "instructions",
-                    "docs": [
-                        "Instructions Sysvar for instruction introspection"
-                    ],
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "in_market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "out_market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "amount_in",
-                    "type": "u64"
-                }
-            ]
-        },
         {
             "name": "begin_lp_swap",
             "discriminator": [
@@ -1786,203 +1542,16 @@
             ]
         },
         {
-            "name": "deposit_into_insurance_fund_stake",
+            "name": "deposit_into_isolated_perp_position",
             "discriminator": [
-                4,
-                22,
-                226,
-                201,
-                124,
-                44,
-                82,
-                230
-            ],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "signer": true
-                },
-                {
-                    "name": "state",
-                    "writable": true
-                },
-                {
-                    "name": "spot_market",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "insurance_fund_stake",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    115,
-                                    116,
-                                    97,
-                                    107,
-                                    101
-                                ]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "user_stats"
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "user_stats",
-                    "writable": true
-                },
-                {
-                    "name": "spot_market_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "user_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "token_program"
-                },
-                {
-                    "name": "velocity_signer"
-                }
-            ],
-            "args": [
-                {
-                    "name": "market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "amount",
-                    "type": "u64"
-                }
-            ]
-        },
-        {
-            "name": "deposit_into_isolated_perp_position",
-            "discriminator": [
-                101,
-                48,
-                255,
-                153,
-                127,
-                121,
-                170,
-                26
+                101,
+                48,
+                255,
+                153,
+                127,
+                121,
+                170,
+                26
             ],
             "accounts": [
                 {
@@ -2340,185 +1909,53 @@
             ]
         },
         {
-            "name": "end_insurance_fund_swap",
+            "name": "end_lp_swap",
             "discriminator": [
-                206,
-                230,
-                98,
-                8,
-                249,
-                158,
-                169,
-                167
+                99,
+                125,
+                214,
+                165,
+                129,
+                175,
+                253,
+                135
             ],
             "accounts": [
                 {
                     "name": "state"
                 },
                 {
-                    "name": "authority",
+                    "name": "admin",
                     "writable": true,
                     "signer": true
                 },
                 {
-                    "name": "out_insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "out_market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "in_insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "in_market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "out_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "in_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "if_rebalance_config",
-                    "writable": true
-                },
-                {
-                    "name": "token_program"
-                },
-                {
-                    "name": "velocity_signer"
-                },
-                {
-                    "name": "instructions",
-                    "docs": [
-                        "Instructions Sysvar for instruction introspection"
-                    ],
-                    "address": "Sysvar1nstructions1111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "in_market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "out_market_index",
-                    "type": "u16"
-                }
-            ]
-        },
-        {
-            "name": "end_lp_swap",
-            "discriminator": [
-                99,
-                125,
-                214,
-                165,
-                129,
-                175,
-                253,
-                135
-            ],
-            "accounts": [
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "signer_out_token_account",
-                    "docs": [
-                        "Signer token accounts"
-                    ],
-                    "writable": true
-                },
-                {
-                    "name": "signer_in_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "constituent_out_token_account",
-                    "docs": [
-                        "Constituent token accounts"
-                    ],
-                    "writable": true
-                },
-                {
-                    "name": "constituent_in_token_account",
-                    "writable": true
-                },
-                {
-                    "name": "out_constituent",
-                    "docs": [
-                        "Constituents"
-                    ],
+                    "name": "signer_out_token_account",
+                    "docs": [
+                        "Signer token accounts"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "signer_in_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "constituent_out_token_account",
+                    "docs": [
+                        "Constituent token accounts"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "constituent_in_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "out_constituent",
+                    "docs": [
+                        "Constituents"
+                    ],
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -3349,87 +2786,6 @@
                 }
             ]
         },
-        {
-            "name": "initialize_if_rebalance_config",
-            "discriminator": [
-                8,
-                85,
-                184,
-                167,
-                176,
-                61,
-                173,
-                226
-            ],
-            "accounts": [
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "if_rebalance_config",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    102,
-                                    95,
-                                    114,
-                                    101,
-                                    98,
-                                    97,
-                                    108,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    99,
-                                    111,
-                                    110,
-                                    102,
-                                    105,
-                                    103
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "params.in_market_index"
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "params.out_market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "rent",
-                    "address": "SysvarRent111111111111111111111111111111111"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "params",
-                    "type": {
-                        "defined": {
-                            "name": "IfRebalanceConfigParams"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "initialize_insurance_fund_stake",
             "discriminator": [
@@ -8123,75 +7479,164 @@
             ]
         },
         {
-            "name": "transfer_deposit",
+            "name": "sweep_perp_market_fees",
             "discriminator": [
-                20,
-                20,
+                194,
                 147,
-                223,
-                41,
-                63,
-                204,
-                111
+                181,
+                230,
+                193,
+                155,
+                241,
+                225
             ],
             "accounts": [
-                {
-                    "name": "from_user",
-                    "writable": true
-                },
-                {
-                    "name": "to_user",
-                    "writable": true
-                },
-                {
-                    "name": "user_stats",
-                    "writable": true
-                },
-                {
-                    "name": "authority",
-                    "signer": true,
-                    "relations": [
-                        "from_user",
-                        "to_user",
-                        "user_stats"
-                    ]
-                },
                 {
                     "name": "state"
                 },
                 {
-                    "name": "spot_market_vault",
+                    "name": "perp_market",
+                    "writable": true,
                     "pda": {
                         "seeds": [
                             {
                                 "kind": "const",
                                 "value": [
-                                    115,
                                     112,
-                                    111,
-                                    116,
+                                    101,
+                                    114,
+                                    112,
                                     95,
                                     109,
                                     97,
                                     114,
                                     107,
                                     101,
-                                    116,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
                                     116
                                 ]
                             },
                             {
                                 "kind": "arg",
-                                "path": "market_index"
+                                "path": "perp_market_index"
                             }
                         ]
                     }
-                }
+                },
+                {
+                    "name": "spot_market",
+                    "docs": [
+                        "The perp market's quote spot market (enforced by the PDA derivation)"
+                    ],
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "perp_market"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "oracle",
+                    "relations": [
+                        "perp_market"
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "perp_market_index",
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "transfer_deposit",
+            "discriminator": [
+                20,
+                20,
+                147,
+                223,
+                41,
+                63,
+                204,
+                111
+            ],
+            "accounts": [
+                {
+                    "name": "from_user",
+                    "writable": true
+                },
+                {
+                    "name": "to_user",
+                    "writable": true
+                },
+                {
+                    "name": "user_stats",
+                    "writable": true
+                },
+                {
+                    "name": "authority",
+                    "signer": true,
+                    "relations": [
+                        "from_user",
+                        "to_user",
+                        "user_stats"
+                    ]
+                },
+                {
+                    "name": "state"
+                },
+                {
+                    "name": "spot_market_vault",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_index"
+                            }
+                        ]
+                    }
+                }
             ],
             "args": [
                 {
@@ -8727,120 +8172,6 @@
                 }
             ]
         },
-        {
-            "name": "transfer_protocol_if_shares_to_revenue_pool",
-            "discriminator": [
-                236,
-                136,
-                147,
-                153,
-                146,
-                205,
-                104,
-                29
-            ],
-            "accounts": [
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "authority",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "spot_market_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "market_index"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "if_rebalance_config",
-                    "writable": true
-                },
-                {
-                    "name": "token_program"
-                },
-                {
-                    "name": "velocity_signer"
-                }
-            ],
-            "args": [
-                {
-                    "name": "market_index",
-                    "type": "u16"
-                },
-                {
-                    "name": "amount",
-                    "type": "u64"
-                }
-            ]
-        },
         {
             "name": "trigger_order",
             "discriminator": [
@@ -9359,117 +8690,16 @@
             ]
         },
         {
-            "name": "update_delegate_user_gov_token_insurance_stake",
+            "name": "update_discount_mint",
             "discriminator": [
-                241,
-                29,
-                215,
-                228,
-                142,
-                116,
-                22,
-                160
-            ],
-            "accounts": [
-                {
-                    "name": "spot_market",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    15,
-                                    0
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "insurance_fund_stake"
-                },
-                {
-                    "name": "user_stats",
-                    "writable": true
-                },
-                {
-                    "name": "admin",
-                    "signer": true
-                },
-                {
-                    "name": "insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    15,
-                                    0
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "state"
-                }
-            ],
-            "args": []
-        },
-        {
-            "name": "update_discount_mint",
-            "discriminator": [
-                32,
-                252,
-                122,
-                211,
-                66,
-                31,
-                47,
-                241
+                32,
+                252,
+                122,
+                211,
+                66,
+                31,
+                47,
+                241
             ],
             "accounts": [
                 {
@@ -9759,43 +8989,6 @@
                 }
             ]
         },
-        {
-            "name": "update_if_rebalance_config",
-            "discriminator": [
-                142,
-                245,
-                249,
-                66,
-                249,
-                181,
-                22,
-                83
-            ],
-            "accounts": [
-                {
-                    "name": "admin",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "if_rebalance_config",
-                    "writable": true
-                },
-                {
-                    "name": "state"
-                }
-            ],
-            "args": [
-                {
-                    "name": "params",
-                    "type": {
-                        "defined": {
-                            "name": "IfRebalanceConfigParams"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "update_initial_amm_cache_info",
             "discriminator": [
@@ -10632,6 +9825,70 @@
                 }
             ]
         },
+        {
+            "name": "update_perp_market_fee_pool_buffer_target",
+            "discriminator": [
+                125,
+                234,
+                40,
+                44,
+                91,
+                26,
+                231,
+                177
+            ],
+            "accounts": [
+                {
+                    "name": "admin",
+                    "signer": true
+                },
+                {
+                    "name": "state"
+                },
+                {
+                    "name": "perp_market",
+                    "writable": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "fee_pool_buffer_target",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "update_perp_market_funding_bias_sensitivity",
+            "discriminator": [
+                143,
+                62,
+                234,
+                145,
+                184,
+                237,
+                110,
+                116
+            ],
+            "accounts": [
+                {
+                    "name": "admin",
+                    "signer": true
+                },
+                {
+                    "name": "state"
+                },
+                {
+                    "name": "perp_market",
+                    "writable": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "funding_bias_sensitivity",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "update_perp_market_funding_period",
             "discriminator": [
@@ -10733,6 +9990,10 @@
                 {
                     "name": "if_liquidation_fee",
                     "type": "u32"
+                },
+                {
+                    "name": "protocol_liquidation_fee",
+                    "type": "u32"
                 }
             ]
         },
@@ -11721,6 +10982,48 @@
                 }
             ]
         },
+        {
+            "name": "update_protocol_fee_recipient",
+            "docs": [
+                "Cold-only: set the treasury protocol fees may be withdrawn to.",
+                "Perp (quote) and spot (per-market token) recipients are configured",
+                "independently via `market_type`."
+            ],
+            "discriminator": [
+                213,
+                60,
+                21,
+                106,
+                42,
+                67,
+                60,
+                162
+            ],
+            "accounts": [
+                {
+                    "name": "state",
+                    "writable": true
+                },
+                {
+                    "name": "admin",
+                    "signer": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "protocol_fee_recipient",
+                    "type": "pubkey"
+                },
+                {
+                    "name": "market_type",
+                    "type": {
+                        "defined": {
+                            "name": "MarketType"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "update_special_user_status",
             "discriminator": [
@@ -12051,11 +11354,11 @@
                     "type": "u16"
                 },
                 {
-                    "name": "user_if_factor",
+                    "name": "if_fee_factor",
                     "type": "u32"
                 },
                 {
-                    "name": "total_if_factor",
+                    "name": "protocol_fee_factor",
                     "type": "u32"
                 }
             ]
@@ -12125,6 +11428,10 @@
                 {
                     "name": "if_liquidation_fee",
                     "type": "u32"
+                },
+                {
+                    "name": "protocol_liquidation_fee",
+                    "type": "u32"
                 }
             ]
         },
@@ -12842,118 +12149,16 @@
             ]
         },
         {
-            "name": "update_user_gov_token_insurance_stake",
+            "name": "update_user_idle",
             "discriminator": [
-                143,
-                99,
-                235,
-                187,
+                253,
+                133,
+                67,
+                22,
+                103,
+                161,
                 20,
-                159,
-                184,
-                84
-            ],
-            "accounts": [
-                {
-                    "name": "state"
-                },
-                {
-                    "name": "spot_market",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    112,
-                                    111,
-                                    116,
-                                    95,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    15,
-                                    0
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "insurance_fund_stake",
-                    "writable": true
-                },
-                {
-                    "name": "user_stats",
-                    "writable": true
-                },
-                {
-                    "name": "signer",
-                    "signer": true
-                },
-                {
-                    "name": "insurance_fund_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    105,
-                                    110,
-                                    115,
-                                    117,
-                                    114,
-                                    97,
-                                    110,
-                                    99,
-                                    101,
-                                    95,
-                                    102,
-                                    117,
-                                    110,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    15,
-                                    0
-                                ]
-                            }
-                        ]
-                    }
-                }
-            ],
-            "args": []
-        },
-        {
-            "name": "update_user_idle",
-            "discriminator": [
-                253,
-                133,
-                67,
-                22,
-                103,
-                161,
-                20,
-                100
+                100
             ],
             "accounts": [
                 {
@@ -13413,6 +12618,12 @@
                 {
                     "name": "spot_market",
                     "writable": true
+                },
+                {
+                    "name": "oracle",
+                    "relations": [
+                        "spot_market"
+                    ]
                 }
             ],
             "args": [
@@ -13912,32 +13123,426 @@
                     "name": "velocity_signer"
                 },
                 {
-                    "name": "constituent",
-                    "writable": true
+                    "name": "constituent",
+                    "writable": true
+                },
+                {
+                    "name": "constituent_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "spot_market",
+                    "writable": true
+                },
+                {
+                    "name": "spot_market_vault",
+                    "writable": true
+                },
+                {
+                    "name": "token_program"
+                },
+                {
+                    "name": "mint"
+                },
+                {
+                    "name": "oracle"
+                }
+            ],
+            "args": [
+                {
+                    "name": "amount",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "withdraw_protocol_fees_perp",
+            "docs": [
+                "Withdraw a perp market's accrued protocol fees (from the quote spot vault)",
+                "to `protocol_fee_recipient_perp` (auth: `FeeWithdraw` hot key)."
+            ],
+            "discriminator": [
+                227,
+                99,
+                23,
+                227,
+                168,
+                217,
+                136,
+                181
+            ],
+            "accounts": [
+                {
+                    "name": "state"
+                },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "authority",
+                    "signer": true
+                },
+                {
+                    "name": "perp_market",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    112,
+                                    101,
+                                    114,
+                                    112,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_index"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "quote_spot_market",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "perp_market"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "spot_market_vault",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "perp_market"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "mint",
+                    "relations": [
+                        "spot_market_vault"
+                    ]
+                },
+                {
+                    "name": "recipient"
+                },
+                {
+                    "name": "recipient_token_account",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "recipient"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "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": "token_program"
+                },
+                {
+                    "name": "velocity_signer"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                }
+            ],
+            "args": [
+                {
+                    "name": "market_index",
+                    "type": "u16"
+                },
+                {
+                    "name": "amount",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "withdraw_protocol_fees_spot",
+            "docs": [
+                "Withdraw a spot market's accrued protocol fees to `protocol_fee_recipient_spot`",
+                "(auth: `FeeWithdraw` hot key)."
+            ],
+            "discriminator": [
+                177,
+                216,
+                30,
+                239,
+                253,
+                177,
+                123,
+                155
+            ],
+            "accounts": [
+                {
+                    "name": "state"
+                },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "authority",
+                    "signer": true
+                },
+                {
+                    "name": "spot_market",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_index"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "spot_market_vault",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    115,
+                                    112,
+                                    111,
+                                    116,
+                                    95,
+                                    109,
+                                    97,
+                                    114,
+                                    107,
+                                    101,
+                                    116,
+                                    95,
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_index"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "mint",
+                    "relations": [
+                        "spot_market_vault"
+                    ]
                 },
                 {
-                    "name": "constituent_token_account",
-                    "writable": true
+                    "name": "recipient"
                 },
                 {
-                    "name": "spot_market",
-                    "writable": true
+                    "name": "recipient_token_account",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "recipient"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "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": "spot_market_vault",
-                    "writable": true
+                    "name": "token_program"
                 },
                 {
-                    "name": "token_program"
+                    "name": "velocity_signer"
                 },
                 {
-                    "name": "mint"
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
                 },
                 {
-                    "name": "oracle"
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
                 }
             ],
             "args": [
+                {
+                    "name": "market_index",
+                    "type": "u16"
+                },
                 {
                     "name": "amount",
                     "type": "u64"
@@ -14038,19 +13643,6 @@
                 99
             ]
         },
-        {
-            "name": "IfRebalanceConfig",
-            "discriminator": [
-                214,
-                84,
-                40,
-                251,
-                107,
-                144,
-                173,
-                239
-            ]
-        },
         {
             "name": "InsuranceFundStake",
             "discriminator": [
@@ -14235,19 +13827,6 @@
         }
     ],
     "events": [
-        {
-            "name": "AdminWithdrawFromInsuranceFundRecord",
-            "discriminator": [
-                230,
-                236,
-                10,
-                0,
-                196,
-                41,
-                147,
-                45
-            ]
-        },
         {
             "name": "AmmCurveChanged",
             "discriminator": [
@@ -14339,19 +13918,6 @@
                 114
             ]
         },
-        {
-            "name": "InsuranceFundSwapRecord",
-            "discriminator": [
-                85,
-                190,
-                99,
-                203,
-                237,
-                33,
-                227,
-                100
-            ]
-        },
         {
             "name": "LPBorrowLendDepositRecord",
             "discriminator": [
@@ -14456,6 +14022,32 @@
                 90
             ]
         },
+        {
+            "name": "PerpMarketFeeSweepRecord",
+            "discriminator": [
+                55,
+                107,
+                227,
+                104,
+                179,
+                8,
+                121,
+                33
+            ]
+        },
+        {
+            "name": "ProtocolFeeWithdrawRecord",
+            "discriminator": [
+                249,
+                158,
+                52,
+                81,
+                30,
+                11,
+                45,
+                149
+            ]
+        },
         {
             "name": "RevenueShareSettleRecord",
             "discriminator": [
@@ -14547,19 +14139,6 @@
                 12
             ]
         },
-        {
-            "name": "TransferProtocolIfSharesToRevenuePoolRecord",
-            "discriminator": [
-                209,
-                118,
-                142,
-                167,
-                130,
-                46,
-                164,
-                151
-            ]
-        },
         {
             "name": "_SignedMsgOrderParamsExport",
             "discriminator": [
@@ -16334,6 +15913,21 @@
             "code": 6351,
             "name": "InvalidAdminTier",
             "msg": "Signer is not authorized for this admin tier"
+        },
+        {
+            "code": 6352,
+            "name": "WithdrawGuardThresholdNotionalTooLarge",
+            "msg": "Withdraw guard threshold notional exceeds max"
+        },
+        {
+            "code": 6353,
+            "name": "InvalidProtocolFeeRecipient",
+            "msg": "Recipient must be the configured protocol fee recipient"
+        },
+        {
+            "code": 6354,
+            "name": "InsufficientProtocolFees",
+            "msg": "Insufficient protocol fees available to withdraw"
         }
     ],
     "types": [
@@ -16433,7 +16027,11 @@
                     {
                         "name": "total_fee",
                         "docs": [
-                            "total fees collected by this perp market",
+                            "Lifetime fee-derived income booked to the AMM ITSELF (analytics):",
+                            "its fee provision (the `amm_fee` cut of trade-fee remainders) plus",
+                            "spread surplus. NOT the market's gross fees — those live in",
+                            "`PerpMarket.fee_ledger.total_exchange_fee`. Adjusted in lockstep with",
+                            "`total_fee_minus_distributions` by admin summary-stats corrections.",
                             "precision: QUOTE_PRECISION"
                         ],
                         "type": "i128"
@@ -16441,7 +16039,9 @@
                     {
                         "name": "total_mm_fee",
                         "docs": [
-                            "total fees collected by the vAMM's bid/ask spread",
+                            "Spread-capture component of `total_fee` (analytics): the gap between",
+                            "the curve price and the execution price on AMM fills. Trading profit,",
+                            "not a fee anyone explicitly pays.",
                             "precision: QUOTE_PRECISION"
                         ],
                         "type": "i128"
@@ -16449,7 +16049,14 @@
                     {
                         "name": "total_fee_minus_distributions",
                         "docs": [
-                            "total fees minus any recognized upnl and pool withdraws",
+                            "The AMM's equity ledger (retained earnings) — broader than the name",
+                            "suggests: fee income (`apply_fill_fees`) + funding and other P&L",
+                            "(`record_amm_pnl`) + external credits (`record_credit`), minus",
+                            "curve-adjustment costs (`apply_cost`) and bankruptcy clawbacks.",
+                            "Contains ONLY the AMM's own money (protocol/IF carveouts never enter",
+                            "it). Drives `is_underwater`, the drawdown breaker, and curve-cost",
+                            "budgets; reconciled against pool balances by",
+                            "`calculate_perp_market_amm_summary_stats`.",
                             "precision: QUOTE_PRECISION"
                         ],
                         "type": "i128"
@@ -16457,7 +16064,9 @@
                     {
                         "name": "total_fee_withdrawn",
                         "docs": [
-                            "sum of all fees from fee pool withdrawn to revenue pool",
+                            "@deprecated frozen analytics counter from the pre-isolation design",
+                            "(sum of fees withdrawn from the fee pool to the revenue pool). The",
+                            "sweep no longer touches the AMM's pools, so nothing writes this.",
                             "precision: QUOTE_PRECISION"
                         ],
                         "type": "u128"
@@ -16635,12 +16244,25 @@
                         "name": "reference_price_offset_deadband_pct",
                         "type": "u8"
                     },
+                    {
+                        "name": "funding_bias_sensitivity",
+                        "docs": [
+                            "s in the funding bias β(f) = 1 + s * ρ(f): how much the paying-side",
+                            "spread widens while the vAMM pays funding on its inventory.",
+                            "",
+                            "s is stored in hundredths (s = value / 100), so at full ramp (ρ = 1)",
+                            "the multiplier is 1 + value/100: 50 => 1.5x, 100 => 2x, u8 caps s at",
+                            "2.55. Same convention as `amm_spread_adjustment` (100 = double).",
+                            "0 disables the bias."
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding_post_amm",
                         "type": {
                             "array": [
                                 "u8",
-                                3
+                                2
                             ]
                         }
                     }
@@ -16667,50 +16289,6 @@
                 ]
             }
         },
-        {
-            "name": "AdminWithdrawFromInsuranceFundRecord",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "market_index",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "admin",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "shares_burned",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "insurance_fund_vault_amount_before",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "protocol_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "protocol_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "recipient_token_account",
-                        "type": "pubkey"
-                    }
-                ]
-            }
-        },
         {
             "name": "AmmCache",
             "type": {
@@ -17640,52 +17218,126 @@
                         "type": "u128"
                     },
                     {
-                        "name": "market_cumulative_borrow_interest",
+                        "name": "market_cumulative_borrow_interest",
+                        "docs": [
+                            "precision: SPOT_CUMULATIVE_INTEREST_PRECISION"
+                        ],
+                        "type": "u128"
+                    },
+                    {
+                        "name": "total_deposits_after",
+                        "docs": [
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "total_withdraws_after",
+                        "docs": [
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "explanation",
+                        "type": {
+                            "defined": {
+                                "name": "DepositExplanation"
+                            }
+                        }
+                    },
+                    {
+                        "name": "transfer_user",
+                        "type": {
+                            "option": "pubkey"
+                        }
+                    },
+                    {
+                        "name": "signer",
+                        "type": {
+                            "option": "pubkey"
+                        }
+                    },
+                    {
+                        "name": "user_token_amount_after",
+                        "docs": [
+                            "precision: token mint precision"
+                        ],
+                        "type": "i128"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "FeeLedger",
+            "docs": [
+                "All of a perp market's fee-split accounting in one ledger.",
+                "Pure counters — token claims live in the pools",
+                "(`protocol_fee_pool`, the quote `revenue_pool`, `AMM.fee_pool`).",
+                "Convention: gross-fee counters record what the taker actually paid",
+                "(post referee discount, pre carve-outs) on BOTH the AMM and DLOB-match",
+                "paths."
+            ],
+            "serialization": "bytemuckunsafe",
+            "repr": {
+                "kind": "c"
+            },
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "total_exchange_fee",
+                        "docs": [
+                            "lifetime gross taker fees collected (analytics; not a routing driver)",
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u128"
+                    },
+                    {
+                        "name": "total_liquidation_fee",
+                        "docs": [
+                            "lifetime liquidation fees charged to liquidatees (IF + protocol cuts;",
+                            "pure analytics — routing happens via the pending counters).",
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u128"
+                    },
+                    {
+                        "name": "pending_protocol_fee",
                         "docs": [
-                            "precision: SPOT_CUMULATIVE_INTEREST_PRECISION"
+                            "protocol (residual) carveouts accrued but not yet materialized into",
+                            "`protocol_fee_pool`. precision: QUOTE_PRECISION"
                         ],
                         "type": "u128"
                     },
                     {
-                        "name": "total_deposits_after",
+                        "name": "pending_if_fee",
                         "docs": [
+                            "insurance-fund carveouts accrued but not yet materialized into the",
+                            "quote `revenue_pool`; also the first bankruptcy tranche.",
                             "precision: QUOTE_PRECISION"
                         ],
-                        "type": "u64"
+                        "type": "u128"
                     },
                     {
-                        "name": "total_withdraws_after",
+                        "name": "amm_protocol_fees_received",
                         "docs": [
-                            "precision: QUOTE_PRECISION"
+                            "cumulative fee provision granted to the AMM via `amm_fee_numerator` —",
+                            "its backstop-of-last-resort tranche, drawable (and decremented) only in",
+                            "bankruptcy. The AMM's own spread/trading capital beyond this provision",
+                            "is never tapped. precision: QUOTE_PRECISION"
                         ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "explanation",
-                        "type": {
-                            "defined": {
-                                "name": "DepositExplanation"
-                            }
-                        }
-                    },
-                    {
-                        "name": "transfer_user",
-                        "type": {
-                            "option": "pubkey"
-                        }
-                    },
-                    {
-                        "name": "signer",
-                        "type": {
-                            "option": "pubkey"
-                        }
+                        "type": "u128"
                     },
                     {
-                        "name": "user_token_amount_after",
+                        "name": "pending_amm_provision",
                         "docs": [
-                            "precision: token mint precision"
+                            "AMM fee provision accrued at fill (already booked into the AMM's",
+                            "`total_fee_minus_distributions`) but not yet tokenized into",
+                            "`amm.fee_pool` by the sweep. Invariant: `<= amm_protocol_fees_received`.",
+                            "precision: QUOTE_PRECISION"
                         ],
-                        "type": "i128"
+                        "type": "u128"
                     }
                 ]
             }
@@ -17724,13 +17376,26 @@
                         "type": "u64"
                     },
                     {
-                        "name": "padding",
+                        "name": "amm_fee_numerator",
                         "docs": [
-                            "Reserved padding. Kept so `size_of::<FeeStructure>()` stays a multiple of 16",
-                            "(OrderFillerRewardStructure's u128 forces 16-byte alignment on host x86_64);",
-                            "removing it would diverge host vs. SBF layout."
+                            "Share of the trade-fee *remainder* (taker fee after maker rebate, referral,",
+                            "referee discount, and filler reward are taken off the top) provisioned to",
+                            "the AMM as liquidity (its backstop-of-last-resort tranche, tracked in",
+                            "`PerpMarket.fee_ledger.amm_protocol_fees_received`). precision:",
+                            "FEE_PERCENTAGE_DENOMINATOR. `amm_fee_numerator + if_fee_numerator` must",
+                            "be <= FEE_PERCENTAGE_DENOMINATOR; the protocol receives the residual",
+                            "(`remainder − amm − if`) into its withdrawable `protocol_fee_pool`.",
+                            "(Was the reserved `padding: u64`, repartitioned into two u32s —",
+                            "size/alignment unchanged.)"
                         ],
-                        "type": "u64"
+                        "type": "u32"
+                    },
+                    {
+                        "name": "if_fee_numerator",
+                        "docs": [
+                            "Share of the trade-fee remainder routed to the insurance fund (`revenue_pool`)."
+                        ],
+                        "type": "u32"
                     }
                 ]
             }
@@ -18090,9 +17755,6 @@
                     {
                         "name": "LpSettle"
                     },
-                    {
-                        "name": "IfRebalance"
-                    },
                     {
                         "name": "FeatureFlag"
                     },
@@ -18110,160 +17772,9 @@
                     },
                     {
                         "name": "AmmSpreadAdjust"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "IfRebalanceConfig",
-            "serialization": "bytemuckunsafe",
-            "repr": {
-                "kind": "c"
-            },
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "pubkey",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "total_in_amount",
-                        "docs": [
-                            "total amount to be sold"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "current_in_amount",
-                        "docs": [
-                            "amount already sold"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "current_out_amount",
-                        "docs": [
-                            "amount already bought"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "current_out_amount_transferred",
-                        "docs": [
-                            "amount already transferred to revenue pool"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "current_in_amount_since_last_transfer",
-                        "docs": [
-                            "amount already bought in epoch"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "epoch_start_ts",
-                        "docs": [
-                            "start time of epoch"
-                        ],
-                        "type": "i64"
-                    },
-                    {
-                        "name": "epoch_in_amount",
-                        "docs": [
-                            "amount already bought in epoch"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "epoch_max_in_amount",
-                        "docs": [
-                            "max amount to swap in epoch"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "epoch_duration",
-                        "docs": [
-                            "duration of epoch"
-                        ],
-                        "type": "i64"
-                    },
-                    {
-                        "name": "out_market_index",
-                        "docs": [
-                            "market index to sell"
-                        ],
-                        "type": "u16"
-                    },
-                    {
-                        "name": "in_market_index",
-                        "docs": [
-                            "market index to buy"
-                        ],
-                        "type": "u16"
-                    },
-                    {
-                        "name": "max_slippage_bps",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "swap_mode",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "status",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "padding2",
-                        "type": {
-                            "array": [
-                                "u8",
-                                32
-                            ]
-                        }
-                    }
-                ]
-            }
-        },
-        {
-            "name": "IfRebalanceConfigParams",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "total_in_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "epoch_max_in_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "epoch_duration",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "out_market_index",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "in_market_index",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "max_slippage_bps",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "swap_mode",
-                        "type": "u8"
                     },
                     {
-                        "name": "status",
-                        "type": "u8"
+                        "name": "FeeWithdraw"
                     }
                 ]
             }
@@ -18356,15 +17867,33 @@
                     },
                     {
                         "name": "revenue_settle_period",
+                        "docs": [
+                            "How often `revenue_pool` may settle into the IF vault (seconds)."
+                        ],
                         "type": "i64"
                     },
                     {
-                        "name": "total_factor",
+                        "name": "if_fee_factor",
+                        "docs": [
+                            "Fraction of spot deposit-interest gains carved out to the insurance fund",
+                            "(staker-owned). precision: IF_FACTOR_PRECISION. (Was `total_factor`; the",
+                            "protocol-vs-staker split was removed — the IF is now 100% staker-owned,",
+                            "so this is purely the staker IF carveout.)"
+                        ],
                         "type": "u32"
                     },
                     {
-                        "name": "user_factor",
-                        "type": "u32"
+                        "name": "_padding_if",
+                        "docs": [
+                            "Was `user_factor` (the old protocol/staker split knob). The IF is now",
+                            "100% staker-owned, so the split is gone; slot kept as padding."
+                        ],
+                        "type": {
+                            "array": [
+                                "u8",
+                                4
+                            ]
+                        }
                     }
                 ]
             }
@@ -18533,112 +18062,24 @@
                         "type": "u128"
                     },
                     {
-                        "name": "user_if_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "total_if_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "if_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "user_if_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "total_if_shares_after",
-                        "type": "u128"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "InsuranceFundSwapRecord",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "rebalance_config",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "in_if_total_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "out_if_total_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "in_if_user_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "out_if_user_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "in_if_total_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "out_if_total_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "in_if_user_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "out_if_user_shares_after",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "in_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "out_amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "out_oracle_price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "out_oracle_price_twap",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "in_vault_amount_before",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "out_vault_amount_before",
-                        "type": "u64"
+                        "name": "user_if_shares_before",
+                        "type": "u128"
                     },
                     {
-                        "name": "in_fund_vault_amount_after",
-                        "type": "u64"
+                        "name": "total_if_shares_before",
+                        "type": "u128"
                     },
                     {
-                        "name": "out_fund_vault_amount_after",
-                        "type": "u64"
+                        "name": "if_shares_after",
+                        "type": "u128"
                     },
                     {
-                        "name": "in_market_index",
-                        "type": "u16"
+                        "name": "user_if_shares_after",
+                        "type": "u128"
                     },
                     {
-                        "name": "out_market_index",
-                        "type": "u16"
+                        "name": "total_if_shares_after",
+                        "type": "u128"
                     }
                 ]
             }
@@ -19256,6 +18697,14 @@
                             "precision: QUOTE_PRECISION"
                         ],
                         "type": "u64"
+                    },
+                    {
+                        "name": "protocol_fee",
+                        "docs": [
+                            "protocol's cut, routed to the perp market's `protocol_fee_pool`",
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u64"
                     }
                 ]
             }
@@ -19298,6 +18747,14 @@
                             "precision: token mint precision"
                         ],
                         "type": "u64"
+                    },
+                    {
+                        "name": "protocol_fee",
+                        "docs": [
+                            "protocol's cut, routed to the liability market's `protocol_fee_pool`",
+                            "precision: token mint precision"
+                        ],
+                        "type": "u64"
                     }
                 ]
             }
@@ -19674,15 +19131,26 @@
                     {
                         "name": "padding",
                         "docs": [
-                            "Padding so historical_oracle_data is 8-aligned."
+                            "Padding so last_funding_oracle_twap is 8-aligned."
                         ],
                         "type": {
                             "array": [
                                 "u8",
-                                11
+                                3
                             ]
                         }
                     },
+                    {
+                        "name": "last_funding_oracle_twap",
+                        "docs": [
+                            "Oracle TWAP captured at last funding update, the normalizer",
+                            "`last_24h_avg_funding_rate` accrued against. Read by the AMM's",
+                            "funding bias spread and `get_last_funding_basis`. Migrated from",
+                            "`PerpMarket` so the AMM reads only from `MarketStats`.",
+                            "precision: PRICE_PRECISION"
+                        ],
+                        "type": "i64"
+                    },
                     {
                         "name": "historical_oracle_data",
                         "docs": [
@@ -21028,20 +20496,17 @@
                         "type": "i128"
                     },
                     {
-                        "name": "total_exchange_fee",
-                        "docs": [
-                            "total fees collected by exchange fee schedule",
-                            "precision: QUOTE_PRECISION"
-                        ],
-                        "type": "u128"
-                    },
-                    {
-                        "name": "total_liquidation_fee",
+                        "name": "fee_ledger",
                         "docs": [
-                            "all fees collected by market for liquidations",
-                            "precision: QUOTE_PRECISION"
+                            "The market's fee ledger: every fee-split counter in one place (gross",
+                            "analytics, pending protocol/IF carveouts, and the AMM's backstop",
+                            "tranche). Mutate through its accessor methods, not raw field writes."
                         ],
-                        "type": "u128"
+                        "type": {
+                            "defined": {
+                                "name": "FeeLedger"
+                            }
+                        }
                     },
                     {
                         "name": "oracle",
@@ -21062,6 +20527,67 @@
                             }
                         }
                     },
+                    {
+                        "name": "protocol_fee_pool",
+                        "docs": [
+                            "Protocol fees collected on this perp market, quote/USDC-denominated — a",
+                            "protocol-owned Deposit-type claim against the quote spot market vault",
+                            "(like `pnl_pool`; counted in the quote market's `deposit_balance`).",
+                            "Owned by the protocol, not users, and never part of the insurance",
+                            "backstop. `market_index` is set to `quote_spot_market_index`. Withdrawn",
+                            "directly to `State.protocol_fee_recipient_perp`."
+                        ],
+                        "type": {
+                            "defined": {
+                                "name": "PoolBalance"
+                            }
+                        }
+                    },
+                    {
+                        "name": "protocol_liquidation_fee",
+                        "docs": [
+                            "Protocol's cut of a perp liquidation, taken from the liquidatee.",
+                            "precision: LIQUIDATOR_FEE_PRECISION"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "_padding_buffer",
+                        "type": {
+                            "array": [
+                                "u8",
+                                4
+                            ]
+                        }
+                    },
+                    {
+                        "name": "fee_pool_buffer_target",
+                        "docs": [
+                            "The pnl-pool retention buffer the streaming sweep's IF and",
+                            "AMM-provision drains leave untouched: `sweep_market_fees` drains",
+                            "those pendings only from what the pnl pool holds above",
+                            "`max(net_user_pnl, 0) + fee_pool_buffer_target`. The protocol drain",
+                            "is EXEMPT — it reserves only `max(net_user_pnl, 0)` and runs first;",
+                            "it sweeps every settle, so each drain stays small, and its pending is",
+                            "no bankruptcy tranche so retaining it buys nothing.",
+                            "",
+                            "Why a buffer on top of the user-claims reservation: `net_user_pnl`",
+                            "is a mark-to-market snapshot, so a pool swept to the exact mark is",
+                            "short on the next adverse oracle tick — and the sweep is a one-way",
+                            "valve, so the slack can't be cheaply recalled (IF value returns only",
+                            "through capped gated paths, the AMM provision only via bankruptcy",
+                            "clawback). The buffer throttles those outflows per sweep; pool tokens",
+                            "are fungible (pendings are counters, not segregated tokens), so",
+                            "whichever cut lingers keeps settling winners in the meantime. This",
+                            "delays materialization, it does not divert anyone's cut. Side",
+                            "benefits: an unswept IF cut gives THIS market uncapped market-local",
+                            "bankruptcy coverage (tranche 1) instead of capped shared-vault",
+                            "coverage, and the buffer damps the IF settle ratchet (value settled",
+                            "into the IF accrues to stakers permanently).",
+                            "precision: QUOTE_PRECISION"
+                        ],
+                        "type": "u64"
+                    },
                     {
                         "name": "name",
                         "docs": [
@@ -21124,11 +20650,17 @@
                         "type": "i64"
                     },
                     {
-                        "name": "last_funding_oracle_twap",
+                        "name": "_padding_funding_twap",
                         "docs": [
-                            "oracle TWAP captured at last funding update"
+                            "Explicit padding where `last_funding_oracle_twap` used to live",
+                            "(moved to `MarketStats`); keeps every later field at its old offset."
                         ],
-                        "type": "i64"
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
                     },
                     {
                         "name": "order_step_size",
@@ -21407,13 +20939,14 @@
                         "docs": [
                             "Trailing padding so `market_stats` lands at the offset Rust naturally",
                             "computes via `repr(C)` alignment and the `(SIZE - 8) % 16 == 0`",
-                            "invariant holds. Bumped to 36 bytes (was 28) when `next_curve_record_id`",
-                            "was removed."
+                            "invariant holds. (32 bytes moved into `fee_ledger` as",
+                            "`amm_protocol_fees_received` and then `pending_amm_provision` joined",
+                            "it, keeping `market_stats` fixed.)"
                         ],
                         "type": {
                             "array": [
                                 "u8",
-                                36
+                                4
                             ]
                         }
                     },
@@ -21478,6 +21011,50 @@
                 ]
             }
         },
+        {
+            "name": "PerpMarketFeeSweepRecord",
+            "docs": [
+                "Emitted by the streaming fee sweep (`sweep_market_fees`) when it",
+                "materializes pending fee carveouts out of a perp market's pnl pool."
+            ],
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "ts",
+                        "docs": [
+                            "unix_timestamp of action"
+                        ],
+                        "type": "i64"
+                    },
+                    {
+                        "name": "market_index",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "if_swept",
+                        "docs": [
+                            "pending insurance cut moved to the quote spot market's revenue_pool"
+                        ],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "protocol_swept",
+                        "docs": [
+                            "pending protocol cut moved to the market's protocol_fee_pool"
+                        ],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "amm_provision_tokenized",
+                        "docs": [
+                            "AMM fee provision tokenized into amm.fee_pool (booked at fill)"
+                        ],
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "PerpPosition",
             "serialization": "bytemuckunsafe",
@@ -21755,6 +21332,51 @@
                 ]
             }
         },
+        {
+            "name": "ProtocolFeeWithdrawRecord",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "ts",
+                        "docs": [
+                            "unix_timestamp of action"
+                        ],
+                        "type": "i64"
+                    },
+                    {
+                        "name": "market_index",
+                        "docs": [
+                            "perp market index for a perp-fee withdrawal, else the spot market index"
+                        ],
+                        "type": "u16"
+                    },
+                    {
+                        "name": "is_perp",
+                        "docs": [
+                            "true if this withdrawal drained a perp market's protocol_fee_pool",
+                            "(sourced from the quote spot vault), false for a spot market withdrawal"
+                        ],
+                        "type": "bool"
+                    },
+                    {
+                        "name": "spot_market_index",
+                        "docs": [
+                            "the spot market the tokens were drawn from"
+                        ],
+                        "type": "u16"
+                    },
+                    {
+                        "name": "amount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "recipient_token_account",
+                        "type": "pubkey"
+                    }
+                ]
+            }
+        },
         {
             "name": "PythLazerOracle",
             "serialization": "bytemuckunsafe",
@@ -23135,12 +22757,58 @@
                         "name": "pool_id",
                         "type": "u8"
                     },
+                    {
+                        "name": "_padding_align_pfp",
+                        "docs": [
+                            "Aligns `protocol_fee_pool`'s leading u128 to a 16-byte struct offset so",
+                            "host (x86_64, align 16) and SBF (align 8) layouts agree. Do not reorder."
+                        ],
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
+                    },
+                    {
+                        "name": "protocol_fee_pool",
+                        "docs": [
+                            "Protocol fees collected in this market's token (lending protocol carveout",
+                            "+ spot-liquidation protocol fee). A protocol-owned Deposit-type claim",
+                            "inside the spot vault (counted in `deposit_balance`, like `revenue_pool`)",
+                            "— owned by the protocol, not users, and never part of the insurance",
+                            "backstop. Withdrawn directly to `State.protocol_fee_recipient_spot`; the",
+                            "withdrawal decrements this claim and re-validates the vault still covers",
+                            "all remaining claims, so it can never tap user deposits."
+                        ],
+                        "type": {
+                            "defined": {
+                                "name": "PoolBalance"
+                            }
+                        }
+                    },
+                    {
+                        "name": "protocol_liquidation_fee",
+                        "docs": [
+                            "Protocol's cut of a spot liquidation, taken from the liquidatee.",
+                            "precision: LIQUIDATOR_FEE_PRECISION"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "protocol_fee_factor",
+                        "docs": [
+                            "Protocol's carveout of lending deposit-interest gains, routed to",
+                            "`protocol_fee_pool`. precision: IF_FACTOR_PRECISION"
+                        ],
+                        "type": "u32"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                56
+                                8
                             ]
                         }
                     }
@@ -23320,7 +22988,7 @@
                     {
                         "name": "warm_admin",
                         "docs": [
-                            "Operational authority (e.g. multisig+timelock). Can rotate the 11 hot keys",
+                            "Operational authority (e.g. multisig+timelock). Can rotate the 10 hot keys",
                             "below. `Pubkey::default()` means unset — only `cold_admin` can act in that case."
                         ],
                         "type": "pubkey"
@@ -23355,10 +23023,6 @@
                         "name": "hot_lp_settle",
                         "type": "pubkey"
                     },
-                    {
-                        "name": "hot_if_rebalance",
-                        "type": "pubkey"
-                    },
                     {
                         "name": "hot_feature_flag",
                         "type": "pubkey"
@@ -23491,6 +23155,35 @@
                         "name": "lp_pool_feature_bit_flags",
                         "type": "u8"
                     },
+                    {
+                        "name": "protocol_fee_recipient_perp",
+                        "docs": [
+                            "Treasury that PERP protocol fees (quote-denominated) may be withdrawn",
+                            "to. Settable only by `cold_admin`. `withdraw_protocol_fees_perp` pays",
+                            "this key's associated token account (recipient-locked).",
+                            "`Pubkey::default()` (unset) makes perp withdrawals inert."
+                        ],
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "protocol_fee_recipient_spot",
+                        "docs": [
+                            "Treasury that SPOT protocol fees (each market's own token: lending",
+                            "carveouts + spot-liquidation cuts) may be withdrawn to. Settable only",
+                            "by `cold_admin`. `withdraw_protocol_fees_spot` pays this key's",
+                            "associated token account for the market's mint (recipient-locked).",
+                            "`Pubkey::default()` (unset) makes spot withdrawals inert."
+                        ],
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "hot_fee_withdraw",
+                        "docs": [
+                            "Hot key authorized for the `FeeWithdraw` role (triggers protocol-fee",
+                            "withdrawals to the configured recipients)."
+                        ],
+                        "type": "pubkey"
+                    },
                     {
                         "name": "padding",
                         "type": {
@@ -23660,42 +23353,6 @@
                 ]
             }
         },
-        {
-            "name": "TransferProtocolIfSharesToRevenuePoolRecord",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "market_index",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "shares",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "if_vault_amount_before",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "protocol_shares_before",
-                        "type": "u128"
-                    },
-                    {
-                        "name": "transfer_amount",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
         {
             "name": "UpdatePerpMarketSummaryStatsParams",
             "type": {
@@ -23712,12 +23369,6 @@
                         "type": {
                             "option": "bool"
                         }
-                    },
-                    {
-                        "name": "exclude_total_liq_fee",
-                        "type": {
-                            "option": "bool"
-                        }
                     }
                 ]
             }
@@ -24133,11 +23784,17 @@
                         "type": "u8"
                     },
                     {
-                        "name": "if_staked_gov_token_amount",
+                        "name": "padding1",
                         "docs": [
-                            "The amount of tokens staked in the governance spot markets if"
+                            "9 bytes: 1 byte of former repr(C) alignment padding + the removed",
+                            "8-byte `if_staked_gov_token_amount` field (gov-token stake fee discount)"
                         ],
-                        "type": "u64"
+                        "type": {
+                            "array": [
+                                "u8",
+                                9
+                            ]
+                        }
                     },
                     {
                         "name": "delegate_permissions",