@crypticdot/defituna-client 2.0.9 → 2.0.11

package/dist/index.js

@@ -7161,7 +7161,7 @@ async function getCreateAtaInstructions(rpc, payer, mint, owner, tokenProgram =
     if (owner == payer.address) {
       cleanup.push(
         (0, import_token_2022.getCloseAccountInstruction)(
-          { account: ata, destination: payer.address, owner },
+          { account: ata, destination: owner, owner: payer },
           { programAddress: tokenProgram }
         )
       );
@@ -7402,30 +7402,24 @@ async function addLiquidityOrcaInstructions(rpc, authority, positionMint, args,
     whirlpool.data.tickSpacing
   );
   const [upperTickArrayAddress] = await (0, import_whirlpools_client2.getTickArrayAddress)(whirlpool.address, upperTickArrayStartIndex);
-  const [lowerTickArray, upperTickArray] = await (0, import_whirlpools_client2.fetchAllMaybeTickArray)(rpc, [
-    lowerTickArrayAddress,
-    upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      (0, import_whirlpools_client2.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: lowerTickArrayAddress,
-        startTickIndex: lowerTickArrayStartIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && lowerTickArrayStartIndex !== upperTickArrayStartIndex) {
-    instructions.push(
-      (0, import_whirlpools_client2.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: upperTickArrayAddress,
-        startTickIndex: upperTickArrayStartIndex
-      })
-    );
-  }
+  instructions.push(
+    (0, import_whirlpools_client2.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: lowerTickArrayAddress,
+      startTickIndex: lowerTickArrayStartIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    (0, import_whirlpools_client2.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: upperTickArrayAddress,
+      startTickIndex: upperTickArrayStartIndex,
+      idempotent: true
+    })
+  );
   const ix = await addLiquidityOrcaInstruction(
     authority,
     tunaPosition,
@@ -9202,30 +9196,24 @@ async function openPositionWithLiquidityOrcaInstructions(rpc, authority, positio
   const [lowerTickArrayAddress] = await (0, import_whirlpools_client9.getTickArrayAddress)(whirlpool.address, lowerTickArrayIndex);
   const upperTickArrayIndex = (0, import_whirlpools_core4.getTickArrayStartTickIndex)(args.tickUpperIndex, whirlpool.data.tickSpacing);
   const [upperTickArrayAddress] = await (0, import_whirlpools_client9.getTickArrayAddress)(whirlpool.address, upperTickArrayIndex);
-  const [lowerTickArray, upperTickArray] = await (0, import_whirlpools_client9.fetchAllMaybeTickArray)(rpc, [
-    lowerTickArrayAddress,
-    upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      (0, import_whirlpools_client9.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: lowerTickArrayAddress,
-        startTickIndex: lowerTickArrayIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && lowerTickArrayIndex !== upperTickArrayIndex) {
-    instructions.push(
-      (0, import_whirlpools_client9.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: upperTickArrayAddress,
-        startTickIndex: upperTickArrayIndex
-      })
-    );
-  }
+  instructions.push(
+    (0, import_whirlpools_client9.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: lowerTickArrayAddress,
+      startTickIndex: lowerTickArrayIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    (0, import_whirlpools_client9.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: upperTickArrayAddress,
+      startTickIndex: upperTickArrayIndex,
+      idempotent: true
+    })
+  );
   const ix = await openPositionWithLiquidityOrcaInstruction(
     authority,
     positionMint,
@@ -10266,30 +10254,24 @@ async function rebalancePositionOrcaInstructions(rpc, authority, positionMint, c
   if (!cleanupInstructions) cleanupInstructions = instructions;
   const internalCleanupInstructions = [];
   const secondaryTickArrays = await OrcaUtils.getTickArraysForRebalancedPosition(whirlpool, tunaPosition);
-  const [lowerTickArray, upperTickArray] = await (0, import_whirlpools_client12.fetchAllMaybeTickArray)(rpc, [
-    secondaryTickArrays.lowerTickArrayAddress,
-    secondaryTickArrays.upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      (0, import_whirlpools_client12.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: secondaryTickArrays.lowerTickArrayAddress,
-        startTickIndex: secondaryTickArrays.lowerTickArrayStartIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && secondaryTickArrays.lowerTickArrayStartIndex !== secondaryTickArrays.upperTickArrayStartIndex) {
-    instructions.push(
-      (0, import_whirlpools_client12.getInitializeTickArrayInstruction)({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: secondaryTickArrays.upperTickArrayAddress,
-        startTickIndex: secondaryTickArrays.upperTickArrayStartIndex
-      })
-    );
-  }
+  instructions.push(
+    (0, import_whirlpools_client12.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: secondaryTickArrays.lowerTickArrayAddress,
+      startTickIndex: secondaryTickArrays.lowerTickArrayStartIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    (0, import_whirlpools_client12.getInitializeDynamicTickArrayInstruction)({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: secondaryTickArrays.upperTickArrayAddress,
+      startTickIndex: secondaryTickArrays.upperTickArrayStartIndex,
+      idempotent: true
+    })
+  );
   const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,

package/dist/index.mjs

@@ -7245,7 +7245,7 @@ async function getCreateAtaInstructions(rpc, payer, mint, owner, tokenProgram =
     if (owner == payer.address) {
       cleanup.push(
         getCloseAccountInstruction(
-          { account: ata, destination: payer.address, owner },
+          { account: ata, destination: owner, owner: payer },
           { programAddress: tokenProgram }
         )
       );
@@ -7418,9 +7418,8 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
 
 // src/txbuilder/addLiquidityOrca.ts
 import {
-  fetchAllMaybeTickArray,
   fetchMaybeWhirlpool,
-  getInitializeTickArrayInstruction,
+  getInitializeDynamicTickArrayInstruction,
   getOracleAddress,
   getPositionAddress,
   getTickArrayAddress as getTickArrayAddress3,
@@ -7512,30 +7511,24 @@ async function addLiquidityOrcaInstructions(rpc, authority, positionMint, args,
     whirlpool.data.tickSpacing
   );
   const [upperTickArrayAddress] = await getTickArrayAddress3(whirlpool.address, upperTickArrayStartIndex);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray(rpc, [
-    lowerTickArrayAddress,
-    upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      getInitializeTickArrayInstruction({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: lowerTickArrayAddress,
-        startTickIndex: lowerTickArrayStartIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && lowerTickArrayStartIndex !== upperTickArrayStartIndex) {
-    instructions.push(
-      getInitializeTickArrayInstruction({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: upperTickArrayAddress,
-        startTickIndex: upperTickArrayStartIndex
-      })
-    );
-  }
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: lowerTickArrayAddress,
+      startTickIndex: lowerTickArrayStartIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: upperTickArrayAddress,
+      startTickIndex: upperTickArrayStartIndex,
+      idempotent: true
+    })
+  );
   const ix = await addLiquidityOrcaInstruction(
     authority,
     tunaPosition,
@@ -7671,10 +7664,10 @@ async function addLiquidityOrcaInstruction(authority, tunaPosition, tunaConfig,
 
 // src/txbuilder/addLiquidityFusion.ts
 import {
-  fetchAllMaybeTickArray as fetchAllMaybeTickArray2,
+  fetchAllMaybeTickArray,
   fetchMaybeFusionPool,
   FUSIONAMM_PROGRAM_ADDRESS,
-  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction2,
+  getInitializeTickArrayInstruction,
   getPositionAddress as getPositionAddress2,
   getTickArrayAddress as getTickArrayAddress4
 } from "@crypticdot/fusionamm-client";
@@ -7764,13 +7757,13 @@ async function addLiquidityFusionInstructions(rpc, authority, positionMint, args
     fusionPool.data.tickSpacing
   );
   const [upperTickArrayAddress] = await getTickArrayAddress4(fusionPool.address, upperTickArrayStartIndex);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray2(rpc, [
+  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray(rpc, [
     lowerTickArrayAddress,
     upperTickArrayAddress
   ]);
   if (!lowerTickArray.exists) {
     instructions.push(
-      getInitializeTickArrayInstruction2({
+      getInitializeTickArrayInstruction({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: lowerTickArrayAddress,
@@ -7780,7 +7773,7 @@ async function addLiquidityFusionInstructions(rpc, authority, positionMint, args
   }
   if (!upperTickArray.exists && lowerTickArrayStartIndex !== upperTickArrayStartIndex) {
     instructions.push(
-      getInitializeTickArrayInstruction2({
+      getInitializeTickArrayInstruction({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: upperTickArrayAddress,
@@ -9318,9 +9311,8 @@ async function openPositionFusionInstruction(rpc, authority, positionMint, fusio
 
 // src/txbuilder/openPositionWithLiquidityOrca.ts
 import {
-  fetchAllMaybeTickArray as fetchAllMaybeTickArray3,
   fetchMaybeWhirlpool as fetchMaybeWhirlpool7,
-  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction3,
+  getInitializeDynamicTickArrayInstruction as getInitializeDynamicTickArrayInstruction2,
   getOracleAddress as getOracleAddress4,
   getPositionAddress as getPositionAddress15,
   getTickArrayAddress as getTickArrayAddress6,
@@ -9405,30 +9397,24 @@ async function openPositionWithLiquidityOrcaInstructions(rpc, authority, positio
   const [lowerTickArrayAddress] = await getTickArrayAddress6(whirlpool.address, lowerTickArrayIndex);
   const upperTickArrayIndex = getTickArrayStartTickIndex6(args.tickUpperIndex, whirlpool.data.tickSpacing);
   const [upperTickArrayAddress] = await getTickArrayAddress6(whirlpool.address, upperTickArrayIndex);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray3(rpc, [
-    lowerTickArrayAddress,
-    upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      getInitializeTickArrayInstruction3({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: lowerTickArrayAddress,
-        startTickIndex: lowerTickArrayIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && lowerTickArrayIndex !== upperTickArrayIndex) {
-    instructions.push(
-      getInitializeTickArrayInstruction3({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: upperTickArrayAddress,
-        startTickIndex: upperTickArrayIndex
-      })
-    );
-  }
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction2({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: lowerTickArrayAddress,
+      startTickIndex: lowerTickArrayIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction2({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: upperTickArrayAddress,
+      startTickIndex: upperTickArrayIndex,
+      idempotent: true
+    })
+  );
   const ix = await openPositionWithLiquidityOrcaInstruction(
     authority,
     positionMint,
@@ -9561,11 +9547,11 @@ async function openPositionWithLiquidityOrcaInstruction(authority, positionMint,
 
 // src/txbuilder/openPositionWithLiquidityFusion.ts
 import {
-  fetchAllMaybeTickArray as fetchAllMaybeTickArray4,
+  fetchAllMaybeTickArray as fetchAllMaybeTickArray2,
   fetchMaybeFusionPool as fetchMaybeFusionPool7,
   FP_NFT_UPDATE_AUTH as FP_NFT_UPDATE_AUTH2,
   FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS8,
-  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction4,
+  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction2,
   getPositionAddress as getPositionAddress16,
   getTickArrayAddress as getTickArrayAddress7
 } from "@crypticdot/fusionamm-client";
@@ -9648,13 +9634,13 @@ async function openPositionWithLiquidityFusionInstructions(rpc, authority, posit
   const [lowerTickArrayAddress] = await getTickArrayAddress7(fusionPool.address, lowerTickArrayIndex);
   const upperTickArrayIndex = getTickArrayStartTickIndex7(args.tickUpperIndex, fusionPool.data.tickSpacing);
   const [upperTickArrayAddress] = await getTickArrayAddress7(fusionPool.address, upperTickArrayIndex);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray4(rpc, [
+  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray2(rpc, [
     lowerTickArrayAddress,
     upperTickArrayAddress
   ]);
   if (!lowerTickArray.exists) {
     instructions.push(
-      getInitializeTickArrayInstruction4({
+      getInitializeTickArrayInstruction2({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: lowerTickArrayAddress,
@@ -9664,7 +9650,7 @@ async function openPositionWithLiquidityFusionInstructions(rpc, authority, posit
   }
   if (!upperTickArray.exists && lowerTickArrayIndex !== upperTickArrayIndex) {
     instructions.push(
-      getInitializeTickArrayInstruction4({
+      getInitializeTickArrayInstruction2({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: upperTickArrayAddress,
@@ -10494,9 +10480,8 @@ async function repayDebtInstruction(authority, positionMint, mintA, mintB, marke
 
 // src/txbuilder/rebalancePositionOrca.ts
 import {
-  fetchAllMaybeTickArray as fetchAllMaybeTickArray5,
   fetchMaybeWhirlpool as fetchMaybeWhirlpool9,
-  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction5,
+  getInitializeDynamicTickArrayInstruction as getInitializeDynamicTickArrayInstruction3,
   getOracleAddress as getOracleAddress7,
   getPositionAddress as getPositionAddress19,
   WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS11
@@ -10529,30 +10514,24 @@ async function rebalancePositionOrcaInstructions(rpc, authority, positionMint, c
   if (!cleanupInstructions) cleanupInstructions = instructions;
   const internalCleanupInstructions = [];
   const secondaryTickArrays = await OrcaUtils.getTickArraysForRebalancedPosition(whirlpool, tunaPosition);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray5(rpc, [
-    secondaryTickArrays.lowerTickArrayAddress,
-    secondaryTickArrays.upperTickArrayAddress
-  ]);
-  if (!lowerTickArray.exists) {
-    instructions.push(
-      getInitializeTickArrayInstruction5({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: secondaryTickArrays.lowerTickArrayAddress,
-        startTickIndex: secondaryTickArrays.lowerTickArrayStartIndex
-      })
-    );
-  }
-  if (!upperTickArray.exists && secondaryTickArrays.lowerTickArrayStartIndex !== secondaryTickArrays.upperTickArrayStartIndex) {
-    instructions.push(
-      getInitializeTickArrayInstruction5({
-        whirlpool: whirlpool.address,
-        funder: authority,
-        tickArray: secondaryTickArrays.upperTickArrayAddress,
-        startTickIndex: secondaryTickArrays.upperTickArrayStartIndex
-      })
-    );
-  }
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction3({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: secondaryTickArrays.lowerTickArrayAddress,
+      startTickIndex: secondaryTickArrays.lowerTickArrayStartIndex,
+      idempotent: true
+    })
+  );
+  instructions.push(
+    getInitializeDynamicTickArrayInstruction3({
+      whirlpool: whirlpool.address,
+      funder: authority,
+      tickArray: secondaryTickArrays.upperTickArrayAddress,
+      startTickIndex: secondaryTickArrays.upperTickArrayStartIndex,
+      idempotent: true
+    })
+  );
   const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -10681,10 +10660,10 @@ async function rebalancePositionOrcaInstruction(authority, tunaPosition, tunaCon
 
 // src/txbuilder/rebalancePositionFusion.ts
 import {
-  fetchAllMaybeTickArray as fetchAllMaybeTickArray6,
+  fetchAllMaybeTickArray as fetchAllMaybeTickArray3,
   fetchMaybeFusionPool as fetchMaybeFusionPool9,
   FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS11,
-  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction6,
+  getInitializeTickArrayInstruction as getInitializeTickArrayInstruction3,
   getPositionAddress as getPositionAddress20
 } from "@crypticdot/fusionamm-client";
 import {
@@ -10714,13 +10693,13 @@ async function rebalancePositionFusionInstructions(rpc, authority, positionMint,
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
   const secondaryTickArrays = await FusionUtils.getTickArraysForRebalancedPosition(fusionPool, tunaPosition);
-  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray6(rpc, [
+  const [lowerTickArray, upperTickArray] = await fetchAllMaybeTickArray3(rpc, [
     secondaryTickArrays.lowerTickArrayAddress,
     secondaryTickArrays.upperTickArrayAddress
   ]);
   if (!lowerTickArray.exists) {
     instructions.push(
-      getInitializeTickArrayInstruction6({
+      getInitializeTickArrayInstruction3({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: secondaryTickArrays.lowerTickArrayAddress,
@@ -10730,7 +10709,7 @@ async function rebalancePositionFusionInstructions(rpc, authority, positionMint,
   }
   if (!upperTickArray.exists && secondaryTickArrays.lowerTickArrayStartIndex !== secondaryTickArrays.upperTickArrayStartIndex) {
     instructions.push(
-      getInitializeTickArrayInstruction6({
+      getInitializeTickArrayInstruction3({
         fusionPool: fusionPool.address,
         funder: authority,
         tickArray: secondaryTickArrays.upperTickArrayAddress,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@crypticdot/defituna-client",
   "description": "Typescript client to interact with DefiTuna's on-chain program.",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@orca-so/whirlpools-core": "^2.0.0",
-    "@orca-so/whirlpools-client": "^2.0.0",
-    "@orca-so/whirlpools": "^2.2.0",
-    "@crypticdot/fusionamm-core": "^1.0.49",
-    "@crypticdot/fusionamm-client": "^1.0.49",
-    "@crypticdot/fusionamm-sdk": "^1.0.49",
+    "@orca-so/whirlpools-client": "^3.0.0",
+    "@orca-so/whirlpools": "^3.0.0",
+    "@crypticdot/fusionamm-core": "^1.0.53",
+    "@crypticdot/fusionamm-client": "^1.0.53",
+    "@crypticdot/fusionamm-sdk": "^1.0.53",
     "@solana/kit": "^2.1.0",
     "@solana-program/compute-budget": "^0.7.0",
     "@solana-program/system": "^0.7.0",
@@ -38,9 +38,9 @@
     "@codama/renderers-rust": "^1.0.22",
     "@codama/visitors-core": "^1.2.13",
     "@codama/nodes-from-anchor": "^1.1.14",
-    "@codama/renderers": "^1.0.23",
+    "@codama/renderers": "^1.0.24",
     "@types/node": "22.9.0",
-    "codama": "^1.2.12",
+    "codama": "^1.2.14",
     "dotenv": "^16.4.7",
     "eslint": "^8.57.0",
     "ts-node": "^10.9.2",