forgex-cli 1.0.20 → 1.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/adapters/jito-adapter.d.ts +25 -1
- package/dist/src/adapters/jito-adapter.d.ts.map +1 -1
- package/dist/src/adapters/jito-adapter.js +56 -2
- package/dist/src/adapters/jito-adapter.js.map +1 -1
- package/dist/src/adapters/rpc-adapter.d.ts.map +1 -1
- package/dist/src/adapters/rpc-adapter.js +23 -4
- package/dist/src/adapters/rpc-adapter.js.map +1 -1
- package/dist/src/adapters/sdk-adapter.d.ts.map +1 -1
- package/dist/src/adapters/sdk-adapter.js +74 -36
- package/dist/src/adapters/sdk-adapter.js.map +1 -1
- package/dist/src/commands/tools/index.d.ts.map +1 -1
- package/dist/src/commands/tools/index.js +17 -5
- package/dist/src/commands/tools/index.js.map +1 -1
- package/dist/src/const/IDL/pump-swap-IDL.d.ts +5696 -1503
- package/dist/src/const/IDL/pump-swap-IDL.d.ts.map +1 -1
- package/dist/src/const/IDL/pump-swap-IDL.js +5419 -1245
- package/dist/src/const/IDL/pump-swap-IDL.js.map +1 -1
- package/dist/src/data-source.d.ts +14 -0
- package/dist/src/data-source.d.ts.map +1 -1
- package/dist/src/data-source.js +25 -0
- package/dist/src/data-source.js.map +1 -1
- package/dist/src/sol-sdk/batch/create.d.ts.map +1 -1
- package/dist/src/sol-sdk/batch/create.js +67 -133
- package/dist/src/sol-sdk/batch/create.js.map +1 -1
- package/dist/src/sol-sdk/batch/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/batch/index.js +54 -32
- package/dist/src/sol-sdk/batch/index.js.map +1 -1
- package/dist/src/sol-sdk/jito/index.d.ts +2 -0
- package/dist/src/sol-sdk/jito/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/jito/index.js +36 -13
- package/dist/src/sol-sdk/jito/index.js.map +1 -1
- package/dist/src/sol-sdk/pump/index.d.ts +1 -0
- package/dist/src/sol-sdk/pump/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/pump/index.js +3 -0
- package/dist/src/sol-sdk/pump/index.js.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/buy.d.ts.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/buy.js +57 -47
- package/dist/src/sol-sdk/pump/instructions/buy.js.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/sell.d.ts.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/sell.js +52 -37
- package/dist/src/sol-sdk/pump/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/index.d.ts +15 -1
- package/dist/src/sol-sdk/pumpswap/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/pumpswap/index.js +39 -2
- package/dist/src/sol-sdk/pumpswap/index.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/buy.d.ts +7 -2
- package/dist/src/sol-sdk/pumpswap/instructions/buy.d.ts.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/buy.js +60 -41
- package/dist/src/sol-sdk/pumpswap/instructions/buy.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/sell.d.ts +2 -0
- package/dist/src/sol-sdk/pumpswap/instructions/sell.d.ts.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/sell.js +41 -36
- package/dist/src/sol-sdk/pumpswap/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/turnover/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/turnover/index.js +44 -20
- package/dist/src/sol-sdk/turnover/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,9 +6,9 @@ import BigNumber from 'bignumber.js';
|
|
|
6
6
|
import { Program } from '@coral-xyz/anchor';
|
|
7
7
|
import { IDL } from '../../../const/IDL/pump-swap-IDL.js';
|
|
8
8
|
import { AnchorProvider } from '@coral-xyz/anchor';
|
|
9
|
-
import { PUMP_SWAP_GLOBAL_CONFIG, PUMP_FEE_RECEIPENT, PUMP_SWAP_PROGRAM,
|
|
9
|
+
import { PUMP_SWAP_GLOBAL_CONFIG, PUMP_FEE_RECEIPENT, PUMP_SWAP_PROGRAM, ASSOCIATED_TOKEN_PROGRAM_ID, PUMP_SWAP_EVENT_AUTHORITY, PUMP_SWAP_FEE_CONFIG, PUMP_SWAP_FEE_PROGRAM, } from '../../../const/index.js';
|
|
10
10
|
import { getCoinCreatorVaultAtaPda, getCoinCreatorVaultAuthorityPda } from '../rpc/index.js';
|
|
11
|
-
import { getGlobalVolumeAccumulatorPDA, getUserVolumeAccumulatorPDA } from '../index.js';
|
|
11
|
+
import { getGlobalVolumeAccumulatorPDA, getUserVolumeAccumulatorPDA, getPoolV2PDA } from '../index.js';
|
|
12
12
|
const BUY_DISCRIMINATOR = new Uint8Array([102, 6, 61, 18, 1, 218, 235, 234]);
|
|
13
13
|
export const calcOutAmountByNewPool = ({ amount, slippageDecimal, }) => {
|
|
14
14
|
const poolInfo = {
|
|
@@ -44,13 +44,27 @@ export const getPoolInfo = async (connection, poolId) => {
|
|
|
44
44
|
},
|
|
45
45
|
}, {});
|
|
46
46
|
let program = new Program(IDL, provider);
|
|
47
|
-
|
|
48
|
-
const
|
|
47
|
+
// 兼容新旧 IDL:Pool (PascalCase) 或 pool (camelCase)
|
|
48
|
+
const accountNs = program.account.pool || program.account.Pool;
|
|
49
|
+
const account = await accountNs.fetch(new PublicKey(poolId));
|
|
50
|
+
// 兼容 camelCase(旧 IDL)和 snake_case(新 IDL)字段名
|
|
51
|
+
const baseMint = account.baseMint ?? account.base_mint;
|
|
52
|
+
const quoteMint = account.quoteMint ?? account.quote_mint;
|
|
53
|
+
const poolBaseTokenAccount = account.poolBaseTokenAccount ?? account.pool_base_token_account;
|
|
54
|
+
const poolQuoteTokenAccount = account.poolQuoteTokenAccount ?? account.pool_quote_token_account;
|
|
55
|
+
const coinCreator = account.coinCreator ?? account.coin_creator;
|
|
49
56
|
const { mintAProgram, mintBProgram } = await getMintTokenPrograms(connection, poolBaseTokenAccount, poolQuoteTokenAccount);
|
|
50
57
|
const [poolBaseTokenInfo, poolQuoteTokenInfo] = await Promise.all([
|
|
51
58
|
decodePoolInfo(mintAProgram.data),
|
|
52
59
|
decodePoolInfo(mintBProgram.data),
|
|
53
60
|
]);
|
|
61
|
+
// 检测 base/quote mint 的 token program(Token vs Token-2022)
|
|
62
|
+
const [baseMintInfo, quoteMintInfo] = await Promise.all([
|
|
63
|
+
connection.getAccountInfo(new PublicKey(baseMint)),
|
|
64
|
+
connection.getAccountInfo(new PublicKey(quoteMint)),
|
|
65
|
+
]);
|
|
66
|
+
const baseTokenProgram = baseMintInfo?.owner || TOKEN_PROGRAM_ID;
|
|
67
|
+
const quoteTokenProgram = quoteMintInfo?.owner || TOKEN_PROGRAM_ID;
|
|
54
68
|
return {
|
|
55
69
|
poolId,
|
|
56
70
|
poolBaseTokenInfo,
|
|
@@ -59,6 +73,9 @@ export const getPoolInfo = async (connection, poolId) => {
|
|
|
59
73
|
vaultB: poolQuoteTokenAccount,
|
|
60
74
|
mintA: new PublicKey(baseMint).toBase58(),
|
|
61
75
|
mintB: new PublicKey(quoteMint).toBase58(),
|
|
76
|
+
baseTokenProgram,
|
|
77
|
+
quoteTokenProgram,
|
|
78
|
+
coinCreator: new PublicKey(coinCreator),
|
|
62
79
|
};
|
|
63
80
|
};
|
|
64
81
|
const decodePoolInfo = async (data) => {
|
|
@@ -92,6 +109,13 @@ export const buyInstruction = async ({ owner, poolInfo, wsolAmount, tokenAmount,
|
|
|
92
109
|
const maxQuoteAmountIn = new BigNumber(wsolAmount.toString()).times(1 + slippage).toFixed(0);
|
|
93
110
|
if (poolInfo?.mintA !== inputMint && poolInfo?.mintB !== inputMint)
|
|
94
111
|
return Promise.reject(new Error('input mint does not match pool'));
|
|
112
|
+
// 确定 base/quote token program(支持 Token-2022)
|
|
113
|
+
const tokenMint = poolInfo.mintA == NATIVE_MINT.toBase58() ? poolInfo.mintB : poolInfo.mintA;
|
|
114
|
+
const baseTokenProgramId = poolInfo.baseTokenProgram || TOKEN_PROGRAM_ID;
|
|
115
|
+
const quoteTokenProgramId = poolInfo.quoteTokenProgram || TOKEN_PROGRAM_ID;
|
|
116
|
+
// base/quote 与 mintA/mintB 的对应关系
|
|
117
|
+
const mintATokenProgram = poolInfo.mintA === inputMint ? quoteTokenProgramId : baseTokenProgramId;
|
|
118
|
+
const mintBTokenProgram = poolInfo.mintB === inputMint ? quoteTokenProgramId : baseTokenProgramId;
|
|
95
119
|
const transaction = new Transaction();
|
|
96
120
|
const baseLamports = 2039280;
|
|
97
121
|
// 如果提供了初始 wsolAccount,使用它;否则创建新的
|
|
@@ -106,37 +130,32 @@ export const buyInstruction = async ({ owner, poolInfo, wsolAmount, tokenAmount,
|
|
|
106
130
|
programId: TOKEN_PROGRAM_ID,
|
|
107
131
|
seed,
|
|
108
132
|
});
|
|
109
|
-
|
|
110
|
-
const
|
|
133
|
+
// 使用正确的 token program 获取 ATA(支持 Token-2022)
|
|
134
|
+
const tokenProgramForMint = poolInfo.mintA === inputMint ? mintBTokenProgram : mintATokenProgram;
|
|
135
|
+
const tokenAccount = await getAssociatedTokenAddress(new PublicKey(tokenMint), owner.publicKey, false, tokenProgramForMint);
|
|
111
136
|
// 只有在需要创建 Token Account 时才创建
|
|
112
137
|
if (needCreateAtaAccount) {
|
|
113
138
|
transaction.add(createWsolAccount, createInitializeAccountInstruction(wsolAccount, NATIVE_MINT, owner.publicKey));
|
|
114
|
-
transaction.add(createAssociatedTokenAccountIdempotentInstruction(owner.publicKey, tokenAccount, owner.publicKey, new PublicKey(tokenMint)));
|
|
139
|
+
transaction.add(createAssociatedTokenAccountIdempotentInstruction(owner.publicKey, tokenAccount, owner.publicKey, new PublicKey(tokenMint), tokenProgramForMint));
|
|
115
140
|
}
|
|
116
141
|
const [poolBaseTokenAccount, poolQuoteTokenAccount] = await Promise.all([
|
|
117
|
-
getAssociatedTokenAddress(new PublicKey(poolInfo.mintA), new PublicKey(poolInfo.poolId), true),
|
|
118
|
-
getAssociatedTokenAddress(new PublicKey(poolInfo.mintB), new PublicKey(poolInfo.poolId), true),
|
|
142
|
+
getAssociatedTokenAddress(new PublicKey(poolInfo.mintA), new PublicKey(poolInfo.poolId), true, mintATokenProgram),
|
|
143
|
+
getAssociatedTokenAddress(new PublicKey(poolInfo.mintB), new PublicKey(poolInfo.poolId), true, mintBTokenProgram),
|
|
119
144
|
]);
|
|
120
145
|
const coin_creator_vault_authority_data = getCoinCreatorVaultAuthorityPda(creator, PUMP_SWAP_PROGRAM);
|
|
121
146
|
const coin_creator_vault_authority = coin_creator_vault_authority_data[0];
|
|
122
|
-
const coin_creator_vault_ata_data = getCoinCreatorVaultAtaPda(coin_creator_vault_authority,
|
|
147
|
+
const coin_creator_vault_ata_data = getCoinCreatorVaultAtaPda(coin_creator_vault_authority, quoteTokenProgramId, NATIVE_MINT);
|
|
123
148
|
const coin_creator_vault_ata = coin_creator_vault_ata_data[0];
|
|
149
|
+
// protocol_fee_recipient_token_account PDA(使用 quote token program)
|
|
150
|
+
const protocolFeeRecipientAta = getCoinCreatorVaultAtaPda(PUMP_FEE_RECEIPENT, quoteTokenProgramId, new PublicKey(poolInfo.mintA === inputMint ? poolInfo.mintA : poolInfo.mintB))[0];
|
|
124
151
|
const globalVolumeAccumulator = getGlobalVolumeAccumulatorPDA();
|
|
125
152
|
const userVolumeAccumulator = getUserVolumeAccumulatorPDA(owner.publicKey);
|
|
126
153
|
const accounts = [
|
|
127
|
-
{ pubkey: new PublicKey(poolInfo.poolId), isSigner: false, isWritable:
|
|
154
|
+
{ pubkey: new PublicKey(poolInfo.poolId), isSigner: false, isWritable: true }, // pool (writable)
|
|
128
155
|
{ pubkey: owner.publicKey, isSigner: true, isWritable: true }, // user (signer)
|
|
129
|
-
{ pubkey: PUMP_SWAP_GLOBAL_CONFIG, isSigner: false, isWritable: false }, //
|
|
130
|
-
{
|
|
131
|
-
|
|
132
|
-
isSigner: false,
|
|
133
|
-
isWritable: false,
|
|
134
|
-
}, // mint (readonly)
|
|
135
|
-
{
|
|
136
|
-
pubkey: new PublicKey(poolInfo.mintB),
|
|
137
|
-
isSigner: false,
|
|
138
|
-
isWritable: false,
|
|
139
|
-
}, // WSOL_TOKEN_ACCOUNT (readonly)
|
|
156
|
+
{ pubkey: PUMP_SWAP_GLOBAL_CONFIG, isSigner: false, isWritable: false }, // global_config
|
|
157
|
+
{ pubkey: new PublicKey(poolInfo.mintA), isSigner: false, isWritable: false }, // base_mint
|
|
158
|
+
{ pubkey: new PublicKey(poolInfo.mintB), isSigner: false, isWritable: false }, // quote_mint
|
|
140
159
|
{
|
|
141
160
|
pubkey: poolInfo.mintA === NATIVE_MINT.toBase58() ? wsolAccount : tokenAccount,
|
|
142
161
|
isSigner: false,
|
|
@@ -149,26 +168,25 @@ export const buyInstruction = async ({ owner, poolInfo, wsolAmount, tokenAmount,
|
|
|
149
168
|
}, // user_quote_token_account
|
|
150
169
|
{ pubkey: poolBaseTokenAccount, isSigner: false, isWritable: true }, // pool_base_token_account
|
|
151
170
|
{ pubkey: poolQuoteTokenAccount, isSigner: false, isWritable: true }, // pool_quote_token_account
|
|
152
|
-
{ pubkey: PUMP_FEE_RECEIPENT, isSigner: false, isWritable: false }, //
|
|
153
|
-
{ pubkey:
|
|
154
|
-
{ pubkey:
|
|
155
|
-
{ pubkey:
|
|
156
|
-
{ pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, //
|
|
157
|
-
{ pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, //
|
|
158
|
-
{ pubkey: PUMP_SWAP_EVENT_AUTHORITY, isSigner: false, isWritable: false }, // event_authority
|
|
159
|
-
{ pubkey: PUMP_SWAP_PROGRAM, isSigner: false, isWritable: false }, //
|
|
160
|
-
{ pubkey: coin_creator_vault_ata, isSigner: false, isWritable: true }, // coin_creator_vault_ata
|
|
161
|
-
{ pubkey: coin_creator_vault_authority, isSigner: false, isWritable: false }, // coin_creator_vault_authority
|
|
162
|
-
{
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
{ pubkey:
|
|
168
|
-
{ pubkey: PUMP_SWAP_FEE_CONFIG, isSigner: false, isWritable: false }, // pump_swap_fee_config (readonly)
|
|
169
|
-
{ pubkey: PUMP_SWAP_FEE_PROGRAM, isSigner: false, isWritable: false }, // pump_swap_fee_program (readonly)
|
|
171
|
+
{ pubkey: PUMP_FEE_RECEIPENT, isSigner: false, isWritable: false }, // protocol_fee_recipient
|
|
172
|
+
{ pubkey: protocolFeeRecipientAta, isSigner: false, isWritable: true }, // protocol_fee_recipient_token_account
|
|
173
|
+
{ pubkey: mintATokenProgram, isSigner: false, isWritable: false }, // base_token_program
|
|
174
|
+
{ pubkey: mintBTokenProgram, isSigner: false, isWritable: false }, // quote_token_program
|
|
175
|
+
{ pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, // system_program
|
|
176
|
+
{ pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // associated_token_program
|
|
177
|
+
{ pubkey: PUMP_SWAP_EVENT_AUTHORITY, isSigner: false, isWritable: false }, // event_authority
|
|
178
|
+
{ pubkey: PUMP_SWAP_PROGRAM, isSigner: false, isWritable: false }, // program
|
|
179
|
+
{ pubkey: coin_creator_vault_ata, isSigner: false, isWritable: true }, // coin_creator_vault_ata
|
|
180
|
+
{ pubkey: coin_creator_vault_authority, isSigner: false, isWritable: false }, // coin_creator_vault_authority
|
|
181
|
+
{ pubkey: globalVolumeAccumulator, isSigner: false, isWritable: false }, // global_volume_accumulator
|
|
182
|
+
{ pubkey: userVolumeAccumulator, isSigner: false, isWritable: true }, // user_volume_accumulator
|
|
183
|
+
{ pubkey: PUMP_SWAP_FEE_CONFIG, isSigner: false, isWritable: false }, // fee_config
|
|
184
|
+
{ pubkey: PUMP_SWAP_FEE_PROGRAM, isSigner: false, isWritable: false }, // fee_program
|
|
185
|
+
// PumpFun 升级:追加 pool_v2 PDA (readonly)
|
|
186
|
+
{ pubkey: getPoolV2PDA(new PublicKey(poolInfo.mintA === inputMint ? poolInfo.mintB : poolInfo.mintA)), isSigner: false, isWritable: false },
|
|
170
187
|
];
|
|
171
|
-
|
|
188
|
+
// 8 (discriminator) + 8 (base_amount_out) + 8 (max_quote_amount_in) + 1 (track_volume: OptionBool)
|
|
189
|
+
const data = Buffer.alloc(8 + 8 + 8 + 1);
|
|
172
190
|
data.set(BUY_DISCRIMINATOR, 0);
|
|
173
191
|
// 浏览器兼容的BigInt写入方法
|
|
174
192
|
const writeBigUInt64LE = (buffer, value, offset) => {
|
|
@@ -180,6 +198,7 @@ export const buyInstruction = async ({ owner, poolInfo, wsolAmount, tokenAmount,
|
|
|
180
198
|
};
|
|
181
199
|
writeBigUInt64LE(data, BigInt(baseAmountOut.toString()), 8);
|
|
182
200
|
writeBigUInt64LE(data, BigInt(maxQuoteAmountIn.toString()), 16);
|
|
201
|
+
data.writeUInt8(0, 24); // track_volume = false (OptionBool)
|
|
183
202
|
transaction.add(new TransactionInstruction({
|
|
184
203
|
keys: accounts,
|
|
185
204
|
programId: PUMP_SWAP_PROGRAM,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/buy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/buy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sell.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/sell.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,WAAW,EACX,OAAO,EACP,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AAgBvB,eAAO,MAAM,mBAAmB,GAAU,uLAYvC;IACD,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sell.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/sell.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,WAAW,EACX,OAAO,EACP,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AAgBvB,eAAO,MAAM,mBAAmB,GAAU,uLAYvC;IACD,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,SAAS,CAAC;QAC7B,iBAAiB,CAAC,EAAE,SAAS,CAAC;KAC/B,CAAC;IACF,UAAU,EAAE,EAAE,CAAC;IACf,WAAW,EAAE,EAAE,CAAC;IAChB,OAAO,EAAE,SAAS,CAAC;IACnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,4BAA4B,CAAC,EAAE,sBAAsB,CAAC;CACvD,KAAG,OAAO,CAAC,WAAW,CAyJtB,CAAC"}
|
|
@@ -2,8 +2,9 @@ import { NATIVE_MINT, getAssociatedTokenAddress, createAssociatedTokenAccountIde
|
|
|
2
2
|
import { Transaction, Keypair, PublicKey, SystemProgram, TransactionInstruction, } from '@solana/web3.js';
|
|
3
3
|
import BN from 'bn.js';
|
|
4
4
|
import BigNumber from 'bignumber.js';
|
|
5
|
-
import { PUMP_SWAP_GLOBAL_CONFIG, PUMP_FEE_RECEIPENT, PUMP_SWAP_PROGRAM,
|
|
5
|
+
import { PUMP_SWAP_GLOBAL_CONFIG, PUMP_FEE_RECEIPENT, PUMP_SWAP_PROGRAM, ASSOCIATED_TOKEN_PROGRAM_ID, PUMP_SWAP_EVENT_AUTHORITY, PUMP_SWAP_FEE_CONFIG, PUMP_SWAP_FEE_PROGRAM, } from '../../../const/index.js';
|
|
6
6
|
import { getCoinCreatorVaultAuthorityPda, getCoinCreatorVaultAtaPda } from '../rpc/index.js';
|
|
7
|
+
import { getPoolV2PDA } from '../index.js';
|
|
7
8
|
const SELL_DISCRIMINATOR = new Uint8Array([51, 230, 133, 164, 1, 127, 131, 173]);
|
|
8
9
|
export const sellSPLInstructions = async ({ owner, slippage = 0.01, poolInfo, wsolAmount, tokenAmount, creator, needCreateAtaAccount = true, needCloseTokenAccount = false, needCloseWsolAccount = true, initialWsolAccount, createWsolAccountInstruction, }) => {
|
|
9
10
|
const inputMint = NATIVE_MINT.toBase58();
|
|
@@ -13,6 +14,12 @@ export const sellSPLInstructions = async ({ owner, slippage = 0.01, poolInfo, ws
|
|
|
13
14
|
const minQuoteAmountOut = new BigNumber(wsolAmount.toString()).times(1 - slippage).toFixed(0);
|
|
14
15
|
if (poolInfo?.mintA !== inputMint && poolInfo?.mintB !== inputMint)
|
|
15
16
|
return Promise.reject(new Error('input mint does not match pool'));
|
|
17
|
+
// 确定 base/quote token program(支持 Token-2022)
|
|
18
|
+
const tokenMint = poolInfo.mintA == NATIVE_MINT.toBase58() ? poolInfo.mintB : poolInfo.mintA;
|
|
19
|
+
const baseTokenProgramId = poolInfo.baseTokenProgram || TOKEN_PROGRAM_ID;
|
|
20
|
+
const quoteTokenProgramId = poolInfo.quoteTokenProgram || TOKEN_PROGRAM_ID;
|
|
21
|
+
const mintATokenProgram = poolInfo.mintA === inputMint ? quoteTokenProgramId : baseTokenProgramId;
|
|
22
|
+
const mintBTokenProgram = poolInfo.mintB === inputMint ? quoteTokenProgramId : baseTokenProgramId;
|
|
16
23
|
const transaction = new Transaction();
|
|
17
24
|
const baseLamports = 2039280;
|
|
18
25
|
const wsolAccount = initialWsolAccount || (await PublicKey.createWithSeed(owner.publicKey, seed, TOKEN_PROGRAM_ID));
|
|
@@ -26,59 +33,57 @@ export const sellSPLInstructions = async ({ owner, slippage = 0.01, poolInfo, ws
|
|
|
26
33
|
programId: TOKEN_PROGRAM_ID,
|
|
27
34
|
seed,
|
|
28
35
|
});
|
|
29
|
-
|
|
30
|
-
const
|
|
36
|
+
// 使用正确的 token program 获取 ATA(支持 Token-2022)
|
|
37
|
+
const tokenProgramForMint = poolInfo.mintA === inputMint ? mintBTokenProgram : mintATokenProgram;
|
|
38
|
+
const tokenAccount = await getAssociatedTokenAddress(new PublicKey(tokenMint), owner.publicKey, false, tokenProgramForMint);
|
|
31
39
|
if (needCreateAtaAccount) {
|
|
32
40
|
transaction.add(createWsolAccount, createInitializeAccountInstruction(wsolAccount, NATIVE_MINT, owner.publicKey));
|
|
33
|
-
transaction.add(createAssociatedTokenAccountIdempotentInstruction(owner.publicKey, tokenAccount, owner.publicKey, new PublicKey(tokenMint)));
|
|
41
|
+
transaction.add(createAssociatedTokenAccountIdempotentInstruction(owner.publicKey, tokenAccount, owner.publicKey, new PublicKey(tokenMint), tokenProgramForMint));
|
|
34
42
|
}
|
|
35
43
|
const [poolBaseTokenAccount, poolQuoteTokenAccount] = await Promise.all([
|
|
36
|
-
getAssociatedTokenAddress(new PublicKey(poolInfo.mintA), new PublicKey(poolInfo.poolId), true),
|
|
37
|
-
getAssociatedTokenAddress(new PublicKey(poolInfo.mintB), new PublicKey(poolInfo.poolId), true),
|
|
44
|
+
getAssociatedTokenAddress(new PublicKey(poolInfo.mintA), new PublicKey(poolInfo.poolId), true, mintATokenProgram),
|
|
45
|
+
getAssociatedTokenAddress(new PublicKey(poolInfo.mintB), new PublicKey(poolInfo.poolId), true, mintBTokenProgram),
|
|
38
46
|
]);
|
|
39
47
|
const coin_creator_vault_authority_data = getCoinCreatorVaultAuthorityPda(creator, PUMP_SWAP_PROGRAM);
|
|
40
48
|
const coin_creator_vault_authority = coin_creator_vault_authority_data[0];
|
|
41
|
-
const coin_creator_vault_ata_data = getCoinCreatorVaultAtaPda(coin_creator_vault_authority,
|
|
49
|
+
const coin_creator_vault_ata_data = getCoinCreatorVaultAtaPda(coin_creator_vault_authority, quoteTokenProgramId, NATIVE_MINT);
|
|
42
50
|
const coin_creator_vault_ata = coin_creator_vault_ata_data[0];
|
|
51
|
+
// protocol_fee_recipient_token_account PDA(使用 quote token program)
|
|
52
|
+
const protocolFeeRecipientAta = getCoinCreatorVaultAtaPda(PUMP_FEE_RECEIPENT, quoteTokenProgramId, new PublicKey(poolInfo.mintA === inputMint ? poolInfo.mintA : poolInfo.mintB))[0];
|
|
43
53
|
const accounts = [
|
|
44
|
-
{ pubkey: new PublicKey(poolInfo.poolId), isSigner: false, isWritable:
|
|
45
|
-
{ pubkey: owner.publicKey, isSigner: true, isWritable: true },
|
|
46
|
-
{ pubkey: PUMP_SWAP_GLOBAL_CONFIG, isSigner: false, isWritable: false },
|
|
47
|
-
{
|
|
48
|
-
|
|
49
|
-
isSigner: false,
|
|
50
|
-
isWritable: false,
|
|
51
|
-
},
|
|
52
|
-
{
|
|
53
|
-
pubkey: new PublicKey(poolInfo.mintB),
|
|
54
|
-
isSigner: false,
|
|
55
|
-
isWritable: false,
|
|
56
|
-
},
|
|
54
|
+
{ pubkey: new PublicKey(poolInfo.poolId), isSigner: false, isWritable: true }, // pool (writable)
|
|
55
|
+
{ pubkey: owner.publicKey, isSigner: true, isWritable: true }, // user (signer)
|
|
56
|
+
{ pubkey: PUMP_SWAP_GLOBAL_CONFIG, isSigner: false, isWritable: false }, // global_config
|
|
57
|
+
{ pubkey: new PublicKey(poolInfo.mintA), isSigner: false, isWritable: false }, // base_mint
|
|
58
|
+
{ pubkey: new PublicKey(poolInfo.mintB), isSigner: false, isWritable: false }, // quote_mint
|
|
57
59
|
{
|
|
58
60
|
pubkey: poolInfo.mintA === NATIVE_MINT.toBase58() ? wsolAccount : tokenAccount,
|
|
59
61
|
isSigner: false,
|
|
60
62
|
isWritable: true,
|
|
61
|
-
},
|
|
63
|
+
}, // user_base_token_account
|
|
62
64
|
{
|
|
63
65
|
pubkey: poolInfo.mintA === NATIVE_MINT.toBase58() ? tokenAccount : wsolAccount,
|
|
64
66
|
isSigner: false,
|
|
65
67
|
isWritable: true,
|
|
66
|
-
},
|
|
67
|
-
{ pubkey: poolBaseTokenAccount, isSigner: false, isWritable: true },
|
|
68
|
-
{ pubkey: poolQuoteTokenAccount, isSigner: false, isWritable: true },
|
|
69
|
-
{ pubkey: PUMP_FEE_RECEIPENT, isSigner: false, isWritable: false },
|
|
70
|
-
{ pubkey:
|
|
71
|
-
{ pubkey:
|
|
72
|
-
{ pubkey:
|
|
73
|
-
{ pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
|
|
74
|
-
{ pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
75
|
-
{ pubkey: PUMP_SWAP_EVENT_AUTHORITY, isSigner: false, isWritable: false },
|
|
76
|
-
{ pubkey: PUMP_SWAP_PROGRAM, isSigner: false, isWritable: false },
|
|
77
|
-
{ pubkey: coin_creator_vault_ata, isSigner: false, isWritable: true },
|
|
78
|
-
{ pubkey: coin_creator_vault_authority, isSigner: false, isWritable: false },
|
|
79
|
-
{ pubkey: PUMP_SWAP_FEE_CONFIG, isSigner: false, isWritable: false },
|
|
80
|
-
{ pubkey: PUMP_SWAP_FEE_PROGRAM, isSigner: false, isWritable: false },
|
|
68
|
+
}, // user_quote_token_account
|
|
69
|
+
{ pubkey: poolBaseTokenAccount, isSigner: false, isWritable: true }, // pool_base_token_account
|
|
70
|
+
{ pubkey: poolQuoteTokenAccount, isSigner: false, isWritable: true }, // pool_quote_token_account
|
|
71
|
+
{ pubkey: PUMP_FEE_RECEIPENT, isSigner: false, isWritable: false }, // protocol_fee_recipient
|
|
72
|
+
{ pubkey: protocolFeeRecipientAta, isSigner: false, isWritable: true }, // protocol_fee_recipient_token_account
|
|
73
|
+
{ pubkey: mintATokenProgram, isSigner: false, isWritable: false }, // base_token_program
|
|
74
|
+
{ pubkey: mintBTokenProgram, isSigner: false, isWritable: false }, // quote_token_program
|
|
75
|
+
{ pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, // system_program
|
|
76
|
+
{ pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }, // associated_token_program
|
|
77
|
+
{ pubkey: PUMP_SWAP_EVENT_AUTHORITY, isSigner: false, isWritable: false }, // event_authority
|
|
78
|
+
{ pubkey: PUMP_SWAP_PROGRAM, isSigner: false, isWritable: false }, // program
|
|
79
|
+
{ pubkey: coin_creator_vault_ata, isSigner: false, isWritable: true }, // coin_creator_vault_ata
|
|
80
|
+
{ pubkey: coin_creator_vault_authority, isSigner: false, isWritable: false }, // coin_creator_vault_authority
|
|
81
|
+
{ pubkey: PUMP_SWAP_FEE_CONFIG, isSigner: false, isWritable: false }, // fee_config
|
|
82
|
+
{ pubkey: PUMP_SWAP_FEE_PROGRAM, isSigner: false, isWritable: false }, // fee_program
|
|
83
|
+
// PumpFun 升级:追加 pool_v2 PDA (readonly)
|
|
84
|
+
{ pubkey: getPoolV2PDA(new PublicKey(poolInfo.mintA === inputMint ? poolInfo.mintB : poolInfo.mintA)), isSigner: false, isWritable: false },
|
|
81
85
|
];
|
|
86
|
+
// 8 (discriminator) + 8 (base_amount_in) + 8 (min_quote_amount_out)
|
|
82
87
|
const data = Buffer.alloc(8 + 8 + 8);
|
|
83
88
|
data.set(SELL_DISCRIMINATOR, 0);
|
|
84
89
|
const writeBigUInt64LE = (buffer, value, offset) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sell.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/sell.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,yBAAyB,EACzB,iDAAiD,EACjD,6BAA6B,EAC7B,gBAAgB,EAChB,kCAAkC,GACnC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,WAAW,EACX,OAAO,EACP,SAAS,EACT,aAAa,EACb,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"sell.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pumpswap/instructions/sell.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sol-sdk/turnover/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EASX,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sol-sdk/turnover/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,13 @@ import { AnchorProvider } from '@coral-xyz/anchor';
|
|
|
2
2
|
import { PublicKey, Transaction, LAMPORTS_PER_SOL, } from '@solana/web3.js';
|
|
3
3
|
import { pumpBuySPLInstructions, pumpSellSPLInstructions } from '../pump/index.js';
|
|
4
4
|
import { raydiumSellInstruction, raydiumGetPoolInfo, raydiumGetCpmmPoolInfo, raydiumCpmmSwapBaseOutBuyInstruction, raydiumCpmmSellInstruction, raydiumBuyExactOutInstruction, } from '../raydium/index.js';
|
|
5
|
-
import { pumpSwapBuyInstruction, pumpSwapSellInstruction, pumpSwapGetPoolInfo } from '../pumpswap/index.js';
|
|
5
|
+
import { pumpSwapBuyInstruction, pumpSwapSellInstruction, pumpSwapGetPoolInfo, getInitUserVolumeAccumulatorIxIfNeeded } from '../pumpswap/index.js';
|
|
6
6
|
import { getLaunchlabReverseInfo, launchlabBuyExactOutInstruction, launchlabSellExactInInstruction, } from '../launchlab/index.js';
|
|
7
7
|
import { meteoraDlmmBuyExactOutInstructions, meteoraDlmmSellInstructions } from '../meteora/index.js';
|
|
8
8
|
import AmmCalc, { LaunchlabAmmCalc } from '../calc.js';
|
|
9
9
|
import { NATIVE_MINT } from '@solana/spl-token';
|
|
10
10
|
import BN from 'bn.js';
|
|
11
11
|
import BigNumber from 'bignumber.js';
|
|
12
|
-
import JitoJsonRpcClient from '../jito/index.js';
|
|
13
12
|
import { getWalletKeypair } from '../../utils/index.js';
|
|
14
13
|
import { transferSOLInstruction } from '../transfer/index.js';
|
|
15
14
|
import { getJitoAdapter } from '../../adapters/jito-adapter.js';
|
|
@@ -33,7 +32,7 @@ import { getBinArray } from '../meteora/index.js';
|
|
|
33
32
|
export const executeSingleTurnover = async (params) => {
|
|
34
33
|
const { connection, fromWallet, toWallet, tokenAddress, tokenAmount, decimals, exchangeName, poolInfo, priceInSol, creatorAddress, priorityFee, slippage = 1, tipAddress, commissionAmount, pumpfunReverseInfo, ammReverseInfo, raydiumV4Keys, raydiumCpmmKeys, pumpswapReverseInfo, launchlabReverseInfo, meteoraDLMMReverseInfo, } = params;
|
|
35
34
|
try {
|
|
36
|
-
const
|
|
35
|
+
const jitoAdapter = getJitoAdapter();
|
|
37
36
|
const blockhash = (await connection.getLatestBlockhash()).blockhash;
|
|
38
37
|
const fromKeypair = getWalletKeypair(fromWallet);
|
|
39
38
|
const toKeypair = getWalletKeypair(toWallet);
|
|
@@ -92,35 +91,47 @@ export const executeSingleTurnover = async (params) => {
|
|
|
92
91
|
meteoraDLMMReverseInfo,
|
|
93
92
|
binArray,
|
|
94
93
|
});
|
|
95
|
-
const tipTx =
|
|
94
|
+
const tipTx = jitoAdapter.getTipInstruction(fromKeypair.publicKey, priorityFee);
|
|
96
95
|
sellTx.add(tipTx);
|
|
97
96
|
buyTx.sign(toKeypair);
|
|
98
97
|
sellTx.sign(fromKeypair);
|
|
99
98
|
const simulation1 = await connection.simulateTransaction(buyTx);
|
|
100
|
-
console.log('simulation1', simulation1);
|
|
99
|
+
console.log('simulation1', JSON.stringify(simulation1.value.err), simulation1.value.logs?.slice(-3));
|
|
100
|
+
if (simulation1.value.err) {
|
|
101
|
+
return {
|
|
102
|
+
success: false,
|
|
103
|
+
error: `买入交易模拟失败: ${JSON.stringify(simulation1.value.err)} | ${simulation1.value.logs?.slice(-3)?.join(' | ')}`,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
101
106
|
const simulation2 = await connection.simulateTransaction(sellTx);
|
|
102
|
-
console.log('simulation2', simulation2);
|
|
103
|
-
|
|
104
|
-
const buyTxBase64 = Buffer.from(buyTx.serialize()).toString('base64');
|
|
105
|
-
const sellTxBase64 = Buffer.from(sellTx.serialize()).toString('base64');
|
|
106
|
-
// 4. 发送捆绑交易
|
|
107
|
-
const bundleResult = await getJitoAdapter().sendBundle([sellTxBase64, buyTxBase64]);
|
|
108
|
-
if (bundleResult.bundleId) {
|
|
109
|
-
// 5. 确认捆绑交易
|
|
110
|
-
const bundleStatus = await jito.confirmInflightBundle(bundleResult.bundleId);
|
|
111
|
-
const isSuccess = jito.isBundleSuccess(bundleStatus.confirmation_status);
|
|
107
|
+
console.log('simulation2', JSON.stringify(simulation2.value.err), simulation2.value.logs?.slice(-3));
|
|
108
|
+
if (simulation2.value.err) {
|
|
112
109
|
return {
|
|
113
|
-
success:
|
|
114
|
-
|
|
115
|
-
error: isSuccess ? undefined : '捆绑交易执行失败',
|
|
110
|
+
success: false,
|
|
111
|
+
error: `卖出交易模拟失败: ${JSON.stringify(simulation2.value.err)} | ${simulation2.value.logs?.slice(-3)?.join(' | ')}`,
|
|
116
112
|
};
|
|
117
113
|
}
|
|
118
|
-
|
|
114
|
+
// 3. 序列化交易
|
|
115
|
+
const buyTxBase64 = Buffer.from(buyTx.serialize()).toString('base64');
|
|
116
|
+
const sellTxBase64 = Buffer.from(sellTx.serialize()).toString('base64');
|
|
117
|
+
// 4. 逐笔发送交易(sell 先发,确认后再发 buy)
|
|
118
|
+
const sellResult = await jitoAdapter.sendTransaction(sellTxBase64);
|
|
119
|
+
const sellConfirm = await jitoAdapter.confirmTransactionByRpc(connection, sellResult.txHash, 30000);
|
|
120
|
+
if (!sellConfirm.success) {
|
|
119
121
|
return {
|
|
120
122
|
success: false,
|
|
121
|
-
|
|
123
|
+
sellTxHash: sellResult.txHash,
|
|
124
|
+
error: `卖出交易失败: ${sellConfirm.error}`,
|
|
122
125
|
};
|
|
123
126
|
}
|
|
127
|
+
const buyResult = await jitoAdapter.sendTransaction(buyTxBase64);
|
|
128
|
+
const buyConfirm = await jitoAdapter.confirmTransactionByRpc(connection, buyResult.txHash, 30000);
|
|
129
|
+
return {
|
|
130
|
+
success: buyConfirm.success,
|
|
131
|
+
sellTxHash: sellResult.txHash,
|
|
132
|
+
buyTxHash: buyResult.txHash,
|
|
133
|
+
error: buyConfirm.success ? undefined : `买入交易失败: ${buyConfirm.error}`,
|
|
134
|
+
};
|
|
124
135
|
}
|
|
125
136
|
catch (error) {
|
|
126
137
|
console.error('换手交易执行失败:', error);
|
|
@@ -189,6 +200,8 @@ async function buildBuyTransaction(params) {
|
|
|
189
200
|
mintB: rawInfo.mintB,
|
|
190
201
|
poolBaseTokenInfo: { amount: rawInfo.poolBaseTokenInfo.amount.toString() },
|
|
191
202
|
poolQuoteTokenInfo: { amount: rawInfo.poolQuoteTokenInfo.amount.toString() },
|
|
203
|
+
baseTokenProgram: rawInfo.baseTokenProgram,
|
|
204
|
+
quoteTokenProgram: rawInfo.quoteTokenProgram,
|
|
192
205
|
};
|
|
193
206
|
}
|
|
194
207
|
const mintA = new PublicKey(info.mintA);
|
|
@@ -203,12 +216,19 @@ async function buildBuyTransaction(params) {
|
|
|
203
216
|
poolId: poolInfo.pairAddress,
|
|
204
217
|
mintA: mintA.toBase58(),
|
|
205
218
|
mintB: mintB.toBase58(),
|
|
219
|
+
baseTokenProgram: info.baseTokenProgram,
|
|
220
|
+
quoteTokenProgram: info.quoteTokenProgram,
|
|
206
221
|
},
|
|
207
222
|
wsolAmount: new BN(solAmount),
|
|
208
223
|
tokenAmount: new BN(new BigNumber(tokenAmount).times(10 ** decimals).toFixed(0)),
|
|
209
224
|
slippage,
|
|
210
225
|
creator: new PublicKey(creatorAddress),
|
|
211
226
|
});
|
|
227
|
+
// 检查买入方钱包是否需要初始化 user_volume_accumulator
|
|
228
|
+
const initVolumeIx = await getInitUserVolumeAccumulatorIxIfNeeded(connection, buyerKeypair.publicKey, buyerKeypair.publicKey);
|
|
229
|
+
if (initVolumeIx) {
|
|
230
|
+
buyTx.add(initVolumeIx);
|
|
231
|
+
}
|
|
212
232
|
buyTx.add(buyInstruction);
|
|
213
233
|
}
|
|
214
234
|
else if (exchangeName === 'Raydium') {
|
|
@@ -381,6 +401,8 @@ async function buildSellTransaction(params) {
|
|
|
381
401
|
mintB: rawPoolData.mintB,
|
|
382
402
|
poolBaseTokenInfo: { amount: rawPoolData.poolBaseTokenInfo.amount.toString() },
|
|
383
403
|
poolQuoteTokenInfo: { amount: rawPoolData.poolQuoteTokenInfo.amount.toString() },
|
|
404
|
+
baseTokenProgram: rawPoolData.baseTokenProgram,
|
|
405
|
+
quoteTokenProgram: rawPoolData.quoteTokenProgram,
|
|
384
406
|
};
|
|
385
407
|
}
|
|
386
408
|
const mintA = new PublicKey(poolData.mintA);
|
|
@@ -398,6 +420,8 @@ async function buildSellTransaction(params) {
|
|
|
398
420
|
poolId: poolInfo.pairAddress,
|
|
399
421
|
mintA: mintA.toBase58(),
|
|
400
422
|
mintB: mintB.toBase58(),
|
|
423
|
+
baseTokenProgram: poolData.baseTokenProgram,
|
|
424
|
+
quoteTokenProgram: poolData.quoteTokenProgram,
|
|
401
425
|
},
|
|
402
426
|
tokenAmount: new BN(tokenAmountInDecimals),
|
|
403
427
|
wsolAmount: new BN(receiveAmount),
|