@raydium-io/raydium-sdk-v2 0.1.36-alpha → 0.1.38-alpha

package/lib/raydium/token/type.d.ts

@@ -1,4 +1,4 @@
-export { bF as LpToken, bE as SplToken, bC as TokenInfo, bD as TokenJson } from '../../api-33b5ab27.js';
+export { bF as LpToken, bE as SplToken, bC as TokenInfo, bD as TokenJson } from '../../api-364b009b.js';
 import '../../module/token.js';
 import 'axios';
 import '../../solana/type.js';

package/lib/raydium/token/utils.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { RawMint, TransferFeeConfig } from '@solana/spl-token';
-import { bC as TokenInfo, ac as BigNumberish, c4 as TokenAmount, h as ApiV3Token } from '../../api-33b5ab27.js';
+import { bC as TokenInfo, ac as BigNumberish, c4 as TokenAmount, h as ApiV3Token } from '../../api-364b009b.js';
 import { Token } from '../../module/token.js';
 import 'axios';
 import '../../solana/type.js';

package/lib/raydium/tradeV2/index.d.ts

@@ -2,7 +2,7 @@ export { makeSwapInstruction, route1Instruction, route2Instruction, routeInstruc
 export { BasicPoolInfo, ComputeAmountOutAmmLayout, ComputeAmountOutLayout, ComputeAmountOutRouteLayout, ComputePoolType, ComputeRoutePathType, MakeSwapInstructionParam, PoolAccountInfoV4, ReturnTypeFetchMultipleInfo, ReturnTypeGetAddLiquidityDefaultPool, ReturnTypeGetAllRoute, ReturnTypeMakeSwapInstruction, ReturnTypeMakeSwapTransaction, RoutePathType } from './type.js';
 import '@solana/web3.js';
 import 'bn.js';
-import '../../api-33b5ab27.js';
+import '../../api-364b009b.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/spl-token';
@@ -19,7 +19,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-7da56d56.js';
+import '../../type-8e8becba.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/tradeV2/instrument.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { q as ApiV3PoolInfoItem, z as PoolKeys } from '../../api-33b5ab27.js';
+import { q as ApiV3PoolInfoItem, z as PoolKeys } from '../../api-364b009b.js';
 import { ComputePoolType, MakeSwapInstructionParam, ReturnTypeMakeSwapInstruction } from './type.js';
 import 'axios';
 import '../../solana/type.js';
@@ -18,7 +18,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-7da56d56.js';
+import '../../type-8e8becba.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/tradeV2/trade.d.ts

@@ -1,10 +1,10 @@
 import '@solana/web3.js';
 import '../../common/txTool/txType.js';
-import '../../api-33b5ab27.js';
-export { i as default } from '../../raydium-b84847b9.js';
+import '../../api-364b009b.js';
+export { i as default } from '../../raydium-c65b6b21.js';
 import 'bn.js';
 import '../liquidity/type.js';
-import '../../type-7da56d56.js';
+import '../../type-8e8becba.js';
 import './type.js';
 import '../cpmm/type.js';
 import 'axios';

package/lib/raydium/tradeV2/type.d.ts

@@ -1,10 +1,10 @@
 import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-33b5ab27.js';
+import { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-364b009b.js';
 import Decimal from 'decimal.js';
 import { Token } from '../../module/token.js';
 import { ComputeAmountOutParam } from '../liquidity/type.js';
-import { d as ComputeClmmPoolInfo } from '../../type-7da56d56.js';
+import { d as ComputeClmmPoolInfo } from '../../type-8e8becba.js';
 import { CpmmComputeData } from '../cpmm/type.js';
 import 'axios';
 import '../../solana/type.js';

package/lib/raydium/type.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '@solana/spl-token';
-export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-33b5ab27.js';
+export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-364b009b.js';
 import 'bn.js';
 import 'axios';
 import '../solana/type.js';

package/lib/raydium/utils1216/index.d.ts

@@ -1,6 +1,6 @@
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-b84847b9.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-c65b6b21.js';
 import '@solana/web3.js';
-import '../../api-33b5ab27.js';
+import '../../api-364b009b.js';
 import 'axios';
 import '../../solana/type.js';
 import 'bn.js';
@@ -21,7 +21,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-7da56d56.js';
+import '../../type-8e8becba.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/utils1216/utils1216.d.ts

@@ -1,9 +1,9 @@
 import '../../marshmallow/index.js';
 import '@solana/web3.js';
 import 'bn.js';
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-b84847b9.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-c65b6b21.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../api-33b5ab27.js';
+import '../../api-364b009b.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/spl-token';
@@ -21,7 +21,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-7da56d56.js';
+import '../../type-8e8becba.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-b84847b9.d.ts → raydium-c65b6b21.d.ts}

@@ -1,5 +1,5 @@
 import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } from '@solana/web3.js';
-import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-33b5ab27.js';
+import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-364b009b.js';
 import { API_URL_CONFIG } from './api/url.js';
 import { Owner } from './common/owner.js';
 import { Cluster } from './solana/type.js';
@@ -10,7 +10,7 @@ import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
 import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, ComputeAmountOutParam, SwapParam, AmmRpcData } from './raydium/liquidity/type.js';
 import { StableLayout } from './raydium/liquidity/stable.js';
-import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-7da56d56.js';
+import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-8e8becba.js';
 import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 import { CpmmRpcData, CpmmComputeData, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { ComputeAmountOutLayout, BasicPoolInfo, ReturnTypeGetAllRoute, ComputeRoutePathType, ComputePoolType, ReturnTypeFetchMultipleInfo } from './raydium/tradeV2/type.js';
@@ -418,11 +418,11 @@ declare class Utils1216 extends ModuleBase {
         perLpLoss: BN__default;
         totalClaimedAmount: BN__default;
     }[], "", {
+        status: number;
         padding: BN__default[];
         bump: number;
         endTime: BN__default;
         openTime: BN__default;
-        status: number;
         ammId: PublicKey;
         tokenInfo: {
             mintDecimals: number;
@@ -606,10 +606,7 @@ interface DataBase<T> {
 interface ApiData {
     tokens?: DataBase<ApiV3Token[]>;
     tokenList?: DataBase<ApiV3TokenRes>;
-    jupTokenList?: {
-        [JupTokenType.ALL]?: DataBase<ApiV3Token[]>;
-        [JupTokenType.Strict]?: DataBase<ApiV3Token[]>;
-    };
+    jupTokenList?: DataBase<ApiV3Token[]>;
 }
 declare class Raydium {
     cluster: Cluster;
@@ -648,7 +645,7 @@ declare class Raydium {
     private isCacheInvalidate;
     fetchChainTime(): Promise<void>;
     fetchV3TokenList(forceUpdate?: boolean): Promise<ApiV3TokenRes>;
-    fetchJupTokenList(type: JupTokenType, forceUpdate?: boolean): Promise<ApiV3Token[]>;
+    fetchJupTokenList(forceUpdate?: boolean): Promise<ApiV3Token[]>;
     get chainTimeData(): {
         offset: number;
         chainTime: number;

package/lib/{type-7da56d56.d.ts → type-8e8becba.d.ts}

@@ -1,7 +1,7 @@
 import { PublicKey, Transaction, Signer, Keypair, TransactionInstruction, EpochInfo } from '@solana/web3.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
-import { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-33b5ab27.js';
+import { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-364b009b.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydium-io/raydium-sdk-v2",
-  "version": "0.1.36-alpha",
+  "version": "0.1.38-alpha",
   "description": "An SDK for building applications on top of Raydium.",
   "license": "GPL-3.0",
   "main": "./lib/index.js",

package/src/api/api.ts

@@ -168,9 +168,9 @@ export class Api {
     return res.data;
   }
 
-  async getJupTokenList(type?: JupTokenType): Promise<ApiV3Token[]> {
+  async getJupTokenList(): Promise<ApiV3Token[]> {
     return this.api.get("", {
-      baseURL: (this.urlConfigs.JUP_TOKEN_LIST || API_URLS.JUP_TOKEN_LIST).replace("{type}", type || JupTokenType.ALL),
+      baseURL: this.urlConfigs.JUP_TOKEN_LIST || API_URLS.JUP_TOKEN_LIST,
     });
   }
 
@@ -185,7 +185,7 @@ export class Api {
     const { type = "all", sort = "liquidity", order = "desc", page = 0, pageSize = 100 } = props;
     const res = await this.api.get<PoolsApiReturn>(
       (this.urlConfigs.POOL_LIST || API_URLS.POOL_LIST) +
-      `?poolType=${type}&poolSortField=${sort}&sortType=${order}&page=${page}&pageSize=${pageSize}`,
+        `?poolType=${type}&poolSortField=${sort}&sortType=${order}&page=${page}&pageSize=${pageSize}`,
     );
     return res.data;
   }
@@ -246,7 +246,7 @@ export class Api {
 
     const res = await this.api.get(
       (this.urlConfigs.POOL_SEARCH_MINT || API_URLS.POOL_SEARCH_MINT) +
-      `?mint1=${baseMint}&mint2=${quoteMint}&poolType=${type}&poolSortField=${sort}&sortType=${order}&pageSize=100&page=${page}`,
+        `?mint1=${baseMint}&mint2=${quoteMint}&poolType=${type}&poolSortField=${sort}&sortType=${order}&pageSize=100&page=${page}`,
     );
     return res.data;
   }

package/src/api/url.ts

@@ -21,7 +21,7 @@ export const API_URLS = {
   TOKEN_LIST: "/mint/list",
   MINT_INFO_ID: "/mint/ids",
 
-  JUP_TOKEN_LIST: "https://token.jup.ag/{type}",
+  JUP_TOKEN_LIST: "https://tokens.jup.ag/tokens?tags=lst,community",
   /**
    * poolType: {all, concentrated, standard, allFarm, concentratedFarm, standardFarm}
    * poolSortField: {liquidity | volume_24h / 7d / 30d | fee_24h / 7d / 30d | apr_24h / 7d / 30d}

package/src/raydium/raydium.ts

@@ -62,10 +62,7 @@ interface ApiData {
 
   // v3 data
   tokenList?: DataBase<ApiV3TokenRes>;
-  jupTokenList?: {
-    [JupTokenType.ALL]?: DataBase<ApiV3Token[]>;
-    [JupTokenType.Strict]?: DataBase<ApiV3Token[]>;
-  };
+  jupTokenList?: DataBase<ApiV3Token[]>;
 }
 
 export class Raydium {
@@ -238,29 +235,40 @@ export class Raydium {
   public async fetchV3TokenList(forceUpdate?: boolean): Promise<ApiV3TokenRes> {
     if (this.apiData.tokenList && !this.isCacheInvalidate(this.apiData.tokenList.fetched) && !forceUpdate)
       return this.apiData.tokenList.data;
-    const raydiumList = await this.api.getTokenList();
-    const dataObject = {
-      fetched: Date.now(),
-      data: raydiumList,
-    };
-    this.apiData.tokenList = dataObject;
-
-    return dataObject.data;
+    try {
+      const raydiumList = await this.api.getTokenList();
+      const dataObject = {
+        fetched: Date.now(),
+        data: raydiumList,
+      };
+      this.apiData.tokenList = dataObject;
+
+      return dataObject.data;
+    } catch (e) {
+      console.error(e);
+      return {
+        mintList: [],
+        blacklist: [],
+        whiteList: [],
+      };
+    }
   }
 
-  public async fetchJupTokenList(type: JupTokenType, forceUpdate?: boolean): Promise<ApiV3Token[]> {
-    const prevFetched = this.apiData.jupTokenList?.[type];
+  public async fetchJupTokenList(forceUpdate?: boolean): Promise<ApiV3Token[]> {
+    const prevFetched = this.apiData.jupTokenList;
     if (prevFetched && !this.isCacheInvalidate(prevFetched.fetched) && !forceUpdate) return prevFetched.data;
-    const jupList = await this.api.getJupTokenList(type);
-    this.apiData.jupTokenList = {
-      ...this.apiData.jupTokenList,
-      [type]: {
+    try {
+      const jupList = await this.api.getJupTokenList();
+      this.apiData.jupTokenList = {
         fetched: Date.now(),
         data: jupList,
-      },
-    };
+      };
 
-    return this.apiData.jupTokenList[type]!.data;
+      return this.apiData.jupTokenList.data;
+    } catch (e) {
+      console.error(e);
+      return [];
+    }
   }
 
   get chainTimeData(): { offset: number; chainTime: number } | undefined {

package/src/raydium/token/token.ts

@@ -1,8 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { MintLayout, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 
-import { Price, Token } from "@/module";
-import { validateAndParsePublicKey, SOLMint } from "@/common/pubKey";
 import { ApiV3Token, JupTokenType } from "@/api/type";
 import ModuleBase, { ModuleBaseProps } from "../moduleBase";
 import { LoadParams } from "../type";
@@ -30,7 +28,7 @@ export default class TokenModule extends ModuleBase {
     this.checkDisabled();
     const { forceUpdate = false, type = JupTokenType.Strict } = params || {};
     const { mintList, blacklist, whiteList } = await this.scope.fetchV3TokenList(forceUpdate);
-    const jup = await this.scope.fetchJupTokenList(type, forceUpdate);
+    const jup = await this.scope.fetchJupTokenList(forceUpdate);
     // reset all data
     this._tokenList = [];
     this._tokenMap = new Map();