forgex-cli 1.0.8 → 1.0.10

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.
@@ -1 +1 @@
1
- {"version":3,"file":"sdk-adapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/sdk-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdk-adapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/sdk-adapter.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ import { getDecryptedPrivateKey } from '../wallet-store.js';
19
19
  import { batchTrade, pumpBatchTrade, launchlabBatchTrade } from '../sol-sdk/batch/index.js';
20
20
  import { executeSingleTurnover, executeBatchTurnover, } from '../sol-sdk/turnover/index.js';
21
21
  import { transferSOLInstruction, } from '../sol-sdk/transfer/index.js';
22
- import { getPumpCurveState } from '../sol-sdk/pump/index.js';
22
+ import { getPumpCurveState, getBondingCurvePDA } from '../sol-sdk/pump/index.js';
23
23
  import { pumpSwapGetPoolInfo } from '../sol-sdk/pumpswap/index.js';
24
24
  import { raydiumGetPoolInfo, raydiumGetCpmmPoolInfo, raydiumGetPoolKeys, raydiumGetCpmmKeys, } from '../sol-sdk/raydium/index.js';
25
25
  import { getLaunchlabReverseInfo } from '../sol-sdk/launchlab/index.js';
@@ -46,121 +46,155 @@ export async function fetchTradeContext(tokenCA) {
46
46
  const config = loadConfig();
47
47
  const connection = getConnection();
48
48
  const ds = getDataSource();
49
- // 1. 获取代币信息和交易对 -- 通过 DataSource -> CodexAdapter
50
- const [tokenInfo, pairs] = await Promise.all([
51
- ds.getTokenInfo(tokenCA),
52
- ds.getPairsForToken(tokenCA, 10),
53
- ]);
54
- if (!pairs || pairs.length === 0) {
55
- throw new Error(`无法获取代币交易对: ${tokenCA}`);
56
- }
57
- // 2. 筛选有效交易对(SOL 交易对, 支持的 DEX)
58
- const validExchanges = ['Pump', 'PumpSwap', 'Raydium', 'Raydium CPMM', 'LaunchLab', 'Meteora'];
59
- const solMint = NATIVE_MINT.toBase58();
60
- const solPairs = pairs.filter((p) => validExchanges.includes(p.exchangeName) &&
61
- (p.token0Address === solMint || p.token1Address === solMint));
62
- if (solPairs.length === 0) {
63
- throw new Error('未找到有效的 SOL 交易对');
64
- }
65
- const topPair = solPairs[0];
66
- const exchangeName = topPair.exchangeName;
67
- const poolId = topPair.pairAddress;
68
- const decimals = tokenInfo.decimals || 6;
69
- const creatorAddress = tokenInfo.creatorAddress || '';
70
- // 构建 poolInfo 兼容格式 (保持 batchTrade 等 SDK 函数的参数兼容性)
71
- const poolInfo = {
72
- pairAddress: topPair.pairAddress,
73
- exchange: { name: exchangeName },
74
- tokenA: topPair.token0Address,
75
- tokenB: topPair.token1Address,
76
- };
77
- // 3. 获取深度数据
49
+ let exchangeName = '';
50
+ let poolId = '';
51
+ let decimals = 6;
52
+ let creatorAddress = '';
53
+ let poolInfo;
78
54
  let pumpfunReverseInfo;
79
55
  let ammReverseInfo;
80
56
  let launchlabReverseInfo;
81
57
  let meteoraDLMMReverseInfo;
82
58
  let raydiumV4Keys;
83
59
  let raydiumCpmmKeys;
60
+ let priceInSol = '0';
61
+ let priceUsd = 0;
62
+ // ── 路径 A:先尝试从链上 BondingCurve 直接读取 Pump.fun 数据 ──
63
+ // 完全不依赖 Codex API,零延迟
84
64
  try {
85
- if (exchangeName === 'Pump') {
86
- pumpfunReverseInfo = await getPumpCurveState(connection, tokenCA);
87
- }
88
- else if (exchangeName === 'PumpSwap') {
89
- const poolData = await pumpSwapGetPoolInfo(connection, poolId);
90
- ammReverseInfo = {
91
- mintA: poolData.mintA,
92
- mintB: poolData.mintB,
93
- poolBaseTokenInfo: poolData.poolBaseTokenInfo,
94
- poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
95
- };
96
- }
97
- else if (exchangeName === 'Raydium') {
98
- const poolData = await raydiumGetPoolInfo(connection, poolId);
99
- ammReverseInfo = {
100
- mintA: '',
101
- mintB: '',
102
- poolBaseTokenInfo: poolData.poolBaseTokenInfo,
103
- poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
104
- };
105
- const keysData = await raydiumGetPoolKeys(connection, poolId);
106
- raydiumV4Keys = keysData.poolKeys;
107
- }
108
- else if (exchangeName === 'Raydium CPMM') {
109
- const poolData = await raydiumGetCpmmPoolInfo(connection, poolId);
110
- ammReverseInfo = {
111
- mintA: '',
112
- mintB: '',
113
- poolBaseTokenInfo: poolData.poolBaseTokenInfo,
114
- poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
115
- };
116
- const keysData = await raydiumGetCpmmKeys(connection, poolId);
117
- raydiumCpmmKeys = keysData.poolKeys;
118
- }
119
- else if (exchangeName === 'LaunchLab') {
120
- launchlabReverseInfo = await getLaunchlabReverseInfo({ connection, poolId });
121
- }
122
- else if (exchangeName === 'Meteora') {
123
- // Bug 4 fix: 添加 Meteora DLMM 深度数据获取
124
- const dlmmInfo = await getDLMMPoolInfo({ connection, poolId });
125
- meteoraDLMMReverseInfo = {
126
- mintA: dlmmInfo.token_x_mint,
127
- mintB: dlmmInfo.token_y_mint,
128
- reserveX: dlmmInfo.reserve_x,
129
- reserveY: dlmmInfo.reserve_y,
130
- oracle: dlmmInfo.oracle,
131
- binStep: dlmmInfo.bin_step,
132
- activeId: dlmmInfo.active_id,
65
+ const bondingCurvePDA = getBondingCurvePDA(new PublicKey(tokenCA));
66
+ // 注意:传 bondingCurvePDA 地址,不是 mint 地址
67
+ const curveState = await getPumpCurveState(connection, bondingCurvePDA.toBase58());
68
+ if (curveState && !curveState.complete) {
69
+ // 确认是 Pump.fun 未毕业代币
70
+ exchangeName = 'Pump';
71
+ poolId = bondingCurvePDA.toBase58();
72
+ decimals = 6; // Pump.fun 固定 6 位小数
73
+ // Anchor fetch 返回 camelCase 字段
74
+ const creator = curveState.creator ?? curveState.creator;
75
+ creatorAddress = creator ? (creator.toBase58?.() ?? String(creator)) : '';
76
+ pumpfunReverseInfo = curveState;
77
+ // 兼容 camelCase(Anchor fetch)和 snake_case(原始字节解析)
78
+ const vSol = Number(curveState.virtualSolReserves ?? curveState.virtual_sol_reserves);
79
+ const vToken = Number(curveState.virtualTokenReserves ?? curveState.virtual_token_reserves);
80
+ priceInSol = new BigNumber(vSol).div(1e9)
81
+ .div(new BigNumber(vToken).div(1e6))
82
+ .toString();
83
+ poolInfo = {
84
+ pairAddress: poolId,
85
+ exchange: { name: 'Pump' },
86
+ tokenA: tokenCA,
87
+ tokenB: NATIVE_MINT.toBase58(),
133
88
  };
89
+ // priceUsd 异步获取,不阻塞交易
90
+ ds.getTokenPrice(tokenCA).then((p) => { priceUsd = p.priceUsd; }).catch(() => { });
134
91
  }
135
92
  }
136
- catch (e) {
137
- console.error(`获取 ${exchangeName} 深度数据失败:`, e.message);
93
+ catch {
94
+ // bondingCurve 读取失败,说明不是 Pump.fun 未毕业代币,走 Codex 路径
138
95
  }
139
- // 获取代币价格
140
- // Pump.fun: 直接从链上 BondingCurve 储备计算,消除对 Codex API 的阻塞依赖
141
- let priceInSol = '0';
142
- let priceUsd = 0;
143
- if (exchangeName === 'Pump' && pumpfunReverseInfo) {
144
- // AMM 恒积公式: price = (vSol / 1e9) / (vToken / 1e6)
145
- priceInSol = new BigNumber(Number(pumpfunReverseInfo.virtual_sol_reserves)).div(1e9)
146
- .div(new BigNumber(Number(pumpfunReverseInfo.virtual_token_reserves)).div(1e6))
147
- .toString();
148
- // 异步填充 priceUsd(fire-and-forget,不阻塞交易)
149
- ds.getTokenPrice(tokenCA).then(priceData => {
150
- priceUsd = priceData.priceUsd;
151
- }).catch(() => {
152
- // 价格获取失败不阻塞交易
96
+ // ── 路径 B:非 Pump.fun 或已毕业,通过 Codex 获取交易对信息 ──
97
+ if (!exchangeName) {
98
+ const [tokenInfo, pairs] = await Promise.all([
99
+ ds.getTokenInfo(tokenCA),
100
+ ds.getPairsForToken(tokenCA, 10),
101
+ ]).catch((e) => {
102
+ throw new Error(`获取交易对失败 (${tokenCA}): ${e.message}`);
153
103
  });
154
- }
155
- else {
156
- // 其他 DEX 类型仍通过 Codex API 获取价格
104
+ if (!pairs || pairs.length === 0) {
105
+ throw new Error(`无法获取代币交易对: ${tokenCA}`);
106
+ }
107
+ const validExchanges = ['Pump', 'PumpSwap', 'Raydium', 'Raydium CPMM', 'LaunchLab', 'Meteora'];
108
+ const solMint = NATIVE_MINT.toBase58();
109
+ const solPairs = pairs.filter((p) => validExchanges.includes(p.exchangeName) &&
110
+ (p.token0Address === solMint || p.token1Address === solMint));
111
+ if (solPairs.length === 0) {
112
+ throw new Error('未找到有效的 SOL 交易对');
113
+ }
114
+ const topPair = solPairs[0];
115
+ exchangeName = topPair.exchangeName;
116
+ poolId = topPair.pairAddress;
117
+ decimals = tokenInfo.decimals || 6;
118
+ creatorAddress = tokenInfo.creatorAddress || '';
119
+ poolInfo = {
120
+ pairAddress: topPair.pairAddress,
121
+ exchange: { name: exchangeName },
122
+ tokenA: topPair.token0Address,
123
+ tokenB: topPair.token1Address,
124
+ };
125
+ // 获取深度数据
157
126
  try {
158
- const priceData = await ds.getTokenPrice(tokenCA);
159
- priceInSol = String(priceData.priceSol);
160
- priceUsd = priceData.priceUsd;
127
+ if (exchangeName === 'Pump') {
128
+ pumpfunReverseInfo = await getPumpCurveState(connection, tokenCA);
129
+ }
130
+ else if (exchangeName === 'PumpSwap') {
131
+ const poolData = await pumpSwapGetPoolInfo(connection, poolId);
132
+ ammReverseInfo = {
133
+ mintA: poolData.mintA,
134
+ mintB: poolData.mintB,
135
+ poolBaseTokenInfo: poolData.poolBaseTokenInfo,
136
+ poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
137
+ };
138
+ }
139
+ else if (exchangeName === 'Raydium') {
140
+ const poolData = await raydiumGetPoolInfo(connection, poolId);
141
+ ammReverseInfo = {
142
+ mintA: '',
143
+ mintB: '',
144
+ poolBaseTokenInfo: poolData.poolBaseTokenInfo,
145
+ poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
146
+ };
147
+ const keysData = await raydiumGetPoolKeys(connection, poolId);
148
+ raydiumV4Keys = keysData.poolKeys;
149
+ }
150
+ else if (exchangeName === 'Raydium CPMM') {
151
+ const poolData = await raydiumGetCpmmPoolInfo(connection, poolId);
152
+ ammReverseInfo = {
153
+ mintA: '',
154
+ mintB: '',
155
+ poolBaseTokenInfo: poolData.poolBaseTokenInfo,
156
+ poolQuoteTokenInfo: poolData.poolQuoteTokenInfo,
157
+ };
158
+ const keysData = await raydiumGetCpmmKeys(connection, poolId);
159
+ raydiumCpmmKeys = keysData.poolKeys;
160
+ }
161
+ else if (exchangeName === 'LaunchLab') {
162
+ launchlabReverseInfo = await getLaunchlabReverseInfo({ connection, poolId });
163
+ }
164
+ else if (exchangeName === 'Meteora') {
165
+ const dlmmInfo = await getDLMMPoolInfo({ connection, poolId });
166
+ meteoraDLMMReverseInfo = {
167
+ mintA: dlmmInfo.token_x_mint,
168
+ mintB: dlmmInfo.token_y_mint,
169
+ reserveX: dlmmInfo.reserve_x,
170
+ reserveY: dlmmInfo.reserve_y,
171
+ oracle: dlmmInfo.oracle,
172
+ binStep: dlmmInfo.bin_step,
173
+ activeId: dlmmInfo.active_id,
174
+ };
175
+ }
176
+ }
177
+ catch (e) {
178
+ console.error(`获取 ${exchangeName} 深度数据失败:`, e.message);
161
179
  }
162
- catch {
163
- // 价格获取失败不阻塞交易
180
+ // 价格(Pump.fun 已在路径 A 算好,这里处理其他 DEX)
181
+ if (exchangeName === 'Pump' && pumpfunReverseInfo) {
182
+ const vSol = Number(pumpfunReverseInfo.virtualSolReserves ?? pumpfunReverseInfo.virtual_sol_reserves);
183
+ const vToken = Number(pumpfunReverseInfo.virtualTokenReserves ?? pumpfunReverseInfo.virtual_token_reserves);
184
+ priceInSol = new BigNumber(vSol).div(1e9)
185
+ .div(new BigNumber(vToken).div(1e6))
186
+ .toString();
187
+ ds.getTokenPrice(tokenCA).then((p) => { priceUsd = p.priceUsd; }).catch(() => { });
188
+ }
189
+ else {
190
+ try {
191
+ const priceData = await ds.getTokenPrice(tokenCA);
192
+ priceInSol = String(priceData.priceSol);
193
+ priceUsd = priceData.priceUsd;
194
+ }
195
+ catch {
196
+ // 价格获取失败不阻塞交易
197
+ }
164
198
  }
165
199
  }
166
200
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"sdk-adapter.js","sourceRoot":"","sources":["../../../src/adapters/sdk-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdk-adapter.js","sourceRoot":"","sources":["../../../src/adapters/sdk-adapter.ts"],"names":[],"mappings":"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"}
package/dist/src/index.js CHANGED
@@ -18,7 +18,7 @@ export function createProgram() {
18
18
  program
19
19
  .name('forgex')
20
20
  .description('ForgeX CLI - Solana 链上做市系统命令行工具')
21
- .version('1.0.8')
21
+ .version('1.0.10')
22
22
  .option('--format <format>', '输出格式: json | table | minimal', 'json');
23
23
  // 绑定 program 实例到 output 模块,使 --format 全局标志自动生效
24
24
  bindProgram(program);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,UAAU,aAAa;IAC3B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,QAAQ,CAAC;SACd,WAAW,CAAC,iCAAiC,CAAC;SAC9C,OAAO,CAAC,OAAO,CAAC;SAChB,MAAM,CAAC,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,CAAC,CAAC;IAEvE,+CAA+C;IAC/C,WAAW,CAAC,OAAO,CAAC,CAAC;IAErB,QAAQ;IACR,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAClC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEhC,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,UAAU,aAAa;IAC3B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,QAAQ,CAAC;SACd,WAAW,CAAC,iCAAiC,CAAC;SAC9C,OAAO,CAAC,QAAQ,CAAC;SACjB,MAAM,CAAC,mBAAmB,EAAE,8BAA8B,EAAE,MAAM,CAAC,CAAC;IAEvE,+CAA+C;IAC/C,WAAW,CAAC,OAAO,CAAC,CAAC;IAErB,QAAQ;IACR,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAClC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/B,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEhC,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -23,8 +23,10 @@ export declare function buyInstructions(provider: Provider, buyer: PublicKey, mi
23
23
  */
24
24
  export declare const buySPLInstructions: (provider: Provider, payer: PublicKey, caAddr: string, buyAmount: string, // 小数
25
25
  slippageDecimal: number, caPrice: string, creator: PublicKey, tokenAmount?: string, reserveInfo?: {
26
- virtual_sol_reserves: bigint | number;
27
- virtual_token_reserves: bigint | number;
26
+ virtual_sol_reserves?: bigint | number;
27
+ virtual_token_reserves?: bigint | number;
28
+ virtualSolReserves?: bigint | number;
29
+ virtualTokenReserves?: bigint | number;
28
30
  }) => Promise<[string, Transaction]>;
29
31
  export declare const buySPLFromAmountInstructions: (provider: Provider, payer: PublicKey, caAddr: string, receiveAmount: string, maxSolCost: string, creator: PublicKey, redis: ClientRedis) => Promise<Transaction>;
30
32
  export declare const calcSPLOutAmount: (connection: Connection, token: string, amount: string, slippageDecimal: number) => Promise<string[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/pump/instructions/buy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAW,SAAS,EAAoB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAwBhG;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,SAAS,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CA+CtB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAC7B,UAAU,QAAQ,EAClB,OAAO,SAAS,EAChB,QAAQ,MAAM,EACd,WAAW,MAAM,EAAE,KAAK;AACxB,iBAAiB,MAAM,EACvB,SAAS,MAAM,EACf,SAAS,SAAS,EAClB,cAAc,MAAM,EACpB,cAAc;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,KAC/F,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CA6B/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,QAAQ,EAClB,OAAO,SAAS,EAChB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,YAAY,MAAM,EAClB,SAAS,SAAS,EAClB,OAAO,WAAW,KACjB,OAAO,CAAC,WAAW,CAcrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,iBAAiB,MAAM,sBAuCxB,CAAC;AAEF,eAAO,MAAM,WAAW,GAAU,YAAY,UAAU,EAAE,OAAO,MAAM,oBAUtE,CAAC"}
1
+ {"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/pump/instructions/buy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAW,SAAS,EAAoB,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAwBhG;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,SAAS,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CA+CtB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAC7B,UAAU,QAAQ,EAClB,OAAO,SAAS,EAChB,QAAQ,MAAM,EACd,WAAW,MAAM,EAAE,KAAK;AACxB,iBAAiB,MAAM,EACvB,SAAS,MAAM,EACf,SAAS,SAAS,EAClB,cAAc,MAAM,EACpB,cAAc;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,KAC/K,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CA8B/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,QAAQ,EAClB,OAAO,SAAS,EAChB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,YAAY,MAAM,EAClB,SAAS,SAAS,EAClB,OAAO,WAAW,KACjB,OAAO,CAAC,WAAW,CAcrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,iBAAiB,MAAM,sBAuCxB,CAAC;AAEF,eAAO,MAAM,WAAW,GAAU,YAAY,UAAU,EAAE,OAAO,MAAM,oBAUtE,CAAC"}
@@ -69,8 +69,9 @@ slippageDecimal, caPrice, creator, tokenAmount, reserveInfo) => {
69
69
  }
70
70
  else if (reserveInfo) {
71
71
  // AMM 恒积公式: k = vSol * vToken; newSol = vSol + buyAmount(lamports); receiveAmount = vToken - k/newSol
72
- const vSol = Number(reserveInfo.virtual_sol_reserves); // lamports
73
- const vToken = Number(reserveInfo.virtual_token_reserves); // token units (1e6)
72
+ // 兼容 camelCase(Anchor fetch)和 snake_case
73
+ const vSol = Number(reserveInfo.virtualSolReserves ?? reserveInfo.virtual_sol_reserves); // lamports
74
+ const vToken = Number(reserveInfo.virtualTokenReserves ?? reserveInfo.virtual_token_reserves); // token units (1e6)
74
75
  const k = new BigNumber(vSol).times(vToken);
75
76
  const newSol = new BigNumber(vSol).plus(buyAmount); // buyAmount 已是 lamports
76
77
  const newToken = k.div(newSol);
@@ -1 +1 @@
1
- {"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pump/instructions/buy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buy.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/pump/instructions/buy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "forgex-cli",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "description": "ForgeX CLI - Solana on-chain market making system command-line tool",
5
5
  "type": "module",
6
6
  "author": "cat",