@meteora-ag/cp-amm-sdk 1.0.1 → 1.0.2-rc.1

package/dist/index.js

@@ -30,7 +30,7 @@ var cp_amm_default = {
   address: "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG",
   metadata: {
     name: "cp_amm",
-    version: "0.1.0",
+    version: "0.1.1",
     spec: "0.1.0",
     description: "Created with Anchor"
   },
@@ -591,38 +591,38 @@ var cp_amm_default = {
               {
                 kind: "const",
                 value: [
-                  153,
-                  10,
-                  107,
-                  154,
-                  255,
-                  249,
-                  210,
+                  48,
+                  9,
+                  89,
+                  123,
+                  106,
+                  114,
+                  131,
+                  251,
+                  50,
                   173,
-                  176,
-                  67,
-                  220,
-                  214,
-                  152,
-                  71,
-                  46,
-                  146,
-                  161,
-                  33,
+                  254,
+                  250,
+                  10,
+                  80,
+                  160,
+                  84,
+                  143,
+                  100,
                   81,
-                  148,
+                  249,
+                  134,
+                  112,
+                  30,
+                  213,
+                  50,
                   166,
-                  119,
-                  5,
-                  189,
-                  142,
-                  11,
-                  57,
-                  68,
-                  162,
-                  70,
-                  126,
-                  100
+                  239,
+                  78,
+                  53,
+                  175,
+                  188,
+                  85
                 ]
               },
               {
@@ -684,38 +684,38 @@ var cp_amm_default = {
               {
                 kind: "const",
                 value: [
-                  153,
-                  10,
-                  107,
-                  154,
-                  255,
-                  249,
-                  210,
+                  48,
+                  9,
+                  89,
+                  123,
+                  106,
+                  114,
+                  131,
+                  251,
+                  50,
                   173,
-                  176,
-                  67,
-                  220,
-                  214,
-                  152,
-                  71,
-                  46,
-                  146,
-                  161,
-                  33,
+                  254,
+                  250,
+                  10,
+                  80,
+                  160,
+                  84,
+                  143,
+                  100,
                   81,
-                  148,
+                  249,
+                  134,
+                  112,
+                  30,
+                  213,
+                  50,
                   166,
-                  119,
-                  5,
-                  189,
-                  142,
-                  11,
-                  57,
-                  68,
-                  162,
-                  70,
-                  126,
-                  100
+                  239,
+                  78,
+                  53,
+                  175,
+                  188,
+                  85
                 ]
               },
               {
@@ -1309,7 +1309,7 @@ var cp_amm_default = {
               },
               {
                 kind: "arg",
-                path: "config_parameters.index"
+                path: "index"
               }
             ]
           }
@@ -1357,11 +1357,108 @@ var cp_amm_default = {
         }
       ],
       args: [
+        {
+          name: "index",
+          type: "u64"
+        },
         {
           name: "config_parameters",
           type: {
             defined: {
-              name: "ConfigParameters"
+              name: "StaticConfigParameters"
+            }
+          }
+        }
+      ]
+    },
+    {
+      name: "create_dynamic_config",
+      discriminator: [
+        81,
+        251,
+        122,
+        78,
+        66,
+        57,
+        208,
+        82
+      ],
+      accounts: [
+        {
+          name: "config",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  99,
+                  111,
+                  110,
+                  102,
+                  105,
+                  103
+                ]
+              },
+              {
+                kind: "arg",
+                path: "index"
+              }
+            ]
+          }
+        },
+        {
+          name: "admin",
+          writable: true,
+          signer: true
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        },
+        {
+          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: "index",
+          type: "u64"
+        },
+        {
+          name: "config_parameters",
+          type: {
+            defined: {
+              name: "DynamicConfigParameters"
             }
           }
         }
@@ -2306,6 +2403,312 @@ var cp_amm_default = {
         }
       ]
     },
+    {
+      name: "initialize_pool_with_dynamic_config",
+      discriminator: [
+        149,
+        82,
+        72,
+        197,
+        253,
+        252,
+        68,
+        15
+      ],
+      accounts: [
+        {
+          name: "creator"
+        },
+        {
+          name: "position_nft_mint",
+          docs: [
+            "position_nft_mint"
+          ],
+          writable: true,
+          signer: true
+        },
+        {
+          name: "position_nft_account",
+          docs: [
+            "position nft account"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  112,
+                  111,
+                  115,
+                  105,
+                  116,
+                  105,
+                  111,
+                  110,
+                  95,
+                  110,
+                  102,
+                  116,
+                  95,
+                  97,
+                  99,
+                  99,
+                  111,
+                  117,
+                  110,
+                  116
+                ]
+              },
+              {
+                kind: "account",
+                path: "position_nft_mint"
+              }
+            ]
+          }
+        },
+        {
+          name: "payer",
+          docs: [
+            "Address paying to create the pool. Can be anyone"
+          ],
+          writable: true,
+          signer: true
+        },
+        {
+          name: "pool_creator_authority",
+          signer: true,
+          relations: [
+            "config"
+          ]
+        },
+        {
+          name: "config",
+          docs: [
+            "Which config the pool belongs to."
+          ]
+        },
+        {
+          name: "pool_authority",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  112,
+                  111,
+                  111,
+                  108,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "pool",
+          docs: [
+            "Initialize an account to store the pool state"
+          ],
+          writable: true
+        },
+        {
+          name: "position",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  112,
+                  111,
+                  115,
+                  105,
+                  116,
+                  105,
+                  111,
+                  110
+                ]
+              },
+              {
+                kind: "account",
+                path: "position_nft_mint"
+              }
+            ]
+          }
+        },
+        {
+          name: "token_a_mint",
+          docs: [
+            "Token a mint"
+          ]
+        },
+        {
+          name: "token_b_mint",
+          docs: [
+            "Token b mint"
+          ]
+        },
+        {
+          name: "token_a_vault",
+          docs: [
+            "Token a vault for the pool"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  116,
+                  111,
+                  107,
+                  101,
+                  110,
+                  95,
+                  118,
+                  97,
+                  117,
+                  108,
+                  116
+                ]
+              },
+              {
+                kind: "account",
+                path: "token_a_mint"
+              },
+              {
+                kind: "account",
+                path: "pool"
+              }
+            ]
+          }
+        },
+        {
+          name: "token_b_vault",
+          docs: [
+            "Token b vault for the pool"
+          ],
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  116,
+                  111,
+                  107,
+                  101,
+                  110,
+                  95,
+                  118,
+                  97,
+                  117,
+                  108,
+                  116
+                ]
+              },
+              {
+                kind: "account",
+                path: "token_b_mint"
+              },
+              {
+                kind: "account",
+                path: "pool"
+              }
+            ]
+          }
+        },
+        {
+          name: "payer_token_a",
+          docs: [
+            "payer token a account"
+          ],
+          writable: true
+        },
+        {
+          name: "payer_token_b",
+          docs: [
+            "creator token b account"
+          ],
+          writable: true
+        },
+        {
+          name: "token_a_program",
+          docs: [
+            "Program to create mint account and mint tokens"
+          ]
+        },
+        {
+          name: "token_b_program",
+          docs: [
+            "Program to create mint account and mint tokens"
+          ]
+        },
+        {
+          name: "token_2022_program",
+          docs: [
+            "Program to create NFT mint/token account and transfer for token22 account"
+          ],
+          address: "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+        },
+        {
+          name: "system_program",
+          address: "11111111111111111111111111111111"
+        },
+        {
+          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: "InitializeCustomizablePoolParameters"
+            }
+          }
+        }
+      ]
+    },
     {
       name: "initialize_reward",
       discriminator: [
@@ -3660,6 +4063,19 @@ var cp_amm_default = {
         54
       ]
     },
+    {
+      name: "EvtCreateDynamicConfig",
+      discriminator: [
+        231,
+        197,
+        13,
+        164,
+        248,
+        213,
+        133,
+        152
+      ]
+    },
     {
       name: "EvtCreatePosition",
       discriminator: [
@@ -4030,6 +4446,16 @@ var cp_amm_default = {
       code: 6039,
       name: "PositionIsNotEmpty",
       msg: "Position is not empty"
+    },
+    {
+      code: 6040,
+      name: "InvalidPoolCreatorAuthority",
+      msg: "Invalid pool creator authority"
+    },
+    {
+      code: 6041,
+      name: "InvalidConfigType",
+      msg: "Invalid config type"
     }
   ],
   types: [
@@ -4258,6 +4684,13 @@ var cp_amm_default = {
             ],
             type: "u8"
           },
+          {
+            name: "config_type",
+            docs: [
+              "Config type mode, 0 for static, 1 for dynamic"
+            ],
+            type: "u8"
+          },
           {
             name: "_padding_0",
             docs: [
@@ -4266,7 +4699,7 @@ var cp_amm_default = {
             type: {
               array: [
                 "u8",
-                6
+                5
               ]
             }
           },
@@ -4308,45 +4741,13 @@ var cp_amm_default = {
       }
     },
     {
-      name: "ConfigParameters",
+      name: "DynamicConfigParameters",
       type: {
         kind: "struct",
-        fields: [
-          {
-            name: "pool_fees",
-            type: {
-              defined: {
-                name: "PoolFeeParameters"
-              }
-            }
-          },
-          {
-            name: "sqrt_min_price",
-            type: "u128"
-          },
-          {
-            name: "sqrt_max_price",
-            type: "u128"
-          },
-          {
-            name: "vault_config_key",
-            type: "pubkey"
-          },
+        fields: [
           {
             name: "pool_creator_authority",
             type: "pubkey"
-          },
-          {
-            name: "activation_type",
-            type: "u8"
-          },
-          {
-            name: "collect_fee_mode",
-            type: "u8"
-          },
-          {
-            name: "index",
-            type: "u64"
           }
         ]
       }
@@ -4748,7 +5149,7 @@ var cp_amm_default = {
     {
       name: "EvtCreateConfig",
       docs: [
-        "Create config"
+        "Create static config"
       ],
       type: {
         kind: "struct",
@@ -4796,6 +5197,29 @@ var cp_amm_default = {
         ]
       }
     },
+    {
+      name: "EvtCreateDynamicConfig",
+      docs: [
+        "Create dynamic config"
+      ],
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "config",
+            type: "pubkey"
+          },
+          {
+            name: "pool_creator_authority",
+            type: "pubkey"
+          },
+          {
+            name: "index",
+            type: "u64"
+          }
+        ]
+      }
+    },
     {
       name: "EvtCreatePosition",
       type: {
@@ -5401,18 +5825,11 @@ var cp_amm_default = {
             type: "u128"
           },
           {
-            name: "token_a_reserve",
-            docs: [
-              "token a reserve"
-            ],
-            type: "u64"
-          },
-          {
-            name: "token_b_reserve",
+            name: "_padding",
             docs: [
-              "token b reserve"
+              "padding, previous reserve amount, be careful to use that field"
             ],
-            type: "u64"
+            type: "u128"
           },
           {
             name: "protocol_a_fee",
@@ -6135,6 +6552,46 @@ var cp_amm_default = {
         ]
       }
     },
+    {
+      name: "StaticConfigParameters",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "pool_fees",
+            type: {
+              defined: {
+                name: "PoolFeeParameters"
+              }
+            }
+          },
+          {
+            name: "sqrt_min_price",
+            type: "u128"
+          },
+          {
+            name: "sqrt_max_price",
+            type: "u128"
+          },
+          {
+            name: "vault_config_key",
+            type: "pubkey"
+          },
+          {
+            name: "pool_creator_authority",
+            type: "pubkey"
+          },
+          {
+            name: "activation_type",
+            type: "u8"
+          },
+          {
+            name: "collect_fee_mode",
+            type: "u8"
+          }
+        ]
+      }
+    },
     {
       name: "SwapParameters",
       type: {
@@ -7278,6 +7735,7 @@ var CpAmm = class {
     });
     this.poolAuthority = derivePoolAuthority();
   }
+  //// ANCHOR: PRIVATE FUNCTIONS //////
   /**
    * Prepares token accounts for a transaction by retrieving or creating associated token accounts.
    * @private
@@ -7618,6 +8076,72 @@ var CpAmm = class {
       };
     });
   }
+  /**
+   * Private helper method to prepare common customizable pool creation logic
+   * @param {PrepareCustomizablePoolParams} params - Common parameters for pool creation
+   * @returns Prepared transaction data including instructions and accounts
+   */
+  prepareCreateCustomizablePoolParams(params) {
+    return __async(this, null, function* () {
+      const {
+        pool,
+        tokenAMint,
+        tokenBMint,
+        tokenAAmount,
+        tokenBAmount,
+        payer,
+        positionNft,
+        tokenAProgram,
+        tokenBProgram
+      } = params;
+      const position = derivePositionAddress(positionNft);
+      const positionNftAccount = derivePositionNftAccount(positionNft);
+      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
+      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
+      const {
+        tokenAAta: payerTokenA,
+        tokenBAta: payerTokenB,
+        instructions: preInstructions
+      } = yield this.prepareTokenAccounts(
+        payer,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      );
+      if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          payer,
+          payerTokenA,
+          BigInt(tokenAAmount.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
+      if (tokenBMint.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          payer,
+          payerTokenB,
+          BigInt(tokenBAmount.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
+      const tokenBadgeAccounts = this.getTokenBadgeAccounts(
+        tokenAMint,
+        tokenBMint
+      );
+      return {
+        position,
+        positionNftAccount,
+        tokenAVault,
+        tokenBVault,
+        payerTokenA,
+        payerTokenB,
+        preInstructions,
+        tokenBadgeAccounts
+      };
+    });
+  }
+  //// ANCHOR: GETTER/FETCHER FUNCTIONS //////
   /**
    * Fetches the Config state of the program.
    * @param config - Public key of the config account.
@@ -7941,13 +8465,11 @@ var CpAmm = class {
       maxSqrtPrice,
       sqrtPrice
     } = params;
-    const actualAmountIn = inputTokenInfo ? inAmount.sub(
-      calculateTransferFeeIncludedAmount(
-        inAmount,
-        inputTokenInfo.mint,
-        inputTokenInfo.currentEpoch
-      ).transferFee
-    ) : inAmount;
+    const actualAmountIn = inputTokenInfo ? calculateTransferFeeExcludedAmount(
+      inAmount,
+      inputTokenInfo.mint,
+      inputTokenInfo.currentEpoch
+    ).amount : inAmount;
     const { liquidityDelta, rawAmount } = isTokenA ? {
       liquidityDelta: getLiquidityDeltaFromAmountA(
         actualAmountIn,
@@ -8122,6 +8644,7 @@ var CpAmm = class {
       liquidityDelta
     };
   }
+  //// ANCHOR: MAIN ENDPOINT //////
   /**
    * Builds a transaction to create a permissionless pool.
    * @param params - Parameters for pool creation.
@@ -8235,43 +8758,104 @@ var CpAmm = class {
         tokenBProgram
       } = params;
       const pool = deriveCustomizablePoolAddress(tokenAMint, tokenBMint);
-      const position = derivePositionAddress(positionNft);
-      const positionNftAccount = derivePositionNftAccount(positionNft);
-      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
-      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       const {
-        tokenAAta: payerTokenA,
-        tokenBAta: payerTokenB,
-        instructions: preInstructions
-      } = yield this.prepareTokenAccounts(
+        position,
+        positionNftAccount,
+        tokenAVault,
+        tokenBVault,
+        payerTokenA,
+        payerTokenB,
+        preInstructions,
+        tokenBadgeAccounts
+      } = yield this.prepareCreateCustomizablePoolParams({
+        pool,
+        tokenAMint,
+        tokenBMint,
+        tokenAAmount,
+        tokenBAmount: tokenBMint.equals(_spltoken.NATIVE_MINT) ? _bnjs.max.call(void 0, tokenBAmount, new (0, _anchor.BN)(1)) : tokenBAmount,
+        payer,
+        positionNft,
+        tokenAProgram,
+        tokenBProgram
+      });
+      const transaction = yield this._program.methods.initializeCustomizablePool({
+        poolFees,
+        sqrtMinPrice,
+        sqrtMaxPrice,
+        hasAlphaVault,
+        liquidity: liquidityDelta,
+        sqrtPrice: initSqrtPrice,
+        activationType,
+        collectFeeMode,
+        activationPoint
+      }).accountsPartial({
+        creator,
+        positionNftAccount,
+        positionNftMint: positionNft,
         payer,
+        poolAuthority: this.poolAuthority,
+        pool,
+        position,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
+        payerTokenA,
+        payerTokenB,
+        token2022Program: _spltoken.TOKEN_2022_PROGRAM_ID,
+        tokenAProgram,
+        tokenBProgram,
+        systemProgram: _web3js.SystemProgram.programId
+      }).preInstructions(preInstructions).remainingAccounts(tokenBadgeAccounts).transaction();
+      return { tx: transaction, pool, position };
+    });
+  }
+  createCustomPoolWithDynamicConfig(params) {
+    return __async(this, null, function* () {
+      const {
         tokenAMint,
         tokenBMint,
+        tokenAAmount,
+        tokenBAmount,
+        sqrtMinPrice,
+        sqrtMaxPrice,
+        liquidityDelta,
+        initSqrtPrice,
+        payer,
+        config,
+        poolCreatorAuthority,
+        creator,
+        positionNft,
+        poolFees,
+        hasAlphaVault,
+        collectFeeMode,
+        activationPoint,
+        activationType,
         tokenAProgram,
         tokenBProgram
-      );
-      if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
-        const wrapSOLIx = wrapSOLInstruction(
-          payer,
-          payerTokenA,
-          BigInt(tokenAAmount.toString())
-        );
-        preInstructions.push(...wrapSOLIx);
-      }
-      if (tokenBMint.equals(_spltoken.NATIVE_MINT)) {
-        const lamports = tokenBAmount.eq(new (0, _anchor.BN)(0)) ? new (0, _anchor.BN)(1) : tokenBAmount;
-        const wrapSOLIx = wrapSOLInstruction(
-          payer,
-          payerTokenB,
-          BigInt(lamports.toString())
-        );
-        preInstructions.push(...wrapSOLIx);
-      }
-      const tokenBadgeAccounts = this.getTokenBadgeAccounts(
+      } = params;
+      const pool = derivePoolAddress(config, tokenAMint, tokenBMint);
+      const {
+        position,
+        positionNftAccount,
+        tokenAVault,
+        tokenBVault,
+        payerTokenA,
+        payerTokenB,
+        preInstructions,
+        tokenBadgeAccounts
+      } = yield this.prepareCreateCustomizablePoolParams({
+        pool,
         tokenAMint,
-        tokenBMint
-      );
-      const transaction = yield this._program.methods.initializeCustomizablePool({
+        tokenBMint,
+        tokenAAmount,
+        tokenBAmount,
+        payer,
+        positionNft,
+        tokenAProgram,
+        tokenBProgram
+      });
+      const transaction = yield this._program.methods.initializePoolWithDynamicConfig({
         poolFees,
         sqrtMinPrice,
         sqrtMaxPrice,
@@ -8289,6 +8873,8 @@ var CpAmm = class {
         poolAuthority: this.poolAuthority,
         pool,
         position,
+        poolCreatorAuthority,
+        config,
         tokenAMint,
         tokenBMint,
         tokenAVault,