@whetstone-research/doppler-sdk 1.0.19 → 1.0.20

package/dist/solana/react/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkGUGN3EYX_cjs = require('../../chunk-GUGN3EYX.cjs');
-var chunkAKLS6T3R_cjs = require('../../chunk-AKLS6T3R.cjs');
+var chunkKJ6W44WF_cjs = require('../../chunk-KJ6W44WF.cjs');
+var chunkY6TJIH33_cjs = require('../../chunk-Y6TJIH33.cjs');
 require('../../chunk-Q7SFCCGT.cjs');
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
@@ -10,7 +10,7 @@ var kit = require('@solana/kit');
 var AmmContext = react.createContext(null);
 function AmmProvider({
   rpc,
-  programId = chunkAKLS6T3R_cjs.CPMM_PROGRAM_ID,
+  programId = chunkY6TJIH33_cjs.CPMM_PROGRAM_ID,
   commitment = "confirmed",
   refreshInterval = 3e4,
   defaultSlippageBps = 50,
@@ -91,7 +91,7 @@ function createAmmContextValue(config) {
   return {
     rpc,
     endpoint,
-    programId: programId ?? chunkAKLS6T3R_cjs.CPMM_PROGRAM_ID,
+    programId: programId ?? chunkY6TJIH33_cjs.CPMM_PROGRAM_ID,
     commitment,
     refreshInterval,
     defaultSlippageBps
@@ -333,7 +333,7 @@ function usePool(poolAddress, options = {}) {
       }
       setError(null);
       try {
-        const poolData = await chunkGUGN3EYX_cjs.fetchPool(rpc, poolAddress, {
+        const poolData = await chunkKJ6W44WF_cjs.fetchPool(rpc, poolAddress, {
           programId,
           commitment
         });
@@ -411,7 +411,7 @@ function usePools(poolAddresses, options = {}) {
     try {
       const results = await Promise.all(
         poolAddresses.map(
-          (addr) => chunkGUGN3EYX_cjs.fetchPool(rpc, addr, { programId, commitment }).then((pool) => [addr, pool]).catch(() => [addr, null])
+          (addr) => chunkKJ6W44WF_cjs.fetchPool(rpc, addr, { programId, commitment }).then((pool) => [addr, pool]).catch(() => [addr, null])
         )
       );
       if (mountedRef.current) {
@@ -500,9 +500,9 @@ function useSwap(options) {
         };
       }
       try {
-        const swapQuote = chunkGUGN3EYX_cjs.getSwapQuote(pool, state.inputAmount, tradeDirection);
-        const slippageFactor = chunkAKLS6T3R_cjs.BPS_DENOM - BigInt(state.slippageBps);
-        const minAmountOut = swapQuote.amountOut * slippageFactor / chunkAKLS6T3R_cjs.BPS_DENOM;
+        const swapQuote = chunkKJ6W44WF_cjs.getSwapQuote(pool, state.inputAmount, tradeDirection);
+        const slippageFactor = chunkY6TJIH33_cjs.BPS_DENOM - BigInt(state.slippageBps);
+        const minAmountOut = swapQuote.amountOut * slippageFactor / chunkY6TJIH33_cjs.BPS_DENOM;
         return {
           ...swapQuote,
           minAmountOut,
@@ -543,14 +543,14 @@ function useSwap(options) {
         };
       }
       try {
-        const { amountIn, feeTotal } = chunkGUGN3EYX_cjs.getSwapQuoteExactOut(
+        const { amountIn, feeTotal } = chunkKJ6W44WF_cjs.getSwapQuoteExactOut(
           pool,
           state.outputAmount,
           tradeDirection
         );
-        const slippageFactor = chunkAKLS6T3R_cjs.BPS_DENOM + BigInt(state.slippageBps);
-        const maxAmountIn = amountIn * slippageFactor / chunkAKLS6T3R_cjs.BPS_DENOM;
-        const forwardQuote = chunkGUGN3EYX_cjs.getSwapQuote(pool, amountIn, tradeDirection);
+        const slippageFactor = chunkY6TJIH33_cjs.BPS_DENOM + BigInt(state.slippageBps);
+        const maxAmountIn = amountIn * slippageFactor / chunkY6TJIH33_cjs.BPS_DENOM;
+        const forwardQuote = chunkKJ6W44WF_cjs.getSwapQuote(pool, amountIn, tradeDirection);
         return {
           amountOut: state.outputAmount,
           feeTotal,
@@ -558,7 +558,7 @@ function useSwap(options) {
           // Not calculated for exact out
           feeComp: 0n,
           priceImpact: forwardQuote.priceImpact,
-          executionPrice: chunkGUGN3EYX_cjs.ratioToNumber(state.outputAmount, amountIn),
+          executionPrice: chunkKJ6W44WF_cjs.ratioToNumber(state.outputAmount, amountIn),
           minAmountOut: state.outputAmount,
           maxAmountIn,
           tradeDirection,
@@ -683,13 +683,13 @@ function useLiquidity(options) {
       };
     }
     try {
-      const quote = chunkGUGN3EYX_cjs.getAddLiquidityQuote(
+      const quote = chunkKJ6W44WF_cjs.getAddLiquidityQuote(
         pool,
         addState.amount0,
         addState.amount1
       );
-      const slippageFactor = chunkAKLS6T3R_cjs.BPS_DENOM - BigInt(addState.slippageBps);
-      const minSharesOut = quote.sharesOut * slippageFactor / chunkAKLS6T3R_cjs.BPS_DENOM;
+      const slippageFactor = chunkY6TJIH33_cjs.BPS_DENOM - BigInt(addState.slippageBps);
+      const minSharesOut = quote.sharesOut * slippageFactor / chunkY6TJIH33_cjs.BPS_DENOM;
       return {
         ...quote,
         minSharesOut,
@@ -723,10 +723,10 @@ function useLiquidity(options) {
       };
     }
     try {
-      const quote = chunkGUGN3EYX_cjs.getRemoveLiquidityQuote(pool, removeState.shares);
-      const slippageFactor = chunkAKLS6T3R_cjs.BPS_DENOM - BigInt(removeState.slippageBps);
-      const minAmount0Out = quote.amount0 * slippageFactor / chunkAKLS6T3R_cjs.BPS_DENOM;
-      const minAmount1Out = quote.amount1 * slippageFactor / chunkAKLS6T3R_cjs.BPS_DENOM;
+      const quote = chunkKJ6W44WF_cjs.getRemoveLiquidityQuote(pool, removeState.shares);
+      const slippageFactor = chunkY6TJIH33_cjs.BPS_DENOM - BigInt(removeState.slippageBps);
+      const minAmount0Out = quote.amount0 * slippageFactor / chunkY6TJIH33_cjs.BPS_DENOM;
+      const minAmount1Out = quote.amount1 * slippageFactor / chunkY6TJIH33_cjs.BPS_DENOM;
       return {
         ...quote,
         minAmount0Out,
@@ -843,7 +843,7 @@ function usePosition(poolAddress, positionId = 0n, options = {}) {
     setLoading(true);
     setError(null);
     try {
-      const { getPositionAddress } = await import('../../pda-PZRHQJMK.cjs');
+      const { getPositionAddress } = await import('../../pda-A4PIAS5Y.cjs');
       const [posAddr] = await getPositionAddress(
         poolAddress,
         ownerAddress,
@@ -852,8 +852,8 @@ function usePosition(poolAddress, positionId = 0n, options = {}) {
       );
       setPositionAddress(posAddr);
       const [positionData, poolData] = await Promise.all([
-        chunkGUGN3EYX_cjs.fetchPosition(rpc, posAddr, { programId, commitment }),
-        providedPool ? Promise.resolve(providedPool) : chunkGUGN3EYX_cjs.fetchPool(rpc, poolAddress, { programId, commitment })
+        chunkKJ6W44WF_cjs.fetchPosition(rpc, posAddr, { programId, commitment }),
+        providedPool ? Promise.resolve(providedPool) : chunkKJ6W44WF_cjs.fetchPool(rpc, poolAddress, { programId, commitment })
       ]);
       if (mountedRef.current) {
         setPosition(positionData);
@@ -882,11 +882,11 @@ function usePosition(poolAddress, positionId = 0n, options = {}) {
   }, [fetchPositionData]);
   const pendingFees = react.useMemo(() => {
     if (!pool || !position) return null;
-    return chunkGUGN3EYX_cjs.getPendingFees(pool, position);
+    return chunkKJ6W44WF_cjs.getPendingFees(pool, position);
   }, [pool, position]);
   const value = react.useMemo(() => {
     if (!pool || !position) return null;
-    return chunkGUGN3EYX_cjs.getPositionValue(pool, position);
+    return chunkKJ6W44WF_cjs.getPositionValue(pool, position);
   }, [pool, position]);
   react.useEffect(() => {
     mountedRef.current = true;
@@ -941,7 +941,7 @@ function useUserPositions(poolFilter, options = {}) {
     setLoading(true);
     setError(null);
     try {
-      const positionsData = await chunkGUGN3EYX_cjs.fetchUserPositions(
+      const positionsData = await chunkKJ6W44WF_cjs.fetchUserPositions(
         rpc,
         ownerAddress,
         poolFilter,
@@ -986,44 +986,6 @@ function useUserPositions(poolFilter, options = {}) {
     refetch: fetchPositions
   };
 }
-function createCollectFeesInstruction(accounts, args, programId = chunkAKLS6T3R_cjs.CPMM_PROGRAM_ID) {
-  const {
-    pool,
-    position,
-    owner,
-    authority,
-    vault0,
-    vault1,
-    token0Mint,
-    token1Mint,
-    user0,
-    user1,
-    tokenProgram = chunkAKLS6T3R_cjs.TOKEN_PROGRAM_ADDRESS
-  } = accounts;
-  const keys = [
-    { address: pool, role: kit.AccountRole.WRITABLE },
-    { address: position, role: kit.AccountRole.WRITABLE },
-    { address: owner, role: kit.AccountRole.READONLY_SIGNER },
-    { address: authority, role: kit.AccountRole.READONLY },
-    { address: vault0, role: kit.AccountRole.WRITABLE },
-    { address: vault1, role: kit.AccountRole.WRITABLE },
-    { address: token0Mint, role: kit.AccountRole.READONLY },
-    { address: token1Mint, role: kit.AccountRole.READONLY },
-    { address: user0, role: kit.AccountRole.WRITABLE },
-    { address: user1, role: kit.AccountRole.WRITABLE },
-    { address: tokenProgram, role: kit.AccountRole.READONLY }
-  ];
-  const data = chunkGUGN3EYX_cjs.encodeInstructionData(
-    chunkAKLS6T3R_cjs.INSTRUCTION_DISCRIMINATORS.collectFees,
-    chunkGUGN3EYX_cjs.collectFeesArgsCodec,
-    args
-  );
-  return {
-    programAddress: programId,
-    accounts: keys,
-    data
-  };
-}
 var MAX_FEE_AMOUNT = BigInt("18446744073709551615");
 function useFees(positionAddress, poolAddress, options = {}) {
   const {
@@ -1057,7 +1019,7 @@ function useFees(positionAddress, poolAddress, options = {}) {
   }, [providedPool, providedPosition]);
   const fees = react.useMemo(() => {
     if (!pool || !position) return null;
-    const { pending0, pending1 } = chunkGUGN3EYX_cjs.getPendingFees(pool, position);
+    const { pending0, pending1 } = chunkKJ6W44WF_cjs.getPendingFees(pool, position);
     return {
       pending0,
       pending1,
@@ -1084,13 +1046,13 @@ function useFees(positionAddress, poolAddress, options = {}) {
         const promises = [];
         if (!providedPosition && positionAddress) {
           promises.push(
-            chunkGUGN3EYX_cjs.fetchPosition(rpc, positionAddress, { programId, commitment })
+            chunkKJ6W44WF_cjs.fetchPosition(rpc, positionAddress, { programId, commitment })
           );
         } else {
           promises.push(Promise.resolve(providedPosition));
         }
         if (!providedPool && poolAddress) {
-          promises.push(chunkGUGN3EYX_cjs.fetchPool(rpc, poolAddress, { programId, commitment }));
+          promises.push(chunkKJ6W44WF_cjs.fetchPool(rpc, poolAddress, { programId, commitment }));
         } else {
           promises.push(Promise.resolve(providedPool));
         }
@@ -1138,24 +1100,30 @@ function useFees(positionAddress, poolAddress, options = {}) {
         const {
           max0 = MAX_FEE_AMOUNT,
           max1 = MAX_FEE_AMOUNT,
+          token0Program,
+          token1Program,
+          tokenProgram,
           userToken0,
           userToken1
         } = collectOptions;
-        const ix = createCollectFeesInstruction(
+        const ix = chunkKJ6W44WF_cjs.getCollectFeesInstruction(
           {
             pool: poolAddress,
             position: positionAddress,
-            owner: wallet.address,
+            owner: wallet.signer,
             authority: pool.authority,
             vault0: pool.vault0,
             vault1: pool.vault1,
             token0Mint: pool.token0Mint,
             token1Mint: pool.token1Mint,
             user0: userToken0,
-            user1: userToken1
+            user1: userToken1,
+            token0Program: token0Program ?? tokenProgram ?? chunkY6TJIH33_cjs.TOKEN_PROGRAM_ADDRESS,
+            token1Program: token1Program ?? tokenProgram ?? chunkY6TJIH33_cjs.TOKEN_PROGRAM_ADDRESS,
+            max0,
+            max1
           },
-          { max0, max1 },
-          programId
+          { programAddress: programId }
         );
         const { value: latestBlockhash } = await rpc.getLatestBlockhash({ commitment }).send();
         const baseMessage = kit.createTransactionMessage({ version: "legacy" });
@@ -1243,7 +1211,7 @@ function useFees(positionAddress, poolAddress, options = {}) {
 function useFeesFromData(pool, position) {
   return react.useMemo(() => {
     if (!pool || !position) return null;
-    const { pending0, pending1 } = chunkGUGN3EYX_cjs.getPendingFees(pool, position);
+    const { pending0, pending1 } = chunkKJ6W44WF_cjs.getPendingFees(pool, position);
     return {
       pending0,
       pending1,
@@ -1278,9 +1246,9 @@ function useOracle(poolAddress, options = {}) {
     setLoading(true);
     setError(null);
     try {
-      const [oracleAddr] = await chunkAKLS6T3R_cjs.getOracleAddress(poolAddress, programId);
+      const [oracleAddr] = await chunkY6TJIH33_cjs.getOracleAddress(poolAddress, programId);
       setOracleAddress(oracleAddr);
-      const oracleData = await chunkGUGN3EYX_cjs.fetchOracle(rpc, oracleAddr, {
+      const oracleData = await chunkKJ6W44WF_cjs.fetchOracle(rpc, oracleAddr, {
         programId,
         commitment
       });
@@ -1303,34 +1271,34 @@ function useOracle(poolAddress, options = {}) {
   const twap = react.useCallback(
     (windowSeconds) => {
       if (!oracle || !oracle.initialized) return null;
-      return chunkGUGN3EYX_cjs.consultTwap(oracle, windowSeconds);
+      return chunkKJ6W44WF_cjs.consultTwap(oracle, windowSeconds);
     },
     [oracle]
   );
   const spotPrice = react.useMemo(() => {
     if (!oracle || !oracle.initialized) return null;
-    const prices = chunkGUGN3EYX_cjs.getOracleSpotPrices(oracle);
+    const prices = chunkKJ6W44WF_cjs.getOracleSpotPrices(oracle);
     return { price0: prices.price0, price1: prices.price1 };
   }, [oracle]);
   const deviation = react.useMemo(() => {
     if (!oracle || !oracle.initialized) return null;
-    const dev = chunkGUGN3EYX_cjs.getOracleDeviation(oracle);
+    const dev = chunkKJ6W44WF_cjs.getOracleDeviation(oracle);
     return { deviation0: dev.deviation0, deviation1: dev.deviation1 };
   }, [oracle]);
   const age = react.useMemo(() => {
     if (!oracle || !oracle.initialized) return null;
-    return chunkGUGN3EYX_cjs.getOracleAge(oracle);
+    return chunkKJ6W44WF_cjs.getOracleAge(oracle);
   }, [oracle]);
   const isStaleCheck = react.useCallback(
     (maxAgeSeconds) => {
       if (!oracle || !oracle.initialized) return true;
-      return chunkGUGN3EYX_cjs.isOracleStale(oracle, maxAgeSeconds);
+      return chunkKJ6W44WF_cjs.isOracleStale(oracle, maxAgeSeconds);
     },
     [oracle]
   );
   const bufferStats = react.useMemo(() => {
     if (!oracle || !oracle.initialized) return null;
-    const stats = chunkGUGN3EYX_cjs.getOracleBufferStats(oracle);
+    const stats = chunkKJ6W44WF_cjs.getOracleBufferStats(oracle);
     return {
       capacity: stats.capacity,
       filledCount: stats.filledCount,
@@ -1341,7 +1309,7 @@ function useOracle(poolAddress, options = {}) {
   const compareWithPool = react.useCallback(
     (pool) => {
       if (!oracle || !oracle.initialized) return null;
-      return chunkGUGN3EYX_cjs.comparePoolAndOraclePrices(pool, oracle);
+      return chunkKJ6W44WF_cjs.comparePoolAndOraclePrices(pool, oracle);
     },
     [oracle]
   );
@@ -1380,7 +1348,7 @@ function useTwap(poolAddress, windowSeconds, options = {}) {
   const { oracle, loading, error, refetch } = useOracle(poolAddress, options);
   const twap = react.useMemo(() => {
     if (!oracle || !oracle.initialized) return null;
-    return chunkGUGN3EYX_cjs.consultTwap(oracle, windowSeconds);
+    return chunkKJ6W44WF_cjs.consultTwap(oracle, windowSeconds);
   }, [oracle, windowSeconds]);
   return {
     twap,
@@ -1419,7 +1387,7 @@ function useOracles(poolAddresses, options = {}) {
       const results = await Promise.all(
         poolAddresses.map(async (poolAddr) => {
           try {
-            const result = await chunkGUGN3EYX_cjs.getOracleForPool(rpc, poolAddr, {
+            const result = await chunkKJ6W44WF_cjs.getOracleForPool(rpc, poolAddr, {
               programId,
               commitment
             });