genius-intents 0.23.0 → 0.23.1
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/CHANGELOG.md +49 -0
- package/dist/direct-pools/meteora/pool-info/meteora-dbc-pool-info.service.d.ts +1 -1
- package/dist/direct-pools/meteora/pool-info/meteora-dbc-pool-info.service.d.ts.map +1 -1
- package/dist/direct-pools/meteora/pool-info/meteora-dbc-pool-info.service.js +4 -8
- package/dist/direct-pools/meteora/pool-info/meteora-dbc-pool-info.service.js.map +1 -1
- package/dist/direct-pools/meteora/txn-builder/meteora-damm-v2.service.d.ts.map +1 -1
- package/dist/direct-pools/meteora/txn-builder/meteora-damm-v2.service.js +2 -2
- package/dist/direct-pools/meteora/txn-builder/meteora-damm-v2.service.js.map +1 -1
- package/dist/direct-pools/meteora/txn-builder/meteora-dbc.service.d.ts.map +1 -1
- package/dist/direct-pools/meteora/txn-builder/meteora-dbc.service.js +12 -4
- package/dist/direct-pools/meteora/txn-builder/meteora-dbc.service.js.map +1 -1
- package/dist/direct-pools/meteora/txn-builder/meteora-dlmm.service.js +2 -2
- package/dist/direct-pools/meteora/txn-builder/meteora-dlmm.service.js.map +1 -1
- package/dist/direct-pools/pump-fun/pool-info/pump-fun-pool-info.service.d.ts +0 -4
- package/dist/direct-pools/pump-fun/pool-info/pump-fun-pool-info.service.d.ts.map +1 -1
- package/dist/direct-pools/pump-fun/pool-info/pump-fun-pool-info.service.js +2 -21
- package/dist/direct-pools/pump-fun/pool-info/pump-fun-pool-info.service.js.map +1 -1
- package/dist/direct-pools/pump-fun/pool-info/pump-swap-amm-pool-info.service.d.ts +0 -4
- package/dist/direct-pools/pump-fun/pool-info/pump-swap-amm-pool-info.service.d.ts.map +1 -1
- package/dist/direct-pools/pump-fun/pool-info/pump-swap-amm-pool-info.service.js +3 -23
- package/dist/direct-pools/pump-fun/pool-info/pump-swap-amm-pool-info.service.js.map +1 -1
- package/dist/direct-pools/pump-fun/txn-builder/pump-swap-amm.service.js +1 -1
- package/dist/direct-pools/pump-fun/txn-builder/pump-swap-amm.service.js.map +1 -1
- package/dist/direct-pools/raydium/pool-info/raydium-clmm-pool-info.service.d.ts +0 -4
- package/dist/direct-pools/raydium/pool-info/raydium-clmm-pool-info.service.d.ts.map +1 -1
- package/dist/direct-pools/raydium/pool-info/raydium-clmm-pool-info.service.js +3 -23
- package/dist/direct-pools/raydium/pool-info/raydium-clmm-pool-info.service.js.map +1 -1
- package/dist/direct-pools/raydium/pool-info/raydium-launchlab-pool-info.service.d.ts.map +1 -1
- package/dist/direct-pools/raydium/pool-info/raydium-launchlab-pool-info.service.js +3 -0
- package/dist/direct-pools/raydium/pool-info/raydium-launchlab-pool-info.service.js.map +1 -1
- package/dist/direct-pools/raydium/pool-info/raydium-pool-info.types.d.ts +1 -0
- package/dist/direct-pools/raydium/pool-info/raydium-pool-info.types.d.ts.map +1 -1
- package/dist/direct-pools/raydium/txn-builder/raydium-clmm.service.d.ts.map +1 -1
- package/dist/direct-pools/raydium/txn-builder/raydium-clmm.service.js +3 -3
- package/dist/direct-pools/raydium/txn-builder/raydium-clmm.service.js.map +1 -1
- package/dist/direct-pools/raydium/txn-builder/raydium-launchlab.service.d.ts.map +1 -1
- package/dist/direct-pools/raydium/txn-builder/raydium-launchlab.service.js +17 -12
- package/dist/direct-pools/raydium/txn-builder/raydium-launchlab.service.js.map +1 -1
- package/dist/direct-pools/raydium/txn-builder/raydium.types.d.ts +2 -0
- package/dist/direct-pools/raydium/txn-builder/raydium.types.d.ts.map +1 -1
- package/dist/direct-pools/utils/token-program.util.d.ts +3 -0
- package/dist/direct-pools/utils/token-program.util.d.ts.map +1 -0
- package/dist/direct-pools/utils/token-program.util.js +23 -0
- package/dist/direct-pools/utils/token-program.util.js.map +1 -0
- package/dist/direct-pools/whirlpools/txn-builder/whirlpools.service.js +2 -2
- package/dist/direct-pools/whirlpools/txn-builder/whirlpools.service.js.map +1 -1
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.service.d.ts +5 -10
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.service.d.ts.map +1 -1
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.service.js +104 -56
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.service.js.map +1 -1
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.types.d.ts +10 -3
- package/dist/lib/dex/evm-direct-pool/evm-direct-pool.types.d.ts.map +1 -1
- package/dist/lib/genius-swap-router/genius-swap-router.abi.d.ts +3 -0
- package/dist/lib/genius-swap-router/genius-swap-router.abi.d.ts.map +1 -0
- package/dist/lib/genius-swap-router/genius-swap-router.abi.js +437 -0
- package/dist/lib/genius-swap-router/genius-swap-router.abi.js.map +1 -0
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ const raydium_sdk_v2_1 = require("@raydium-io/raydium-sdk-v2");
|
|
|
5
5
|
const raydium_launchlab_service_1 = require("../txn-builder/raydium-launchlab.service");
|
|
6
6
|
const constants_1 = require("../../constants");
|
|
7
7
|
const logger_1 = require("../../../utils/logger");
|
|
8
|
+
const token_program_util_1 = require("../../utils/token-program.util");
|
|
8
9
|
let logger;
|
|
9
10
|
class RaydiumLaunchlabPoolInfo {
|
|
10
11
|
constructor(_raydium, debug = false) {
|
|
@@ -26,6 +27,7 @@ class RaydiumLaunchlabPoolInfo {
|
|
|
26
27
|
}
|
|
27
28
|
const poolInfo = raydium_sdk_v2_1.LaunchpadPool.decode(accountInfo.data);
|
|
28
29
|
const creatorVault = raydium_launchlab_service_1.RaydiumLaunchlabService.getCreatorVaultPda(poolInfo.creator, poolInfo.mintB);
|
|
30
|
+
const baseTokenProgram = await (0, token_program_util_1.getTokenProgram)(this._raydium.connection, poolInfo.mintA);
|
|
29
31
|
return {
|
|
30
32
|
poolType: constants_1.PoolTypesEnum.RAYDIUM_LAUNCHLAB,
|
|
31
33
|
configId: poolInfo.configId.toBase58(),
|
|
@@ -33,6 +35,7 @@ class RaydiumLaunchlabPoolInfo {
|
|
|
33
35
|
baseMint: poolInfo.mintA.toBase58(),
|
|
34
36
|
quoteMint: poolInfo.mintB.toBase58(),
|
|
35
37
|
creatorVault: creatorVault.toBase58(),
|
|
38
|
+
baseTokenProgram: baseTokenProgram.toBase58(),
|
|
36
39
|
};
|
|
37
40
|
}
|
|
38
41
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-launchlab-pool-info.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/pool-info/raydium-launchlab-pool-info.service.ts"],"names":[],"mappings":";;;AACA,+DAAoE;AACpE,wFAAmF;AACnF,+CAAgD;AAEhD,kDAA6E;
|
|
1
|
+
{"version":3,"file":"raydium-launchlab-pool-info.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/pool-info/raydium-launchlab-pool-info.service.ts"],"names":[],"mappings":";;;AACA,+DAAoE;AACpE,wFAAmF;AACnF,+CAAgD;AAEhD,kDAA6E;AAC7E,uEAAiE;AAEjE,IAAI,MAAe,CAAC;AACpB,MAAa,wBAAwB;IACnC,YACmB,QAAiB,EAClC,QAAiB,KAAK;QADL,aAAQ,GAAR,QAAQ,CAAS;QAGlC,IAAI,KAAK,EAAE,CAAC;YACV,sBAAa,CAAC,SAAS,CAAC,sBAAa,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,qBAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1F,MAAM,GAAG,sBAAa,CAAC,SAAS,EAAE,CAAC;QACrC,CAAC;QACD,MAAM,GAAG,sBAAa,CAAC,SAAS,EAAE,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,MAAiB;QACjC,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAE1E,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,QAAQ,GAAG,8BAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,YAAY,GAAG,mDAAuB,CAAC,kBAAkB,CAC7D,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,KAAK,CACf,CAAC;YAEF,MAAM,gBAAgB,GAAG,MAAM,IAAA,oCAAe,EAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YAEzF,OAAO;gBACL,QAAQ,EAAE,yBAAa,CAAC,iBAAiB;gBACzC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE;gBACtC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAC1C,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACpC,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;gBACrC,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,EAAE;aAC9C,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF;AA7CD,4DA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-pool-info.types.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/pool-info/raydium-pool-info.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,6BAA6B,EAAE,MAAM,CAAC;IACtC,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAGD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,aAAa,CAAC,iBAAiB,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"raydium-pool-info.types.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/pool-info/raydium-pool-info.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,6BAA6B,EAAE,MAAM,CAAC;IACtC,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAGD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,aAAa,CAAC,iBAAiB,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-clmm.service.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-clmm.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,kBAAkB;IAC7B,gBAAuB,SAAS,YAAiE;IACjG,gBAAuB,aAAa,YAElC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAkD;IAC9F,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAA6B;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAA6B;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAE9C;;IAIF;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQxF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS;IAQjE;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAQ3D;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAQ1D;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;IAWxE;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"raydium-clmm.service.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-clmm.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,kBAAkB;IAC7B,gBAAuB,SAAS,YAAiE;IACjG,gBAAuB,aAAa,YAElC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAkD;IAC9F,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAA6B;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAA6B;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAE9C;;IAIF;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQxF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS;IAQjE;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAQ3D;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAQ1D;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS;IAWxE;;OAEG;IACG,qBAAqB,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAmH3F"}
|
|
@@ -47,14 +47,14 @@ class RaydiumClmmService {
|
|
|
47
47
|
* Create swap instruction for CLMM
|
|
48
48
|
*/
|
|
49
49
|
async createSwapInstruction(params) {
|
|
50
|
-
const { user, configId, poolId, inputMint, outputMint, outputTokenProgram, amountIn, minimumAmountOut, sqrtPriceLimitX64, isBaseInput, currentActiveTickArrayAddress, tickArrays, blockHash, wrapOrUnwrapSol = false, } = params;
|
|
50
|
+
const { user, configId, poolId, inputMint, outputMint, inputTokenProgram, outputTokenProgram, amountIn, minimumAmountOut, sqrtPriceLimitX64, isBaseInput, currentActiveTickArrayAddress, tickArrays, blockHash, wrapOrUnwrapSol = false, } = params;
|
|
51
51
|
const instructions = [];
|
|
52
52
|
const inputVault = RaydiumClmmService.getVaultPda(poolId, inputMint);
|
|
53
53
|
const outputVault = RaydiumClmmService.getVaultPda(poolId, outputMint);
|
|
54
54
|
const observationState = RaydiumClmmService.getObservationStatePda(poolId);
|
|
55
55
|
// const tickArrayBitmap = RaydiumClmmService.getTickArrayBitmapPda(poolId);
|
|
56
|
-
const userInputTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(inputMint, user);
|
|
57
|
-
const userOutputTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(outputMint, user);
|
|
56
|
+
const userInputTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(inputMint, user, true, inputTokenProgram);
|
|
57
|
+
const userOutputTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(outputMint, user, true, outputTokenProgram);
|
|
58
58
|
// Wrap SOL if source is native SOL or WSOL
|
|
59
59
|
if (wrapOrUnwrapSol && inputMint.equals(spl_token_1.NATIVE_MINT)) {
|
|
60
60
|
instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userInputTokenAta, user, spl_token_1.NATIVE_MINT), web3_js_1.SystemProgram.transfer({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-clmm.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-clmm.service.ts"],"names":[],"mappings":";;;AAAA,6CAMyB;AACzB,iDAQ2B;AAC3B,mFAAwE;AAGxE,MAAa,kBAAkB;IAe7B,gBAAe,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,WAAsB,EAAE,KAAgB,EAAE,KAAgB;QAC1E,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EAC5E,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAiB,EAAE,IAAe;QACnD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EACzD,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,MAAiB;QAC7C,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,EAC1C,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,MAAiB;QAC5C,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,EAClD,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,MAAiB,EAAE,UAAkB;QAC1D,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxC,eAAe,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAE5C,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,EACzD,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,MAA8B;QACxD,MAAM,EACJ,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,6BAA6B,EAC7B,UAAU,EACV,SAAS,EACT,eAAe,GAAG,KAAK,GACxB,GAAG,MAAM,CAAC;QAEX,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,UAAU,GAAG,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACvE,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC3E,4EAA4E;QAE5E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,
|
|
1
|
+
{"version":3,"file":"raydium-clmm.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-clmm.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-launchlab.service.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-launchlab.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAE1F,qBAAa,uBAAuB;IAClC,gBAAuB,SAAS,YAAgE;IAEhG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA0C;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA+B;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAqC;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA4C;IAEvF,MAAM,CAAC,QAAQ,CAAC,uBAAuB,sBAAuD;IAC9F,MAAM,CAAC,QAAQ,CAAC,wBAAwB,sBAAuD;;IAI/F;;OAEG;IACH,MAAM,CAAC,eAAe,IAAI,SAAS;IAKnC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQrE;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS;IAQxE;;OAEG;IACH,MAAM,CAAC,oBAAoB,IAAI,SAAS;IAKxC;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQ9E;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQ1E;;OAEG;IACG,2BAA2B,CAC/B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"raydium-launchlab.service.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-launchlab.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAGT,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAE1F,qBAAa,uBAAuB;IAClC,gBAAuB,SAAS,YAAgE;IAEhG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA0C;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAA+B;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAqC;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA4C;IAEvF,MAAM,CAAC,QAAQ,CAAC,uBAAuB,sBAAuD;IAC9F,MAAM,CAAC,QAAQ,CAAC,wBAAwB,sBAAuD;;IAI/F;;OAEG;IACH,MAAM,CAAC,eAAe,IAAI,SAAS;IAKnC;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQrE;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS;IAQxE;;OAEG;IACH,MAAM,CAAC,oBAAoB,IAAI,SAAS;IAKxC;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQ9E;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS;IAQ1E;;OAEG;IACG,2BAA2B,CAC/B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,oBAAoB,CAAC;IAiGhC;;OAEG;IACG,4BAA4B,CAChC,MAAM,EAAE,2BAA2B,GAClC,OAAO,CAAC,oBAAoB,CAAC;CAkGjC"}
|
|
@@ -56,7 +56,7 @@ class RaydiumLaunchlabService {
|
|
|
56
56
|
* Create buy exact in instruction (buy base tokens with quote tokens)
|
|
57
57
|
*/
|
|
58
58
|
async createBuyExactInInstruction(params) {
|
|
59
|
-
const { user, baseMint, quoteMint, amountIn, minimumAmountOut, configId, platformId, creatorVault, blockHash, wrapOrUnwrapSol = false, } = params;
|
|
59
|
+
const { user, baseMint, quoteMint, amountIn, minimumAmountOut, configId, platformId, creatorVault, blockHash, baseTokenProgram, wrapOrUnwrapSol = false, } = params;
|
|
60
60
|
const instructions = [];
|
|
61
61
|
const authority = RaydiumLaunchlabService.getAuthorityPda();
|
|
62
62
|
const poolState = RaydiumLaunchlabService.getPoolStatePda(baseMint, quoteMint);
|
|
@@ -64,7 +64,7 @@ class RaydiumLaunchlabService {
|
|
|
64
64
|
const quoteVault = RaydiumLaunchlabService.getPoolVaultPda(poolState, quoteMint);
|
|
65
65
|
const eventAuthority = RaydiumLaunchlabService.getEventAuthorityPda();
|
|
66
66
|
const platformVault = RaydiumLaunchlabService.getPlatformVaultPda(platformId, quoteMint);
|
|
67
|
-
const userBaseTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(baseMint, user);
|
|
67
|
+
const userBaseTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(baseMint, user, true, baseTokenProgram);
|
|
68
68
|
const userQuoteTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(quoteMint, user);
|
|
69
69
|
// Wrap SOL if source (quote) is native SOL or WSOL
|
|
70
70
|
if (wrapOrUnwrapSol && quoteMint.equals(spl_token_1.NATIVE_MINT)) {
|
|
@@ -74,7 +74,7 @@ class RaydiumLaunchlabService {
|
|
|
74
74
|
lamports: amountIn.toNumber(),
|
|
75
75
|
}), (0, spl_token_1.createSyncNativeInstruction)(userQuoteTokenAta));
|
|
76
76
|
}
|
|
77
|
-
const ataIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userBaseTokenAta, user, baseMint);
|
|
77
|
+
const ataIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userBaseTokenAta, user, baseMint, baseTokenProgram);
|
|
78
78
|
instructions.push(ataIx);
|
|
79
79
|
const keys = [
|
|
80
80
|
{ pubkey: user, isSigner: true, isWritable: true },
|
|
@@ -88,7 +88,7 @@ class RaydiumLaunchlabService {
|
|
|
88
88
|
{ pubkey: quoteVault, isSigner: false, isWritable: true },
|
|
89
89
|
{ pubkey: baseMint, isSigner: false, isWritable: false },
|
|
90
90
|
{ pubkey: quoteMint, isSigner: false, isWritable: false },
|
|
91
|
-
{ pubkey:
|
|
91
|
+
{ pubkey: baseTokenProgram, isSigner: false, isWritable: false },
|
|
92
92
|
{ pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
93
93
|
{ pubkey: eventAuthority, isSigner: false, isWritable: false },
|
|
94
94
|
{ pubkey: RaydiumLaunchlabService.programId, isSigner: false, isWritable: false },
|
|
@@ -118,7 +118,7 @@ class RaydiumLaunchlabService {
|
|
|
118
118
|
* Create sell exact in instruction (sell base tokens for quote tokens)
|
|
119
119
|
*/
|
|
120
120
|
async createSellExactInInstruction(params) {
|
|
121
|
-
const { user, baseMint, quoteMint, amountIn, minimumAmountOut, configId, platformId, creatorVault, blockHash, wrapOrUnwrapSol = false, } = params;
|
|
121
|
+
const { user, baseMint, quoteMint, amountIn, minimumAmountOut, configId, platformId, creatorVault, blockHash, baseTokenProgram, wrapOrUnwrapSol = false, } = params;
|
|
122
122
|
const instructions = [];
|
|
123
123
|
const authority = RaydiumLaunchlabService.getAuthorityPda();
|
|
124
124
|
const poolState = RaydiumLaunchlabService.getPoolStatePda(baseMint, quoteMint);
|
|
@@ -126,15 +126,20 @@ class RaydiumLaunchlabService {
|
|
|
126
126
|
const quoteVault = RaydiumLaunchlabService.getPoolVaultPda(poolState, quoteMint);
|
|
127
127
|
const eventAuthority = RaydiumLaunchlabService.getEventAuthorityPda();
|
|
128
128
|
const platformVault = RaydiumLaunchlabService.getPlatformVaultPda(platformId, quoteMint);
|
|
129
|
-
const userBaseTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(baseMint, user);
|
|
129
|
+
const userBaseTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(baseMint, user, true, baseTokenProgram);
|
|
130
130
|
const userQuoteTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(quoteMint, user);
|
|
131
131
|
// Wrap SOL if source (base) is native SOL or WSOL
|
|
132
|
-
if (wrapOrUnwrapSol &&
|
|
133
|
-
|
|
132
|
+
if (wrapOrUnwrapSol && quoteMint.equals(spl_token_1.NATIVE_MINT)) {
|
|
133
|
+
const userNativeTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, user);
|
|
134
|
+
instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userNativeTokenAta, user, spl_token_1.NATIVE_MINT), web3_js_1.SystemProgram.transfer({
|
|
134
135
|
fromPubkey: user,
|
|
135
|
-
toPubkey:
|
|
136
|
-
lamports: amountIn.toNumber(),
|
|
137
|
-
}), (0, spl_token_1.createSyncNativeInstruction)(
|
|
136
|
+
toPubkey: userNativeTokenAta,
|
|
137
|
+
lamports: baseMint.equals(spl_token_1.NATIVE_MINT) ? amountIn.toNumber() : 1,
|
|
138
|
+
}), (0, spl_token_1.createSyncNativeInstruction)(userNativeTokenAta));
|
|
139
|
+
}
|
|
140
|
+
if (!quoteMint.equals(spl_token_1.NATIVE_MINT)) {
|
|
141
|
+
const ataIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(user, userQuoteTokenAta, user, quoteMint);
|
|
142
|
+
instructions.push(ataIx);
|
|
138
143
|
}
|
|
139
144
|
const keys = [
|
|
140
145
|
{ pubkey: user, isSigner: true, isWritable: true },
|
|
@@ -148,7 +153,7 @@ class RaydiumLaunchlabService {
|
|
|
148
153
|
{ pubkey: quoteVault, isSigner: false, isWritable: true },
|
|
149
154
|
{ pubkey: baseMint, isSigner: false, isWritable: false },
|
|
150
155
|
{ pubkey: quoteMint, isSigner: false, isWritable: false },
|
|
151
|
-
{ pubkey:
|
|
156
|
+
{ pubkey: baseTokenProgram, isSigner: false, isWritable: false },
|
|
152
157
|
{ pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
|
|
153
158
|
{ pubkey: eventAuthority, isSigner: false, isWritable: false },
|
|
154
159
|
{ pubkey: RaydiumLaunchlabService.programId, isSigner: false, isWritable: false },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium-launchlab.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-launchlab.service.ts"],"names":[],"mappings":";;;;;;AAAA,6CAMyB;AACzB,iDAO2B;AAC3B,kDAAuB;AACvB,mFAAwE;AAGxE,MAAa,uBAAuB;IAWlC,gBAAe,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,eAAe;QACpB,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACjF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,KAAgB,EAAE,KAAgB;QACvD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EACpD,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,SAAoB,EAAE,IAAe;QAC1D,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAC5D,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,oBAAoB;QACzB,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3F,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,UAAqB,EAAE,KAAgB;QAChE,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EACzC,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,OAAkB,EAAE,KAAgB;QAC5D,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EACtC,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,2BAA2B,CAC/B,MAAkC;QAElC,MAAM,EACJ,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,SAAS,EACT,eAAe,GAAG,KAAK,GACxB,GAAG,MAAM,CAAC;QAEX,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,SAAS,GAAG,uBAAuB,CAAC,eAAe,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,uBAAuB,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC/E,MAAM,SAAS,GAAG,uBAAuB,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,uBAAuB,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;QACtE,MAAM,aAAa,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEzF,MAAM,gBAAgB,GAAG,IAAA,yCAA6B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"raydium-launchlab.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium-launchlab.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,7 @@ export interface IRaydiumLaunchlabBuyParams {
|
|
|
52
52
|
amountIn: bn;
|
|
53
53
|
minimumAmountOut: bn;
|
|
54
54
|
blockHash: string;
|
|
55
|
+
baseTokenProgram: PublicKey;
|
|
55
56
|
wrapOrUnwrapSol?: boolean;
|
|
56
57
|
}
|
|
57
58
|
export interface IRaydiumLaunchlabSellParams {
|
|
@@ -64,6 +65,7 @@ export interface IRaydiumLaunchlabSellParams {
|
|
|
64
65
|
amountIn: bn;
|
|
65
66
|
minimumAmountOut: bn;
|
|
66
67
|
blockHash: string;
|
|
68
|
+
baseTokenProgram: PublicKey;
|
|
67
69
|
wrapOrUnwrapSol?: boolean;
|
|
68
70
|
}
|
|
69
71
|
//# sourceMappingURL=raydium.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium.types.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,SAAS,CAAC;IAClB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,EAAE,CAAC;IACtB,6BAA6B,EAAE,SAAS,CAAC;IACzC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
1
|
+
{"version":3,"file":"raydium.types.d.ts","sourceRoot":"","sources":["../../../../src/direct-pools/raydium/txn-builder/raydium.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,SAAS,CAAC;IAClB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,EAAE,CAAC;IACtB,6BAA6B,EAAE,SAAS,CAAC;IACzC,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,EAAE,CAAC;IACb,gBAAgB,EAAE,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-program.util.d.ts","sourceRoot":"","sources":["../../../src/direct-pools/utils/token-program.util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,eAAO,MAAM,eAAe,GAC1B,YAAY,UAAU,EACtB,WAAW,SAAS,KACnB,OAAO,CAAC,SAAS,CAqBnB,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getTokenProgram = void 0;
|
|
4
|
+
const spl_token_1 = require("@solana/spl-token");
|
|
5
|
+
const getTokenProgram = async (connection, tokenMint) => {
|
|
6
|
+
try {
|
|
7
|
+
const mintAccountInfo = await connection.getAccountInfo(tokenMint);
|
|
8
|
+
if (!mintAccountInfo) {
|
|
9
|
+
console.debug(`Mint account not found for ${tokenMint.toBase58()}, defaulting to TOKEN_PROGRAM_ID`);
|
|
10
|
+
return spl_token_1.TOKEN_PROGRAM_ID;
|
|
11
|
+
}
|
|
12
|
+
const tokenProgram = mintAccountInfo.owner.equals(spl_token_1.TOKEN_PROGRAM_ID)
|
|
13
|
+
? spl_token_1.TOKEN_PROGRAM_ID
|
|
14
|
+
: spl_token_1.TOKEN_2022_PROGRAM_ID;
|
|
15
|
+
return tokenProgram;
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
console.debug(`Unable to determine token program for mint ${tokenMint.toBase58()}, defaulting to TOKEN_PROGRAM_ID, error: ${error}`);
|
|
19
|
+
return spl_token_1.TOKEN_PROGRAM_ID;
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
exports.getTokenProgram = getTokenProgram;
|
|
23
|
+
//# sourceMappingURL=token-program.util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-program.util.js","sourceRoot":"","sources":["../../../src/direct-pools/utils/token-program.util.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAGrE,MAAM,eAAe,GAAG,KAAK,EAClC,UAAsB,EACtB,SAAoB,EACA,EAAE;IACtB,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CACX,8BAA8B,SAAS,CAAC,QAAQ,EAAE,kCAAkC,CACrF,CAAC;YACF,OAAO,4BAAgB,CAAC;QAC1B,CAAC;QAED,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,4BAAgB,CAAC;YACjE,CAAC,CAAC,4BAAgB;YAClB,CAAC,CAAC,iCAAqB,CAAC;QAE1B,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,8CAA8C,SAAS,CAAC,QAAQ,EAAE,4CAA4C,KAAK,EAAE,CACtH,CAAC;QACF,OAAO,4BAAgB,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC;AAxBW,QAAA,eAAe,mBAwB1B"}
|
|
@@ -21,8 +21,8 @@ class WhirlpoolsService {
|
|
|
21
21
|
const instructions = [];
|
|
22
22
|
const srcMint = aToB ? tokenMintA : tokenMintB;
|
|
23
23
|
const destMint = aToB ? tokenMintB : tokenMintA;
|
|
24
|
-
const tokenOwnerAccountA = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMintA, user);
|
|
25
|
-
const tokenOwnerAccountB = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMintB, user);
|
|
24
|
+
const tokenOwnerAccountA = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMintA, user, true, tokenProgramA);
|
|
25
|
+
const tokenOwnerAccountB = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMintB, user, true, tokenProgramB);
|
|
26
26
|
const oracle = WhirlpoolsService.getOracleAddress(whirlpool);
|
|
27
27
|
// Wrap SOL if source is native SOL or WSOL
|
|
28
28
|
if (wrapOrUnwrapSol && srcMint.equals(spl_token_1.NATIVE_MINT)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whirlpools.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/whirlpools/txn-builder/whirlpools.service.ts"],"names":[],"mappings":";;;AAAA,6CAMyB;AACzB,iDAM2B;AAC3B,mFAAwE;AAGxE,MAAa,iBAAiB;IAM5B,gBAAe,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAC,SAAoB;QAC1C,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,EACrD,IAAI,CAAC,SAAS,CACf,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,MAA6B;QACvD,MAAM,EACJ,SAAS,EACT,IAAI,EACJ,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,WAAW,EACX,WAAW,EACX,MAAM,EACN,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACtB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,UAAU,EACV,sBAAsB,EACtB,SAAS,EACT,eAAe,GAAG,KAAK,GACxB,GAAG,MAAM,CAAC;QAEX,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAEhD,MAAM,kBAAkB,GAAG,IAAA,yCAA6B,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"whirlpools.service.js","sourceRoot":"","sources":["../../../../src/direct-pools/whirlpools/txn-builder/whirlpools.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { GeniusIntentsSDKConfig } from '../../../types/sdk-config';
|
|
2
|
-
import { PriceResponse } from '../../../types/price-response';
|
|
3
1
|
import { EvmDirectPoolConfig } from './evm-direct-pool.types';
|
|
4
2
|
import { IIntentProtocol } from '../../../interfaces/intent-protocol';
|
|
3
|
+
import { GeniusIntentsSDKConfig } from '../../../types/sdk-config';
|
|
5
4
|
import { ChainIdEnum, ProtocolEnum } from '../../../types/enums';
|
|
6
5
|
import { IntentPriceParams } from '../../../types/price-params';
|
|
7
6
|
import { IntentQuoteParams } from '../../../types/quote-params';
|
|
7
|
+
import { PriceResponse } from '../../../types/price-response';
|
|
8
8
|
import { QuoteResponse } from '../../../types/quote-response';
|
|
9
9
|
import { SupportedEvmDexes } from '../pair-discovery';
|
|
10
10
|
export declare class EvmDirectPoolService implements IIntentProtocol {
|
|
@@ -23,14 +23,11 @@ export declare class EvmDirectPoolService implements IIntentProtocol {
|
|
|
23
23
|
readonly chains: ChainIdEnum[];
|
|
24
24
|
readonly protocols: IIntentProtocol[];
|
|
25
25
|
readonly supportedDexes: SupportedEvmDexes[];
|
|
26
|
-
/**
|
|
27
|
-
* Gas limit for native token transfers
|
|
28
|
-
*/
|
|
29
|
-
private _nativeTransferGasLimit;
|
|
30
26
|
/**
|
|
31
27
|
* Mapping of protocol to override parameter keys
|
|
32
28
|
*/
|
|
33
29
|
private _overrideKeys;
|
|
30
|
+
private readonly _geniusSwapRouterDeployments;
|
|
34
31
|
/**
|
|
35
32
|
* Optimized protocol and override key mappings for O(1) lookups
|
|
36
33
|
*/
|
|
@@ -64,9 +61,7 @@ export declare class EvmDirectPoolService implements IIntentProtocol {
|
|
|
64
61
|
private _getProtocolAndKey;
|
|
65
62
|
fetchPrice(params: IntentPriceParams): Promise<PriceResponse>;
|
|
66
63
|
fetchQuote(params: IntentQuoteParams): Promise<QuoteResponse>;
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
*/
|
|
70
|
-
private _buildFeeTransfer;
|
|
64
|
+
private _buildWrappedSwapCalldata;
|
|
65
|
+
private _buildApprovalTransaction;
|
|
71
66
|
}
|
|
72
67
|
//# sourceMappingURL=evm-direct-pool.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm-direct-pool.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/dex/evm-direct-pool/evm-direct-pool.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"evm-direct-pool.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/dex/evm-direct-pool/evm-direct-pool.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EAIpB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAI9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,qBAAa,oBAAqB,YAAW,eAAe;IAC1D;;OAEG;IACH,SAAgB,QAAQ,gCAAgC;IAExD;;OAEG;IACH,SAAgB,WAAW,QAAQ;IACnC,SAAgB,UAAU,SAAS;IAEnC;;OAEG;IACH,SAAgB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7C,SAAgB,cAAc,EAAE,iBAAiB,EAAE,CAAC;IAEpD;;OAEG;IACH,OAAO,CAAC,aAAa,CAOlB;IAEH,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAU3C;IAEF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkD;IAC/E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;gBAE7D,MAAM,CAAC,EAAE,sBAAsB,GAAG,mBAAmB;IA2B1D,eAAe,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,MAAM,EAAE;QAClE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,GAAG,MAAM,IAAI,CAAC;IAMf;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAiBjC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqD/B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAiBb,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAW7D,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAoF1E,OAAO,CAAC,yBAAyB;IAkBjC,OAAO,CAAC,yBAAyB;CAuClC"}
|