@clonegod/ttd-sol-common 2.0.44 → 2.0.46

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

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

package/dist/trade/send/helius.js

@@ -14,7 +14,7 @@ exports.HELIUS_TIP_ACCOUNTS = [
     "4vieeGHPYPG2MmyPRcYjdiDmmhN3ww7hsFNap8pVN3Ey",
     "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
 ];
-const sendTxWithHelius = async (signedTransaction, swqos_only) => {
+const sendTxWithHelius = async (signedTransactionBase64, swqos_only) => {
     let url = process.env.HELIUS_SEND_TX_URL || 'http://tyo-sender.helius-rpc.com/fast';
     if (swqos_only) {
         url = url + "?swqos_only=true";
@@ -25,7 +25,7 @@ const sendTxWithHelius = async (signedTransaction, swqos_only) => {
         id: Date.now().toString(),
         method: 'sendTransaction',
         params: [
-            Buffer.from(signedTransaction.serialize()).toString('base64'),
+            signedTransactionBase64,
             {
                 encoding: 'base64',
                 skipPreflight: true,

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

@@ -1,4 +1,3 @@
-import { Transaction } from "@solana/web3.js";
 export declare const JITO_TIP_ACCOUNTS: string[];
 export declare class JitoUtils {
     static jitoTipAccounts: string[];
@@ -6,5 +5,5 @@ export declare class JitoUtils {
     static fetchJitoTipAccounts(): Promise<string[]>;
 }
 export declare const getJitoTipAccount: () => string;
-export declare const sendBundleWithJito: (mainTx: Transaction, tipTx: Transaction) => Promise<string>;
-export declare const sendBundleWithJitoMultiIps: (mainTx: Transaction, tipTx: Transaction) => Promise<string>;
+export declare const sendBundleWithJito: (mainTxBase64: string, tipTxBase64: string) => Promise<string>;
+export declare const sendBundleWithJitoMultiIps: (mainTxHash: string, mainTxBase64: string, tipTxBase64: string) => Promise<string>;

package/dist/trade/send/jito.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendBundleWithJitoMultiIps = exports.sendBundleWithJito = exports.getJitoTipAccount = exports.JitoUtils = exports.JITO_TIP_ACCOUNTS = void 0;
 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 +76,7 @@ const getJitoTipAccount = () => {
 };
 exports.getJitoTipAccount = getJitoTipAccount;
 JitoUtils.init();
-const sendBundleWithJito = async (mainTx, tipTx) => {
+const sendBundleWithJito = async (mainTxBase64, tipTxBase64) => {
     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);
@@ -86,7 +85,7 @@ const sendBundleWithJito = async (mainTx, tipTx) => {
         id: 1,
         method: 'sendBundle',
         params: [
-            [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')),
+            [tipTxBase64, mainTxBase64],
             {
                 "encoding": "base64"
             }
@@ -110,14 +109,14 @@ const sendBundleWithJito = async (mainTx, tipTx) => {
     }
 };
 exports.sendBundleWithJito = sendBundleWithJito;
-const sendBundleWithJitoMultiIps = async (mainTx, tipTx) => {
+const sendBundleWithJitoMultiIps = async (mainTxHash, mainTxBase64, tipTxBase64) => {
     let ips = (process.env.JITO_SEND_BUNDLE_SERVER_IPS || '127.0.0.1').split(',');
     let urls = ips.map(ip => `http://${ip}:10001/solana/send_tx`);
     const body = {
         trace_id: '',
-        txid: (0, common_1.getSignature)(mainTx),
+        txid: mainTxHash,
         encoding: 'base64',
-        encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),
+        encoded_tx: [tipTxBase64, mainTxBase64].join(','),
         max_retry: 3
     };
     Promise.all(urls.map(async (url) => {

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

@@ -1,6 +1,7 @@
-import { Transaction } from '@solana/web3.js';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 export declare class TransactionSender {
     constructor();
-    sendTransaction(singedTransaction: Transaction, swqos_only: boolean): Promise<string>;
-    sendBundle(mainTx: Transaction, tipTx: Transaction, use_multi_ips?: boolean): Promise<string>;
+    sendTransaction(singedTransaction: Transaction | VersionedTransaction, swqos_only?: boolean): Promise<string>;
+    sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips?: boolean): Promise<string>;
 }
+export declare function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string;

package/dist/trade/send/send_tx.js

@@ -1,21 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionSender = void 0;
+exports.serializeTransactionBase64 = serializeTransactionBase64;
+const web3_js_1 = require("@solana/web3.js");
 const helius_1 = require("./helius");
 const jito_1 = require("./jito");
+const common_1 = require("../../common");
 class TransactionSender {
     constructor() {
     }
-    async sendTransaction(singedTransaction, swqos_only) {
-        return await (0, helius_1.sendTxWithHelius)(singedTransaction, swqos_only);
+    async sendTransaction(singedTransaction, swqos_only = true) {
+        const singedTxBase64 = serializeTransactionBase64(singedTransaction);
+        return await (0, helius_1.sendTxWithHelius)(singedTxBase64, swqos_only);
     }
     async sendBundle(mainTx, tipTx, use_multi_ips = false) {
+        const mainTxBase64 = serializeTransactionBase64(mainTx);
+        const tipTxBase64 = serializeTransactionBase64(tipTx);
         if (use_multi_ips) {
-            return await (0, jito_1.sendBundleWithJitoMultiIps)(mainTx, tipTx);
+            const mainTxHash = (0, common_1.getSignature)(mainTx);
+            return await (0, jito_1.sendBundleWithJitoMultiIps)(mainTxHash, mainTxBase64, tipTxBase64);
         }
         else {
-            return await (0, jito_1.sendBundleWithJito)(mainTx, tipTx);
+            return await (0, jito_1.sendBundleWithJito)(mainTxBase64, tipTxBase64);
         }
     }
 }
 exports.TransactionSender = TransactionSender;
+function serializeTransactionBase64(tx) {
+    let buffer;
+    if (tx instanceof web3_js_1.VersionedTransaction) {
+        buffer = Buffer.from(tx.serialize());
+    }
+    else {
+        buffer = Buffer.from(tx.serialize({ verifySignatures: false }));
+    }
+    return buffer.toString('base64');
+}

package/package.json

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

package/src/trade/send/helius.ts

@@ -1,4 +1,3 @@
-import { Transaction } from "@solana/web3.js"
 import { getHttpClient } from "./http_client"
 
 export const HELIUS_TIP_ACCOUNTS = [
@@ -17,7 +16,7 @@ export const HELIUS_TIP_ACCOUNTS = [
 /**
  * Jito + SWQOS
  */
-export const sendTxWithHelius = async (signedTransaction: Transaction, swqos_only: boolean): Promise<string> => {
+export const sendTxWithHelius = async (signedTransactionBase64: string, swqos_only: boolean): Promise<string> => {
     let url = process.env.HELIUS_SEND_TX_URL || 'http://tyo-sender.helius-rpc.com/fast'
 
     if (swqos_only) {
@@ -31,7 +30,7 @@ export const sendTxWithHelius = async (signedTransaction: Transaction, swqos_onl
         id: Date.now().toString(),
         method: 'sendTransaction',
         params: [
-            Buffer.from(signedTransaction.serialize()).toString('base64'),
+            signedTransactionBase64,
             {
                 encoding: 'base64',
                 skipPreflight: true, // Required for Sender

package/src/trade/send/jito.ts

@@ -1,7 +1,5 @@
 import { log_warn } from "@clonegod/ttd-core/dist";
-import { Transaction } from "@solana/web3.js";
 import axios, { AxiosError } from "axios";
-import { getSignature } from "../../common";
 import { getHttpClient } from "./http_client";
 
 export const JITO_TIP_ACCOUNTS = [
@@ -50,7 +48,7 @@ JitoUtils.init()
 
 // -----------------------------------------------------------
 
-export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction): Promise<string> => {
+export const sendBundleWithJito = async (mainTxBase64: string, tipTxBase64: string): Promise<string> => {
     let url = process.env.JITO_SEND_BUNDLE_URL || 'https://tokyo.mainnet.block-engine.jito.wtf/api/v1/bundles'
 
     // 使用共享的 axios 实例，复用连接池
@@ -61,7 +59,7 @@ export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction
         id: 1,
         method: 'sendBundle',
         params: [
-            [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')),
+            [tipTxBase64, mainTxBase64],
             {
                 "encoding": "base64"
             }
@@ -94,15 +92,15 @@ export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction
 }
 
 
-export const sendBundleWithJitoMultiIps = async (mainTx: Transaction, tipTx: Transaction): Promise<string> => {
+export const sendBundleWithJitoMultiIps = async (mainTxHash: string, mainTxBase64: string, tipTxBase64: string): Promise<string> => {
     let ips = (process.env.JITO_SEND_BUNDLE_SERVER_IPS || '127.0.0.1').split(',')
     let urls = ips.map(ip => `http://${ip}:10001/solana/send_tx`)
 
     const body = {
         trace_id: '',
-        txid: getSignature(mainTx),
+        txid: mainTxHash,
         encoding: 'base64',    // base64
-        encoded_tx: [tipTx, mainTx].map(tx => Buffer.from(tx.serialize()).toString('base64')).join(','),  // main tx
+        encoded_tx: [tipTxBase64, mainTxBase64].join(','),  // main tx
         max_retry: 3
     }
 

package/src/trade/send/send_tx.ts

@@ -1,6 +1,7 @@
-import { Transaction } from '@solana/web3.js';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 import { sendTxWithHelius } from './helius';
 import { sendBundleWithJito, sendBundleWithJitoMultiIps } from './jito';
+import { getSignature } from '../../common';
 
 
 /**
@@ -11,17 +12,55 @@ export class TransactionSender {
     constructor() {
     }
 
-    async sendTransaction(singedTransaction: Transaction, swqos_only:boolean): Promise<string> {
-        return await sendTxWithHelius(singedTransaction, swqos_only)
+    /**
+     * 使用Helius Sender 发送交易
+     * - swqos_only=true, 需给 helius 发送至少5000lamports的通道使用费
+     * - swqos_only=false, 需给helius 发送至少0.0002SOL的小费，会同时向jito发送交易
+     * 
+     * @param singedTransaction 签名后的交易
+     * @param swqos_only true：swqos ；false: swqos + jito
+     * @returns txhash
+     */
+    async sendTransaction(singedTransaction: Transaction | VersionedTransaction, swqos_only:boolean=true): Promise<string> {
+        const singedTxBase64 = serializeTransactionBase64(singedTransaction)
+        return await sendTxWithHelius(singedTxBase64, swqos_only)
     }
 
-    async sendBundle(mainTx: Transaction, tipTx:Transaction, use_multi_ips: boolean=false): Promise<string> {
+    /**
+     * 使用Jito Bundle 发送交易
+     * - use_multi_ips=true, 使用多台服务器向jito提交交易（缓解jito的限流）
+     * - use_multi_ips=false, 本地直接向jito提交交易
+     * 
+     * @param mainTx 主交易
+     * @param tipTx 小费交易
+     * @param use_multi_ips true：多节点；false: 单节点
+     * @returns bundleId
+     */
+    async sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips: boolean=false): Promise<string> {
+        const mainTxBase64 = serializeTransactionBase64(mainTx)
+        const tipTxBase64 = serializeTransactionBase64(tipTx)
         if(use_multi_ips) {
-            return await sendBundleWithJitoMultiIps(mainTx, tipTx)
+            const mainTxHash = getSignature(mainTx)
+            return await sendBundleWithJitoMultiIps(mainTxHash, mainTxBase64, tipTxBase64)
         } else {
-            return await sendBundleWithJito(mainTx, tipTx)
+            return await sendBundleWithJito(mainTxBase64, tipTxBase64)
         }
     }
 
 }
 
+
+/**
+ * 序列化交易为 base64 字符串
+ */
+export function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string {
+    let buffer:Buffer
+    if (tx instanceof VersionedTransaction) {
+        buffer = Buffer.from(tx.serialize())
+    } else {
+        // Transaction.serialize() 参数是可选的，但默认会验证签名
+        // 传入 { verifySignatures: false } 可以跳过验证，因为我们已经在发送前签名了
+        buffer = Buffer.from(tx.serialize({ verifySignatures: false }))
+    }
+    return buffer.toString('base64')
+}