@clonegod/ttd-sol-common 2.0.47 → 2.0.49

package/dist/trade/index.d.ts

@@ -4,3 +4,4 @@ export * from '../config/SolanaTradeAppConfig';
 export * from './tx_builder';
 export * from './send';
 export * from './jito_tip_wallets';
+export * from './sol_gas_cache';

package/dist/trade/index.js

@@ -20,3 +20,4 @@ __exportStar(require("../config/SolanaTradeAppConfig"), exports);
 __exportStar(require("./tx_builder"), exports);
 __exportStar(require("./send"), exports);
 __exportStar(require("./jito_tip_wallets"), exports);
+__exportStar(require("./sol_gas_cache"), exports);

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

@@ -1,7 +1,7 @@
 import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import { TradeContext } from '@clonegod/ttd-core/dist';
 export declare class TransactionSender {
     constructor();
-    sendTransaction(singedTransaction: Transaction | VersionedTransaction, swqos_only?: boolean): Promise<string>;
-    sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips?: boolean): Promise<string>;
+    sendTransaction(context: TradeContext, mainTx: Transaction | VersionedTransaction, swqos_only?: boolean): Promise<string>;
+    sendBundle(context: TradeContext, 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,23 +1,26 @@
 "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");
+const sol_gas_cache_1 = require("../sol_gas_cache");
 class TransactionSender {
     constructor() {
     }
-    async sendTransaction(singedTransaction, swqos_only = true) {
-        const singedTxBase64 = serializeTransactionBase64(singedTransaction);
+    async sendTransaction(context, mainTx, swqos_only = true) {
+        const mainTxHash = (0, common_1.getSignature)(mainTx);
+        set_transaciton_gas_cost(mainTxHash, context);
+        const singedTxBase64 = serializeTransactionBase64(mainTx);
         return await (0, helius_1.sendTxWithHelius)(singedTxBase64, swqos_only);
     }
-    async sendBundle(mainTx, tipTx, use_multi_ips = false) {
+    async sendBundle(context, mainTx, tipTx, use_multi_ips = false) {
+        const mainTxHash = (0, common_1.getSignature)(mainTx);
+        set_transaciton_gas_cost(mainTxHash, context);
         const mainTxBase64 = serializeTransactionBase64(mainTx);
         const tipTxBase64 = serializeTransactionBase64(tipTx);
         if (use_multi_ips) {
-            const mainTxHash = (0, common_1.getSignature)(mainTx);
             return await (0, jito_1.sendBundleWithJitoMultiIps)(mainTxHash, mainTxBase64, tipTxBase64);
         }
         else {
@@ -36,3 +39,7 @@ function serializeTransactionBase64(tx) {
     }
     return buffer.toString('base64');
 }
+function set_transaciton_gas_cost(txid, context) {
+    const { sol_priority_fee, sol_tip_fee } = context.trade_runtime.settings.strategy;
+    (0, sol_gas_cache_1.set_sol_gas_fee)(txid, { base_fee: 5000, priority_fee: sol_priority_fee + sol_tip_fee, total_fee: 5000 + sol_priority_fee + sol_tip_fee });
+}

package/dist/trade/sol_gas_cache.d.ts

@@ -0,0 +1,3 @@
+import { TradeGasFeeType } from "@clonegod/ttd-core";
+export declare const set_sol_gas_fee: (txid: string, sol_gas_fee: TradeGasFeeType) => void;
+export declare const get_sol_gas_fee: (txid: string) => TradeGasFeeType;

package/dist/trade/sol_gas_cache.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_sol_gas_fee = exports.set_sol_gas_fee = void 0;
+var tx_gas_map = new Map();
+const set_sol_gas_fee = (txid, sol_gas_fee) => {
+    tx_gas_map.set(txid, sol_gas_fee);
+};
+exports.set_sol_gas_fee = set_sol_gas_fee;
+const get_sol_gas_fee = (txid) => {
+    if (tx_gas_map.has(txid)) {
+        return tx_gas_map.get(txid);
+    }
+    return null;
+};
+exports.get_sol_gas_fee = get_sol_gas_fee;

package/dist/trade/tx_result_parse.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse_tx_failed_error_code = exports.TransactionResultParser = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
+const sol_gas_cache_1 = require("./sol_gas_cache");
 class TransactionResultParser {
     constructor(env_args, wallet_pubkey, event_emitter) {
         this.env_args = env_args;
@@ -43,8 +44,15 @@ class TransactionResultParser {
         const base_fee = 5000;
         let priority_fee = 0;
         let total_fee = 0;
-        total_fee = preBalances[0] - postBalances[0];
-        priority_fee = Math.abs(total_fee - base_fee);
+        let sol_gas_fee = (0, sol_gas_cache_1.get_sol_gas_fee)(txid);
+        if (sol_gas_fee) {
+            priority_fee = sol_gas_fee.priority_fee;
+            total_fee = base_fee + priority_fee;
+        }
+        else {
+            total_fee = preBalances[0] - postBalances[0];
+            priority_fee = Math.abs(total_fee - base_fee);
+        }
         let gas_fee = {
             base_fee,
             priority_fee,

package/package.json

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

package/src/trade/index.ts

@@ -3,4 +3,6 @@ export * from './tx_result_parse'
 export * from '../config/SolanaTradeAppConfig'
 export * from './tx_builder'
 export * from './send'
-export * from './jito_tip_wallets'
+export * from './jito_tip_wallets'
+export * from './sol_gas_cache'
+

package/src/trade/send/send_tx.ts

@@ -2,6 +2,8 @@ import { Transaction, VersionedTransaction } from '@solana/web3.js';
 import { sendTxWithHelius } from './helius';
 import { sendBundleWithJito, sendBundleWithJitoMultiIps } from './jito';
 import { getSignature } from '../../common';
+import { TradeContext } from '@clonegod/ttd-core/dist';
+import { set_sol_gas_fee } from '../sol_gas_cache';
 
 
 /**
@@ -17,12 +19,15 @@ export class TransactionSender {
      * - swqos_only=true, 需给 helius 发送至少5000lamports的通道使用费
      * - swqos_only=false, 需给helius 发送至少0.0002SOL的小费，会同时向jito发送交易
      * 
-     * @param singedTransaction 签名后的交易
+     * @param mainTx 签名后的交易
      * @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)
+    async sendTransaction(context:TradeContext, mainTx: Transaction | VersionedTransaction, swqos_only:boolean=true): Promise<string> {
+        const mainTxHash = getSignature(mainTx)
+        set_transaciton_gas_cost(mainTxHash, context)
+
+        const singedTxBase64 = serializeTransactionBase64(mainTx)
         return await sendTxWithHelius(singedTxBase64, swqos_only)
     }
 
@@ -36,11 +41,14 @@ export class TransactionSender {
      * @param use_multi_ips true：多节点；false: 单节点
      * @returns bundleId
      */
-    async sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips: boolean=false): Promise<string> {
+    async sendBundle(context:TradeContext, mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips: boolean=false): Promise<string> {
+        const mainTxHash = getSignature(mainTx)
+        set_transaciton_gas_cost(mainTxHash, context)
+
         const mainTxBase64 = serializeTransactionBase64(mainTx)
         const tipTxBase64 = serializeTransactionBase64(tipTx)
+        
         if(use_multi_ips) {
-            const mainTxHash = getSignature(mainTx)
             return await sendBundleWithJitoMultiIps(mainTxHash, mainTxBase64, tipTxBase64)
         } else {
             return await sendBundleWithJito(mainTxBase64, tipTxBase64)
@@ -53,7 +61,7 @@ export class TransactionSender {
 /**
  * 序列化交易为 base64 字符串
  */
-export function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string {
+function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string {
     let buffer:Buffer
     if (tx instanceof VersionedTransaction) {
         buffer = Buffer.from(tx.serialize())
@@ -64,3 +72,11 @@ export function serializeTransactionBase64(tx: Transaction | VersionedTransactio
     }
     return buffer.toString('base64')
 }
+
+
+// 缓存交易的gas支出
+function set_transaciton_gas_cost(txid:string, context:TradeContext) {
+    const {sol_priority_fee, sol_tip_fee} = context.trade_runtime.settings.strategy
+    set_sol_gas_fee(txid, {base_fee: 5000, priority_fee: sol_priority_fee + sol_tip_fee, total_fee: 5000 + sol_priority_fee + sol_tip_fee})
+}
+

package/src/trade/sol_gas_cache.ts

@@ -0,0 +1,22 @@
+import { TradeGasFeeType } from "@clonegod/ttd-core"
+
+var tx_gas_map:Map<string, TradeGasFeeType> = new Map()
+
+/**
+ * 将发送交易的gas费用缓存到内存中，用于后续的交易结果解析
+ * 
+ * @param txid 
+ * @param sol_gas_fee
+ */
+export const set_sol_gas_fee = (txid: string, sol_gas_fee: TradeGasFeeType) => {
+    tx_gas_map.set(txid, sol_gas_fee)
+}
+
+export const get_sol_gas_fee = (txid: string) : TradeGasFeeType => {
+    if(tx_gas_map.has(txid)) {
+       return tx_gas_map.get(txid)
+    }
+
+    return null
+}
+

package/src/trade/tx_result_parse.ts

@@ -3,6 +3,7 @@ import { StandardPoolInfoType, StandardSwapDetailType, TradeGasFeeType } from '@
 import { DEX_ID, log_info, TradeErrorCodeType } from '@clonegod/ttd-core/dist';
 import { ParsedTransactionWithMeta, PublicKey, TokenBalance } from '@solana/web3.js';
 import { EventEmitter } from 'events';
+import { get_sol_gas_fee } from './sol_gas_cache';
 
 export class TransactionResultParser {
 
@@ -68,8 +69,14 @@ export class TransactionResultParser {
         let priority_fee = 0
         let total_fee = 0
 
-        total_fee = preBalances[0] - postBalances[0]
-        priority_fee = Math.abs(total_fee - base_fee)
+        let sol_gas_fee = get_sol_gas_fee(txid)
+        if(sol_gas_fee) {
+            priority_fee = sol_gas_fee.priority_fee // priority fee + jito tip fee
+            total_fee = base_fee + priority_fee
+        } else {
+            total_fee = preBalances[0] - postBalances[0]
+            priority_fee = Math.abs(total_fee - base_fee)
+        }
 
 
         let gas_fee: TradeGasFeeType = {