@clonegod/ttd-sol-common 2.0.26 → 2.0.28

package/dist/common/get_signature.d.ts

@@ -0,0 +1,2 @@
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
+export declare function getSignature(transaction: Transaction | VersionedTransaction): string;

package/dist/common/get_signature.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSignature = getSignature;
+const bs58_1 = __importDefault(require("bs58"));
+function getSignature(transaction) {
+    const signature = 'signature' in transaction ? transaction.signature : transaction.signatures[0];
+    if (!signature) {
+        throw new Error('Missing transaction signature, the transaction was not signed by the fee payer');
+    }
+    let txid = bs58_1.default.encode(signature);
+    return txid;
+}

package/dist/common/index.d.ts

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

package/dist/common/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./get_wallet_token_account"), exports);
 __exportStar(require("./subscribe_account_update"), exports);
+__exportStar(require("./get_signature"), exports);

package/dist/trade/send/jito.js

@@ -34,8 +34,9 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 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 axios_1 = __importStar(require("axios"));
+const common_1 = require("../../common");
 const http_client_1 = require("./http_client");
 exports.JITO_TIP_ACCOUNTS = [
     "DfXygSm4jCyNCybVYYK6DwvWqjKee8pbDmJGcLWNDXjh",
@@ -77,7 +78,7 @@ const getJitoTipAccount = () => {
 exports.getJitoTipAccount = getJitoTipAccount;
 JitoUtils.init();
 const sendBundleWithJito = async (mainTx, tipTx) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b;
     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 requestData = {
@@ -97,12 +98,9 @@ const sendBundleWithJito = async (mainTx, tipTx) => {
     }
     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}`);
+            const status = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status;
+            const statusText = (_b = error.response) === null || _b === void 0 ? void 0 : _b.statusText;
+            (0, dist_1.log_warn)(`[sendBundleWithJito] Request failed: ${status} - ${statusText}`);
         }
         else {
             (0, dist_1.log_warn)(`[sendBundleWithJito] Unexpected error: ${url} - ${error.message}`);
@@ -115,7 +113,7 @@ const sendBundleWithJitoMultiIps = async (mainTx, tipTx) => {
     let urls = ips.map(ip => `http://${ip}:10429/solana/send_tx`);
     const body = {
         trace_id: '',
-        txid: Buffer.from(mainTx.serialize()).toString('base64'),
+        txid: (0, common_1.getSignature)(mainTx),
         encoding: 'base64',
         encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),
         max_retry: 3

package/package.json

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

package/src/common/get_signature.ts

@@ -0,0 +1,12 @@
+import bs58 from 'bs58'
+import { Transaction, VersionedTransaction } from '@solana/web3.js'
+
+export function getSignature(transaction: Transaction | VersionedTransaction): string {
+    const signature = 'signature' in transaction ? transaction.signature : transaction.signatures[0]
+    if (!signature) {
+        throw new Error('Missing transaction signature, the transaction was not signed by the fee payer')
+    }
+    let txid = bs58.encode(signature)
+
+    return txid
+}

package/src/common/index.ts

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

package/src/trade/send/jito.ts

@@ -1,6 +1,7 @@
+import { log_warn } from "@clonegod/ttd-core/dist";
 import { Transaction } from "@solana/web3.js";
 import axios, { AxiosError } from "axios";
-import { log_error, log_warn } from "@clonegod/ttd-core/dist";
+import { getSignature } from "../../common";
 import { getHttpClient } from "./http_client";
 
 export const JITO_TIP_ACCOUNTS = [
@@ -79,13 +80,10 @@ export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction
     } 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}`);
+            log_warn(`[sendBundleWithJito] Request failed: ${status} - ${statusText}`);
         } else {
             log_warn(`[sendBundleWithJito] Unexpected error: ${url} - ${error.message}`);
         }
@@ -99,7 +97,7 @@ export const sendBundleWithJitoMultiIps = async (mainTx: Transaction, tipTx: Tra
 
     const body = {
         trace_id: '',
-        txid: Buffer.from(mainTx.serialize()).toString('base64'),
+        txid: getSignature(mainTx),
         encoding: 'base64',    // base64
         encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),  // main tx
         max_retry: 3