forgex-cli 1.0.59 → 1.0.61
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/README.md +375 -368
- package/dist/bin/forgex.d.ts +5 -5
- package/dist/bin/forgex.js +14 -14
- package/dist/bin/forgex.js.map +1 -1
- package/dist/src/adapters/codex-adapter.d.ts +90 -90
- package/dist/src/adapters/codex-adapter.d.ts.map +1 -1
- package/dist/src/adapters/codex-adapter.js +76 -76
- package/dist/src/adapters/codex-adapter.js.map +1 -1
- package/dist/src/adapters/connection.d.ts +6 -6
- package/dist/src/adapters/connection.js +8 -8
- package/dist/src/adapters/connection.js.map +1 -1
- package/dist/src/adapters/ipfs.d.ts +3 -3
- package/dist/src/adapters/ipfs.js +3 -3
- package/dist/src/adapters/jito-adapter.d.ts +85 -85
- package/dist/src/adapters/jito-adapter.d.ts.map +1 -1
- package/dist/src/adapters/jito-adapter.js +111 -111
- package/dist/src/adapters/jito-adapter.js.map +1 -1
- package/dist/src/adapters/rpc-adapter.d.ts +53 -53
- package/dist/src/adapters/rpc-adapter.d.ts.map +1 -1
- package/dist/src/adapters/rpc-adapter.js +69 -69
- package/dist/src/adapters/rpc-adapter.js.map +1 -1
- package/dist/src/adapters/sdk-adapter.d.ts +21 -21
- package/dist/src/adapters/sdk-adapter.d.ts.map +1 -1
- package/dist/src/adapters/sdk-adapter.js +79 -79
- package/dist/src/adapters/sdk-adapter.js.map +1 -1
- package/dist/src/commands/config/index.d.ts +1 -1
- package/dist/src/commands/config/index.js +15 -15
- package/dist/src/commands/config/index.js.map +1 -1
- package/dist/src/commands/query/index.d.ts +2 -2
- package/dist/src/commands/query/index.js +82 -82
- package/dist/src/commands/query/index.js.map +1 -1
- package/dist/src/commands/token/index.d.ts +8 -8
- package/dist/src/commands/token/index.js +73 -73
- package/dist/src/commands/token/index.js.map +1 -1
- package/dist/src/commands/tools/index.d.ts +9 -9
- package/dist/src/commands/tools/index.js +137 -137
- package/dist/src/commands/tools/index.js.map +1 -1
- package/dist/src/commands/trade/index.d.ts +2 -2
- package/dist/src/commands/trade/index.js +82 -82
- package/dist/src/commands/trade/index.js.map +1 -1
- package/dist/src/commands/transfer/index.d.ts +8 -8
- package/dist/src/commands/transfer/index.js +106 -106
- package/dist/src/commands/transfer/index.js.map +1 -1
- package/dist/src/commands/wallet/index.d.ts +1 -1
- package/dist/src/commands/wallet/index.js +175 -175
- package/dist/src/commands/wallet/index.js.map +1 -1
- package/dist/src/config.d.ts +26 -26
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +28 -28
- package/dist/src/config.js.map +1 -1
- package/dist/src/const/index.js +1 -1
- package/dist/src/const/index.js.map +1 -1
- package/dist/src/data-source.d.ts +81 -81
- package/dist/src/data-source.d.ts.map +1 -1
- package/dist/src/data-source.js +149 -149
- package/dist/src/data-source.js.map +1 -1
- package/dist/src/data-store/index.d.ts +22 -22
- package/dist/src/data-store/index.d.ts.map +1 -1
- package/dist/src/data-store/index.js +46 -46
- package/dist/src/data-store/index.js.map +1 -1
- package/dist/src/data-store/types.d.ts +3 -3
- package/dist/src/data-store/types.js +3 -3
- package/dist/src/index.d.ts +2 -2
- package/dist/src/index.js +10 -10
- package/dist/src/index.js.map +1 -1
- package/dist/src/output.d.ts +18 -18
- package/dist/src/output.d.ts.map +1 -1
- package/dist/src/output.js +34 -34
- package/dist/src/output.js.map +1 -1
- package/dist/src/shims/store.d.ts +3 -2
- package/dist/src/shims/store.d.ts.map +1 -1
- package/dist/src/shims/store.js +6 -5
- package/dist/src/shims/store.js.map +1 -1
- package/dist/src/sol-sdk/batch/create.d.ts +4 -1
- package/dist/src/sol-sdk/batch/create.d.ts.map +1 -1
- package/dist/src/sol-sdk/batch/create.js +44 -44
- package/dist/src/sol-sdk/batch/create.js.map +1 -1
- package/dist/src/sol-sdk/batch/index.js +135 -135
- package/dist/src/sol-sdk/batch/index.js.map +1 -1
- package/dist/src/sol-sdk/calc.d.ts +63 -63
- package/dist/src/sol-sdk/calc.d.ts.map +1 -1
- package/dist/src/sol-sdk/calc.js +120 -120
- package/dist/src/sol-sdk/calc.js.map +1 -1
- package/dist/src/sol-sdk/jito/index.js +12 -12
- package/dist/src/sol-sdk/jito/index.js.map +1 -1
- package/dist/src/sol-sdk/launchlab/instructions/create.js +10 -10
- package/dist/src/sol-sdk/launchlab/instructions/create.js.map +1 -1
- package/dist/src/sol-sdk/meteora/index.d.ts +5 -5
- package/dist/src/sol-sdk/meteora/index.js +11 -11
- package/dist/src/sol-sdk/meteora/index.js.map +1 -1
- package/dist/src/sol-sdk/meteora/instructions/buy.js +8 -8
- package/dist/src/sol-sdk/meteora/instructions/buy.js.map +1 -1
- package/dist/src/sol-sdk/meteora/instructions/sell.js +6 -6
- package/dist/src/sol-sdk/meteora/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/pump/index.js +3 -3
- package/dist/src/sol-sdk/pump/index.js.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/buy.d.ts +12 -12
- package/dist/src/sol-sdk/pump/instructions/buy.d.ts.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/buy.js +26 -26
- package/dist/src/sol-sdk/pump/instructions/buy.js.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/createAndBuy.d.ts +13 -13
- package/dist/src/sol-sdk/pump/instructions/createAndBuy.js +17 -17
- package/dist/src/sol-sdk/pump/instructions/createAndBuy.js.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/sell.d.ts +2 -2
- package/dist/src/sol-sdk/pump/instructions/sell.d.ts.map +1 -1
- package/dist/src/sol-sdk/pump/instructions/sell.js +7 -7
- package/dist/src/sol-sdk/pump/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/index.d.ts +4 -4
- package/dist/src/sol-sdk/pumpswap/index.js +5 -5
- package/dist/src/sol-sdk/pumpswap/index.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/buy.d.ts +8 -8
- package/dist/src/sol-sdk/pumpswap/instructions/buy.js +19 -19
- package/dist/src/sol-sdk/pumpswap/instructions/buy.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/migrate.js +2 -2
- package/dist/src/sol-sdk/pumpswap/instructions/migrate.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/instructions/sell.js +4 -4
- package/dist/src/sol-sdk/pumpswap/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/pumpswap/rpc/index.js +1 -1
- package/dist/src/sol-sdk/pumpswap/rpc/index.js.map +1 -1
- package/dist/src/sol-sdk/raydium/instructions/cpmmSell.js +3 -3
- package/dist/src/sol-sdk/raydium/instructions/cpmmSell.js.map +1 -1
- package/dist/src/sol-sdk/raydium/instructions/sell.d.ts +40 -8520
- package/dist/src/sol-sdk/raydium/instructions/sell.d.ts.map +1 -1
- package/dist/src/sol-sdk/raydium/instructions/sell.js +6 -6
- package/dist/src/sol-sdk/raydium/instructions/sell.js.map +1 -1
- package/dist/src/sol-sdk/raydium/rpc/index.d.ts +4 -4
- package/dist/src/sol-sdk/rpc/index.d.ts +14 -14
- package/dist/src/sol-sdk/rpc/index.d.ts.map +1 -1
- package/dist/src/sol-sdk/rpc/index.js +17 -17
- package/dist/src/sol-sdk/rpc/index.js.map +1 -1
- package/dist/src/sol-sdk/transfer/index.js +5 -5
- package/dist/src/sol-sdk/transfer/index.js.map +1 -1
- package/dist/src/sol-sdk/turnover/index.d.ts +3 -3
- package/dist/src/sol-sdk/turnover/index.js +56 -56
- package/dist/src/sol-sdk/turnover/index.js.map +1 -1
- package/dist/src/telemetry.d.ts +8 -8
- package/dist/src/telemetry.d.ts.map +1 -1
- package/dist/src/telemetry.js +25 -25
- package/dist/src/telemetry.js.map +1 -1
- package/dist/src/tx-tracker/detail-adapter.d.ts +53 -53
- package/dist/src/tx-tracker/detail-adapter.d.ts.map +1 -1
- package/dist/src/tx-tracker/detail-adapter.js +68 -68
- package/dist/src/tx-tracker/detail-adapter.js.map +1 -1
- package/dist/src/tx-tracker/index.d.ts +67 -67
- package/dist/src/tx-tracker/index.d.ts.map +1 -1
- package/dist/src/tx-tracker/index.js +103 -103
- package/dist/src/tx-tracker/index.js.map +1 -1
- package/dist/src/types/index.d.ts +10 -10
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/websocket.js +1 -1
- package/dist/src/types/websocket.js.map +1 -1
- package/dist/src/utils/index.js +20 -20
- package/dist/src/utils/index.js.map +1 -1
- package/dist/src/wallet-store.d.ts +51 -51
- package/dist/src/wallet-store.d.ts.map +1 -1
- package/dist/src/wallet-store.js +104 -104
- package/dist/src/wallet-store.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sell.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/raydium/instructions/sell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,4BAA4B,CAAC;AASnF,OAAO,EACL,WAAW,EAEX,SAAS,EACT,UAAU,EAEV,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,eAAO,MAAM,UAAU,GAAU,YAAY,UAAU,EAAE,QAAQ,MAAM
|
|
1
|
+
{"version":3,"file":"sell.d.ts","sourceRoot":"","sources":["../../../../../src/sol-sdk/raydium/instructions/sell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,4BAA4B,CAAC;AASnF,OAAO,EACL,WAAW,EAEX,SAAS,EACT,UAAU,EAEV,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,eAAO,MAAM,UAAU,GAAU,YAAY,UAAU,EAAE,QAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAQtE,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,+KAYnC;IACD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,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,CA+EtB,CAAC"}
|
|
@@ -20,9 +20,9 @@ export const sellInstruction = async ({ amount, owner, poolKeys, mintA, mintB, m
|
|
|
20
20
|
return Promise.reject(new Error('input mint does not match pool'));
|
|
21
21
|
const transaction = new Transaction();
|
|
22
22
|
const baseLamports = 2039280;
|
|
23
|
-
//
|
|
23
|
+
// If initial wsolAccount provided, use it; otherwise create new
|
|
24
24
|
const wsolAccount = initialWsolAccount || (await PublicKey.createWithSeed(owner, seed, TOKEN_PROGRAM_ID));
|
|
25
|
-
//
|
|
25
|
+
// Only create new account if needed and no pre-create instruction provided
|
|
26
26
|
if (needCreateAtaAccount && !createWsolAccountInstruction) {
|
|
27
27
|
const createWsolAccount = SystemProgram.createAccountWithSeed({
|
|
28
28
|
fromPubkey: owner,
|
|
@@ -36,12 +36,12 @@ export const sellInstruction = async ({ amount, owner, poolKeys, mintA, mintB, m
|
|
|
36
36
|
transaction.add(createWsolAccount, createInitializeAccountInstruction(wsolAccount, NATIVE_MINT, owner));
|
|
37
37
|
}
|
|
38
38
|
else if (createWsolAccountInstruction) {
|
|
39
|
-
//
|
|
39
|
+
// If pre-create instruction is provided, use it
|
|
40
40
|
transaction.add(createWsolAccountInstruction);
|
|
41
41
|
}
|
|
42
42
|
const tokenMint = mintA == NATIVE_MINT.toBase58() ? mintB : mintA;
|
|
43
43
|
const tokenAccount = await getAssociatedTokenAddress(new PublicKey(tokenMint), owner);
|
|
44
|
-
//
|
|
44
|
+
// Only create Token Account when needed
|
|
45
45
|
if (needCreateAtaAccount) {
|
|
46
46
|
transaction.add(createAssociatedTokenAccountIdempotentInstruction(owner, tokenAccount, owner, new PublicKey(tokenMint)));
|
|
47
47
|
}
|
|
@@ -56,11 +56,11 @@ export const sellInstruction = async ({ amount, owner, poolKeys, mintA, mintB, m
|
|
|
56
56
|
minAmountOut: new BN(minAmountOut),
|
|
57
57
|
}, 4);
|
|
58
58
|
transaction.add(swapInstruction);
|
|
59
|
-
//
|
|
59
|
+
// Only add close instruction when WSOL account needs to be closed
|
|
60
60
|
if (needCloseWsolAccount) {
|
|
61
61
|
transaction.add(createCloseAccountInstruction(wsolAccount, owner, owner));
|
|
62
62
|
}
|
|
63
|
-
//
|
|
63
|
+
// Only add close instruction when Token account needs to be closed
|
|
64
64
|
if (needCloseTokenAccount) {
|
|
65
65
|
transaction.add(createCloseAccountInstruction(tokenAccount, owner, owner));
|
|
66
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sell.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/raydium/instructions/sell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACnF,OAAO,EACL,WAAW,EACX,yBAAyB,EACzB,iDAAiD,EACjD,6BAA6B,EAC7B,kCAAkC,EAClC,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,WAAW,EACX,OAAO,EACP,SAAS,EAET,aAAa,GAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,UAAsB,EAAE,MAAc,EAAE,EAAE;IACzE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAC1C,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC;KACzC,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EACpC,MAAM,EACN,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,YAAY,EACZ,oBAAoB,GAAG,IAAI,EAC3B,qBAAqB,GAAG,KAAK,EAC7B,oBAAoB,GAAG,IAAI,EAC3B,kBAAkB,EAClB,4BAA4B,GAa7B,EAAwB,EAAE;IACzB,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;IACzC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS;QAC5C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAErE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,OAAO,CAAC;IAE7B,
|
|
1
|
+
{"version":3,"file":"sell.js","sourceRoot":"","sources":["../../../../../src/sol-sdk/raydium/instructions/sell.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,18 +2,18 @@ import { Connection } from '@solana/web3.js';
|
|
|
2
2
|
export declare const raydiumCalcCaPrice: (connection: Connection, poolId: string) => Promise<string>;
|
|
3
3
|
export declare const raydiumGetPoolInfo: (connection: Connection, poolId: string) => Promise<{
|
|
4
4
|
poolBaseTokenInfo: {
|
|
5
|
-
amount:
|
|
5
|
+
amount: any;
|
|
6
6
|
};
|
|
7
7
|
poolQuoteTokenInfo: {
|
|
8
|
-
amount:
|
|
8
|
+
amount: any;
|
|
9
9
|
};
|
|
10
10
|
}>;
|
|
11
11
|
export declare const raydiumGetCpmmPoolInfo: (connection: Connection, poolId: string) => Promise<{
|
|
12
12
|
poolBaseTokenInfo: {
|
|
13
|
-
amount:
|
|
13
|
+
amount: any;
|
|
14
14
|
};
|
|
15
15
|
poolQuoteTokenInfo: {
|
|
16
|
-
amount:
|
|
16
|
+
amount: any;
|
|
17
17
|
};
|
|
18
18
|
}>;
|
|
19
19
|
export declare const searchPoolByMint: (mint: string, isNew: boolean) => Promise<string | {
|
|
@@ -5,24 +5,24 @@ export declare const getTokenAccountBalance: (connection: Connection, mint: stri
|
|
|
5
5
|
export declare const getMultipleTokenAccountBalanceByOwners: (connection: Connection, wallets: string[], tokenAddresses: string) => Promise<number[]>;
|
|
6
6
|
export declare const getTokenAccountsByOwner: (connection: Connection, address: string, tokenAddress: string) => Promise<import("@solana/web3.js").RpcResponseAndContext<import("@solana/web3.js").GetProgramAccountsResponse>>;
|
|
7
7
|
/**
|
|
8
|
-
*
|
|
9
|
-
* @param address
|
|
10
|
-
* @param tokenAddress
|
|
11
|
-
* @param leftFee
|
|
12
|
-
* @param priorityFee
|
|
13
|
-
* @param solBalance
|
|
14
|
-
* @returns
|
|
8
|
+
* Get balance or token balance after deducting gas fee and priority fee
|
|
9
|
+
* @param address Address
|
|
10
|
+
* @param tokenAddress Token address
|
|
11
|
+
* @param leftFee Whether to deduct gas fee and priority fee
|
|
12
|
+
* @param priorityFee Priority fee
|
|
13
|
+
* @param solBalance Known balance
|
|
14
|
+
* @returns Balance or token balance (uiAmount)
|
|
15
15
|
*/
|
|
16
|
-
export declare const getAccountBalanceLeftFee: (address: string, tokenAddress: string, leftFee: boolean, //
|
|
17
|
-
priorityFee?: number, //
|
|
18
|
-
solBalance?: number, //
|
|
16
|
+
export declare const getAccountBalanceLeftFee: (address: string, tokenAddress: string, leftFee: boolean, // Whether to deduct gas fee and priority fee
|
|
17
|
+
priorityFee?: number, // Priority fee
|
|
18
|
+
solBalance?: number, // Balance
|
|
19
19
|
fromTransfer?: boolean) => Promise<number>;
|
|
20
|
-
export declare const getMultipleAccountBalanceLeftFee: (wallets: string[], tokenAddress: string, leftFee: boolean, priorityFee?: number, solBalance?: number, //
|
|
20
|
+
export declare const getMultipleAccountBalanceLeftFee: (wallets: string[], tokenAddress: string, leftFee: boolean, priorityFee?: number, solBalance?: number, // Balance
|
|
21
21
|
fromTransfer?: boolean) => Promise<number[]>;
|
|
22
22
|
/**
|
|
23
|
-
*
|
|
24
|
-
* @param priorityFee
|
|
25
|
-
* @param estimateCU
|
|
23
|
+
* Get CU and price
|
|
24
|
+
* @param priorityFee Priority fee (uiAmount)
|
|
25
|
+
* @param estimateCU Estimated CU
|
|
26
26
|
* @returns { limitIx: TransactionInstruction; priceIx: TransactionInstruction }
|
|
27
27
|
*/
|
|
28
28
|
export declare const getCU: (priorityFee: number, estimateCU?: number) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sol-sdk/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EAIV,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,EAAE,aAAY,UAAwB,eAE9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,SAAS,MAAM,KACd,OAAO,CAAC,MAAM,CAOhB,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,MAAM,MAAM,EACZ,SAAS,MAAM,KACd,OAAO,CAAC,MAAM,CAiBhB,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,YAAY,UAAU,EACtB,SAAS,MAAM,EAAE,EACjB,gBAAgB,MAAM,sBAMvB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,UAAU,EACtB,SAAS,MAAM,EACf,cAAc,MAAM,mHAMrB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,SAAS,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sol-sdk/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EAIV,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,EAAE,aAAY,UAAwB,eAE9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,SAAS,MAAM,KACd,OAAO,CAAC,MAAM,CAOhB,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,MAAM,MAAM,EACZ,SAAS,MAAM,KACd,OAAO,CAAC,MAAM,CAiBhB,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,YAAY,UAAU,EACtB,SAAS,MAAM,EAAE,EACjB,gBAAgB,MAAM,sBAMvB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,UAAU,EACtB,SAAS,MAAM,EACf,cAAc,MAAM,mHAMrB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,cAAc,MAAM,EACpB,SAAS,OAAO,EAAE,6CAA6C;AAC/D,cAAc,MAAM,EAAE,eAAe;AACrC,aAAa,MAAM,EAAE,UAAU;AAC/B,eAAe,OAAO,KACrB,OAAO,CAAC,MAAM,CAmChB,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,SAAS,MAAM,EAAE,EACjB,cAAc,MAAM,EACpB,SAAS,OAAO,EAChB,cAAc,MAAM,EACpB,aAAa,MAAM,EAAE,UAAU;AAC/B,eAAe,OAAO,sBAQvB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAChB,aAAa,MAAM,EACnB,aAAa,MAAM,KAClB;IAAE,OAAO,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,sBAAsB,CAAA;CAQpE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,UAAU,EACtB,QAAQ,MAAM,EACd,WAAU,MAAU,EACpB,WAAU,MAAa,KACtB,OAAO,CAAC,OAAO,CAmBjB,CAAC"}
|
|
@@ -41,22 +41,22 @@ export const getTokenAccountsByOwner = async (connection, address, tokenAddress)
|
|
|
41
41
|
return tokenAccount;
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
44
|
-
*
|
|
45
|
-
* @param address
|
|
46
|
-
* @param tokenAddress
|
|
47
|
-
* @param leftFee
|
|
48
|
-
* @param priorityFee
|
|
49
|
-
* @param solBalance
|
|
50
|
-
* @returns
|
|
44
|
+
* Get balance or token balance after deducting gas fee and priority fee
|
|
45
|
+
* @param address Address
|
|
46
|
+
* @param tokenAddress Token address
|
|
47
|
+
* @param leftFee Whether to deduct gas fee and priority fee
|
|
48
|
+
* @param priorityFee Priority fee
|
|
49
|
+
* @param solBalance Known balance
|
|
50
|
+
* @returns Balance or token balance (uiAmount)
|
|
51
51
|
*/
|
|
52
|
-
export const getAccountBalanceLeftFee = async (address, tokenAddress, leftFee, //
|
|
53
|
-
priorityFee, //
|
|
54
|
-
solBalance, //
|
|
55
|
-
fromTransfer //
|
|
52
|
+
export const getAccountBalanceLeftFee = async (address, tokenAddress, leftFee, // Whether to deduct gas fee and priority fee
|
|
53
|
+
priorityFee, // Priority fee
|
|
54
|
+
solBalance, // Balance
|
|
55
|
+
fromTransfer // Whether called from transfer/aggregation page
|
|
56
56
|
) => {
|
|
57
57
|
// try {
|
|
58
58
|
const { gasSettings: { priorityFee: systemPriorityFee }, rpcUrl, } = store.getState().settings;
|
|
59
|
-
//
|
|
59
|
+
// For transactions, deduct double the priority fee
|
|
60
60
|
const fee = (Number(priorityFee == undefined ? systemPriorityFee : priorityFee) *
|
|
61
61
|
(fromTransfer ? 1 : 2) *
|
|
62
62
|
LAMPORTS_PER_SOL +
|
|
@@ -87,16 +87,16 @@ fromTransfer // 是否从归集页面调用
|
|
|
87
87
|
// return 0;
|
|
88
88
|
// }
|
|
89
89
|
};
|
|
90
|
-
export const getMultipleAccountBalanceLeftFee = async (wallets, tokenAddress, leftFee, priorityFee, solBalance, //
|
|
91
|
-
fromTransfer //
|
|
90
|
+
export const getMultipleAccountBalanceLeftFee = async (wallets, tokenAddress, leftFee, priorityFee, solBalance, // Balance
|
|
91
|
+
fromTransfer // Whether called from transfer/aggregation page
|
|
92
92
|
) => {
|
|
93
93
|
const tokenAccountBalances = await Promise.all(wallets.map(wallet => getAccountBalanceLeftFee(wallet, tokenAddress, leftFee, priorityFee, solBalance, fromTransfer)));
|
|
94
94
|
return tokenAccountBalances;
|
|
95
95
|
};
|
|
96
96
|
/**
|
|
97
|
-
*
|
|
98
|
-
* @param priorityFee
|
|
99
|
-
* @param estimateCU
|
|
97
|
+
* Get CU and price
|
|
98
|
+
* @param priorityFee Priority fee (uiAmount)
|
|
99
|
+
* @param estimateCU Estimated CU
|
|
100
100
|
* @returns { limitIx: TransactionInstruction; priceIx: TransactionInstruction }
|
|
101
101
|
*/
|
|
102
102
|
export const getCU = (priorityFee, estimateCU) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sol-sdk/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,SAAS,EACT,gBAAgB,EAChB,oBAAoB,GAErB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,yBAAyB,EAAE,WAAW,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AACpH,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,WAAW,GAAG,KAAK,CAAC;AAE1B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,aAAyB,WAAW,EAAE,EAAE;IACjF,OAAO,IAAI,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,UAAsB,EACtB,OAAe,EACE,EAAE;IACnB,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtF,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,UAAsB,EACtB,IAAY,EACZ,OAAe,EACE,EAAE;IACnB,uCAAuC;IACvC,KAAK,MAAM,SAAS,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,yBAAyB,CAChD,IAAI,SAAS,CAAC,IAAI,CAAC,EACnB,IAAI,SAAS,CAAC,OAAO,CAAC,EACtB,KAAK,EACL,SAAS,CACV,CAAC;YACF,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YAChF,IAAI,mBAAmB,CAAC,KAAK,CAAC,QAAQ;gBAAE,OAAO,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,2BAA2B;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,KAAK,EACzD,UAAsB,EACtB,OAAiB,EACjB,cAAsB,EACtB,EAAE;IACF,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAClF,CAAC;IACF,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,UAAsB,EACtB,OAAe,EACf,YAAoB,EACpB,EAAE;IACF,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,uBAAuB,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;QACpF,IAAI,EAAE,IAAI,SAAS,CAAC,YAAY,CAAC;KAClC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,OAAe,EACf,YAAoB,EACpB,OAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sol-sdk/rpc/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { PublicKey, SystemProgram, Transaction, LAMPORTS_PER_SOL, } from '@solan
|
|
|
2
2
|
import { createAssociatedTokenAccountIdempotentInstruction, createTransferCheckedInstruction, createSyncNativeInstruction, createCloseAccountInstruction, getAssociatedTokenAddressSync, } from '@solana/spl-token';
|
|
3
3
|
import BigNumber from 'bignumber.js';
|
|
4
4
|
const MIN_COMMISSION_AMOUNT = new BigNumber(0.005).times(LAMPORTS_PER_SOL).toNumber();
|
|
5
|
-
//
|
|
5
|
+
// Transfer SOL instruction
|
|
6
6
|
export const transferSOLInstruction = (from, to, amount) => {
|
|
7
7
|
return SystemProgram.transfer({
|
|
8
8
|
fromPubkey: from,
|
|
@@ -13,14 +13,14 @@ export const transferSOLInstruction = (from, to, amount) => {
|
|
|
13
13
|
export const transferSOL = (addresses) => {
|
|
14
14
|
return addresses.map(address => transferSOLInstruction(new PublicKey(address.from), new PublicKey(address.to), address.amount));
|
|
15
15
|
};
|
|
16
|
-
//
|
|
16
|
+
// Transfer token instruction
|
|
17
17
|
export const transferTokenInstruction = ({ from, to, amount, token, fromAta, toAta, decimals, }) => {
|
|
18
18
|
const tx = new Transaction();
|
|
19
19
|
tx.add(createAssociatedTokenAccountIdempotentInstruction(from, toAta, new PublicKey(to), new PublicKey(token)));
|
|
20
20
|
tx.add(createTransferCheckedInstruction(fromAta, new PublicKey(token), toAta, from, BigInt(amount), decimals, [from]));
|
|
21
21
|
return [tx];
|
|
22
22
|
};
|
|
23
|
-
//
|
|
23
|
+
// Batch transfer token instruction
|
|
24
24
|
export const transferToken = (addresses) => {
|
|
25
25
|
const alltxs = [];
|
|
26
26
|
addresses.forEach(address => {
|
|
@@ -39,7 +39,7 @@ export const transferToken = (addresses) => {
|
|
|
39
39
|
});
|
|
40
40
|
return alltxs;
|
|
41
41
|
};
|
|
42
|
-
//
|
|
42
|
+
// Transfer SOL to WSOL instruction
|
|
43
43
|
export const solToWsolInstruction = ({ from, fromAta, amount, }) => {
|
|
44
44
|
const txs = [];
|
|
45
45
|
txs.push(SystemProgram.transfer({
|
|
@@ -49,7 +49,7 @@ export const solToWsolInstruction = ({ from, fromAta, amount, }) => {
|
|
|
49
49
|
}), createSyncNativeInstruction(fromAta));
|
|
50
50
|
return txs;
|
|
51
51
|
};
|
|
52
|
-
//
|
|
52
|
+
// Transfer WSOL to SOL instruction
|
|
53
53
|
export const wsolToSolInstruction = ({ from, fromAta, }) => {
|
|
54
54
|
const txs = [];
|
|
55
55
|
txs.push(createCloseAccountInstruction(fromAta, from, from));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sol-sdk/transfer/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,aAAa,EACb,WAAW,EAGX,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iDAAiD,EACjD,gCAAgC,EAChC,2BAA2B,EAC3B,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEtF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sol-sdk/transfer/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,15 +68,15 @@ export interface BatchTurnoverParams {
|
|
|
68
68
|
meteoraDLMMReverseInfo?: MeteoraDLMMReverseInfo;
|
|
69
69
|
}
|
|
70
70
|
/**
|
|
71
|
-
*
|
|
71
|
+
* Execute a single turnover trade (bundled buy + sell transaction)
|
|
72
72
|
*/
|
|
73
73
|
export declare const executeSingleTurnover: (params: TurnoverTradeParams) => Promise<TurnoverTradeResult>;
|
|
74
74
|
/**
|
|
75
|
-
*
|
|
75
|
+
* Execute batch turnover trades
|
|
76
76
|
*/
|
|
77
77
|
export declare const executeBatchTurnover: (params: BatchTurnoverParams) => Promise<TurnoverTradeResult[]>;
|
|
78
78
|
/**
|
|
79
|
-
*
|
|
79
|
+
* Calculate SOL transfer amount for turnover trades
|
|
80
80
|
*/
|
|
81
81
|
export declare const calculateTurnoverProfit: (tokenAmount: number, priceInSol: number, slippage?: number, fees?: number) => number;
|
|
82
82
|
//# sourceMappingURL=index.d.ts.map
|