@whetstone-research/doppler-sdk 1.0.18 → 1.0.20

package/dist/solana/react/index.d.cts

@@ -4,7 +4,7 @@ import { ReactNode } from 'react';
 import { Rpc, SolanaRpcApi, Address, TransactionSigner } from '@solana/kit';
 import { WalletAccount, Wallet } from '@wallet-standard/base';
 import { StandardConnectFeature, StandardDisconnectFeature } from '@wallet-standard/features';
-import { P as Pool, m as SwapQuote, l as TradeDirection, o as AddLiquidityQuote, p as RemoveLiquidityQuote, a as Position, V as PositionValue, W as PositionWithAddress, O as OracleState, _ as TwapResult, J as OracleWithAddress } from '../../oracle-7PmpwwPx.cjs';
+import { P as Pool, l as SwapQuote, k as TradeDirection, n as AddLiquidityQuote, o as RemoveLiquidityQuote, a as Position, Q as PositionValue, U as PositionWithAddress, O as OracleState, X as TwapResult, E as OracleWithAddress } from '../../oracle-D1wPWydZ.cjs';
 
 /**
  * Configuration for the AMM provider
@@ -847,6 +847,12 @@ interface CollectFeesOptions {
     max0?: bigint;
     /** Maximum amount of token1 to collect (default: all) */
     max1?: bigint;
+    /** Token0 program; defaults to tokenProgram or classic SPL Token */
+    token0Program?: Address;
+    /** Token1 program; defaults to tokenProgram or classic SPL Token */
+    token1Program?: Address;
+    /** Shared SPL Token program fallback */
+    tokenProgram?: Address;
     /** User's token0 account */
     userToken0: Address;
     /** User's token1 account */

package/dist/solana/react/index.d.ts

@@ -4,7 +4,7 @@ import { ReactNode } from 'react';
 import { Rpc, SolanaRpcApi, Address, TransactionSigner } from '@solana/kit';
 import { WalletAccount, Wallet } from '@wallet-standard/base';
 import { StandardConnectFeature, StandardDisconnectFeature } from '@wallet-standard/features';
-import { P as Pool, m as SwapQuote, l as TradeDirection, o as AddLiquidityQuote, p as RemoveLiquidityQuote, a as Position, V as PositionValue, W as PositionWithAddress, O as OracleState, _ as TwapResult, J as OracleWithAddress } from '../../oracle-7PmpwwPx.js';
+import { P as Pool, l as SwapQuote, k as TradeDirection, n as AddLiquidityQuote, o as RemoveLiquidityQuote, a as Position, Q as PositionValue, U as PositionWithAddress, O as OracleState, X as TwapResult, E as OracleWithAddress } from '../../oracle-D1wPWydZ.js';
 
 /**
  * Configuration for the AMM provider
@@ -847,6 +847,12 @@ interface CollectFeesOptions {
     max0?: bigint;
     /** Maximum amount of token1 to collect (default: all) */
     max1?: bigint;
+    /** Token0 program; defaults to tokenProgram or classic SPL Token */
+    token0Program?: Address;
+    /** Token1 program; defaults to tokenProgram or classic SPL Token */
+    token1Program?: Address;
+    /** Shared SPL Token program fallback */
+    tokenProgram?: Address;
     /** User's token0 account */
     userToken0: Address;
     /** User's token1 account */

package/dist/solana/react/index.js

@@ -1,9 +1,9 @@
-import { fetchPool, getSwapQuote, getSwapQuoteExactOut, ratioToNumber, getAddLiquidityQuote, getRemoveLiquidityQuote, fetchPosition, getPendingFees, getPositionValue, fetchUserPositions, fetchOracle, consultTwap, getOracleSpotPrices, getOracleDeviation, getOracleAge, isOracleStale, getOracleBufferStats, comparePoolAndOraclePrices, getOracleForPool, encodeInstructionData, collectFeesArgsCodec } from '../../chunk-C2D7CIXP.js';
-import { CPMM_PROGRAM_ID, BPS_DENOM, getOracleAddress, TOKEN_PROGRAM_ADDRESS, INSTRUCTION_DISCRIMINATORS } from '../../chunk-6TOPYGOG.js';
+import { fetchPool, getSwapQuote, getSwapQuoteExactOut, ratioToNumber, getAddLiquidityQuote, getRemoveLiquidityQuote, fetchPosition, getPendingFees, getPositionValue, fetchUserPositions, getCollectFeesInstruction, fetchOracle, consultTwap, getOracleSpotPrices, getOracleDeviation, getOracleAge, isOracleStale, getOracleBufferStats, comparePoolAndOraclePrices, getOracleForPool } from '../../chunk-BESE77DM.js';
+import { CPMM_PROGRAM_ID, BPS_DENOM, TOKEN_PROGRAM_ADDRESS, getOracleAddress } from '../../chunk-ZUJKBFXW.js';
 import '../../chunk-PZ5AY32C.js';
 import { createContext, useMemo, useContext, useState, useEffect, useCallback, useRef } from 'react';
 import { jsx } from 'react/jsx-runtime';
-import { createSolanaRpc, createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstruction, signTransactionMessageWithSigners, getBase64EncodedWireTransaction, AccountRole } from '@solana/kit';
+import { createSolanaRpc, createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstruction, signTransactionMessageWithSigners, getBase64EncodedWireTransaction } from '@solana/kit';
 
 var AmmContext = createContext(null);
 function AmmProvider({
@@ -841,7 +841,7 @@ function usePosition(poolAddress, positionId = 0n, options = {}) {
     setLoading(true);
     setError(null);
     try {
-      const { getPositionAddress } = await import('../../pda-N6ULJYLG.js');
+      const { getPositionAddress } = await import('../../pda-JVAD45XJ.js');
       const [posAddr] = await getPositionAddress(
         poolAddress,
         ownerAddress,
@@ -984,44 +984,6 @@ function useUserPositions(poolFilter, options = {}) {
     refetch: fetchPositions
   };
 }
-function createCollectFeesInstruction(accounts, args, programId = CPMM_PROGRAM_ID) {
-  const {
-    pool,
-    position,
-    owner,
-    authority,
-    vault0,
-    vault1,
-    token0Mint,
-    token1Mint,
-    user0,
-    user1,
-    tokenProgram = TOKEN_PROGRAM_ADDRESS
-  } = accounts;
-  const keys = [
-    { address: pool, role: AccountRole.WRITABLE },
-    { address: position, role: AccountRole.WRITABLE },
-    { address: owner, role: AccountRole.READONLY_SIGNER },
-    { address: authority, role: AccountRole.READONLY },
-    { address: vault0, role: AccountRole.WRITABLE },
-    { address: vault1, role: AccountRole.WRITABLE },
-    { address: token0Mint, role: AccountRole.READONLY },
-    { address: token1Mint, role: AccountRole.READONLY },
-    { address: user0, role: AccountRole.WRITABLE },
-    { address: user1, role: AccountRole.WRITABLE },
-    { address: tokenProgram, role: AccountRole.READONLY }
-  ];
-  const data = encodeInstructionData(
-    INSTRUCTION_DISCRIMINATORS.collectFees,
-    collectFeesArgsCodec,
-    args
-  );
-  return {
-    programAddress: programId,
-    accounts: keys,
-    data
-  };
-}
 var MAX_FEE_AMOUNT = BigInt("18446744073709551615");
 function useFees(positionAddress, poolAddress, options = {}) {
   const {
@@ -1136,24 +1098,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 = 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 ?? TOKEN_PROGRAM_ADDRESS,
+            token1Program: token1Program ?? tokenProgram ?? TOKEN_PROGRAM_ADDRESS,
+            max0,
+            max1
           },
-          { max0, max1 },
-          programId
+          { programAddress: programId }
         );
         const { value: latestBlockhash } = await rpc.getLatestBlockhash({ commitment }).send();
         const baseMessage = createTransactionMessage({ version: "legacy" });