@meteora-ag/cp-amm-sdk 1.2.5 → 1.2.6-rc.1

package/dist/index.mjs

@@ -40,8 +40,8 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/CpAmm.ts
-import { Program } from "@coral-xyz/anchor";
-import { NATIVE_MINT as NATIVE_MINT2, TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID2 } from "@solana/spl-token";
+import { Program as Program2 } from "@coral-xyz/anchor";
+import { NATIVE_MINT as NATIVE_MINT2, TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID3 } from "@solana/spl-token";
 import invariant from "invariant";
 
 // src/idl/cp_amm.json
@@ -49,7 +49,7 @@ var cp_amm_default = {
   address: "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG",
   metadata: {
     name: "cp_amm",
-    version: "0.1.5",
+    version: "0.1.6",
     spec: "0.1.0",
     description: "Created with Anchor"
   },
@@ -720,19 +720,19 @@ var cp_amm_default = {
           }
         },
         {
-          name: "claim_fee_operator",
+          name: "operator",
           docs: [
             "Claim fee operator"
           ]
         },
         {
-          name: "operator",
+          name: "whitelisted_address",
           docs: [
             "Operator"
           ],
           signer: true,
           relations: [
-            "claim_fee_operator"
+            "operator"
           ]
         },
         {
@@ -894,29 +894,35 @@ var cp_amm_default = {
       ]
     },
     {
-      name: "close_claim_fee_operator",
+      name: "close_config",
       discriminator: [
-        38,
-        134,
-        82,
-        216,
+        145,
+        9,
+        72,
+        157,
         95,
-        124,
-        17,
-        99
+        125,
+        61,
+        85
       ],
       accounts: [
         {
-          name: "claim_fee_operator",
+          name: "config",
           writable: true
         },
         {
-          name: "rent_receiver",
-          writable: true
+          name: "operator"
         },
         {
-          name: "admin",
-          signer: true
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
+        },
+        {
+          name: "rent_receiver",
+          writable: true
         },
         {
           name: "event_authority",
@@ -954,25 +960,24 @@ var cp_amm_default = {
       args: []
     },
     {
-      name: "close_config",
+      name: "close_operator_account",
       discriminator: [
-        145,
+        171,
         9,
-        72,
-        157,
-        95,
-        125,
-        61,
-        85
+        213,
+        74,
+        120,
+        23,
+        3,
+        29
       ],
       accounts: [
         {
-          name: "config",
+          name: "operator",
           writable: true
         },
         {
           name: "admin",
-          writable: true,
           signer: true
         },
         {
@@ -1127,9 +1132,14 @@ var cp_amm_default = {
           writable: true
         },
         {
-          name: "admin",
-          writable: true,
-          signer: true
+          name: "operator"
+        },
+        {
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
         },
         {
           name: "rent_receiver",
@@ -1171,20 +1181,23 @@ var cp_amm_default = {
       args: []
     },
     {
-      name: "create_claim_fee_operator",
+      name: "create_config",
+      docs: [
+        "OPERATOR FUNCTIONS /////"
+      ],
       discriminator: [
-        169,
-        62,
+        201,
         207,
-        107,
-        58,
-        187,
-        162,
-        109
+        243,
+        114,
+        75,
+        111,
+        47,
+        189
       ],
       accounts: [
         {
-          name: "claim_fee_operator",
+          name: "config",
           writable: true,
           pda: {
             seeds: [
@@ -1192,21 +1205,16 @@ var cp_amm_default = {
                 kind: "const",
                 value: [
                   99,
-                  102,
-                  95,
-                  111,
-                  112,
-                  101,
-                  114,
-                  97,
-                  116,
                   111,
-                  114
+                  110,
+                  102,
+                  105,
+                  103
                 ]
               },
               {
-                kind: "account",
-                path: "operator"
+                kind: "arg",
+                path: "index"
               }
             ]
           }
@@ -1215,7 +1223,14 @@ var cp_amm_default = {
           name: "operator"
         },
         {
-          name: "admin",
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
+        },
+        {
+          name: "payer",
           writable: true,
           signer: true
         },
@@ -1256,22 +1271,32 @@ var cp_amm_default = {
           name: "program"
         }
       ],
-      args: []
+      args: [
+        {
+          name: "index",
+          type: "u64"
+        },
+        {
+          name: "config_parameters",
+          type: {
+            defined: {
+              name: "StaticConfigParameters"
+            }
+          }
+        }
+      ]
     },
     {
-      name: "create_config",
-      docs: [
-        "ADMIN FUNCTIONS /////"
-      ],
+      name: "create_dynamic_config",
       discriminator: [
-        201,
-        207,
-        243,
-        114,
-        75,
-        111,
-        47,
-        189
+        81,
+        251,
+        122,
+        78,
+        66,
+        57,
+        208,
+        82
       ],
       accounts: [
         {
@@ -1298,7 +1323,17 @@ var cp_amm_default = {
           }
         },
         {
-          name: "admin",
+          name: "operator"
+        },
+        {
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
+        },
+        {
+          name: "payer",
           writable: true,
           signer: true
         },
@@ -1348,50 +1383,62 @@ var cp_amm_default = {
           name: "config_parameters",
           type: {
             defined: {
-              name: "StaticConfigParameters"
+              name: "DynamicConfigParameters"
             }
           }
         }
       ]
     },
     {
-      name: "create_dynamic_config",
+      name: "create_operator_account",
+      docs: [
+        "ADMIN FUNCTIONS /////"
+      ],
       discriminator: [
-        81,
-        251,
-        122,
-        78,
-        66,
-        57,
-        208,
-        82
+        221,
+        64,
+        246,
+        149,
+        240,
+        153,
+        229,
+        163
       ],
       accounts: [
         {
-          name: "config",
+          name: "operator",
           writable: true,
           pda: {
             seeds: [
               {
                 kind: "const",
                 value: [
-                  99,
                   111,
-                  110,
-                  102,
-                  105,
-                  103
+                  112,
+                  101,
+                  114,
+                  97,
+                  116,
+                  111,
+                  114
                 ]
               },
               {
-                kind: "arg",
-                path: "index"
+                kind: "account",
+                path: "whitelisted_address"
               }
             ]
           }
         },
+        {
+          name: "whitelisted_address"
+        },
         {
           name: "admin",
+          signer: true
+        },
+        {
+          name: "payer",
           writable: true,
           signer: true
         },
@@ -1434,16 +1481,8 @@ var cp_amm_default = {
       ],
       args: [
         {
-          name: "index",
-          type: "u64"
-        },
-        {
-          name: "config_parameters",
-          type: {
-            defined: {
-              name: "DynamicConfigParameters"
-            }
-          }
+          name: "permission",
+          type: "u128"
         }
       ]
     },
@@ -1643,7 +1682,17 @@ var cp_amm_default = {
           name: "token_mint"
         },
         {
-          name: "admin",
+          name: "operator"
+        },
+        {
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
+        },
+        {
+          name: "payer",
           writable: true,
           signer: true
         },
@@ -1686,6 +1735,40 @@ var cp_amm_default = {
       ],
       args: []
     },
+    {
+      name: "dummy_ix",
+      discriminator: [
+        234,
+        95,
+        176,
+        185,
+        7,
+        42,
+        35,
+        159
+      ],
+      accounts: [
+        {
+          name: "pod_aligned_fee_time_scheduler"
+        },
+        {
+          name: "pod_aligned_fee_rate_limiter"
+        },
+        {
+          name: "pod_aligned_fee_market_cap_scheduler"
+        }
+      ],
+      args: [
+        {
+          name: "_ixs",
+          type: {
+            defined: {
+              name: "DummyParams"
+            }
+          }
+        }
+      ]
+    },
     {
       name: "fund_reward",
       discriminator: [
@@ -3247,8 +3330,14 @@ var cp_amm_default = {
           writable: true
         },
         {
-          name: "admin",
-          signer: true
+          name: "operator"
+        },
+        {
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
         },
         {
           name: "event_authority",
@@ -3628,7 +3717,7 @@ var cp_amm_default = {
       ],
       args: [
         {
-          name: "params",
+          name: "_params",
           type: {
             defined: {
               name: "SwapParameters"
@@ -3769,7 +3858,7 @@ var cp_amm_default = {
       ],
       args: [
         {
-          name: "params",
+          name: "_params",
           type: {
             defined: {
               name: "SwapParameters2"
@@ -3779,16 +3868,16 @@ var cp_amm_default = {
       ]
     },
     {
-      name: "update_reward_duration",
+      name: "update_pool_fees",
       discriminator: [
-        138,
-        174,
-        196,
-        169,
-        213,
-        235,
-        254,
-        107
+        118,
+        217,
+        203,
+        179,
+        60,
+        8,
+        70,
+        89
       ],
       accounts: [
         {
@@ -3796,13 +3885,84 @@ var cp_amm_default = {
           writable: true
         },
         {
-          name: "signer",
-          signer: true
+          name: "operator"
         },
         {
-          name: "event_authority",
-          pda: {
-            seeds: [
+          name: "whitelisted_address",
+          signer: true,
+          relations: [
+            "operator"
+          ]
+        },
+        {
+          name: "event_authority",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  95,
+                  95,
+                  101,
+                  118,
+                  101,
+                  110,
+                  116,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "program"
+        }
+      ],
+      args: [
+        {
+          name: "params",
+          type: {
+            defined: {
+              name: "UpdatePoolFeesParameters"
+            }
+          }
+        }
+      ]
+    },
+    {
+      name: "update_reward_duration",
+      discriminator: [
+        138,
+        174,
+        196,
+        169,
+        213,
+        235,
+        254,
+        107
+      ],
+      accounts: [
+        {
+          name: "pool",
+          writable: true
+        },
+        {
+          name: "signer",
+          signer: true
+        },
+        {
+          name: "event_authority",
+          pda: {
+            seeds: [
               {
                 kind: "const",
                 value: [
@@ -3989,19 +4149,6 @@ var cp_amm_default = {
     }
   ],
   accounts: [
-    {
-      name: "ClaimFeeOperator",
-      discriminator: [
-        166,
-        48,
-        134,
-        86,
-        34,
-        200,
-        188,
-        150
-      ]
-    },
     {
       name: "Config",
       discriminator: [
@@ -4015,6 +4162,58 @@ var cp_amm_default = {
         130
       ]
     },
+    {
+      name: "Operator",
+      discriminator: [
+        219,
+        31,
+        188,
+        145,
+        69,
+        139,
+        204,
+        117
+      ]
+    },
+    {
+      name: "PodAlignedFeeMarketCapScheduler",
+      discriminator: [
+        251,
+        130,
+        208,
+        253,
+        245,
+        27,
+        145,
+        203
+      ]
+    },
+    {
+      name: "PodAlignedFeeRateLimiter",
+      discriminator: [
+        160,
+        219,
+        8,
+        251,
+        179,
+        7,
+        16,
+        117
+      ]
+    },
+    {
+      name: "PodAlignedFeeTimeScheduler",
+      discriminator: [
+        239,
+        132,
+        138,
+        213,
+        67,
+        154,
+        130,
+        70
+      ]
+    },
     {
       name: "Pool",
       discriminator: [
@@ -4069,19 +4268,6 @@ var cp_amm_default = {
     }
   ],
   events: [
-    {
-      name: "EvtAddLiquidity",
-      discriminator: [
-        175,
-        242,
-        8,
-        157,
-        30,
-        247,
-        185,
-        169
-      ]
-    },
     {
       name: "EvtClaimPartnerFee",
       discriminator: [
@@ -4134,19 +4320,6 @@ var cp_amm_default = {
         231
       ]
     },
-    {
-      name: "EvtCloseClaimFeeOperator",
-      discriminator: [
-        111,
-        39,
-        37,
-        55,
-        110,
-        216,
-        194,
-        23
-      ]
-    },
     {
       name: "EvtCloseConfig",
       discriminator: [
@@ -4173,19 +4346,6 @@ var cp_amm_default = {
         178
       ]
     },
-    {
-      name: "EvtCreateClaimFeeOperator",
-      discriminator: [
-        21,
-        6,
-        153,
-        120,
-        68,
-        116,
-        28,
-        177
-      ]
-    },
     {
       name: "EvtCreateConfig",
       discriminator: [
@@ -4316,19 +4476,6 @@ var cp_amm_default = {
         11
       ]
     },
-    {
-      name: "EvtRemoveLiquidity",
-      discriminator: [
-        87,
-        46,
-        88,
-        98,
-        175,
-        96,
-        34,
-        91
-      ]
-    },
     {
       name: "EvtSetPoolStatus",
       discriminator: [
@@ -4355,19 +4502,6 @@ var cp_amm_default = {
         103
       ]
     },
-    {
-      name: "EvtSwap",
-      discriminator: [
-        27,
-        60,
-        21,
-        213,
-        138,
-        170,
-        187,
-        147
-      ]
-    },
     {
       name: "EvtSwap2",
       discriminator: [
@@ -4381,6 +4515,19 @@ var cp_amm_default = {
         153
       ]
     },
+    {
+      name: "EvtUpdatePoolFees",
+      discriminator: [
+        76,
+        165,
+        246,
+        102,
+        102,
+        217,
+        156,
+        44
+      ]
+    },
     {
       name: "EvtUpdateRewardDuration",
       discriminator: [
@@ -4674,7 +4821,7 @@ var cp_amm_default = {
     },
     {
       code: 6050,
-      name: "InvalidFeeScheduler",
+      name: "InvalidFeeTimeScheduler",
       msg: "Invalid fee scheduler"
     },
     {
@@ -4686,6 +4833,41 @@ var cp_amm_default = {
       code: 6052,
       name: "InvalidPoolVersion",
       msg: "Invalid pool version"
+    },
+    {
+      code: 6053,
+      name: "InvalidAuthority",
+      msg: "Invalid authority to do that action"
+    },
+    {
+      code: 6054,
+      name: "InvalidPermission",
+      msg: "Invalid permission"
+    },
+    {
+      code: 6055,
+      name: "InvalidFeeMarketCapScheduler",
+      msg: "Invalid fee market cap scheduler"
+    },
+    {
+      code: 6056,
+      name: "CannotUpdateBaseFee",
+      msg: "Cannot update base fee"
+    },
+    {
+      code: 6057,
+      name: "InvalidDynamicFeeParameters",
+      msg: "Invalid dynamic fee parameters"
+    },
+    {
+      code: 6058,
+      name: "InvalidUpdatePoolFeesParameters",
+      msg: "Invalid update pool fees parameters"
+    },
+    {
+      code: 6059,
+      name: "MissingOperatorAccount",
+      msg: "Missing operator account"
     }
   ],
   types: [
@@ -4719,7 +4901,7 @@ var cp_amm_default = {
       }
     },
     {
-      name: "BaseFeeConfig",
+      name: "BaseFeeInfo",
       serialization: "bytemuck",
       repr: {
         kind: "c"
@@ -4728,38 +4910,13 @@ var cp_amm_default = {
         kind: "struct",
         fields: [
           {
-            name: "cliff_fee_numerator",
-            type: "u64"
-          },
-          {
-            name: "base_fee_mode",
-            type: "u8"
-          },
-          {
-            name: "padding",
-            type: {
-              array: [
-                "u8",
-                5
-              ]
-            }
-          },
-          {
-            name: "first_factor",
-            type: "u16"
-          },
-          {
-            name: "second_factor",
+            name: "data",
             type: {
               array: [
                 "u8",
-                8
+                32
               ]
             }
-          },
-          {
-            name: "third_factor",
-            type: "u64"
           }
         ]
       }
@@ -4770,29 +4927,13 @@ var cp_amm_default = {
         kind: "struct",
         fields: [
           {
-            name: "cliff_fee_numerator",
-            type: "u64"
-          },
-          {
-            name: "first_factor",
-            type: "u16"
-          },
-          {
-            name: "second_factor",
+            name: "data",
             type: {
               array: [
                 "u8",
-                8
+                30
               ]
             }
-          },
-          {
-            name: "third_factor",
-            type: "u64"
-          },
-          {
-            name: "base_fee_mode",
-            type: "u8"
           }
         ]
       }
@@ -4803,6 +4944,26 @@ var cp_amm_default = {
       repr: {
         kind: "c"
       },
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "base_fee_info",
+            type: {
+              defined: {
+                name: "BaseFeeInfo"
+              }
+            }
+          },
+          {
+            name: "padding_1",
+            type: "u64"
+          }
+        ]
+      }
+    },
+    {
+      name: "BorshFeeMarketCapScheduler",
       type: {
         kind: "struct",
         fields: [
@@ -4811,70 +4972,122 @@ var cp_amm_default = {
             type: "u64"
           },
           {
-            name: "base_fee_mode",
-            type: "u8"
+            name: "number_of_period",
+            type: "u16"
           },
           {
-            name: "padding_0",
-            type: {
-              array: [
-                "u8",
-                5
-              ]
-            }
+            name: "sqrt_price_step_bps",
+            type: "u32"
           },
           {
-            name: "first_factor",
-            type: "u16"
+            name: "scheduler_expiration_duration",
+            type: "u32"
+          },
+          {
+            name: "reduction_factor",
+            type: "u64"
+          },
+          {
+            name: "base_fee_mode",
+            type: "u8"
           },
           {
-            name: "second_factor",
+            name: "padding",
             type: {
               array: [
                 "u8",
-                8
+                3
               ]
             }
-          },
+          }
+        ]
+      }
+    },
+    {
+      name: "BorshFeeRateLimiter",
+      docs: [
+        "we denote reference_amount = x0, cliff_fee_numerator = c, fee_increment = i",
+        "if input_amount <= x0, then fee = input_amount * c",
+        "",
+        "if input_amount > x0, then input_amount = x0 + (a * x0 + b)",
+        "if a < max_index",
+        "then fee = x0 * c + x0 * (c + i) + .... + x0 * (c + i*a) + b * (c + i * (a+1))",
+        "then fee = x0 * (c + c*a + i*a*(a+1)/2) + b * (c + i * (a+1))",
+        "",
+        "if a >= max_index",
+        "if a = max_index + d, input_amount = x0 + max_index * x0 + (d * x0 + b)",
+        "then fee = x0 * (c + c*max_index + i*max_index*(max_index+1)/2) + (d * x0 + b) * MAX_FEE"
+      ],
+      type: {
+        kind: "struct",
+        fields: [
           {
-            name: "third_factor",
+            name: "cliff_fee_numerator",
             type: "u64"
           },
           {
-            name: "padding_1",
+            name: "fee_increment_bps",
+            type: "u16"
+          },
+          {
+            name: "max_limiter_duration",
+            type: "u32"
+          },
+          {
+            name: "max_fee_bps",
+            type: "u32"
+          },
+          {
+            name: "reference_amount",
             type: "u64"
+          },
+          {
+            name: "base_fee_mode",
+            type: "u8"
+          },
+          {
+            name: "padding",
+            type: {
+              array: [
+                "u8",
+                3
+              ]
+            }
           }
         ]
       }
     },
     {
-      name: "ClaimFeeOperator",
-      docs: [
-        "Parameter that set by the protocol"
-      ],
-      serialization: "bytemuck",
-      repr: {
-        kind: "c"
-      },
+      name: "BorshFeeTimeScheduler",
       type: {
         kind: "struct",
         fields: [
           {
-            name: "operator",
-            docs: [
-              "operator"
-            ],
-            type: "pubkey"
+            name: "cliff_fee_numerator",
+            type: "u64"
           },
           {
-            name: "_padding",
-            docs: [
-              "Reserve"
-            ],
+            name: "number_of_period",
+            type: "u16"
+          },
+          {
+            name: "period_frequency",
+            type: "u64"
+          },
+          {
+            name: "reduction_factor",
+            type: "u64"
+          },
+          {
+            name: "base_fee_mode",
+            type: "u8"
+          },
+          {
+            name: "padding",
             type: {
               array: [
                 "u8",
-                128
+                3
               ]
             }
           }
@@ -4985,6 +5198,38 @@ var cp_amm_default = {
         ]
       }
     },
+    {
+      name: "DummyParams",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "borsh_fee_time_scheduler_params",
+            type: {
+              defined: {
+                name: "BorshFeeTimeScheduler"
+              }
+            }
+          },
+          {
+            name: "borsh_fee_rate_limiter_params",
+            type: {
+              defined: {
+                name: "BorshFeeRateLimiter"
+              }
+            }
+          },
+          {
+            name: "borsh_fee_market_cap_scheduler_params",
+            type: {
+              defined: {
+                name: "BorshFeeMarketCapScheduler"
+              }
+            }
+          }
+        ]
+      }
+    },
     {
       name: "DynamicConfigParameters",
       type: {
@@ -5164,50 +5409,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "EvtAddLiquidity",
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "pool",
-            type: "pubkey"
-          },
-          {
-            name: "position",
-            type: "pubkey"
-          },
-          {
-            name: "owner",
-            type: "pubkey"
-          },
-          {
-            name: "params",
-            type: {
-              defined: {
-                name: "AddLiquidityParameters"
-              }
-            }
-          },
-          {
-            name: "token_a_amount",
-            type: "u64"
-          },
-          {
-            name: "token_b_amount",
-            type: "u64"
-          },
-          {
-            name: "total_amount_a",
-            type: "u64"
-          },
-          {
-            name: "total_amount_b",
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "EvtClaimPartnerFee",
       type: {
@@ -5308,25 +5509,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "EvtCloseClaimFeeOperator",
-      docs: [
-        "Close claim fee operator"
-      ],
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "claim_fee_operator",
-            type: "pubkey"
-          },
-          {
-            name: "operator",
-            type: "pubkey"
-          }
-        ]
-      }
-    },
     {
       name: "EvtCloseConfig",
       docs: [
@@ -5376,21 +5558,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "EvtCreateClaimFeeOperator",
-      docs: [
-        "Create claim fee operator"
-      ],
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "operator",
-            type: "pubkey"
-          }
-        ]
-      }
-    },
     {
       name: "EvtCreateConfig",
       docs: [
@@ -5804,42 +5971,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "EvtRemoveLiquidity",
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "pool",
-            type: "pubkey"
-          },
-          {
-            name: "position",
-            type: "pubkey"
-          },
-          {
-            name: "owner",
-            type: "pubkey"
-          },
-          {
-            name: "params",
-            type: {
-              defined: {
-                name: "RemoveLiquidityParameters"
-              }
-            }
-          },
-          {
-            name: "token_a_amount",
-            type: "u64"
-          },
-          {
-            name: "token_b_amount",
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "EvtSetPoolStatus",
       type: {
@@ -5920,50 +6051,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "EvtSwap",
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "pool",
-            type: "pubkey"
-          },
-          {
-            name: "trade_direction",
-            type: "u8"
-          },
-          {
-            name: "has_referral",
-            type: "bool"
-          },
-          {
-            name: "params",
-            type: {
-              defined: {
-                name: "SwapParameters"
-              }
-            }
-          },
-          {
-            name: "swap_result",
-            type: {
-              defined: {
-                name: "SwapResult"
-              }
-            }
-          },
-          {
-            name: "actual_amount_in",
-            type: "u64"
-          },
-          {
-            name: "current_timestamp",
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "EvtSwap2",
       type: {
@@ -6028,6 +6115,30 @@ var cp_amm_default = {
         ]
       }
     },
+    {
+      name: "EvtUpdatePoolFees",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "pool",
+            type: "pubkey"
+          },
+          {
+            name: "operator",
+            type: "pubkey"
+          },
+          {
+            name: "params",
+            type: {
+              defined: {
+                name: "UpdatePoolFeesParameters"
+              }
+            }
+          }
+        ]
+      }
+    },
     {
       name: "EvtUpdateRewardDuration",
       type: {
@@ -6143,7 +6254,7 @@ var cp_amm_default = {
           {
             name: "sqrt_price",
             docs: [
-              "The init price of the pool as a sqrt(token_b/token_a) Q64.64 value"
+              "The init price of the pool as a sqrt(token_b/token_a) Q64.64 value. Market cap fee scheduler minimum price will be derived from this value"
             ],
             type: "u128"
           },
@@ -6162,44 +6273,204 @@ var cp_amm_default = {
             type: "u8"
           },
           {
-            name: "activation_point",
-            docs: [
-              "activation point"
-            ],
-            type: {
-              option: "u64"
-            }
+            name: "activation_point",
+            docs: [
+              "activation point"
+            ],
+            type: {
+              option: "u64"
+            }
+          }
+        ]
+      }
+    },
+    {
+      name: "InitializePoolParameters",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "liquidity",
+            docs: [
+              "initialize liquidity"
+            ],
+            type: "u128"
+          },
+          {
+            name: "sqrt_price",
+            docs: [
+              "The init price of the pool as a sqrt(token_b/token_a) Q64.64 value"
+            ],
+            type: "u128"
+          },
+          {
+            name: "activation_point",
+            docs: [
+              "activation point"
+            ],
+            type: {
+              option: "u64"
+            }
+          }
+        ]
+      }
+    },
+    {
+      name: "Operator",
+      serialization: "bytemuck",
+      repr: {
+        kind: "c"
+      },
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "whitelisted_address",
+            type: "pubkey"
+          },
+          {
+            name: "permission",
+            type: "u128"
+          },
+          {
+            name: "padding",
+            type: {
+              array: [
+                "u64",
+                2
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      name: "PodAlignedFeeMarketCapScheduler",
+      serialization: "bytemuck",
+      repr: {
+        kind: "c"
+      },
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "cliff_fee_numerator",
+            type: "u64"
+          },
+          {
+            name: "base_fee_mode",
+            type: "u8"
+          },
+          {
+            name: "padding",
+            type: {
+              array: [
+                "u8",
+                5
+              ]
+            }
+          },
+          {
+            name: "number_of_period",
+            type: "u16"
+          },
+          {
+            name: "sqrt_price_step_bps",
+            type: "u32"
+          },
+          {
+            name: "scheduler_expiration_duration",
+            type: "u32"
+          },
+          {
+            name: "reduction_factor",
+            type: "u64"
+          }
+        ]
+      }
+    },
+    {
+      name: "PodAlignedFeeRateLimiter",
+      serialization: "bytemuck",
+      repr: {
+        kind: "c"
+      },
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "cliff_fee_numerator",
+            type: "u64"
+          },
+          {
+            name: "base_fee_mode",
+            type: "u8"
+          },
+          {
+            name: "padding",
+            type: {
+              array: [
+                "u8",
+                5
+              ]
+            }
+          },
+          {
+            name: "fee_increment_bps",
+            type: "u16"
+          },
+          {
+            name: "max_limiter_duration",
+            type: "u32"
+          },
+          {
+            name: "max_fee_bps",
+            type: "u32"
+          },
+          {
+            name: "reference_amount",
+            type: "u64"
           }
         ]
       }
     },
     {
-      name: "InitializePoolParameters",
+      name: "PodAlignedFeeTimeScheduler",
+      serialization: "bytemuck",
+      repr: {
+        kind: "c"
+      },
       type: {
         kind: "struct",
         fields: [
           {
-            name: "liquidity",
-            docs: [
-              "initialize liquidity"
-            ],
-            type: "u128"
+            name: "cliff_fee_numerator",
+            type: "u64"
           },
           {
-            name: "sqrt_price",
-            docs: [
-              "The init price of the pool as a sqrt(token_b/token_a) Q64.64 value"
-            ],
-            type: "u128"
+            name: "base_fee_mode",
+            type: "u8"
           },
           {
-            name: "activation_point",
-            docs: [
-              "activation point"
-            ],
+            name: "padding",
             type: {
-              option: "u64"
+              array: [
+                "u8",
+                5
+              ]
             }
+          },
+          {
+            name: "number_of_period",
+            type: "u16"
+          },
+          {
+            name: "period_frequency",
+            type: "u64"
+          },
+          {
+            name: "reduction_factor",
+            type: "u64"
           }
         ]
       }
@@ -6367,7 +6638,7 @@ var cp_amm_default = {
           {
             name: "collect_fee_mode",
             docs: [
-              "0 is collect fee in both token, 1 only collect fee in token a, 2 only collect fee in token b"
+              "0 is collect fee in both token, 1 only collect fee only in token b"
             ],
             type: "u8"
           },
@@ -6488,18 +6759,6 @@ var cp_amm_default = {
               }
             }
           },
-          {
-            name: "padding",
-            docs: [
-              "padding"
-            ],
-            type: {
-              array: [
-                "u8",
-                3
-              ]
-            }
-          },
           {
             name: "dynamic_fee",
             docs: [
@@ -6529,7 +6788,7 @@ var cp_amm_default = {
             name: "base_fee",
             type: {
               defined: {
-                name: "BaseFeeConfig"
+                name: "BaseFeeInfo"
               }
             }
           },
@@ -6651,16 +6910,8 @@ var cp_amm_default = {
             }
           },
           {
-            name: "padding_1",
-            docs: [
-              "padding"
-            ],
-            type: {
-              array: [
-                "u64",
-                2
-              ]
-            }
+            name: "init_sqrt_price",
+            type: "u128"
           }
         ]
       }
@@ -7240,41 +7491,6 @@ var cp_amm_default = {
         ]
       }
     },
-    {
-      name: "SwapResult",
-      docs: [
-        "Encodes all results of swapping"
-      ],
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "output_amount",
-            type: "u64"
-          },
-          {
-            name: "next_sqrt_price",
-            type: "u128"
-          },
-          {
-            name: "lp_fee",
-            type: "u64"
-          },
-          {
-            name: "protocol_fee",
-            type: "u64"
-          },
-          {
-            name: "partner_fee",
-            type: "u64"
-          },
-          {
-            name: "referral_fee",
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "SwapResult2",
       type: {
@@ -7353,6 +7569,41 @@ var cp_amm_default = {
         ]
       }
     },
+    {
+      name: "UpdatePoolFeesParameters",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "cliff_fee_numerator",
+            docs: [
+              "Base fee update mode:",
+              "- None: skip base fee update",
+              "- Some: update new cliff_fee_numerator if base fee is static"
+            ],
+            type: {
+              option: "u64"
+            }
+          },
+          {
+            name: "dynamic_fee",
+            docs: [
+              "Dynamic fee update mode:",
+              "- None: skip dynamic fee update",
+              "- Some(with default value): disable dynamic fee",
+              "- Some(with non default value): enable dynamic fee if disabled or update dynamic fee if enabled"
+            ],
+            type: {
+              option: {
+                defined: {
+                  name: "DynamicFeeParameters"
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
     {
       name: "UserRewardInfo",
       serialization: "bytemuck",
@@ -7479,6 +7730,94 @@ var cp_amm_default = {
         ]
       }
     }
+  ],
+  constants: [
+    {
+      name: "BIN_STEP_BPS_DEFAULT",
+      type: "u16",
+      value: "1"
+    },
+    {
+      name: "BIN_STEP_U128_DEFAULT_LE_BYTES",
+      type: {
+        array: [
+          "u8",
+          16
+        ]
+      },
+      value: "[203, 16, 199, 186, 184, 141, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0]"
+    },
+    {
+      name: "CUSTOMIZABLE_POOL_PREFIX",
+      type: "bytes",
+      value: "[99, 112, 111, 111, 108]"
+    },
+    {
+      name: "FEE_DENOMINATOR",
+      docs: [
+        "Default fee denominator. DO NOT simply update it as it will break logic that depends on it as default value."
+      ],
+      type: "u64",
+      value: "1000000000"
+    },
+    {
+      name: "MAX_BASIS_POINT",
+      docs: [
+        "Max basis point. 100% in pct"
+      ],
+      type: "u64",
+      value: "10000"
+    },
+    {
+      name: "MAX_SQRT_PRICE_LE_BYTES",
+      type: {
+        array: [
+          "u8",
+          16
+        ]
+      },
+      value: "[155, 87, 105, 78, 169, 26, 92, 132, 177, 196, 254, 255, 0, 0, 0, 0]"
+    },
+    {
+      name: "MIN_SQRT_PRICE_LE_BYTES",
+      type: {
+        array: [
+          "u8",
+          16
+        ]
+      },
+      value: "[80, 59, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]"
+    },
+    {
+      name: "POOL_AUTHORITY_PREFIX",
+      type: "bytes",
+      value: "[112, 111, 111, 108, 95, 97, 117, 116, 104, 111, 114, 105, 116, 121]"
+    },
+    {
+      name: "POOL_PREFIX",
+      type: "bytes",
+      value: "[112, 111, 111, 108]"
+    },
+    {
+      name: "POSITION_NFT_ACCOUNT_PREFIX",
+      type: "bytes",
+      value: "[112, 111, 115, 105, 116, 105, 111, 110, 95, 110, 102, 116, 95, 97, 99, 99, 111, 117, 110, 116]"
+    },
+    {
+      name: "POSITION_PREFIX",
+      type: "bytes",
+      value: "[112, 111, 115, 105, 116, 105, 111, 110]"
+    },
+    {
+      name: "SPLIT_POSITION_DENOMINATOR",
+      type: "u32",
+      value: "1000000000"
+    },
+    {
+      name: "TOKEN_VAULT_PREFIX",
+      type: "bytes",
+      value: "[116, 111, 107, 101, 110, 95, 118, 97, 117, 108, 116]"
+    }
   ]
 };
 
@@ -7501,9 +7840,11 @@ var ActivationPoint = /* @__PURE__ */ ((ActivationPoint2) => {
   return ActivationPoint2;
 })(ActivationPoint || {});
 var BaseFeeMode = /* @__PURE__ */ ((BaseFeeMode3) => {
-  BaseFeeMode3[BaseFeeMode3["FeeSchedulerLinear"] = 0] = "FeeSchedulerLinear";
-  BaseFeeMode3[BaseFeeMode3["FeeSchedulerExponential"] = 1] = "FeeSchedulerExponential";
+  BaseFeeMode3[BaseFeeMode3["FeeTimeSchedulerLinear"] = 0] = "FeeTimeSchedulerLinear";
+  BaseFeeMode3[BaseFeeMode3["FeeTimeSchedulerExponential"] = 1] = "FeeTimeSchedulerExponential";
   BaseFeeMode3[BaseFeeMode3["RateLimiter"] = 2] = "RateLimiter";
+  BaseFeeMode3[BaseFeeMode3["FeeMarketCapSchedulerLinear"] = 3] = "FeeMarketCapSchedulerLinear";
+  BaseFeeMode3[BaseFeeMode3["FeeMarketCapSchedulerExponential"] = 4] = "FeeMarketCapSchedulerExponential";
   return BaseFeeMode3;
 })(BaseFeeMode || {});
 var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode3) => {
@@ -7521,10 +7862,10 @@ var ActivationType = /* @__PURE__ */ ((ActivationType3) => {
   ActivationType3[ActivationType3["Timestamp"] = 1] = "Timestamp";
   return ActivationType3;
 })(ActivationType || {});
-var PoolVersion = /* @__PURE__ */ ((PoolVersion5) => {
-  PoolVersion5[PoolVersion5["V0"] = 0] = "V0";
-  PoolVersion5[PoolVersion5["V1"] = 1] = "V1";
-  return PoolVersion5;
+var PoolVersion = /* @__PURE__ */ ((PoolVersion4) => {
+  PoolVersion4[PoolVersion4["V0"] = 0] = "V0";
+  PoolVersion4[PoolVersion4["V1"] = 1] = "V1";
+  return PoolVersion4;
 })(PoolVersion || {});
 var PoolStatus = /* @__PURE__ */ ((PoolStatus2) => {
   PoolStatus2[PoolStatus2["Enable"] = 0] = "Enable";
@@ -7578,7 +7919,8 @@ var U16_MAX = 65535;
 var MAX_RATE_LIMITER_DURATION_IN_SECONDS = 43200;
 var MAX_RATE_LIMITER_DURATION_IN_SLOTS = 108e3;
 var SPLIT_POSITION_DENOMINATOR = 1e9;
-var CURRENT_POOL_VERSION = 0 /* V0 */;
+var CURRENT_POOL_VERSION = 1 /* V1 */;
+var FEE_PADDING = Array.from(Buffer.alloc(3));
 
 // src/pda.ts
 function getFirstKey(key1, key2) {
@@ -7666,6 +8008,12 @@ function derivePositionNftAccount(positionNftMint) {
     CP_AMM_PROGRAM_ID
   )[0];
 }
+function deriveOperatorAddress(whitelistedAddress) {
+  return PublicKey2.findProgramAddressSync(
+    [Buffer.from("operator"), whitelistedAddress.toBuffer()],
+    CP_AMM_PROGRAM_ID
+  )[0];
+}
 
 // src/helpers/token.ts
 import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
@@ -8100,7 +8448,8 @@ import {
   calculateFee,
   getEpochFee,
   getTransferFeeConfig,
-  MAX_FEE_BASIS_POINTS
+  MAX_FEE_BASIS_POINTS,
+  TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID2
 } from "@solana/spl-token";
 function calculatePreFeeAmount(transferFee, postFeeAmount) {
   if (postFeeAmount.isZero()) {
@@ -8175,6 +8524,61 @@ function calculateTransferFeeExcludedAmount(transferFeeIncludedAmount, mint, cur
     transferFee: new BN3(transferFee.toString())
   };
 }
+function hasTransferHookExtension(connection, mint) {
+  return __async(this, null, function* () {
+    try {
+      const mintAccountInfo = yield connection.getAccountInfo(mint);
+      if (!mintAccountInfo) {
+        return { hasTransferHook: false };
+      }
+      const isToken2022 = mintAccountInfo.owner.equals(TOKEN_2022_PROGRAM_ID2);
+      if (!isToken2022) {
+        return { hasTransferHook: false };
+      }
+      const parsedInfo = yield connection.getParsedAccountInfo(mint);
+      if (parsedInfo.value && "parsed" in parsedInfo.value.data) {
+        const parsedData = parsedInfo.value.data.parsed;
+        if (parsedData && parsedData.info && parsedData.info.extensions) {
+          const extensions = parsedData.info.extensions;
+          const transferHookExtension = extensions.find(
+            (ext) => ext.extension === "transferHook"
+          );
+          if (transferHookExtension && transferHookExtension.state) {
+            return {
+              hasTransferHook: true,
+              transferHookState: {
+                authority: transferHookExtension.state.authority,
+                programId: transferHookExtension.state.programId
+              }
+            };
+          }
+        }
+      }
+      return { hasTransferHook: false };
+    } catch (error) {
+      return { hasTransferHook: false };
+    }
+  });
+}
+function validateNoTransferHook(connection, tokenAMint, tokenBMint) {
+  return __async(this, null, function* () {
+    var _a, _b;
+    const [tokenACheck, tokenBCheck] = yield Promise.all([
+      hasTransferHookExtension(connection, tokenAMint),
+      hasTransferHookExtension(connection, tokenBMint)
+    ]);
+    if (tokenACheck.hasTransferHook) {
+      throw new Error(
+        `Token A (${tokenAMint.toBase58()}) has a transfer hook extension. Transfer hook might prevent permissionless pool creation. Transfer hook program: ${(_a = tokenACheck.transferHookState) == null ? void 0 : _a.programId}`
+      );
+    }
+    if (tokenBCheck.hasTransferHook) {
+      throw new Error(
+        `Token B (${tokenBMint.toBase58()}) has a transfer hook extension. Transfer hook might prevent permissionless pool creation. Transfer hook program: ${(_b = tokenBCheck.transferHookState) == null ? void 0 : _b.programId}`
+      );
+    }
+  });
+}
 
 // src/helpers/vestings.ts
 import { BN as BN4 } from "@coral-xyz/anchor";
@@ -8218,10 +8622,10 @@ function getAvailableVestingLiquidity(vestingData, currentPoint) {
 }
 
 // src/helpers/validation.ts
-import BN14 from "bn.js";
+import BN16 from "bn.js";
 
 // src/math/poolFees/baseFee.ts
-import BN9 from "bn.js";
+import BN11 from "bn.js";
 
 // src/math/poolFees/rateLimiter.ts
 import BN7 from "bn.js";
@@ -8420,35 +8824,33 @@ function getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator) {
   const totalFeeNumerator = dynamicFeeNumerator.add(baseFeeNumerator);
   return BN6.min(totalFeeNumerator, maxFeeNumerator);
 }
-function getTotalTradingFeeFromIncludedFeeAmount(poolFees, currentPoint, activationPoint, includedFeeAmount, tradeDirection, maxFeeNumerator) {
+function getTotalTradingFeeFromIncludedFeeAmount(program, poolFees, currentPoint, activationPoint, includedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
   const baseFeeHandler = getBaseFeeHandler(
-    poolFees.baseFee.cliffFeeNumerator,
-    poolFees.baseFee.firstFactor,
-    poolFees.baseFee.secondFactor,
-    poolFees.baseFee.thirdFactor,
-    poolFees.baseFee.baseFeeMode
+    program,
+    poolFees.baseFee.baseFeeInfo.data
   );
   const baseFeeNumerator = baseFeeHandler.getBaseFeeNumeratorFromIncludedFeeAmount(
     currentPoint,
     activationPoint,
     tradeDirection,
-    includedFeeAmount
+    includedFeeAmount,
+    initSqrtPrice,
+    currentSqrtPrice
   );
   return getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator);
 }
-function getTotalTradingFeeFromExcludedFeeAmount(poolFees, currentPoint, activationPoint, excludedFeeAmount, tradeDirection, maxFeeNumerator) {
+function getTotalTradingFeeFromExcludedFeeAmount(program, poolFees, currentPoint, activationPoint, excludedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
   const baseFeeHandler = getBaseFeeHandler(
-    poolFees.baseFee.cliffFeeNumerator,
-    poolFees.baseFee.firstFactor,
-    poolFees.baseFee.secondFactor,
-    poolFees.baseFee.thirdFactor,
-    poolFees.baseFee.baseFeeMode
+    program,
+    poolFees.baseFee.baseFeeInfo.data
   );
   const baseFeeNumerator = baseFeeHandler.getBaseFeeNumeratorFromExcludedFeeAmount(
     currentPoint,
     activationPoint,
     tradeDirection,
-    excludedFeeAmount
+    excludedFeeAmount,
+    initSqrtPrice,
+    currentSqrtPrice
   );
   return getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator);
 }
@@ -8763,31 +9165,120 @@ function getFeeNumeratorFromExcludedFeeAmount(excludedFeeAmount, referenceAmount
   if (feeNumerator.lt(cliffFeeNumerator)) {
     throw new Error("feeNumerator is less than cliffFeeNumerator");
   }
-  return feeNumerator;
-}
-
-// src/math/poolFees/feeScheduler.ts
-import BN8 from "bn.js";
-function getMaxBaseFeeNumerator(cliffFeeNumerator) {
-  return cliffFeeNumerator;
+  return feeNumerator;
+}
+
+// src/math/poolFees/feeTimeScheduler.ts
+import BN9 from "bn.js";
+
+// src/math/poolFees/feeScheduler.ts
+import BN8 from "bn.js";
+function getFeeNumeratorOnLinearFeeScheduler(cliffFeeNumerator, reductionFactor, period) {
+  const reduction = new BN8(period).mul(reductionFactor);
+  return cliffFeeNumerator.sub(reduction);
+}
+function getFeeNumeratorOnExponentialFeeScheduler(cliffFeeNumerator, reductionFactor, period) {
+  if (period === 0) {
+    return cliffFeeNumerator;
+  }
+  const basisPointMax = new BN8(BASIS_POINT_MAX);
+  const bps = new BN8(reductionFactor).shln(64).div(basisPointMax);
+  const base = ONE_Q64.sub(bps);
+  const result = pow(base, new BN8(period));
+  return cliffFeeNumerator.mul(result).div(ONE_Q64);
+}
+function getMaxBaseFeeNumerator(cliffFeeNumerator) {
+  return cliffFeeNumerator;
+}
+
+// src/math/poolFees/feeTimeScheduler.ts
+function toPodAlignedFeeTimeScheduler(borshFeeScheduler) {
+  return {
+    cliffFeeNumerator: borshFeeScheduler.cliffFeeNumerator,
+    baseFeeMode: borshFeeScheduler.baseFeeMode,
+    padding: new Array(16).fill(0),
+    // Assumes default/rust alignment of 16
+    numberOfPeriod: borshFeeScheduler.numberOfPeriod,
+    periodFrequency: borshFeeScheduler.periodFrequency,
+    reductionFactor: borshFeeScheduler.reductionFactor
+  };
+}
+function toBorshFeeTimeScheduler(podAlignedFeeScheduler) {
+  return {
+    cliffFeeNumerator: podAlignedFeeScheduler.cliffFeeNumerator,
+    numberOfPeriod: podAlignedFeeScheduler.numberOfPeriod,
+    periodFrequency: podAlignedFeeScheduler.periodFrequency,
+    reductionFactor: podAlignedFeeScheduler.reductionFactor,
+    baseFeeMode: podAlignedFeeScheduler.baseFeeMode,
+    padding: new Array(16).fill(0)
+    // Assumes default/rust alignment of 16
+  };
+}
+function getFeeTimeBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period, reductionFactor, feeTimeSchedulerMode) {
+  const periodValue = BN9.min(period, new BN9(numberOfPeriod));
+  const periodNumber = periodValue.toNumber();
+  if (periodNumber > U16_MAX) {
+    throw new Error("Math overflow");
+  }
+  switch (feeTimeSchedulerMode) {
+    case 0 /* FeeTimeSchedulerLinear */: {
+      const feeNumerator = getFeeNumeratorOnLinearFeeScheduler(
+        cliffFeeNumerator,
+        reductionFactor,
+        periodNumber
+      );
+      return feeNumerator;
+    }
+    case 1 /* FeeTimeSchedulerExponential */: {
+      const feeNumerator = getFeeNumeratorOnExponentialFeeScheduler(
+        cliffFeeNumerator,
+        reductionFactor,
+        periodNumber
+      );
+      return feeNumerator;
+    }
+    default:
+      throw new Error("Invalid fee time scheduler mode");
+  }
+}
+function getFeeTimeBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, feeTimeSchedulerMode, currentPoint, activationPoint) {
+  if (periodFrequency.isZero()) {
+    return cliffFeeNumerator;
+  }
+  let period;
+  if (currentPoint.lt(activationPoint)) {
+    period = new BN9(numberOfPeriod);
+  } else {
+    period = currentPoint.sub(activationPoint).div(periodFrequency);
+    if (period.gt(new BN9(numberOfPeriod))) {
+      period = new BN9(numberOfPeriod);
+    }
+  }
+  return getFeeTimeBaseFeeNumeratorByPeriod(
+    cliffFeeNumerator,
+    numberOfPeriod,
+    period,
+    reductionFactor,
+    feeTimeSchedulerMode
+  );
 }
-function getMinBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, reductionFactor, feeSchedulerMode) {
-  return getBaseFeeNumeratorByPeriod(
+function getFeeTimeMinBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, reductionFactor, feeTimeSchedulerMode) {
+  return getFeeTimeBaseFeeNumeratorByPeriod(
     cliffFeeNumerator,
     numberOfPeriod,
-    new BN8(numberOfPeriod),
+    new BN9(numberOfPeriod),
     reductionFactor,
-    feeSchedulerMode
+    feeTimeSchedulerMode
   );
 }
-function getBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period, reductionFactor, feeSchedulerMode) {
-  const periodValue = BN8.min(period, new BN8(numberOfPeriod));
+
+// src/math/poolFees/feeMarketCapScheduler.ts
+import BN10 from "bn.js";
+function getFeeMarketCapBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period, reductionFactor, feeMarketCapSchedulerMode) {
+  const periodValue = BN10.min(period, new BN10(numberOfPeriod));
   const periodNumber = periodValue.toNumber();
-  if (periodNumber > U16_MAX) {
-    throw new Error("Math overflow");
-  }
-  switch (feeSchedulerMode) {
-    case 0 /* FeeSchedulerLinear */: {
+  switch (feeMarketCapSchedulerMode) {
+    case 3 /* FeeMarketCapSchedulerLinear */: {
       const feeNumerator = getFeeNumeratorOnLinearFeeScheduler(
         cliffFeeNumerator,
         reductionFactor,
@@ -8795,7 +9286,7 @@ function getBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period,
       );
       return feeNumerator;
     }
-    case 1 /* FeeSchedulerExponential */: {
+    case 4 /* FeeMarketCapSchedulerExponential */: {
       const feeNumerator = getFeeNumeratorOnExponentialFeeScheduler(
         cliffFeeNumerator,
         reductionFactor,
@@ -8804,42 +9295,46 @@ function getBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period,
       return feeNumerator;
     }
     default:
-      throw new Error("Invalid fee scheduler mode");
-  }
-}
-function getFeeNumeratorOnLinearFeeScheduler(cliffFeeNumerator, reductionFactor, period) {
-  const reduction = new BN8(period).mul(reductionFactor);
-  return cliffFeeNumerator.sub(reduction);
-}
-function getFeeNumeratorOnExponentialFeeScheduler(cliffFeeNumerator, reductionFactor, period) {
-  if (period === 0) {
-    return cliffFeeNumerator;
+      throw new Error("Invalid fee market cap scheduler mode");
   }
-  const basisPointMax = new BN8(BASIS_POINT_MAX);
-  const bps = new BN8(reductionFactor).shln(64).div(basisPointMax);
-  const base = ONE_Q64.sub(bps);
-  const result = pow(base, new BN8(period));
-  return cliffFeeNumerator.mul(result).div(ONE_Q64);
 }
-function getBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, feeSchedulerMode, currentPoint, activationPoint) {
-  if (periodFrequency.isZero()) {
-    return cliffFeeNumerator;
-  }
+function getFeeMarketCapBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, sqrtPriceStepBps, schedulerExpirationDuration, reductionFactor, feeMarketCapSchedulerMode, currentPoint, activationPoint, initSqrtPrice, currentSqrtPrice) {
+  const schedulerExpirationPoint = activationPoint.add(
+    new BN10(schedulerExpirationDuration)
+  );
   let period;
-  if (currentPoint.lt(activationPoint)) {
-    period = new BN8(numberOfPeriod);
+  if (currentPoint.gt(schedulerExpirationPoint) || currentPoint.lt(activationPoint)) {
+    period = new BN10(numberOfPeriod);
   } else {
-    period = currentPoint.sub(activationPoint).div(periodFrequency);
-    if (period.gt(new BN8(numberOfPeriod))) {
-      period = new BN8(numberOfPeriod);
+    if (currentSqrtPrice.lte(initSqrtPrice)) {
+      period = new BN10(0);
+    } else {
+      const maxBps = new BN10(BASIS_POINT_MAX);
+      const stepBps = new BN10(sqrtPriceStepBps);
+      const passedPeriod = currentSqrtPrice.sub(initSqrtPrice).mul(maxBps).div(initSqrtPrice).div(stepBps);
+      if (passedPeriod.gt(new BN10(numberOfPeriod))) {
+        period = new BN10(numberOfPeriod);
+      } else {
+        period = passedPeriod;
+      }
     }
+    period = BN10.min(period, new BN10(numberOfPeriod));
   }
-  return getBaseFeeNumeratorByPeriod(
+  return getFeeMarketCapBaseFeeNumeratorByPeriod(
     cliffFeeNumerator,
     numberOfPeriod,
     period,
     reductionFactor,
-    feeSchedulerMode
+    feeMarketCapSchedulerMode
+  );
+}
+function getFeeMarketCapMinBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, reductionFactor, feeMarketCapSchedulerMode) {
+  return getFeeMarketCapBaseFeeNumeratorByPeriod(
+    cliffFeeNumerator,
+    numberOfPeriod,
+    new BN10(numberOfPeriod),
+    reductionFactor,
+    feeMarketCapSchedulerMode
   );
 }
 
@@ -8864,7 +9359,7 @@ var FeeRateLimiter = class {
       poolVersion
     );
   }
-  getBaseFeeNumeratorFromIncludedFeeAmount(currentPoint, activationPoint, tradeDirection, includedFeeAmount) {
+  getBaseFeeNumeratorFromIncludedFeeAmount(currentPoint, activationPoint, tradeDirection, includedFeeAmount, _initSqrtPrice, _currentSqrtPrice) {
     if (isRateLimiterApplied(
       this.referenceAmount,
       this.maxLimiterDuration,
@@ -8885,7 +9380,7 @@ var FeeRateLimiter = class {
       return this.cliffFeeNumerator;
     }
   }
-  getBaseFeeNumeratorFromExcludedFeeAmount(currentPoint, activationPoint, tradeDirection, excludedFeeAmount) {
+  getBaseFeeNumeratorFromExcludedFeeAmount(currentPoint, activationPoint, tradeDirection, excludedFeeAmount, _initSqrtPrice, _currentSqrtPrice) {
     if (isRateLimiterApplied(
       this.referenceAmount,
       this.maxLimiterDuration,
@@ -8906,88 +9401,178 @@ var FeeRateLimiter = class {
       return this.cliffFeeNumerator;
     }
   }
+  validateBaseFeeIsStatic(currentPoint, activationPoint) {
+    return validateFeeRateLimiterBaseFeeIsStatic(
+      currentPoint,
+      activationPoint,
+      this.maxLimiterDuration,
+      this.referenceAmount,
+      this.maxFeeBps,
+      this.feeIncrementBps
+    );
+  }
+  getMinBaseFeeNumerator() {
+    return this.cliffFeeNumerator;
+  }
 };
-var FeeScheduler = class {
-  constructor(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, feeSchedulerMode) {
+var FeeTimeScheduler = class {
+  constructor(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, feeTimeSchedulerMode) {
     this.cliffFeeNumerator = cliffFeeNumerator;
     this.numberOfPeriod = numberOfPeriod;
     this.periodFrequency = periodFrequency;
     this.reductionFactor = reductionFactor;
-    this.feeSchedulerMode = feeSchedulerMode;
+    this.feeTimeSchedulerMode = feeTimeSchedulerMode;
   }
   validate(collectFeeMode, activationType, poolVersion) {
-    return validateFeeScheduler(
+    return validateFeeTimeScheduler(
       this.numberOfPeriod,
       this.periodFrequency,
       this.reductionFactor,
       this.cliffFeeNumerator,
-      this.feeSchedulerMode,
+      this.feeTimeSchedulerMode,
       poolVersion
     );
   }
-  getBaseFeeNumeratorFromIncludedFeeAmount(currentPoint, activationPoint) {
-    return getBaseFeeNumerator(
+  getBaseFeeNumeratorFromIncludedFeeAmount(currentPoint, activationPoint, _tradeDirection, _includedFeeAmount, _initSqrtPrice, _currentSqrtPrice) {
+    return getFeeTimeBaseFeeNumerator(
       this.cliffFeeNumerator,
       this.numberOfPeriod,
       this.periodFrequency,
       this.reductionFactor,
-      this.feeSchedulerMode,
+      this.feeTimeSchedulerMode,
       currentPoint,
       activationPoint
     );
   }
-  getBaseFeeNumeratorFromExcludedFeeAmount(currentPoint, activationPoint) {
-    return getBaseFeeNumerator(
+  getBaseFeeNumeratorFromExcludedFeeAmount(currentPoint, activationPoint, _tradeDirection, _excludedFeeAmount, _initSqrtPrice, _currentSqrtPrice) {
+    return getFeeTimeBaseFeeNumerator(
       this.cliffFeeNumerator,
       this.numberOfPeriod,
       this.periodFrequency,
       this.reductionFactor,
-      this.feeSchedulerMode,
+      this.feeTimeSchedulerMode,
       currentPoint,
       activationPoint
     );
   }
+  validateBaseFeeIsStatic(currentPoint, activationPoint) {
+    return validateFeeTimeSchedulerBaseFeeIsStatic(
+      currentPoint,
+      activationPoint,
+      new BN11(this.numberOfPeriod),
+      this.periodFrequency
+    );
+  }
+  getMinBaseFeeNumerator() {
+    return getFeeTimeMinBaseFeeNumerator(
+      this.cliffFeeNumerator,
+      this.numberOfPeriod,
+      this.reductionFactor,
+      this.feeTimeSchedulerMode
+    );
+  }
+};
+var FeeMarketCapScheduler = class {
+  constructor(cliffFeeNumerator, numberOfPeriod, sqrtPriceStepBps, schedulerExpirationDuration, reductionFactor, feeMarketCapSchedulerMode) {
+    this.cliffFeeNumerator = cliffFeeNumerator;
+    this.numberOfPeriod = numberOfPeriod;
+    this.sqrtPriceStepBps = sqrtPriceStepBps;
+    this.schedulerExpirationDuration = schedulerExpirationDuration;
+    this.reductionFactor = reductionFactor;
+    this.feeMarketCapSchedulerMode = feeMarketCapSchedulerMode;
+  }
+  validate(_collectFeeMode, _activationType, poolVersion) {
+    return validateFeeMarketCapScheduler(
+      this.cliffFeeNumerator,
+      this.numberOfPeriod,
+      new BN11(this.sqrtPriceStepBps),
+      this.reductionFactor,
+      new BN11(this.schedulerExpirationDuration),
+      this.feeMarketCapSchedulerMode,
+      poolVersion
+    );
+  }
+  getBaseFeeNumeratorFromIncludedFeeAmount(currentPoint, activationPoint, _tradeDirection, _includedFeeAmount, initSqrtPrice, currentSqrtPrice) {
+    return getFeeMarketCapBaseFeeNumerator(
+      this.cliffFeeNumerator,
+      this.numberOfPeriod,
+      this.sqrtPriceStepBps,
+      this.schedulerExpirationDuration,
+      this.reductionFactor,
+      this.feeMarketCapSchedulerMode,
+      currentPoint,
+      activationPoint,
+      initSqrtPrice,
+      currentSqrtPrice
+    );
+  }
+  getBaseFeeNumeratorFromExcludedFeeAmount(currentPoint, activationPoint, _tradeDirection, _excludedFeeAmount, initSqrtPrice, currentSqrtPrice) {
+    return getFeeMarketCapBaseFeeNumerator(
+      this.cliffFeeNumerator,
+      this.numberOfPeriod,
+      this.sqrtPriceStepBps,
+      this.schedulerExpirationDuration,
+      this.reductionFactor,
+      this.feeMarketCapSchedulerMode,
+      currentPoint,
+      activationPoint,
+      initSqrtPrice,
+      currentSqrtPrice
+    );
+  }
+  validateBaseFeeIsStatic(currentPoint, activationPoint) {
+    return validateFeeMarketCapBaseFeeIsStatic(
+      currentPoint,
+      activationPoint,
+      new BN11(this.schedulerExpirationDuration)
+    );
+  }
+  getMinBaseFeeNumerator() {
+    return getFeeMarketCapMinBaseFeeNumerator(
+      this.cliffFeeNumerator,
+      this.numberOfPeriod,
+      this.reductionFactor,
+      this.feeMarketCapSchedulerMode
+    );
+  }
 };
-function getBaseFeeHandler(cliffFeeNumerator, firstFactor, secondFactor, thirdFactor, baseFeeMode) {
+function getBaseFeeHandler(program, rawData) {
+  const data = Buffer.from(rawData);
+  const modeIndex = data.readUInt8(8);
+  const baseFeeMode = modeIndex;
   switch (baseFeeMode) {
-    case 0 /* FeeSchedulerLinear */:
-    case 1 /* FeeSchedulerExponential */: {
-      if (secondFactor.length < 8) {
-        throw new Error(
-          "TypeCastFailed: secondFactor must be at least 8 bytes"
-        );
-      }
-      const periodFrequency = new BN9(
-        Buffer.from(secondFactor.slice(0, 8)),
-        "le"
-      );
-      const feeScheduler = new FeeScheduler(
-        cliffFeeNumerator,
-        firstFactor,
-        periodFrequency,
-        thirdFactor,
-        baseFeeMode
+    case 0 /* FeeTimeSchedulerLinear */:
+    case 1 /* FeeTimeSchedulerExponential */: {
+      const poolFees = decodePodAlignedFeeTimeScheduler(data);
+      return new FeeTimeScheduler(
+        poolFees.cliffFeeNumerator,
+        poolFees.numberOfPeriod,
+        poolFees.periodFrequency,
+        poolFees.reductionFactor,
+        poolFees.baseFeeMode
       );
-      return feeScheduler;
     }
     case 2 /* RateLimiter */: {
-      if (secondFactor.length < 8) {
-        throw new Error(
-          "TypeCastFailed: secondFactor must be at least 8 bytes"
-        );
-      }
-      const maxLimiterDuration = Buffer.from(
-        secondFactor.slice(0, 4)
-      ).readUInt32LE(0);
-      const maxFeeBps = Buffer.from(secondFactor.slice(4, 8)).readUInt32LE(0);
-      const feeRateLimiter = new FeeRateLimiter(
-        cliffFeeNumerator,
-        firstFactor,
-        maxFeeBps,
-        maxLimiterDuration,
-        thirdFactor
+      const poolFees = decodePodAlignedFeeRateLimiter(data);
+      return new FeeRateLimiter(
+        poolFees.cliffFeeNumerator,
+        poolFees.feeIncrementBps,
+        poolFees.maxFeeBps,
+        poolFees.maxLimiterDuration,
+        poolFees.referenceAmount
+      );
+    }
+    case 3 /* FeeMarketCapSchedulerLinear */:
+    case 4 /* FeeMarketCapSchedulerExponential */: {
+      const poolFees = decodePodAlignedFeeMarketCapScheduler(data);
+      return new FeeMarketCapScheduler(
+        poolFees.cliffFeeNumerator,
+        poolFees.numberOfPeriod,
+        poolFees.sqrtPriceStepBps,
+        poolFees.schedulerExpirationDuration,
+        poolFees.reductionFactor,
+        poolFees.baseFeeMode
       );
-      return feeRateLimiter;
     }
     default:
       throw new Error("Invalid base fee mode");
@@ -8995,21 +9580,21 @@ function getBaseFeeHandler(cliffFeeNumerator, firstFactor, secondFactor, thirdFa
 }
 
 // src/math/poolFees/dynamicFee.ts
-import BN10 from "bn.js";
+import BN12 from "bn.js";
 function isDynamicFeeEnabled(dynamicFee) {
   return dynamicFee.initialized !== 0;
 }
 function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeControl) {
-  const squareVfaBin = volatilityAccumulator.mul(new BN10(binStep)).pow(new BN10(2));
+  const squareVfaBin = volatilityAccumulator.mul(new BN12(binStep)).pow(new BN12(2));
   const vFee = variableFeeControl.mul(squareVfaBin);
-  return vFee.add(new BN10(DYNAMIC_FEE_ROUNDING_OFFSET)).div(new BN10(DYNAMIC_FEE_SCALING_FACTOR));
+  return vFee.add(new BN12(DYNAMIC_FEE_ROUNDING_OFFSET)).div(new BN12(DYNAMIC_FEE_SCALING_FACTOR));
 }
 
 // src/math/quote.ts
-import BN12 from "bn.js";
+import BN14 from "bn.js";
 
 // src/math/curve.ts
-import BN11 from "bn.js";
+import BN13 from "bn.js";
 function getNextSqrtPriceFromAmountInBRoundingDown(sqrtPrice, liquidity, amount) {
   const quotient = amount.shln(SCALE_OFFSET * 2).div(liquidity);
   const result = sqrtPrice.add(quotient);
@@ -9039,16 +9624,16 @@ function getNextSqrtPriceFromAmountOutARoundingUp(sqrtPrice, liquidity, amount)
   }
   const product = amount.mul(sqrtPrice);
   const denominator = liquidity.sub(product);
-  if (denominator.lte(new BN11(0))) {
+  if (denominator.lte(new BN13(0))) {
     throw new Error("MathOverflow: denominator is zero or negative");
   }
   return mulDiv(liquidity, sqrtPrice, denominator, 0 /* Up */);
 }
 function getNextSqrtPriceFromOutput(sqrtPrice, liquidity, amountOut, aForB) {
-  if (sqrtPrice.lte(new BN11(0))) {
+  if (sqrtPrice.lte(new BN13(0))) {
     throw new Error("sqrtPrice must be greater than 0");
   }
-  if (liquidity.lte(new BN11(0))) {
+  if (liquidity.lte(new BN13(0))) {
     throw new Error("liquidity must be greater than 0");
   }
   if (aForB) {
@@ -9066,10 +9651,10 @@ function getNextSqrtPriceFromOutput(sqrtPrice, liquidity, amountOut, aForB) {
   }
 }
 function getNextSqrtPriceFromInput(sqrtPrice, liquidity, amountIn, aForB) {
-  if (sqrtPrice.lte(new BN11(0))) {
+  if (sqrtPrice.lte(new BN13(0))) {
     throw new Error("sqrtPrice must be greater than 0");
   }
-  if (liquidity.lte(new BN11(0))) {
+  if (liquidity.lte(new BN13(0))) {
     throw new Error("liquidity must be greater than 0");
   }
   if (aForB) {
@@ -9100,7 +9685,7 @@ function getDeltaAmountBUnsignedUnchecked(lowerSqrtPrice, upperSqrtPrice, liquid
   const prod = liquidity.mul(deltaSqrtPrice);
   const shift = SCALE_OFFSET * 2;
   if (rounding === 0 /* Up */) {
-    const denominator = new BN11(1).ushln(shift);
+    const denominator = new BN13(1).ushln(shift);
     const result = prod.add(denominator.subn(1)).div(denominator);
     return result;
   } else {
@@ -9121,7 +9706,7 @@ function getDeltaAmountAUnsignedUnchecked(lowerSqrtPrice, upperSqrtPrice, liquid
   const numerator1 = liquidity;
   const numerator2 = upperSqrtPrice.sub(lowerSqrtPrice);
   const denominator = lowerSqrtPrice.mul(upperSqrtPrice);
-  if (denominator.lte(new BN11(0))) {
+  if (denominator.lte(new BN13(0))) {
     throw new Error("Denominator must be greater than zero");
   }
   const result = mulDiv(numerator1, numerator2, denominator, rounding);
@@ -9139,19 +9724,22 @@ function getLiquidityDeltaFromAmountB(amountB, lowerSqrtPrice, upperSqrtPrice) {
 }
 
 // src/math/quote.ts
-function getSwapResultFromExactInput(poolState, amountIn, feeMode, tradeDirection, currentPoint) {
-  let actualProtocolFee = new BN12(0);
-  let actualTradingFee = new BN12(0);
-  let actualReferralFee = new BN12(0);
-  let actualPartnerFee = new BN12(0);
+function getSwapResultFromExactInput(program, poolState, amountIn, feeMode, tradeDirection, currentPoint) {
+  let actualProtocolFee = new BN14(0);
+  let actualTradingFee = new BN14(0);
+  let actualReferralFee = new BN14(0);
+  let actualPartnerFee = new BN14(0);
   const maxFeeNumerator = getMaxFeeNumerator(poolState.version);
   const tradeFeeNumerator = getTotalTradingFeeFromIncludedFeeAmount(
+    program,
     poolState.poolFees,
     currentPoint,
     poolState.activationPoint,
     amountIn,
     tradeDirection,
-    maxFeeNumerator
+    maxFeeNumerator,
+    poolState.poolFees.initSqrtPrice,
+    poolState.sqrtPrice
   );
   let actualAmountIn;
   if (feeMode.feesOnInput) {
@@ -9225,7 +9813,7 @@ function calculateAtoBFromAmountIn(poolState, amountIn) {
   return {
     outputAmount,
     nextSqrtPrice,
-    amountLeft: new BN12(0)
+    amountLeft: new BN14(0)
   };
 }
 function calculateBtoAFromAmountIn(poolState, amountIn) {
@@ -9247,22 +9835,25 @@ function calculateBtoAFromAmountIn(poolState, amountIn) {
   return {
     outputAmount,
     nextSqrtPrice,
-    amountLeft: new BN12(0)
+    amountLeft: new BN14(0)
   };
 }
-function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirection, currentPoint) {
-  let actualProtocolFee = new BN12(0);
-  let actualTradingFee = new BN12(0);
-  let actualReferralFee = new BN12(0);
-  let actualPartnerFee = new BN12(0);
+function getSwapResultFromPartialInput(program, poolState, amountIn, feeMode, tradeDirection, currentPoint) {
+  let actualProtocolFee = new BN14(0);
+  let actualTradingFee = new BN14(0);
+  let actualReferralFee = new BN14(0);
+  let actualPartnerFee = new BN14(0);
   const maxFeeNumerator = getMaxFeeNumerator(poolState.version);
   const tradeFeeNumerator = getTotalTradingFeeFromIncludedFeeAmount(
+    program,
     poolState.poolFees,
     currentPoint,
     poolState.activationPoint,
     amountIn,
     tradeDirection,
-    maxFeeNumerator
+    maxFeeNumerator,
+    poolState.poolFees.initSqrtPrice,
+    poolState.sqrtPrice
   );
   let actualAmountIn;
   if (feeMode.feesOnInput) {
@@ -9295,16 +9886,19 @@ function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirect
   }
   let { amountLeft, outputAmount, nextSqrtPrice } = swapAmountFromInput;
   let includedFeeInputAmount;
-  if (amountLeft.gt(new BN12(0))) {
+  if (amountLeft.gt(new BN14(0))) {
     actualAmountIn = actualAmountIn.sub(amountLeft);
     if (feeMode.feesOnInput) {
       const tradeFeeNumerator2 = getTotalTradingFeeFromExcludedFeeAmount(
+        program,
         poolState.poolFees,
         currentPoint,
         poolState.activationPoint,
         actualAmountIn,
         tradeDirection,
-        maxFeeNumerator
+        maxFeeNumerator,
+        poolState.poolFees.initSqrtPrice,
+        poolState.sqrtPrice
       );
       const { includedFeeAmount, feeAmount } = getIncludedFeeAmount(
         tradeFeeNumerator2,
@@ -9424,23 +10018,26 @@ function calculateBtoAFromPartialAmountIn(poolState, amountIn) {
     amountLeft
   };
 }
-function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirection, currentPoint) {
-  let actualProtocolFee = new BN12(0);
-  let actualTradingFee = new BN12(0);
-  let actualReferralFee = new BN12(0);
-  let actualPartnerFee = new BN12(0);
+function getSwapResultFromExactOutput(program, poolState, amountOut, feeMode, tradeDirection, currentPoint) {
+  let actualProtocolFee = new BN14(0);
+  let actualTradingFee = new BN14(0);
+  let actualReferralFee = new BN14(0);
+  let actualPartnerFee = new BN14(0);
   const maxFeeNumerator = getMaxFeeNumerator(poolState.version);
   let includedFeeAmountOut;
   if (feeMode.feesOnInput) {
     includedFeeAmountOut = amountOut;
   } else {
     const tradeFeeNumerator = getTotalTradingFeeFromExcludedFeeAmount(
+      program,
       poolState.poolFees,
       currentPoint,
       poolState.activationPoint,
       amountOut,
       tradeDirection,
-      maxFeeNumerator
+      maxFeeNumerator,
+      poolState.poolFees.initSqrtPrice,
+      poolState.sqrtPrice
     );
     const { includedFeeAmount, feeAmount } = getIncludedFeeAmount(
       tradeFeeNumerator,
@@ -9474,12 +10071,15 @@ function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirect
   let includedFeeInputAmount;
   if (feeMode.feesOnInput) {
     const tradeFeeNumerator = getTotalTradingFeeFromExcludedFeeAmount(
+      program,
       poolState.poolFees,
       currentPoint,
       poolState.activationPoint,
       inputAmount,
       tradeDirection,
-      maxFeeNumerator
+      maxFeeNumerator,
+      poolState.poolFees.initSqrtPrice,
+      poolState.sqrtPrice
     );
     const { includedFeeAmount, feeAmount } = getIncludedFeeAmount(
       tradeFeeNumerator,
@@ -9500,7 +10100,7 @@ function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirect
     includedFeeInputAmount = inputAmount;
   }
   return {
-    amountLeft: new BN12(0),
+    amountLeft: new BN14(0),
     includedFeeInputAmount,
     excludedFeeInputAmount: inputAmount,
     outputAmount: amountOut,
@@ -9553,8 +10153,8 @@ function calculateBtoAFromAmountOut(poolState, amountOut) {
     nextSqrtPrice
   };
 }
-function swapQuoteExactInput(pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
-  if (amountIn.lte(new BN12(0))) {
+function swapQuoteExactInput(program, pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+  if (amountIn.lte(new BN14(0))) {
     throw new Error("Amount in must be greater than 0");
   }
   if (!isSwapEnabled(pool, currentPoint)) {
@@ -9571,6 +10171,7 @@ function swapQuoteExactInput(pool, currentPoint, amountIn, slippage, aToB, hasRe
     ).amount;
   }
   const swapResult = getSwapResultFromExactInput(
+    program,
     pool,
     actualAmountIn,
     feeMode,
@@ -9603,8 +10204,8 @@ function swapQuoteExactInput(pool, currentPoint, amountIn, slippage, aToB, hasRe
     priceImpact
   });
 }
-function swapQuoteExactOutput(pool, currentPoint, amountOut, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
-  if (amountOut.lte(new BN12(0))) {
+function swapQuoteExactOutput(program, pool, currentPoint, amountOut, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+  if (amountOut.lte(new BN14(0))) {
     throw new Error("Amount out must be greater than 0");
   }
   if (!isSwapEnabled(pool, currentPoint)) {
@@ -9621,6 +10222,7 @@ function swapQuoteExactOutput(pool, currentPoint, amountOut, slippage, aToB, has
     ).amount;
   }
   const swapResult = getSwapResultFromExactOutput(
+    program,
     pool,
     actualAmountOut,
     feeMode,
@@ -9653,8 +10255,8 @@ function swapQuoteExactOutput(pool, currentPoint, amountOut, slippage, aToB, has
     priceImpact
   });
 }
-function swapQuotePartialInput(pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
-  if (amountIn.lte(new BN12(0))) {
+function swapQuotePartialInput(program, pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+  if (amountIn.lte(new BN14(0))) {
     throw new Error("Amount in must be greater than 0");
   }
   if (!isSwapEnabled(pool, currentPoint)) {
@@ -9671,6 +10273,7 @@ function swapQuotePartialInput(pool, currentPoint, amountIn, slippage, aToB, has
     ).amount;
   }
   const swapResult = getSwapResultFromPartialInput(
+    program,
     pool,
     actualAmountIn,
     feeMode,
@@ -9705,7 +10308,7 @@ function swapQuotePartialInput(pool, currentPoint, amountIn, slippage, aToB, has
 }
 
 // src/math/priceMath.ts
-import { BN as BN13 } from "@coral-xyz/anchor";
+import { BN as BN15 } from "@coral-xyz/anchor";
 import Decimal3 from "decimal.js";
 function calculateInitSqrtPrice(tokenAAmount, tokenBAmount, minSqrtPrice, maxSqrtPrice) {
   if (tokenAAmount.isZero() || tokenBAmount.isZero()) {
@@ -9728,39 +10331,79 @@ function calculateInitSqrtPrice(tokenAAmount, tokenBAmount, minSqrtPrice, maxSqr
   const discriminant = xyMinusPa.mul(xyMinusPa).add(fourY);
   const sqrtDiscriminant = discriminant.sqrt();
   const result = paMinusXY.add(sqrtDiscriminant).div(new Decimal3(2)).mul(Decimal3.pow(2, 64));
-  return new BN13(result.floor().toFixed());
+  return new BN15(result.floor().toFixed());
 }
 
 // src/helpers/validation.ts
-function validateFeeScheduler(numberOfPeriod, periodFrequency, reductionFactor, cliffFeeNumerator, baseFeeMode, poolVersion) {
-  if (!periodFrequency.eq(new BN14(0)) || numberOfPeriod !== 0 || !reductionFactor.eq(new BN14(0))) {
-    if (numberOfPeriod === 0 || periodFrequency.eq(new BN14(0)) || reductionFactor.eq(new BN14(0))) {
-      return false;
+function validateFeeTimeScheduler(numberOfPeriod, periodFrequency, reductionFactor, cliffFeeNumerator, baseFeeMode, poolVersion) {
+  if (!periodFrequency.eq(new BN16(0)) || numberOfPeriod !== 0 || !reductionFactor.eq(new BN16(0))) {
+    if (numberOfPeriod === 0 || periodFrequency.eq(new BN16(0)) || reductionFactor.eq(new BN16(0))) {
+      throw new Error("PoolError::InvalidFeeTimeScheduler");
     }
   }
-  const minFeeNumerator = getMinBaseFeeNumerator(
+  const minFeeNumerator = getFeeTimeMinBaseFeeNumerator(
     cliffFeeNumerator,
     numberOfPeriod,
     reductionFactor,
     baseFeeMode
   );
   const maxFeeNumerator = getMaxBaseFeeNumerator(cliffFeeNumerator);
-  validateFeeFraction(minFeeNumerator, new BN14(FEE_DENOMINATOR));
-  validateFeeFraction(maxFeeNumerator, new BN14(FEE_DENOMINATOR));
-  if (minFeeNumerator.lt(new BN14(MIN_FEE_NUMERATOR)) || maxFeeNumerator.gt(getMaxFeeNumerator(poolVersion))) {
+  validateFeeFraction(minFeeNumerator, new BN16(FEE_DENOMINATOR));
+  validateFeeFraction(maxFeeNumerator, new BN16(FEE_DENOMINATOR));
+  if (minFeeNumerator.lt(new BN16(MIN_FEE_NUMERATOR)) || maxFeeNumerator.gt(getMaxFeeNumerator(poolVersion))) {
+    throw new Error("PoolError::ExceedMaxFeeBps");
+  }
+  return true;
+}
+function validateFeeTimeSchedulerBaseFeeIsStatic(currentPoint, activationPoint, numberOfPeriod, periodFrequency) {
+  const schedulerExpirationPoint = activationPoint.add(
+    numberOfPeriod.mul(periodFrequency)
+  );
+  return currentPoint.gt(schedulerExpirationPoint);
+}
+function validateFeeMarketCapScheduler(cliffFeeNumerator, numberOfPeriod, sqrtPriceStepBps, reductionFactor, schedulerExpirationDuration, feeMarketCapSchedulerMode, poolVersion) {
+  if (reductionFactor.lte(new BN16(0))) {
+    throw new Error("PoolError::InvalidFeeMarketCapScheduler");
+  }
+  if (sqrtPriceStepBps.lte(new BN16(0))) {
+    throw new Error("PoolError::InvalidFeeMarketCapScheduler");
+  }
+  if (schedulerExpirationDuration.lte(new BN16(0))) {
+    throw new Error("PoolError::InvalidFeeMarketCapScheduler");
+  }
+  if (numberOfPeriod <= 0) {
+    throw new Error("PoolError::InvalidFeeMarketCapScheduler");
+  }
+  const minFeeNumerator = getFeeMarketCapMinBaseFeeNumerator(
+    cliffFeeNumerator,
+    numberOfPeriod,
+    reductionFactor,
+    feeMarketCapSchedulerMode
+  );
+  const maxFeeNumerator = cliffFeeNumerator;
+  validateFeeFraction(minFeeNumerator, new BN16(FEE_DENOMINATOR));
+  validateFeeFraction(maxFeeNumerator, new BN16(FEE_DENOMINATOR));
+  const maxAllowedFeeNumerator = getMaxFeeNumerator(poolVersion);
+  if (minFeeNumerator.lt(new BN16(MIN_FEE_NUMERATOR)) || maxFeeNumerator.gt(maxAllowedFeeNumerator)) {
     throw new Error("PoolError::ExceedMaxFeeBps");
   }
   return true;
 }
+function validateFeeMarketCapBaseFeeIsStatic(currentPoint, activationPoint, schedulerExpirationDuration) {
+  const schedulerExpirationPoint = activationPoint.add(
+    schedulerExpirationDuration
+  );
+  return currentPoint.gt(schedulerExpirationPoint);
+}
 function validateFeeRateLimiter(cliffFeeNumerator, feeIncrementBps, maxFeeBps, maxLimiterDuration, referenceAmount, collectFeeMode, activationType, poolVersion) {
   if (collectFeeMode !== 1 /* OnlyB */) {
     return false;
   }
   const maxFeeNumeratorFromBps = toNumerator(
-    new BN14(maxFeeBps),
-    new BN14(FEE_DENOMINATOR)
+    new BN16(maxFeeBps),
+    new BN16(FEE_DENOMINATOR)
   );
-  if (cliffFeeNumerator.lt(new BN14(MIN_FEE_NUMERATOR)) || cliffFeeNumerator.gt(maxFeeNumeratorFromBps)) {
+  if (cliffFeeNumerator.lt(new BN16(MIN_FEE_NUMERATOR)) || cliffFeeNumerator.gt(maxFeeNumeratorFromBps)) {
     return false;
   }
   if (isZeroRateLimiter(
@@ -9779,39 +10422,53 @@ function validateFeeRateLimiter(cliffFeeNumerator, feeIncrementBps, maxFeeBps, m
   )) {
     return false;
   }
-  const maxLimiterDurationLimit = activationType === 0 /* Slot */ ? new BN14(MAX_RATE_LIMITER_DURATION_IN_SLOTS) : new BN14(MAX_RATE_LIMITER_DURATION_IN_SECONDS);
-  if (new BN14(maxLimiterDuration).gt(maxLimiterDurationLimit)) {
+  const maxLimiterDurationLimit = activationType === 0 /* Slot */ ? new BN16(MAX_RATE_LIMITER_DURATION_IN_SLOTS) : new BN16(MAX_RATE_LIMITER_DURATION_IN_SECONDS);
+  if (new BN16(maxLimiterDuration).gt(maxLimiterDurationLimit)) {
     return false;
   }
   const feeIncrementNumerator = toNumerator(
-    new BN14(feeIncrementBps),
-    new BN14(FEE_DENOMINATOR)
+    new BN16(feeIncrementBps),
+    new BN16(FEE_DENOMINATOR)
   );
-  if (feeIncrementNumerator.gte(new BN14(FEE_DENOMINATOR))) {
+  if (feeIncrementNumerator.gte(new BN16(FEE_DENOMINATOR))) {
     return false;
   }
   if (maxFeeBps > getMaxFeeBps(poolVersion)) {
     return false;
   }
   const minFeeNumerator = getFeeNumeratorFromIncludedFeeAmount(
-    new BN14(0),
+    new BN16(0),
     cliffFeeNumerator,
     referenceAmount,
     maxFeeBps,
     feeIncrementBps
   );
   const maxFeeNumeratorFromAmount = getFeeNumeratorFromIncludedFeeAmount(
-    new BN14(Number.MAX_SAFE_INTEGER),
+    new BN16(Number.MAX_SAFE_INTEGER),
     cliffFeeNumerator,
     referenceAmount,
     maxFeeBps,
     feeIncrementBps
   );
-  if (minFeeNumerator.lt(new BN14(MIN_FEE_NUMERATOR)) || maxFeeNumeratorFromAmount.gt(getMaxFeeNumerator(poolVersion))) {
+  if (minFeeNumerator.lt(new BN16(MIN_FEE_NUMERATOR)) || maxFeeNumeratorFromAmount.gt(getMaxFeeNumerator(poolVersion))) {
     return false;
   }
   return true;
 }
+function validateFeeRateLimiterBaseFeeIsStatic(currentPoint, activationPoint, maxLimiterDuration, referenceAmount, maxFeeBps, feeIncrementBps) {
+  if (isZeroRateLimiter(
+    referenceAmount,
+    maxLimiterDuration,
+    maxFeeBps,
+    feeIncrementBps
+  )) {
+    return true;
+  }
+  const lastEffectiveRateLimiterPoint = activationPoint.add(
+    new BN16(maxLimiterDuration)
+  );
+  return currentPoint.gt(lastEffectiveRateLimiterPoint);
+}
 function validateFeeFraction(numerator, denominator) {
   if (denominator.isZero() || numerator.gte(denominator)) {
     throw new Error(
@@ -9822,8 +10479,71 @@ function validateFeeFraction(numerator, denominator) {
 
 // src/helpers/common.ts
 import { PublicKey as PublicKey6 } from "@solana/web3.js";
-import BN15 from "bn.js";
+import BN18 from "bn.js";
 import Decimal4 from "decimal.js";
+
+// src/helpers/feeCodec.ts
+import BN17 from "bn.js";
+import { BorshCoder } from "@coral-xyz/anchor";
+var cpAmmCoder = new BorshCoder(cp_amm_default);
+function encodeFeeTimeSchedulerParams(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, baseFeeMode) {
+  const feeTimeScheduler = {
+    cliff_fee_numerator: new BN17(cliffFeeNumerator.toString()),
+    number_of_period: numberOfPeriod,
+    period_frequency: new BN17(periodFrequency.toString()),
+    reduction_factor: new BN17(reductionFactor.toString()),
+    base_fee_mode: baseFeeMode,
+    padding: FEE_PADDING
+  };
+  return cpAmmCoder.types.encode("BorshFeeTimeScheduler", feeTimeScheduler);
+}
+function decodeFeeTimeSchedulerParams(data) {
+  return cpAmmCoder.types.decode("BorshFeeTimeScheduler", data);
+}
+function decodePodAlignedFeeTimeScheduler(data) {
+  return cpAmmCoder.types.decode("PodAlignedFeeTimeScheduler", data);
+}
+function encodeFeeMarketCapSchedulerParams(cliffFeeNumerator, numberOfPeriod, sqrtPriceStepBps, schedulerExpirationDuration, reductionFactor, baseFeeMode) {
+  const feeMarketCapScheduler = {
+    cliff_fee_numerator: new BN17(cliffFeeNumerator.toString()),
+    number_of_period: numberOfPeriod,
+    sqrt_price_step_bps: sqrtPriceStepBps,
+    scheduler_expiration_duration: schedulerExpirationDuration,
+    reduction_factor: new BN17(reductionFactor.toString()),
+    base_fee_mode: baseFeeMode,
+    padding: FEE_PADDING
+  };
+  return cpAmmCoder.types.encode(
+    "BorshFeeMarketCapScheduler",
+    feeMarketCapScheduler
+  );
+}
+function decodeFeeMarketCapSchedulerParams(data) {
+  return cpAmmCoder.types.decode("BorshFeeMarketCapScheduler", data);
+}
+function decodePodAlignedFeeMarketCapScheduler(data) {
+  return cpAmmCoder.types.decode("PodAlignedFeeMarketCapScheduler", data);
+}
+function encodeFeeRateLimiterParams(cliffFeeNumerator, feeIncrementBps, maxLimiterDuration, maxFeeBps, referenceAmount) {
+  const feeRateLimiter = {
+    cliff_fee_numerator: new BN17(cliffFeeNumerator.toString()),
+    fee_increment_bps: feeIncrementBps,
+    max_limiter_duration: maxLimiterDuration,
+    max_fee_bps: maxFeeBps,
+    reference_amount: new BN17(referenceAmount.toString()),
+    base_fee_mode: 2 /* RateLimiter */,
+    padding: FEE_PADDING
+  };
+  return cpAmmCoder.types.encode("BorshFeeRateLimiter", feeRateLimiter);
+}
+function decodeFeeRateLimiterParams(data) {
+  return cpAmmCoder.types.decode("BorshFeeRateLimiter", data);
+}
+function decodePodAlignedFeeRateLimiter(data) {
+  return cpAmmCoder.types.decode("PodAlignedFeeRateLimiter", data);
+}
+
+// src/helpers/common.ts
 function hasPartner(poolState) {
   return !poolState.partner.equals(PublicKey6.default);
 }
@@ -9831,10 +10551,10 @@ function getCurrentPoint(connection, activationType) {
   return __async(this, null, function* () {
     const currentSlot = yield connection.getSlot();
     if (activationType === 0 /* Slot */) {
-      return new BN15(currentSlot);
+      return new BN18(currentSlot);
     } else {
       const currentTime = yield connection.getBlockTime(currentSlot);
-      return new BN15(currentTime);
+      return new BN18(currentTime);
     }
   });
 }
@@ -9845,7 +10565,7 @@ function convertToFeeSchedulerSecondFactor(value) {
   return Array.from(value.toArrayLike(Buffer, "le", 8));
 }
 function parseFeeSchedulerSecondFactor(secondFactor) {
-  return new BN15(Buffer.from(secondFactor), "le");
+  return new BN18(Buffer.from(secondFactor), "le");
 }
 function convertToRateLimiterSecondFactor(maxLimiterDuration, maxFeeBps) {
   const buffer1 = maxLimiterDuration.toArrayLike(Buffer, "le", 4);
@@ -9861,10 +10581,10 @@ function parseRateLimiterSecondFactor(secondFactor) {
   };
 }
 function bpsToFeeNumerator(bps) {
-  return new BN15(bps * FEE_DENOMINATOR).divn(BASIS_POINT_MAX);
+  return new BN18(bps * FEE_DENOMINATOR).divn(BASIS_POINT_MAX);
 }
 function feeNumeratorToBps(feeNumerator) {
-  return feeNumerator.muln(BASIS_POINT_MAX).div(new BN15(FEE_DENOMINATOR)).toNumber();
+  return feeNumerator.muln(BASIS_POINT_MAX).div(new BN18(FEE_DENOMINATOR)).toNumber();
 }
 function convertToLamports(amount, tokenDecimal) {
   const valueInLamports = new Decimal4(amount).mul(
@@ -9873,19 +10593,22 @@ function convertToLamports(amount, tokenDecimal) {
   return fromDecimalToBN(valueInLamports);
 }
 function fromDecimalToBN(value) {
-  return new BN15(value.floor().toFixed());
+  return new BN18(value.floor().toFixed());
 }
-function getFeeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode, numberOfPeriod, totalDuration) {
+function getFeeTimeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode, numberOfPeriod, totalDuration) {
   if (startingBaseFeeBps == endingBaseFeeBps) {
     if (numberOfPeriod != 0 || totalDuration != 0) {
       throw new Error("numberOfPeriod and totalDuration must both be zero");
     }
+    const data2 = encodeFeeTimeSchedulerParams(
+      bpsToFeeNumerator(startingBaseFeeBps),
+      0,
+      new BN18(0),
+      new BN18(0),
+      0 /* FeeTimeSchedulerLinear */
+    );
     return {
-      cliffFeeNumerator: bpsToFeeNumerator(startingBaseFeeBps),
-      firstFactor: 0,
-      secondFactor: Array.from(new BN15(0).toArrayLike(Buffer, "le", 8)),
-      thirdFactor: new BN15(0),
-      baseFeeMode: 0 /* FeeSchedulerLinear */
+      data: Array.from(data2)
     };
   }
   if (numberOfPeriod <= 0) {
@@ -9909,23 +10632,68 @@ function getFeeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode
   }
   const maxBaseFeeNumerator = bpsToFeeNumerator(startingBaseFeeBps);
   const minBaseFeeNumerator = bpsToFeeNumerator(endingBaseFeeBps);
-  const periodFrequency = new BN15(totalDuration / numberOfPeriod);
-  const secondFactor = convertToFeeSchedulerSecondFactor(periodFrequency);
+  const periodFrequency = new BN18(totalDuration / numberOfPeriod);
   let reductionFactor;
-  if (baseFeeMode == 0 /* FeeSchedulerLinear */) {
+  if (baseFeeMode == 0 /* FeeTimeSchedulerLinear */) {
     const totalReduction = maxBaseFeeNumerator.sub(minBaseFeeNumerator);
     reductionFactor = totalReduction.divn(numberOfPeriod);
   } else {
     const ratio = minBaseFeeNumerator.toNumber() / maxBaseFeeNumerator.toNumber();
     const decayBase = Math.pow(ratio, 1 / numberOfPeriod);
-    reductionFactor = new BN15(BASIS_POINT_MAX * (1 - decayBase));
+    reductionFactor = new BN18(BASIS_POINT_MAX * (1 - decayBase));
   }
+  const data = encodeFeeTimeSchedulerParams(
+    maxBaseFeeNumerator,
+    numberOfPeriod,
+    periodFrequency,
+    reductionFactor,
+    baseFeeMode
+  );
   return {
-    cliffFeeNumerator: maxBaseFeeNumerator,
-    firstFactor: numberOfPeriod,
-    secondFactor,
-    thirdFactor: reductionFactor,
+    data: Array.from(data)
+  };
+}
+function getFeeMarketCapSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode, numberOfPeriod, sqrtPriceStepBps, schedulerExpirationDuration) {
+  if (numberOfPeriod <= 0) {
+    throw new Error("Total periods must be greater than zero");
+  }
+  const poolMaxFeeBps = getMaxFeeBps(CURRENT_POOL_VERSION);
+  if (startingBaseFeeBps <= endingBaseFeeBps) {
+    throw new Error(
+      `startingBaseFeeBps (${startingBaseFeeBps} bps) must be greater than endingBaseFeeBps (${endingBaseFeeBps} bps)`
+    );
+  }
+  if (startingBaseFeeBps > poolMaxFeeBps) {
+    throw new Error(
+      `startingBaseFeeBps (${startingBaseFeeBps} bps) exceeds maximum allowed value of ${poolMaxFeeBps} bps`
+    );
+  }
+  if (numberOfPeriod == 0 || sqrtPriceStepBps == 0 || schedulerExpirationDuration == 0) {
+    throw new Error(
+      "numberOfPeriod, sqrtPriceStepBps, and schedulerExpirationDuration must be greater than zero"
+    );
+  }
+  const maxBaseFeeNumerator = bpsToFeeNumerator(startingBaseFeeBps);
+  const minBaseFeeNumerator = bpsToFeeNumerator(endingBaseFeeBps);
+  let reductionFactor;
+  if (baseFeeMode == 3 /* FeeMarketCapSchedulerLinear */) {
+    const totalReduction = maxBaseFeeNumerator.sub(minBaseFeeNumerator);
+    reductionFactor = totalReduction.divn(numberOfPeriod);
+  } else {
+    const ratio = minBaseFeeNumerator.toNumber() / maxBaseFeeNumerator.toNumber();
+    const decayBase = Math.pow(ratio, 1 / numberOfPeriod);
+    reductionFactor = new BN18(BASIS_POINT_MAX * (1 - decayBase));
+  }
+  const data = encodeFeeMarketCapSchedulerParams(
+    maxBaseFeeNumerator,
+    numberOfPeriod,
+    sqrtPriceStepBps,
+    schedulerExpirationDuration,
+    reductionFactor,
     baseFeeMode
+  );
+  return {
+    data: Array.from(data)
   };
 }
 function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxLimiterDuration, maxFeeBps, tokenBDecimal, activationType) {
@@ -9946,7 +10714,7 @@ function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxL
       `Fee increment (${feeIncrementBps} bps) exceeds maximum allowed value of ${poolMaxFeeBps} bps`
     );
   }
-  if (feeIncrementNumerator.gte(new BN15(FEE_DENOMINATOR))) {
+  if (feeIncrementNumerator.gte(new BN18(FEE_DENOMINATOR))) {
     throw new Error(
       "Fee increment numerator must be less than FEE_DENOMINATOR"
     );
@@ -9956,12 +10724,12 @@ function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxL
       `Max fee (${maxFeeBps} bps) exceeds maximum allowed value of ${poolMaxFeeBps} bps for PoolVersion V${CURRENT_POOL_VERSION}`
     );
   }
-  const deltaNumerator = new BN15(poolMaxFeeNumerator).sub(cliffFeeNumerator);
+  const deltaNumerator = new BN18(poolMaxFeeNumerator).sub(cliffFeeNumerator);
   const maxIndex = deltaNumerator.div(feeIncrementNumerator);
-  if (maxIndex.lt(new BN15(1))) {
+  if (maxIndex.lt(new BN18(1))) {
     throw new Error("Fee increment is too large for the given base fee");
   }
-  if (cliffFeeNumerator.lt(new BN15(MIN_FEE_NUMERATOR)) || cliffFeeNumerator.gt(new BN15(poolMaxFeeNumerator))) {
+  if (cliffFeeNumerator.lt(new BN18(MIN_FEE_NUMERATOR)) || cliffFeeNumerator.gt(new BN18(poolMaxFeeNumerator))) {
     throw new Error("Base fee must be between 0.01% and 99%");
   }
   const maxDuration = activationType === 0 /* Slot */ ? MAX_RATE_LIMITER_DURATION_IN_SLOTS : MAX_RATE_LIMITER_DURATION_IN_SECONDS;
@@ -9974,55 +10742,83 @@ function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxL
     referenceAmount,
     tokenBDecimal
   );
-  const secondFactor = convertToRateLimiterSecondFactor(
-    new BN15(maxLimiterDuration),
-    new BN15(maxFeeBps)
+  const data = encodeFeeRateLimiterParams(
+    cliffFeeNumerator,
+    feeIncrementBps,
+    maxLimiterDuration,
+    maxFeeBps,
+    referenceAmountInLamports
   );
   return {
-    cliffFeeNumerator,
-    firstFactor: feeIncrementBps,
-    secondFactor,
-    thirdFactor: new BN15(referenceAmountInLamports),
-    baseFeeMode: 2 /* RateLimiter */
+    data: Array.from(data)
   };
 }
 function getBaseFeeParams(baseFeeParams, tokenBDecimal, activationType) {
-  if (baseFeeParams.baseFeeMode === 2 /* RateLimiter */) {
-    if (!baseFeeParams.rateLimiterParam) {
-      throw new Error(
-        "Rate limiter parameters are required for RateLimiter mode"
+  switch (baseFeeParams.baseFeeMode) {
+    case 0 /* FeeTimeSchedulerLinear */:
+    case 1 /* FeeTimeSchedulerExponential */: {
+      if (!baseFeeParams.feeTimeSchedulerParam) {
+        throw new Error(
+          "Fee scheduler parameters are required for FeeTimeScheduler mode"
+        );
+      }
+      const { startingFeeBps, endingFeeBps, numberOfPeriod, totalDuration } = baseFeeParams.feeTimeSchedulerParam;
+      return getFeeTimeSchedulerParams(
+        startingFeeBps,
+        endingFeeBps,
+        baseFeeParams.baseFeeMode,
+        numberOfPeriod,
+        totalDuration
       );
     }
-    const {
-      baseFeeBps,
-      feeIncrementBps,
-      referenceAmount,
-      maxLimiterDuration,
-      maxFeeBps
-    } = baseFeeParams.rateLimiterParam;
-    return getRateLimiterParams(
-      baseFeeBps,
-      feeIncrementBps,
-      referenceAmount,
-      maxLimiterDuration,
-      maxFeeBps,
-      tokenBDecimal,
-      activationType
-    );
-  } else {
-    if (!baseFeeParams.feeSchedulerParam) {
-      throw new Error(
-        "Fee scheduler parameters are required for FeeScheduler mode"
+    case 2 /* RateLimiter */: {
+      if (!baseFeeParams.rateLimiterParam) {
+        throw new Error(
+          "Rate limiter parameters are required for RateLimiter mode"
+        );
+      }
+      const {
+        baseFeeBps,
+        feeIncrementBps,
+        referenceAmount,
+        maxLimiterDuration,
+        maxFeeBps
+      } = baseFeeParams.rateLimiterParam;
+      return getRateLimiterParams(
+        baseFeeBps,
+        feeIncrementBps,
+        referenceAmount,
+        maxLimiterDuration,
+        maxFeeBps,
+        tokenBDecimal,
+        activationType
       );
     }
-    const { startingFeeBps, endingFeeBps, numberOfPeriod, totalDuration } = baseFeeParams.feeSchedulerParam;
-    return getFeeSchedulerParams(
-      startingFeeBps,
-      endingFeeBps,
-      baseFeeParams.baseFeeMode,
-      numberOfPeriod,
-      totalDuration
-    );
+    case 3 /* FeeMarketCapSchedulerLinear */:
+    case 4 /* FeeMarketCapSchedulerExponential */: {
+      if (!baseFeeParams.feeMarketCapSchedulerParam) {
+        throw new Error(
+          "Fee scheduler parameters are required for FeeMarketCapScheduler mode"
+        );
+      }
+      const {
+        startingFeeBps,
+        endingFeeBps,
+        numberOfPeriod,
+        sqrtPriceStepBps,
+        schedulerExpirationDuration
+      } = baseFeeParams.feeMarketCapSchedulerParam;
+      return getFeeMarketCapSchedulerParams(
+        startingFeeBps,
+        endingFeeBps,
+        baseFeeParams.baseFeeMode,
+        numberOfPeriod,
+        sqrtPriceStepBps,
+        schedulerExpirationDuration
+      );
+    }
+    default:
+      throw new Error("Invalid base fee mode");
   }
 }
 function getDynamicFeeParams(baseFeeBps, maxPriceChangeBps = MAX_PRICE_CHANGE_BPS_DEFAULT) {
@@ -10032,15 +10828,15 @@ function getDynamicFeeParams(baseFeeBps, maxPriceChangeBps = MAX_PRICE_CHANGE_BP
     );
   }
   const priceRatio = maxPriceChangeBps / BASIS_POINT_MAX + 1;
-  const sqrtPriceRatioQ64 = new BN15(
+  const sqrtPriceRatioQ64 = new BN18(
     Decimal4.sqrt(priceRatio.toString()).mul(Decimal4.pow(2, 64)).floor().toFixed()
   );
   const deltaBinId = sqrtPriceRatioQ64.sub(ONE_Q64).div(BIN_STEP_BPS_U128_DEFAULT).muln(2);
-  const maxVolatilityAccumulator = new BN15(deltaBinId.muln(BASIS_POINT_MAX));
-  const squareVfaBin = maxVolatilityAccumulator.mul(new BN15(BIN_STEP_BPS_DEFAULT)).pow(new BN15(2));
-  const baseFeeNumerator = new BN15(bpsToFeeNumerator(baseFeeBps));
+  const maxVolatilityAccumulator = new BN18(deltaBinId.muln(BASIS_POINT_MAX));
+  const squareVfaBin = maxVolatilityAccumulator.mul(new BN18(BIN_STEP_BPS_DEFAULT)).pow(new BN18(2));
+  const baseFeeNumerator = new BN18(bpsToFeeNumerator(baseFeeBps));
   const maxDynamicFeeNumerator = baseFeeNumerator.muln(20).divn(100);
-  const vFee = maxDynamicFeeNumerator.mul(new BN15(1e11)).sub(new BN15(99999999999));
+  const vFee = maxDynamicFeeNumerator.mul(new BN18(1e11)).sub(new BN18(99999999999));
   const variableFeeControl = vFee.div(squareVfaBin);
   return {
     binStep: BIN_STEP_BPS_DEFAULT,
@@ -10054,10 +10850,10 @@ function getDynamicFeeParams(baseFeeBps, maxPriceChangeBps = MAX_PRICE_CHANGE_BP
 }
 
 // src/CpAmm.ts
-import BN16, { min as min2, max } from "bn.js";
+import BN19, { min as min2, max } from "bn.js";
 var CpAmm = class {
   constructor(connection) {
-    this._program = new Program(cp_amm_default, {
+    this._program = new Program2(cp_amm_default, {
       connection
     });
     this.poolAuthority = derivePoolAuthority();
@@ -10283,7 +11079,7 @@ var CpAmm = class {
         poolAuthority,
         rentReceiver: owner,
         owner,
-        tokenProgram: TOKEN_2022_PROGRAM_ID2
+        tokenProgram: TOKEN_2022_PROGRAM_ID3
       }).instruction();
     });
   }
@@ -10402,7 +11198,7 @@ var CpAmm = class {
         payer,
         pool,
         position,
-        tokenProgram: TOKEN_2022_PROGRAM_ID2,
+        tokenProgram: TOKEN_2022_PROGRAM_ID3,
         systemProgram: SystemProgram2.programId
       }).instruction();
       return {
@@ -10576,6 +11372,36 @@ var CpAmm = class {
       return pools;
     });
   }
+  fetchPoolFees(pool) {
+    return __async(this, null, function* () {
+      const poolState = yield this._program.account.pool.fetchNullable(pool);
+      if (!poolState) {
+        throw new Error(`Pool account: ${pool} not found`);
+      }
+      const data = Buffer.from(poolState.poolFees.baseFee.baseFeeInfo.data);
+      const modeIndex = data.readUInt8(8);
+      const baseFeeMode = modeIndex;
+      switch (baseFeeMode) {
+        case 0 /* FeeTimeSchedulerLinear */:
+        case 1 /* FeeTimeSchedulerExponential */: {
+          const poolFees = decodePodAlignedFeeTimeScheduler(data);
+          return poolFees;
+        }
+        case 2 /* RateLimiter */: {
+          const poolFees = decodePodAlignedFeeRateLimiter(data);
+          return poolFees;
+        }
+        case 3 /* FeeMarketCapSchedulerLinear */:
+        case 4 /* FeeMarketCapSchedulerExponential */: {
+          const poolFees = decodePodAlignedFeeMarketCapScheduler(data);
+          return poolFees;
+        }
+        default: {
+          throw new Error(`Invalid base fee mode: ${baseFeeMode}`);
+        }
+      }
+    });
+  }
   /**
    * Fetches the Position state.
    * @param position - Public key of the position.
@@ -10808,8 +11634,9 @@ var CpAmm = class {
     } = params;
     const { activationType } = poolState;
     const aToB = poolState.tokenAMint.equals(inputTokenMint);
-    const currentPoint = activationType ? new BN16(currentTime) : new BN16(currentSlot);
+    const currentPoint = activationType ? new BN19(currentTime) : new BN19(currentSlot);
     const swapResult = swapQuoteExactInput(
+      this._program,
       poolState,
       currentPoint,
       inAmount,
@@ -10853,6 +11680,7 @@ var CpAmm = class {
       case 0 /* ExactIn */:
         if ("amountIn" in params) {
           return swapQuoteExactInput(
+            this._program,
             poolState,
             currentPoint,
             params.amountIn,
@@ -10869,6 +11697,7 @@ var CpAmm = class {
       case 2 /* ExactOut */:
         if ("amountOut" in params) {
           return swapQuoteExactOutput(
+            this._program,
             poolState,
             currentPoint,
             params.amountOut,
@@ -10885,6 +11714,7 @@ var CpAmm = class {
       case 1 /* PartialFill */:
         if ("amountIn" in params) {
           return swapQuotePartialInput(
+            this._program,
             poolState,
             currentPoint,
             params.amountIn,
@@ -10952,7 +11782,7 @@ var CpAmm = class {
         0 /* Up */
       )
     };
-    const rawOutputAmount = new BN16(rawAmount(liquidityDelta));
+    const rawOutputAmount = new BN19(rawAmount(liquidityDelta));
     const outputAmount = outputTokenInfo ? calculateTransferFeeIncludedAmount(
       rawOutputAmount,
       outputTokenInfo.mint,
@@ -11059,7 +11889,7 @@ var CpAmm = class {
       tokenAInfo,
       tokenBInfo
     } = params;
-    if (tokenAAmount.eq(new BN16(0)) && tokenBAmount.eq(new BN16(0))) {
+    if (tokenAAmount.eq(new BN19(0)) && tokenBAmount.eq(new BN19(0))) {
       throw new Error("Invalid input amount");
     }
     const actualAmountAIn = tokenAInfo ? tokenAAmount.sub(
@@ -11175,7 +12005,7 @@ var CpAmm = class {
         tokenBVault,
         payerTokenA,
         payerTokenB,
-        token2022Program: TOKEN_2022_PROGRAM_ID2,
+        token2022Program: TOKEN_2022_PROGRAM_ID3,
         tokenAProgram,
         tokenBProgram,
         systemProgram: SystemProgram2.programId
@@ -11226,7 +12056,7 @@ var CpAmm = class {
         tokenAMint,
         tokenBMint,
         tokenAAmount,
-        tokenBAmount: tokenBMint.equals(NATIVE_MINT2) ? max(tokenBAmount, new BN16(1)) : tokenBAmount,
+        tokenBAmount: tokenBMint.equals(NATIVE_MINT2) ? max(tokenBAmount, new BN19(1)) : tokenBAmount,
         payer,
         positionNft,
         tokenAProgram,
@@ -11266,7 +12096,7 @@ var CpAmm = class {
         tokenBVault,
         payerTokenA,
         payerTokenB,
-        token2022Program: TOKEN_2022_PROGRAM_ID2,
+        token2022Program: TOKEN_2022_PROGRAM_ID3,
         tokenAProgram,
         tokenBProgram,
         systemProgram: SystemProgram2.programId
@@ -11361,7 +12191,7 @@ var CpAmm = class {
         tokenBVault,
         payerTokenA,
         payerTokenB,
-        token2022Program: TOKEN_2022_PROGRAM_ID2,
+        token2022Program: TOKEN_2022_PROGRAM_ID3,
         tokenAProgram,
         tokenBProgram,
         systemProgram: SystemProgram2.programId
@@ -11774,20 +12604,21 @@ var CpAmm = class {
       }
       let { poolState } = params;
       poolState = poolState != null ? poolState : yield this.fetchPoolState(pool);
-      const currentPoint = yield getCurrentPoint(
-        this._program.provider.connection,
-        poolState.activationType
-      );
-      const { maxLimiterDuration, maxFeeBps } = parseRateLimiterSecondFactor(
-        poolState.poolFees.baseFee.secondFactor
-      );
+      const data = Buffer.from(poolState.poolFees.baseFee.baseFeeInfo.data);
+      const modeIndex = data.readUInt8(8);
+      const baseFeeMode = modeIndex;
       let rateLimiterApplied = false;
-      if (poolState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+      if (baseFeeMode === 2 /* RateLimiter */) {
+        const currentPoint = yield getCurrentPoint(
+          this._program.provider.connection,
+          poolState.activationType
+        );
+        const rateLimiterPoolFees = decodePodAlignedFeeRateLimiter(data);
         rateLimiterApplied = isRateLimiterApplied(
-          poolState.poolFees.baseFee.thirdFactor,
-          maxLimiterDuration,
-          maxFeeBps,
-          poolState.poolFees.baseFee.firstFactor,
+          rateLimiterPoolFees.referenceAmount,
+          rateLimiterPoolFees.maxLimiterDuration,
+          rateLimiterPoolFees.maxFeeBps,
+          rateLimiterPoolFees.feeIncrementBps,
           currentPoint,
           poolState.activationPoint,
           tradeDirection
@@ -11884,20 +12715,21 @@ var CpAmm = class {
       }
       let { poolState } = params;
       poolState = poolState != null ? poolState : yield this.fetchPoolState(pool);
-      const currentPoint = yield getCurrentPoint(
-        this._program.provider.connection,
-        poolState.activationType
-      );
-      const { maxLimiterDuration, maxFeeBps } = parseRateLimiterSecondFactor(
-        poolState.poolFees.baseFee.secondFactor
-      );
+      const data = Buffer.from(poolState.poolFees.baseFee.baseFeeInfo.data);
+      const modeIndex = data.readUInt8(8);
+      const baseFeeMode = modeIndex;
       let rateLimiterApplied = false;
-      if (poolState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+      if (baseFeeMode === 2 /* RateLimiter */) {
+        const currentPoint = yield getCurrentPoint(
+          this._program.provider.connection,
+          poolState.activationType
+        );
+        const rateLimiterPoolFees = decodePodAlignedFeeRateLimiter(data);
         rateLimiterApplied = isRateLimiterApplied(
-          poolState.poolFees.baseFee.thirdFactor,
-          maxLimiterDuration,
-          maxFeeBps,
-          poolState.poolFees.baseFee.firstFactor,
+          rateLimiterPoolFees.referenceAmount,
+          rateLimiterPoolFees.maxLimiterDuration,
+          rateLimiterPoolFees.maxFeeBps,
+          rateLimiterPoolFees.feeIncrementBps,
           currentPoint,
           poolState.activationPoint,
           tradeDirection
@@ -12166,7 +12998,7 @@ var CpAmm = class {
             );
             return total.add(available);
           },
-          new BN16(0)
+          new BN19(0)
         );
         positionBLiquidityDelta = positionBLiquidityDelta.add(
           totalAvailableVestingLiquidity
@@ -12737,8 +13569,10 @@ export {
   DYNAMIC_FEE_ROUNDING_OFFSET,
   DYNAMIC_FEE_SCALING_FACTOR,
   FEE_DENOMINATOR,
+  FEE_PADDING,
+  FeeMarketCapScheduler,
   FeeRateLimiter,
-  FeeScheduler,
+  FeeTimeScheduler,
   LIQUIDITY_SCALE,
   MAX,
   MAX_CU_BUFFER,
@@ -12779,10 +13613,18 @@ export {
   convertToFeeSchedulerSecondFactor,
   convertToLamports,
   convertToRateLimiterSecondFactor,
+  cpAmmCoder,
   decimalToQ64,
+  decodeFeeMarketCapSchedulerParams,
+  decodeFeeRateLimiterParams,
+  decodeFeeTimeSchedulerParams,
+  decodePodAlignedFeeMarketCapScheduler,
+  decodePodAlignedFeeRateLimiter,
+  decodePodAlignedFeeTimeScheduler,
   deriveClaimFeeOperatorAddress,
   deriveConfigAddress,
   deriveCustomizablePoolAddress,
+  deriveOperatorAddress,
   derivePoolAddress,
   derivePoolAuthority,
   derivePositionAddress,
@@ -12790,6 +13632,9 @@ export {
   deriveRewardVaultAddress,
   deriveTokenBadgeAddress,
   deriveTokenVaultAddress,
+  encodeFeeMarketCapSchedulerParams,
+  encodeFeeRateLimiterParams,
+  encodeFeeTimeSchedulerParams,
   feeNumeratorToBps,
   fromDecimalToBN,
   getAllPositionNftAccountByOwner,
@@ -12799,8 +13644,6 @@ export {
   getAmountWithSlippage,
   getAvailableVestingLiquidity,
   getBaseFeeHandler,
-  getBaseFeeNumerator,
-  getBaseFeeNumeratorByPeriod,
   getBaseFeeParams,
   getCheckedAmounts,
   getCurrentPoint,
@@ -12811,13 +13654,20 @@ export {
   getExcludedFeeAmount,
   getExcludedFeeAmountFromIncludedFeeAmount,
   getFeeInPeriod,
+  getFeeMarketCapBaseFeeNumerator,
+  getFeeMarketCapBaseFeeNumeratorByPeriod,
+  getFeeMarketCapMinBaseFeeNumerator,
+  getFeeMarketCapSchedulerParams,
   getFeeMode,
   getFeeNumeratorFromExcludedFeeAmount,
   getFeeNumeratorFromIncludedFeeAmount,
   getFeeNumeratorOnExponentialFeeScheduler,
   getFeeNumeratorOnLinearFeeScheduler,
   getFeeOnAmount,
-  getFeeSchedulerParams,
+  getFeeTimeBaseFeeNumerator,
+  getFeeTimeBaseFeeNumeratorByPeriod,
+  getFeeTimeMinBaseFeeNumerator,
+  getFeeTimeSchedulerParams,
   getFirstKey,
   getIncludedFeeAmount,
   getLiquidityDeltaFromAmountA,
@@ -12827,7 +13677,6 @@ export {
   getMaxFeeBps,
   getMaxFeeNumerator,
   getMaxIndex,
-  getMinBaseFeeNumerator,
   getNextSqrtPriceFromAmountInARoundingUp,
   getNextSqrtPriceFromAmountInBRoundingDown,
   getNextSqrtPriceFromAmountOutARoundingUp,
@@ -12855,6 +13704,7 @@ export {
   getUnClaimLpFee,
   getUserRewardPending,
   hasPartner,
+  hasTransferHookExtension,
   isDynamicFeeEnabled,
   isNonZeroRateLimiter,
   isRateLimiterApplied,
@@ -12873,11 +13723,18 @@ export {
   swapQuoteExactInput,
   swapQuoteExactOutput,
   swapQuotePartialInput,
+  toBorshFeeTimeScheduler,
   toNumerator,
+  toPodAlignedFeeTimeScheduler,
   unwrapSOLInstruction,
   validateFeeFraction,
+  validateFeeMarketCapBaseFeeIsStatic,
+  validateFeeMarketCapScheduler,
   validateFeeRateLimiter,
-  validateFeeScheduler,
+  validateFeeRateLimiterBaseFeeIsStatic,
+  validateFeeTimeScheduler,
+  validateFeeTimeSchedulerBaseFeeIsStatic,
+  validateNoTransferHook,
   vestingByPositionFilter,
   wrapSOLInstruction
 };