@raydium-io/raydium-sdk-v2 0.0.41-alpha → 0.0.43-alpha

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

@@ -1,4 +1,4 @@
-export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-15746482.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-9fe71e3c.js';
 import '../../module/token.js';
 import '@solana/web3.js';
 import 'bn.js';

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

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { RawMint } from '@solana/spl-token';
-import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-15746482.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-9fe71e3c.js';
 import { Token } from '../../module/token.js';
 import 'bn.js';
 import '../../solana/type.js';

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

@@ -2,7 +2,7 @@ export { makeSwapInstruction, route1Instruction, route2Instruction, routeInstruc
 export { ComputeAmountOutAmmLayout, ComputeAmountOutLayout, ComputeAmountOutRouteLayout, MakeSwapInstructionParam, PoolAccountInfoV4, ReturnTypeFetchMultipleInfo, ReturnTypeGetAddLiquidityDefaultPool, ReturnTypeGetAllRoute, ReturnTypeMakeSwapInstruction, ReturnTypeMakeSwapTransaction, RoutePathType } from './type.js';
 import '@solana/web3.js';
 import 'bn.js';
-import '../../type-15746482.js';
+import '../../type-9fe71e3c.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.js';
@@ -15,5 +15,5 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-08d7cf11.js';
+import '../../type-085c771c.js';
 import '../clmm/layout.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 { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-15746482.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-9fe71e3c.js';
 import { ReturnTypeMakeSwapInstruction, ComputeAmountOutLayout } from './type.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -14,7 +14,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-08d7cf11.js';
+import '../../type-085c771c.js';
 import '../clmm/layout.js';
 
 declare function route1Instruction(programId: PublicKey, poolInfoA: ApiV3PoolInfoItem, poolKeyA: PoolKeys, poolKeyB: PoolKeys, userSourceToken: PublicKey, userRouteToken: PublicKey, userPdaAccount: PublicKey, ownerWallet: PublicKey, inputMint: PublicKey, amountIn: BN__default, amountOut: BN__default, tickArrayA?: PublicKey[]): TransactionInstruction;

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

@@ -1,7 +1,7 @@
 import '@solana/web3.js';
-export { i as default } from '../../raydium-d05441b6.js';
+export { i as default } from '../../raydium-0396913e.js';
 import './type.js';
-import '../../type-15746482.js';
+import '../../type-9fe71e3c.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
@@ -21,7 +21,7 @@ import '../../module/currency.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-08d7cf11.js';
+import '../../type-085c771c.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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

@@ -1,8 +1,8 @@
 import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-15746482.js';
+import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-9fe71e3c.js';
 import { Token } from '../../module/token.js';
-import { c as ClmmPoolInfo } from '../../type-08d7cf11.js';
+import { c as ClmmPoolInfo } from '../../type-085c771c.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.js';

package/lib/raydium/type.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '@solana/spl-token';
-export { bS as ArrayItem, bI as ComputeBudgetConfig, bZ as Cover, bT as ExactPartial, bU as ExactRequired, bY as Fallback, bL as GetTransferAmountFee, bW as GetValue, bH as InstructionReturn, bJ as LoadParams, bG as MakeMultiTransaction, bE as MakeTransaction, bF as MakeV0Transaction, bP as MayArray, bQ as MayDeepArray, bR as MayFunction, bO as ReplaceType, bM as ReturnTypeFetchMultipleMintInfo, bN as ReturnTypeFetchMultipleMintInfos, bV as SKeyof, bX as SOR, bD as SignAllTransactions, bK as TransferAmountFee, b_ as UnionCover, b$ as unionArr } from '../type-15746482.js';
+export { bS as ArrayItem, bI as ComputeBudgetConfig, bZ as Cover, bT as ExactPartial, bU as ExactRequired, bY as Fallback, bL as GetTransferAmountFee, bW as GetValue, bH as InstructionReturn, bJ as LoadParams, bG as MakeMultiTransaction, bE as MakeTransaction, bF as MakeV0Transaction, bP as MayArray, bQ as MayDeepArray, bR as MayFunction, bO as ReplaceType, bM as ReturnTypeFetchMultipleMintInfo, bN as ReturnTypeFetchMultipleMintInfos, bV as SKeyof, bX as SOR, bD as SignAllTransactions, bK as TransferAmountFee, b_ as UnionCover, b$ as unionArr } from '../type-9fe71e3c.js';
 import 'bn.js';
 import '../solana/type.js';
 import '../common/txTool/txType.js';

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

@@ -1,9 +1,9 @@
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d05441b6.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-0396913e.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-15746482.js';
+import '../../type-9fe71e3c.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-08d7cf11.js';
+import '../../type-085c771c.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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

@@ -1,12 +1,12 @@
 import '../../marshmallow/index.js';
 import '@solana/web3.js';
 import 'bn.js';
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d05441b6.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-0396913e.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-15746482.js';
+import '../../type-9fe71e3c.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-08d7cf11.js';
+import '../../type-085c771c.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-d05441b6.d.ts → raydium-0396913e.d.ts}

@@ -1,6 +1,6 @@
 import { PublicKey, Commitment, Connection, Transaction, Signer, TransactionInstruction, Keypair, EpochInfo } from '@solana/web3.js';
 import { Api } from './api/api.js';
-import { ax as TxBuilder, ap as AddInstructionParam, a9 as BigNumberish, bk as CreateFarm, aw as MakeTxData, bl as CreateFarmExtInfo, bm as UpdateFarmReward, bn as UpdateFarmRewards, bo as FarmDWParam, U as FormatFarmInfoOut, bI as ComputeBudgetConfig, av as MakeMultiTxData, l as ApiV3PoolInfoStandardItem, c5 as Percent, c1 as TokenAmount, s as AmmV4Keys, t as AmmV5Keys, k as ApiV3PoolInfoConcentratedItem, S as FormatFarmInfoOutV6, v as ClmmKeys, bE as MakeTransaction, C as CpmmKeys, bL as GetTransferAmountFee, X as OwnerIdoInfo, Y as IdoKeysData, bJ as LoadParams, J as JupTokenType, bz as TokenInfo, e as ApiV3Token, bD as SignAllTransactions, V as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-15746482.js';
+import { ax as TxBuilder, ap as AddInstructionParam, a9 as BigNumberish, bk as CreateFarm, aw as MakeTxData, bl as CreateFarmExtInfo, bm as UpdateFarmReward, bn as UpdateFarmRewards, bo as FarmDWParam, U as FormatFarmInfoOut, bI as ComputeBudgetConfig, av as MakeMultiTxData, l as ApiV3PoolInfoStandardItem, c5 as Percent, c1 as TokenAmount, s as AmmV4Keys, t as AmmV5Keys, k as ApiV3PoolInfoConcentratedItem, S as FormatFarmInfoOutV6, v as ClmmKeys, bE as MakeTransaction, C as CpmmKeys, bL as GetTransferAmountFee, X as OwnerIdoInfo, Y as IdoKeysData, bJ as LoadParams, J as JupTokenType, bz as TokenInfo, e as ApiV3Token, bD as SignAllTransactions, V as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-9fe71e3c.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 { TxVersion } from './common/txTool/txType.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
 import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, ComputeAmountOutParam, SwapParam } from './raydium/liquidity/type.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 } from './type-08d7cf11.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 } from './type-085c771c.js';
 import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 import { CpmmConfigInfoInterface, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
@@ -439,6 +439,7 @@ declare class TokenModule extends ModuleBase {
     private _tokenMap;
     private _blackTokenMap;
     private _mintGroup;
+    private _whiteMap;
     private _extraTokenList;
     constructor(params: ModuleBaseProps);
     load(params?: LoadParams & {
@@ -451,6 +452,7 @@ declare class TokenModule extends ModuleBase {
         official: Set<string>;
         jup: Set<string>;
     };
+    get whiteListMap(): Set<string>;
     /** === util functions === */
     getTokenInfo(mint: string | PublicKey): Promise<ApiV3Token>;
 }

package/lib/{type-08d7cf11.d.ts → type-085c771c.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 { k as ApiV3PoolInfoConcentratedItem, b as ApiClmmConfigInfo, e as ApiV3Token, bL as GetTransferAmountFee, bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, bI as ComputeBudgetConfig, c3 as Fraction, bz as TokenInfo, v as ClmmKeys } from './type-15746482.js';
+import { k as ApiV3PoolInfoConcentratedItem, b as ApiClmmConfigInfo, e as ApiV3Token, bL as GetTransferAmountFee, bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, bI as ComputeBudgetConfig, c3 as Fraction, bz as TokenInfo, v as ClmmKeys } from './type-9fe71e3c.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
 

package/lib/{type-15746482.d.ts → type-9fe71e3c.d.ts}

@@ -1119,6 +1119,7 @@ declare type ApiV3Token = {
 declare type ApiV3TokenRes = {
     mintList: ApiV3Token[];
     blacklist: ApiV3Token[];
+    whiteList: string[];
 };
 interface ApiV3PoolInfoCountItem {
     volume: number;

package/package.json

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

package/src/api/api.ts

@@ -163,7 +163,7 @@ export class Api {
     return this.api.get(this.urlConfigs.RPCS || API_URLS.RPCS);
   }
 
-  async getTokenList(): Promise<{ mintList: ApiV3Token[]; blacklist: ApiV3Token[] }> {
+  async getTokenList(): Promise<{ mintList: ApiV3Token[]; blacklist: ApiV3Token[]; whiteList: string[] }> {
     const res = await this.api.get(this.urlConfigs.TOKEN_LIST || API_URLS.TOKEN_LIST);
     return res.data;
   }
@@ -244,11 +244,6 @@ export class Api {
     ];
     const [baseMint, quoteMint] = mint2 && mint1 > mint2 ? [mint2, mint1] : [mint1, mint2];
 
-    console.log(
-      123123555,
-      `?mint1=${baseMint}&mint2=${quoteMint}&poolType=${type}&poolSortField=${sort}&sortType=${order}&pageSize=100&page=${page}`,
-    );
-
     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}`,

package/src/api/type.ts

@@ -155,6 +155,7 @@ export type ApiV3Token = {
 export type ApiV3TokenRes = {
   mintList: ApiV3Token[];
   blacklist: ApiV3Token[];
+  whiteList: string[];
 };
 
 export interface ApiV3PoolInfoCountItem {

package/src/raydium/marketV2/createMarket.ts

@@ -7,7 +7,7 @@ import { MakeMultiTxData, TxBuildData, TxV0BuildData } from "@/common/txTool/txT
 import { generatePubKey } from "../account/util";
 import { BN_ZERO } from "@/common/bignumber";
 import { makeCreateMarketInstruction } from "./instrument";
-import { ComputeBudgetConfig } from "@/raydium/type";
+import { ComputeBudgetConfig, MakeMultiTransaction } from "@/raydium/type";
 
 interface ExtInfo {
   address: {
@@ -105,29 +105,30 @@ export default class MarketV2 extends ModuleBase {
       },
     });
     const txBuilder = this.createTxBuilder();
-    txBuilder.addCustomComputeBudget(computeBudgetConfig);
+    // txBuilder.addCustomComputeBudget(computeBudgetConfig);
     txBuilder.addInstruction({
       instructions: allTxArr[0].transaction.instructions,
       signers: allTxArr[0].signer,
     });
 
-    const extraTxBuildData: any[] = [];
+    // const extraTxBuildData: any[] = [];
 
     for await (const txData of allTxArr.slice(1, allTxArr.length)) {
-      const extraTxBuilder = this.createTxBuilder();
-      extraTxBuilder.addCustomComputeBudget(computeBudgetConfig);
-      extraTxBuilder.addInstruction({
+      // const extraTxBuilder = this.createTxBuilder();
+      // extraTxBuilder.addCustomComputeBudget(computeBudgetConfig);
+      txBuilder.addInstruction({
         instructions: txData.transaction.instructions,
         signers: txData.signer,
         instructionTypes: txData.instructionTypes,
       });
-      const build = await extraTxBuilder.versionBuild({ txVersion });
-      extraTxBuildData.push(build);
+
+      // const build = await extraTxBuilder.versionBuild({ txVersion });
+      // extraTxBuildData.push(build);
     }
 
-    return txBuilder.versionMultiBuild<T, ExtInfo>({
-      extraPreBuildData: extraTxBuildData,
-      extInfo: {
+    if (txVersion === TxVersion.V0)
+      return txBuilder.sizeCheckBuildV0({
+        computeBudgetConfig,
         address: {
           marketId: market.publicKey,
           requestQueue: requestQueue.publicKey,
@@ -139,8 +140,21 @@ export default class MarketV2 extends ModuleBase {
           baseMint: new PublicKey(baseInfo.mint),
           quoteMin: new PublicKey(quoteInfo.mint),
         },
+      }) as Promise<MakeMultiTxData<T, ExtInfo>>;
+
+    return txBuilder.sizeCheckBuild({
+      computeBudgetConfig,
+      address: {
+        marketId: market.publicKey,
+        requestQueue: requestQueue.publicKey,
+        eventQueue: eventQueue.publicKey,
+        bids: bids.publicKey,
+        asks: asks.publicKey,
+        baseVault: baseVault.publicKey,
+        quoteVault: quoteVault.publicKey,
+        baseMint: new PublicKey(baseInfo.mint),
+        quoteMin: new PublicKey(quoteInfo.mint),
       },
-      txVersion,
     }) as Promise<MakeMultiTxData<T, ExtInfo>>;
   }
 }

package/src/raydium/token/token.ts

@@ -19,6 +19,7 @@ export default class TokenModule extends ModuleBase {
     jup: new Set(),
     extra: new Set(),
   };
+  private _whiteMap: Set<string> = new Set();
   private _extraTokenList: TokenInfo[] = [];
 
   constructor(params: ModuleBaseProps) {
@@ -28,13 +29,14 @@ export default class TokenModule extends ModuleBase {
   public async load(params?: LoadParams & { type?: JupTokenType }): Promise<void> {
     this.checkDisabled();
     const { forceUpdate = false, type = JupTokenType.Strict } = params || {};
-    const { mintList, blacklist } = await this.scope.fetchV3TokenList(forceUpdate);
+    const { mintList, blacklist, whiteList } = await this.scope.fetchV3TokenList(forceUpdate);
     const jup = await this.scope.fetchJupTokenList(type, forceUpdate);
     // reset all data
     this._tokenList = [];
     this._tokenMap = new Map();
     this._blackTokenMap = new Map();
     this._mintGroup = { official: new Set(), jup: new Set(), extra: new Set() };
+    this._whiteMap = new Set(whiteList);
 
     this._tokenMap.set(SOL_INFO.address, SOL_INFO);
     this._mintGroup.official.add(SOL_INFO.address);
@@ -97,6 +99,9 @@ export default class TokenModule extends ModuleBase {
   get mintGroup(): { official: Set<string>; jup: Set<string> } {
     return this._mintGroup;
   }
+  get whiteListMap(): Set<string> {
+    return this._whiteMap;
+  }
 
   /** === util functions === */