@clonegod/ttd-sol-common 2.0.13 → 2.0.15

package/dist/common/constants.d.ts

@@ -3,3 +3,4 @@ export declare enum COMMITMENT_LEVEL {
     CONFIRMED = "confirmed",
     _FINALIZED = "finalized"
 }
+export declare const LAMPORTS_PER_MICRO_LAMPORTS = 1000000;

package/dist/common/constants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMITMENT_LEVEL = void 0;
+exports.LAMPORTS_PER_MICRO_LAMPORTS = exports.COMMITMENT_LEVEL = void 0;
 var COMMITMENT_LEVEL;
 (function (COMMITMENT_LEVEL) {
     COMMITMENT_LEVEL["PROCESSED"] = "processed";
     COMMITMENT_LEVEL["CONFIRMED"] = "confirmed";
     COMMITMENT_LEVEL["_FINALIZED"] = "finalized";
 })(COMMITMENT_LEVEL || (exports.COMMITMENT_LEVEL = COMMITMENT_LEVEL = {}));
+exports.LAMPORTS_PER_MICRO_LAMPORTS = 1000000;

package/dist/common/index.d.ts

@@ -1,2 +1,3 @@
 export * from './constants';
 export * from './get_wallet_token_account';
+export * from './subscribe_account_update';

package/dist/common/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./get_wallet_token_account"), exports);
+__exportStar(require("./subscribe_account_update"), exports);

package/dist/common/subscribe_account_update.d.ts

@@ -1,4 +1,4 @@
 import { StandardPoolInfoType } from "@clonegod/ttd-core";
 import { DEX_ID } from "@clonegod/ttd-core/dist";
 import { SolanaPoolAccountUpdateEventData } from "../types";
-export declare function subscribe_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void): void;
+export declare function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void): void;

package/dist/common/subscribe_account_update.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribe_account_update = subscribe_account_update;
+exports.subscribe_pool_account_update = subscribe_pool_account_update;
 const dist_1 = require("@clonegod/ttd-core/dist");
-function subscribe_account_update(dex_id, pool_list, callback) {
+function subscribe_pool_account_update(dex_id, pool_list, callback) {
     const ws_url = process.env.SUBSCIBE_MULTIPLE_PROVIDERS_WS_URL || 'ws://127.0.0.1:10000';
     const ws_client = new dist_1.WebSocketClient(ws_url);
     ws_client.onOpen(() => {

package/dist/trade/send/helius.d.ts

@@ -0,0 +1,3 @@
+import { Transaction } from "@solana/web3.js";
+export declare const HELIUS_JITO_TIP_ACCOUNTS: string[];
+export declare const sendTxWithHelius: (signedTransaction: Transaction, send_jito?: boolean) => Promise<string>;

package/dist/trade/send/helius.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendTxWithHelius = exports.HELIUS_JITO_TIP_ACCOUNTS = void 0;
+const axios_1 = __importDefault(require("axios"));
+exports.HELIUS_JITO_TIP_ACCOUNTS = [
+    "4ACfpUFoaSD9bfPdeu6DBt89gB6ENTeHBXCAi87NhDEE",
+    "D2L6yPZ2FmmmTKPgzaMKdhu6EWZcTpLy1Vhx8uvZe7NZ",
+    "9bnz4RShgq1hAnLnZbP8kbgBg1kEmcJBYQq3gQbmnSta",
+    "5VY91ws6B2hMmBFRsXkoAAdsPHBJwRfBht4DXox3xkwn",
+    "2nyhqdwKcJZR2vcqCyrYsaPVdAnFoJjiksCXJ7hfEYgD",
+    "2q5pghRs6arqVjRvT5gfgWfWcHWmw1ZuCzphgd5KfWGJ",
+    "wyvPkWjVZz1M8fHQnMMCDTQDbkManefNNhweYk5WkcF",
+    "3KCKozbAaF75qEU33jtzozcJ29yJuaLJTy2jFdzUY8bT",
+    "4vieeGHPYPG2MmyPRcYjdiDmmhN3ww7hsFNap8pVN3Ey",
+    "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
+];
+const sendTxWithHelius = async (signedTransaction, send_jito = true) => {
+    let url = 'http://tyo-sender.helius-rpc.com/fast';
+    if (!send_jito) {
+        url = url + "?swqos_only=true";
+    }
+    const response = await axios_1.default.post(url, {
+        jsonrpc: '2.0',
+        id: Date.now().toString(),
+        method: 'sendTransaction',
+        params: [
+            Buffer.from(signedTransaction.serialize()).toString('base64'),
+            {
+                encoding: 'base64',
+                skipPreflight: true,
+                maxRetries: 0
+            }
+        ]
+    });
+    console.dir(response.data, { depth: null });
+    return response.data.result;
+};
+exports.sendTxWithHelius = sendTxWithHelius;

package/dist/trade/send/index.d.ts

@@ -0,0 +1 @@
+export * from './send_tx';

package/dist/trade/send/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./send_tx"), exports);

package/dist/trade/send/send_tx.d.ts

@@ -0,0 +1,6 @@
+import { Transaction } from '@solana/web3.js';
+export declare class TransactionSender {
+    constructor();
+    sendTransaction(singedTransactions: Transaction[]): Promise<string>;
+    sendBundle(signedTransactions: Transaction[]): Promise<string>;
+}

package/dist/trade/send/send_tx.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionSender = void 0;
+const helius_1 = require("./helius");
+class TransactionSender {
+    constructor() {
+    }
+    async sendTransaction(singedTransactions) {
+        if (singedTransactions.length === 1) {
+            return await (0, helius_1.sendTxWithHelius)(singedTransactions[0]);
+        }
+        else {
+            return await this.sendBundle(singedTransactions);
+        }
+    }
+    async sendBundle(signedTransactions) {
+        throw new Error('not implemented');
+    }
+}
+exports.TransactionSender = TransactionSender;

package/dist/trade/tx_builder.d.ts

@@ -13,6 +13,7 @@ export declare class SolTransactionBuilder {
     execute(context: TradeContext): Promise<string>;
     getPreInstructions(context: TradeContext): TransactionInstruction[];
     getPostInstructions(context: TradeContext): TransactionInstruction[];
-    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction;
-    buildTransactionForTip(context: TradeContext, tipAccount: string, tipAmount: number, tipPayer: Keypair): Transaction;
+    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[], send_jito?: boolean): Transaction;
+    getHeliusJitoTipInstruction(context: TradeContext): TransactionInstruction;
+    buildTransactionForTip(context: TradeContext, tipAccount: string, tipAmount: number, tipPayer?: Keypair): Transaction;
 }

package/dist/trade/tx_builder.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolTransactionBuilder = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 const web3_js_1 = require("@solana/web3.js");
-const LAMPORTS_PER_MICRO_LAMPORTS = 1000000;
+const common_1 = require("../common");
+const helius_1 = require("./send/helius");
 class SolTransactionBuilder {
     constructor(appConfig) {
         this.appConfig = appConfig;
@@ -26,7 +27,7 @@ class SolTransactionBuilder {
     getPreInstructions(context) {
         const cu_limit = context.pool_info.cu_limit || 600000;
         const sol_priority_fee_lamports = context.trade_runtime.settings.strategy.sol_priority_fee;
-        const priorityFeeMicroLamports = Math.floor((sol_priority_fee_lamports * LAMPORTS_PER_MICRO_LAMPORTS) / cu_limit);
+        const priorityFeeMicroLamports = Math.floor((sol_priority_fee_lamports * common_1.LAMPORTS_PER_MICRO_LAMPORTS) / cu_limit);
         const computeBudgetInstruction = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: cu_limit,
         });
@@ -38,7 +39,7 @@ class SolTransactionBuilder {
     getPostInstructions(context) {
         return [];
     }
-    buildTransactionForSwap(context, swapInstructions) {
+    buildTransactionForSwap(context, swapInstructions, send_jito = true) {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset;
         const swapTx = new web3_js_1.Transaction();
         const preInstructions = this.getPreInstructions(context);
@@ -47,10 +48,22 @@ class SolTransactionBuilder {
         swapTx.recentBlockhash = this.recentBlockhash;
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset;
         swapTx.feePayer = this.keypair.publicKey;
+        if (send_jito) {
+            let jitoTipInstruction = this.getHeliusJitoTipInstruction(context);
+            swapTx.instructions.push(jitoTipInstruction);
+        }
         swapTx.sign(this.keypair);
         return swapTx;
     }
-    buildTransactionForTip(context, tipAccount, tipAmount, tipPayer) {
+    getHeliusJitoTipInstruction(context) {
+        let tip_lamports = Math.max(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * web3_js_1.LAMPORTS_PER_SOL);
+        return web3_js_1.SystemProgram.transfer({
+            fromPubkey: this.keypair.publicKey,
+            toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_JITO_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_JITO_TIP_ACCOUNTS.length)]),
+            lamports: tip_lamports,
+        });
+    }
+    buildTransactionForTip(context, tipAccount, tipAmount, tipPayer = undefined) {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset;
         if (!tipPayer) {
             tipPayer = this.keypair;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/src/common/constants.ts

@@ -12,3 +12,6 @@ export enum COMMITMENT_LEVEL {
     _FINALIZED = "finalized"
 }
 
+// There are 10^6 micro-lamports in one lamport
+export const LAMPORTS_PER_MICRO_LAMPORTS = 1000000;
+

package/src/common/index.ts

@@ -1,3 +1,3 @@
 export * from './constants'
 export * from './get_wallet_token_account'
-
+export * from './subscribe_account_update'

package/src/common/subscribe_account_update.ts

@@ -7,7 +7,7 @@ import { SolanaPoolAccountUpdateEventData } from "../types";
  * - 询价：基于池子数据计算价格
  * - 交易使用：交易中需要池子的最新状态
  */
-export function subscribe_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void) {
+export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void) {
     const ws_url = process.env.SUBSCIBE_MULTIPLE_PROVIDERS_WS_URL || 'ws://127.0.0.1:10000';
     const ws_client = new WebSocketClient(ws_url)
     ws_client.onOpen(() => {

package/src/trade/send/helius.ts

@@ -0,0 +1,38 @@
+import { Transaction } from "@solana/web3.js"
+import axios from "axios"
+
+export const HELIUS_JITO_TIP_ACCOUNTS = [
+    "4ACfpUFoaSD9bfPdeu6DBt89gB6ENTeHBXCAi87NhDEE",
+    "D2L6yPZ2FmmmTKPgzaMKdhu6EWZcTpLy1Vhx8uvZe7NZ",
+    "9bnz4RShgq1hAnLnZbP8kbgBg1kEmcJBYQq3gQbmnSta",
+    "5VY91ws6B2hMmBFRsXkoAAdsPHBJwRfBht4DXox3xkwn",
+    "2nyhqdwKcJZR2vcqCyrYsaPVdAnFoJjiksCXJ7hfEYgD",
+    "2q5pghRs6arqVjRvT5gfgWfWcHWmw1ZuCzphgd5KfWGJ",
+    "wyvPkWjVZz1M8fHQnMMCDTQDbkManefNNhweYk5WkcF",
+    "3KCKozbAaF75qEU33jtzozcJ29yJuaLJTy2jFdzUY8bT",
+    "4vieeGHPYPG2MmyPRcYjdiDmmhN3ww7hsFNap8pVN3Ey",
+    "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
+]
+
+export const sendTxWithHelius = async (signedTransaction: Transaction, send_jito:boolean=true): Promise<string> => {
+    let url = 'http://tyo-sender.helius-rpc.com/fast'
+    if(!send_jito) {
+        url = url + "?swqos_only=true"
+    }
+    const response = await axios.post<{ result: string }>(url, {
+        jsonrpc: '2.0',
+        id: Date.now().toString(),
+        method: 'sendTransaction',
+        params: [
+            Buffer.from(signedTransaction.serialize()).toString('base64'),
+            {
+                encoding: 'base64',
+                skipPreflight: true, // Required for Sender
+                maxRetries: 0
+            }
+        ]
+    })
+    console.dir(response.data, { depth: null })
+    
+    return response.data.result;
+}

package/src/trade/send/index.ts

@@ -0,0 +1,2 @@
+export * from './send_tx';
+

package/src/trade/send/jito.ts

@@ -0,0 +1,35 @@
+// import { TradeContext } from "@clonegod/ttd-core/dist";
+// import { ComputeBudgetProgram, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
+// import axios from "axios";
+
+// export class JitoUtils {
+//     public jitoTipAccounts: string[] = []
+
+//     constructor() {
+//         this.init();
+//     }
+
+//     async init(): Promise<void> {
+//         return this.fetchJitoTipAccounts().then((accounts) => {
+//             this.jitoTipAccounts = accounts;
+//             console.log(`fetchJitoTipAccounts success: ${accounts.length} accounts`, accounts)
+//         });
+//     }
+
+//     async fetchJitoTipAccounts(): Promise<string[]> {
+//         const response = await axios.post<{ result: string[] }>('https://mainnet.block-engine.jito.wtf/api/v1/getTipAccounts', {
+//             jsonrpc: '2.0',
+//             id: 1,
+//             method: 'getTipAccounts',
+//             params: []
+//         })
+//         return response.data.result;
+//     }
+
+//     getRandomJitoTipAccount(): string {
+//         if(this.jitoTipAccounts.length === 0) {
+//             throw new Error('jitoTipAccounts is empty');
+//         }
+//         return this.jitoTipAccounts[Math.floor(Math.random() * this.jitoTipAccounts.length)];
+//     }
+// }

package/src/trade/send/send_tx.ts

@@ -0,0 +1,34 @@
+import { AppConfig, log_error, log_info, TradeContext } from '@clonegod/ttd-core/dist';
+import { Connection, Keypair, Transaction, TransactionInstruction } from '@solana/web3.js';
+import { sendTxWithHelius } from './helius';
+
+
+/**
+ * Solana 交易发送器（参考 BSC 的多渠道并行发送设计）
+ * 
+ * 设计思路对齐 BSC：
+ * - 交易构造由具体 DEX Trade 类完成，只返回 swap 指令
+ * - buildMainTx 负责构建主交易（所有渠道共用，只构建一次）
+ * - buildTipTx 负责构建 tip 交易（渠道特定，动态构建）
+ * - TransactionSender 负责多渠道并行发送（RPC / Helius / Jito）
+ */
+export class TransactionSender {
+
+    constructor() {
+    }
+
+    async sendTransaction(singedTransactions: Transaction[]): Promise<string> {
+        if(singedTransactions.length === 1) {
+            return await sendTxWithHelius(singedTransactions[0])
+        } else {
+            return await this.sendBundle(singedTransactions)
+        }
+    }
+
+    async sendBundle(signedTransactions: Transaction[]): Promise<string> {
+        throw new Error('not implemented')
+    }
+
+
+}
+

package/src/trade/tx_builder.ts

@@ -1,12 +1,11 @@
 import { CHAIN_ID, TradeContext } from "@clonegod/ttd-core/dist";
-import { SolanaBlockMetaUpdateEvent } from "../types";
 import { ComputeBudgetProgram, Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
+import { LAMPORTS_PER_MICRO_LAMPORTS } from "../common";
+import { SolanaBlockMetaUpdateEvent } from "../types";
 import { SolanaTradeAppConfig } from "./SolanaTradeAppConfig";
+import { HELIUS_JITO_TIP_ACCOUNTS } from "./send/helius";
 
 
-// There are 10^6 micro-lamports in one lamport
-const LAMPORTS_PER_MICRO_LAMPORTS = 1000000;
-
 export class SolTransactionBuilder {
     appConfig: SolanaTradeAppConfig
     protected connection: Connection
@@ -67,7 +66,7 @@ export class SolTransactionBuilder {
     }
 
 
-    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction {
+    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[], send_jito: boolean=true): Transaction {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset
         // console.log(`buildTransactionForSwap, max_block_offset: ${max_block_offset}`)
 
@@ -81,12 +80,26 @@ export class SolTransactionBuilder {
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset
         swapTx.feePayer = this.keypair.publicKey
 
+        if(send_jito) {
+            let jitoTipInstruction = this.getHeliusJitoTipInstruction(context)
+            swapTx.instructions.push(jitoTipInstruction)
+        }
+
         swapTx.sign(this.keypair)
 
         return swapTx
     }
 
-    buildTransactionForTip(context: TradeContext, tipAccount: string, tipAmount: number, tipPayer: Keypair): Transaction {
+    getHeliusJitoTipInstruction(context: TradeContext): TransactionInstruction {
+        let tip_lamports = Math.max(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * LAMPORTS_PER_SOL)
+        return SystemProgram.transfer({
+            fromPubkey: this.keypair.publicKey,
+            toPubkey: new PublicKey(HELIUS_JITO_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_JITO_TIP_ACCOUNTS.length)]),
+            lamports: tip_lamports,
+        })
+    }
+
+    buildTransactionForTip(context: TradeContext, tipAccount: string, tipAmount: number, tipPayer: Keypair=undefined): Transaction {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset
 
         if(!tipPayer) {