@clonegod/ttd-sol-common 2.0.24 → 2.0.26

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

@@ -6,5 +6,5 @@ export declare class JitoUtils {
     static fetchJitoTipAccounts(): Promise<string[]>;
 }
 export declare const getJitoTipAccount: () => string;
-export declare const sendBundleWithJito: (signedTransactions: Transaction[]) => Promise<string>;
-export declare const sendBundleWithJitoByMultiIps: (signedTransactions: Transaction[]) => Promise<string>;
+export declare const sendBundleWithJito: (mainTx: Transaction, tipTx: Transaction) => Promise<string>;
+export declare const sendBundleWithJitoMultiIps: (mainTx: Transaction, tipTx: Transaction) => Promise<string>;

package/dist/trade/send/jito.js

@@ -1,10 +1,41 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendBundleWithJitoByMultiIps = exports.sendBundleWithJito = exports.getJitoTipAccount = exports.JitoUtils = exports.JITO_TIP_ACCOUNTS = void 0;
-const axios_1 = __importDefault(require("axios"));
+exports.sendBundleWithJitoMultiIps = exports.sendBundleWithJito = exports.getJitoTipAccount = exports.JitoUtils = exports.JITO_TIP_ACCOUNTS = void 0;
+const axios_1 = __importStar(require("axios"));
+const dist_1 = require("@clonegod/ttd-core/dist");
 const http_client_1 = require("./http_client");
 exports.JITO_TIP_ACCOUNTS = [
     "DfXygSm4jCyNCybVYYK6DwvWqjKee8pbDmJGcLWNDXjh",
@@ -45,31 +76,48 @@ const getJitoTipAccount = () => {
 };
 exports.getJitoTipAccount = getJitoTipAccount;
 JitoUtils.init();
-const sendBundleWithJito = async (signedTransactions) => {
+const sendBundleWithJito = async (mainTx, tipTx) => {
+    var _a, _b, _c, _d, _e, _f;
     let url = process.env.JITO_SEND_BUNDLE_URL || 'https://tokyo.mainnet.block-engine.jito.wtf/api/v1/bundles';
     const client = (0, http_client_1.getHttpClient)(url);
-    const response = await client.post(url, {
+    const requestData = {
         jsonrpc: '2.0',
         id: 1,
         method: 'sendBundle',
         params: [
-            signedTransactions.map(tx => Buffer.from(tx.serialize()).toString('base64')),
+            [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')),
             {
                 "encoding": "base64"
             }
         ]
-    });
-    return response.data.result;
+    };
+    try {
+        const response = await client.post(url, requestData);
+        return response.data.result;
+    }
+    catch (error) {
+        if (error instanceof axios_1.AxiosError) {
+            const method = ((_b = (_a = error.config) === null || _a === void 0 ? void 0 : _a.method) === null || _b === void 0 ? void 0 : _b.toUpperCase()) || '';
+            const errorUrl = ((_c = error.config) === null || _c === void 0 ? void 0 : _c.url) || url;
+            const errorData = (_d = error.config) === null || _d === void 0 ? void 0 : _d.data;
+            const status = (_e = error.response) === null || _e === void 0 ? void 0 : _e.status;
+            const statusText = (_f = error.response) === null || _f === void 0 ? void 0 : _f.statusText;
+            (0, dist_1.log_warn)(`[sendBundleWithJito] Request failed - method: ${method}, url: ${errorUrl}, status: ${status}, statusText: ${statusText}, data: ${errorData}`);
+        }
+        else {
+            (0, dist_1.log_warn)(`[sendBundleWithJito] Unexpected error: ${url} - ${error.message}`);
+        }
+    }
 };
 exports.sendBundleWithJito = sendBundleWithJito;
-const sendBundleWithJitoByMultiIps = async (signedTransactions) => {
+const sendBundleWithJitoMultiIps = async (mainTx, tipTx) => {
     let ips = (process.env.JITO_SEND_BUNDLE_PROXY_SERVERS || '127.0.0.1').split(',');
-    let urls = ips.map(ip => `http://${ip}:18888/solana/send_tx`);
+    let urls = ips.map(ip => `http://${ip}:10429/solana/send_tx`);
     const body = {
         trace_id: '',
-        txid: Buffer.from(signedTransactions[0].serialize()).toString('base64'),
+        txid: Buffer.from(mainTx.serialize()).toString('base64'),
         encoding: 'base64',
-        encoded_tx: signedTransactions.map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),
+        encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),
         max_retry: 3
     };
     Promise.all(urls.map(async (url) => {
@@ -84,4 +132,4 @@ const sendBundleWithJitoByMultiIps = async (signedTransactions) => {
     }));
     return 'success';
 };
-exports.sendBundleWithJitoByMultiIps = sendBundleWithJitoByMultiIps;
+exports.sendBundleWithJitoMultiIps = sendBundleWithJitoMultiIps;

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

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

package/dist/trade/send/send_tx.js

@@ -6,16 +6,16 @@ const jito_1 = require("./jito");
 class TransactionSender {
     constructor() {
     }
-    async sendTransaction(singedTransactions, swqos_only) {
-        if (singedTransactions.length === 1) {
-            return await (0, helius_1.sendTxWithHelius)(singedTransactions[0], swqos_only);
+    async sendTransaction(singedTransaction, swqos_only) {
+        return await (0, helius_1.sendTxWithHelius)(singedTransaction, swqos_only);
+    }
+    async sendBundle(mainTx, tipTx, use_multi_ips = false) {
+        if (use_multi_ips) {
+            return await (0, jito_1.sendBundleWithJitoMultiIps)(mainTx, tipTx);
         }
         else {
-            return await this.sendBundle(singedTransactions);
+            return await (0, jito_1.sendBundleWithJito)(mainTx, tipTx);
         }
     }
-    async sendBundle(signedTransactions) {
-        return await (0, jito_1.sendBundleWithJito)(signedTransactions);
-    }
 }
 exports.TransactionSender = TransactionSender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "description": "",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "2.1.5",
+    "@clonegod/ttd-core": "2.1.6",
     "@solana/web3.js": "1.91.6",
     "rpc-websockets": "7.10.0",
     "axios": "^1.2.3",

package/src/trade/send/jito.ts

@@ -1,5 +1,6 @@
 import { Transaction } from "@solana/web3.js";
-import axios from "axios";
+import axios, { AxiosError } from "axios";
+import { log_error, log_warn } from "@clonegod/ttd-core/dist";
 import { getHttpClient } from "./http_client";
 
 export const JITO_TIP_ACCOUNTS = [
@@ -48,43 +49,59 @@ JitoUtils.init()
 
 // -----------------------------------------------------------
 
-export const sendBundleWithJito = async (signedTransactions: Transaction[]): Promise<string> => {
+export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction): Promise<string> => {
     let url = process.env.JITO_SEND_BUNDLE_URL || 'https://tokyo.mainnet.block-engine.jito.wtf/api/v1/bundles'
 
     // 使用共享的 axios 实例，复用连接池
     const client = getHttpClient(url)
-    const response = await client.post<{ result: string }>(url, {
+
+    const requestData = {
         jsonrpc: '2.0',
         id: 1,
         method: 'sendBundle',
         params: [
-            signedTransactions.map(tx => Buffer.from(tx.serialize()).toString('base64')),
+            [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')),
             {
                 "encoding": "base64"
             }
         ]
-    })
-
-    // {
-    //     jsonrpc: '2.0',
-    //     result: 'e62062b4af6963bb0f67fea429f97e4f4fee59851a4ef65154b9f49b5995b5be', // bundle id
-    //     id: 1
-    // }
-    // console.dir(response.data, { depth: null })
-
-    return response.data.result;
+    };
+
+    try {
+        const response = await client.post<{ result: string }>(url, requestData)
+        // {
+        //     jsonrpc: '2.0',
+        //     result: 'e62062b4af6963bb0f67fea429f97e4f4fee59851a4ef65154b9f49b5995b5be', // bundle id
+        //     id: 1
+        // }
+        // console.dir(response.data, { depth: null })
+        return response.data.result;
+    } catch (error) {
+        if(error instanceof AxiosError) {
+            // 提取关键错误信息
+            const method = error.config?.method?.toUpperCase() || '';
+            const errorUrl = error.config?.url || url;
+            const errorData = error.config?.data;
+            const status = error.response?.status;
+            const statusText = error.response?.statusText;
+            
+            log_warn(`[sendBundleWithJito] Request failed - method: ${method}, url: ${errorUrl}, status: ${status}, statusText: ${statusText}, data: ${errorData}`);
+        } else {
+            log_warn(`[sendBundleWithJito] Unexpected error: ${url} - ${error.message}`);
+        }
+    }
 }
 
 
-export const sendBundleWithJitoByMultiIps = async (signedTransactions: Transaction[]): Promise<string> => {
+export const sendBundleWithJitoMultiIps = async (mainTx: Transaction, tipTx: Transaction): Promise<string> => {
     let ips = (process.env.JITO_SEND_BUNDLE_PROXY_SERVERS || '127.0.0.1').split(',')
-    let urls = ips.map(ip => `http://${ip}:18888/solana/send_tx`)
+    let urls = ips.map(ip => `http://${ip}:10429/solana/send_tx`)
 
     const body = {
         trace_id: '',
-        txid: Buffer.from(signedTransactions[0].serialize()).toString('base64'),
+        txid: Buffer.from(mainTx.serialize()).toString('base64'),
         encoding: 'base64',    // base64
-        encoded_tx: signedTransactions.map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),  // main tx
+        encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),  // main tx
         max_retry: 3
     }
 

package/src/trade/send/send_tx.ts

@@ -1,6 +1,6 @@
 import { Transaction } from '@solana/web3.js';
 import { sendTxWithHelius } from './helius';
-import { sendBundleWithJito } from './jito';
+import { sendBundleWithJito, sendBundleWithJitoMultiIps } from './jito';
 
 
 /**
@@ -11,16 +11,16 @@ export class TransactionSender {
     constructor() {
     }
 
-    async sendTransaction(singedTransactions: Transaction[], swqos_only:boolean): Promise<string> {
-        if(singedTransactions.length === 1) {
-            return await sendTxWithHelius(singedTransactions[0], swqos_only)
-        } else {
-            return await this.sendBundle(singedTransactions)
-        }
+    async sendTransaction(singedTransaction: Transaction, swqos_only:boolean): Promise<string> {
+        return await sendTxWithHelius(singedTransaction, swqos_only)
     }
 
-    async sendBundle(signedTransactions: Transaction[]): Promise<string> {
-        return await sendBundleWithJito(signedTransactions)
+    async sendBundle(mainTx: Transaction, tipTx:Transaction, use_multi_ips: boolean=false): Promise<string> {
+        if(use_multi_ips) {
+            return await sendBundleWithJitoMultiIps(mainTx, tipTx)
+        } else {
+            return await sendBundleWithJito(mainTx, tipTx)
+        }
     }
 
 }