@clonegod/ttd-sol-common 1.0.174 → 1.0.180

package/dist/appconfig/app_config.d.ts

@@ -1,4 +1,4 @@
-import { ArbCache, ArbEventSubscriber, TradeResponseType, TradeRuntimeType } from "@clonegod/ttd-core";
+import { ArbCache, ArbEventSubscriber, TradeResponseType, TradeRuntimeType } from "@clonegod/ttd-common";
 import { Connection, Keypair } from "@solana/web3.js";
 import { EventEmitter } from 'events';
 import { AbastrcatTrade } from "../trade";

package/dist/appconfig/app_config.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
 const events_1 = require("events");

package/dist/appconfig/env_args.d.ts

@@ -1,4 +1,4 @@
-import { CHAIN_ID } from "@clonegod/ttd-core/dist";
+import { CHAIN_ID } from "@clonegod/ttd-common/dist";
 export declare class EnvArgs {
     chain_id: CHAIN_ID;
     app_name: string;

package/dist/appconfig/env_args.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvArgs = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 class EnvArgs {
     constructor() {
         this.init();

package/dist/common/context.d.ts

@@ -1,5 +1,5 @@
-import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeRuntimeType } from "@clonegod/ttd-core";
-import { CHAIN_ID, DEX_ID } from "@clonegod/ttd-core/dist";
+import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeRuntimeType } from "@clonegod/ttd-common";
+import { CHAIN_ID, DEX_ID } from "@clonegod/ttd-common/dist";
 import { Connection } from "@solana/web3.js";
 import { SolanaTradeRuntimeType } from "../../types";
 import { AppConfig } from "../appconfig";

package/dist/common/context.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TradeContext = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const send_tx_1 = require("../send_tx");
 class TradeContext {
     constructor(price_msg, order_msg) {

package/dist/helius_geyser_ws/subscribe_pool_change_by_geyser.d.ts

@@ -1,3 +1,3 @@
-import { StandardPoolInfoType } from "@clonegod/ttd-core";
+import { StandardPoolInfoType } from "@clonegod/ttd-common";
 import EventEmitter from "events";
 export declare const subscribe_pool_change_by_geyser: (geyser_ws_url: string, pool_list: StandardPoolInfoType[], eventEmitter: EventEmitter) => Promise<void>;

package/dist/helius_geyser_ws/subscribe_pool_change_by_geyser.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe_pool_change_by_geyser = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const ws_1 = __importDefault(require("ws"));
 const constants_1 = require("../common/constants");
 const subscribe_pool_change_by_geyser = (geyser_ws_url, pool_list, eventEmitter) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/helius_geyser_ws/subscribe_txid.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe_wallet_transaction_txid = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const ws_1 = __importDefault(require("ws"));
 const constants_1 = require("../common/constants");
 const subscribe_wallet_transaction_txid = (geyser_ws_url, wallet_address, signature, eventEmitter) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/helius_geyser_ws/subscribe_wallet_transaction.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe_wallet_transaction = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const ws_1 = __importDefault(require("ws"));
 const constants_1 = require("../common/constants");
 const subscribe_wallet_transaction = (geyser_ws_url, wallet_token_account_list, eventEmitter) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -18,9 +18,10 @@ const bs58_1 = __importDefault(require("bs58"));
 const axios_1 = __importDefault(require("axios"));
 const types_1 = require("./types");
 const get_signature_1 = require("../send_tx/get_signature");
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const common_1 = require("../common");
 const jito_1 = require("../jito");
+const jitodontfront_1 = require("../jito/jitodontfront");
 class RpcClient {
     constructor(connection, id) {
         this.connection = connection;
@@ -585,6 +586,8 @@ class RpcClient {
                 const serializedMainTx = transaction.serialize({ verifySignatures: false }).toString(encoding);
                 let jito_region = process.env.JITO_REGION || region;
                 let jitoApiUrl = `${types_1.JITO_API_URLS[jito_region]}/api/v1/bundles`;
+                let jitoDontFrontTransaction = (0, jitodontfront_1.createJitoDontFrontTransaction)(blockhash.blockhash, signers[0]);
+                let jitoDontFrontTransaction_serialized = jitoDontFrontTransaction.serialize({ verifySignatures: false }).toString(encoding);
                 const send_tx_jito_url = process.env.SEND_TX_JITO_URL || '';
                 const send_tx_jito_stratgy = process.env.SEND_TX_JITO_STRATEGY || '';
                 if (!(0, dist_1.isEmpty)(send_tx_jito_url) && send_tx_jito_stratgy === 'mul_ips') {
@@ -594,7 +597,11 @@ class RpcClient {
                     let encoded_tx = serializedMainTx;
                     if (jito_use_separate_tx) {
                         let serializedTipTx = (yield axios_1.default.get(`${process.env.JITO_CREATE_TIP_TX_URL}?group_id=${group_id}&blockhash=${recent_blockhash}&encoding=${encoding}&tip_amount=${tipAmount}`)).data.data;
-                        encoded_tx = [serializedMainTx, serializedTipTx].join(',');
+                        encoded_tx = [
+                            jitoDontFrontTransaction_serialized,
+                            serializedMainTx,
+                            serializedTipTx
+                        ].join(',');
                     }
                     const send_result = yield (0, dist_1.postJSON)(send_tx_jito_url, {
                         encoding,
@@ -610,7 +617,7 @@ class RpcClient {
                     });
                     return;
                 }
-                let bundleId = yield this.sendJitoBundle([serializedMainTx], encoding, jitoApiUrl);
+                let bundleId = yield this.sendJitoBundle([jitoDontFrontTransaction_serialized, serializedMainTx], encoding, jitoApiUrl);
                 (0, dist_1.log_info)(`sendJitoBundle`, {
                     txid,
                     jitoApiUrl,

package/dist/index.d.ts

@@ -5,4 +5,3 @@ export * from './quote';
 export * from './send_tx';
 export * from './trade';
 export * from './token';
-export * from './grpc';

package/dist/index.js

@@ -21,4 +21,3 @@ __exportStar(require("./quote"), exports);
 __exportStar(require("./send_tx"), exports);
 __exportStar(require("./trade"), exports);
 __exportStar(require("./token"), exports);
-__exportStar(require("./grpc"), exports);

package/dist/jito/jitodontfront.d.ts

@@ -0,0 +1,3 @@
+import { Keypair } from "@solana/web3.js";
+import { Transaction } from "@solana/web3.js";
+export declare function createJitoDontFrontTransaction(recentBlockhash: string, tipPayer: Keypair): Transaction;

package/dist/jito/jitodontfront.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createJitoDontFrontTransaction = createJitoDontFrontTransaction;
+const web3_js_1 = require("@solana/web3.js");
+const web3_js_2 = require("@solana/web3.js");
+const web3_js_3 = require("@solana/web3.js");
+function createJitoDontFrontTransaction(recentBlockhash, tipPayer) {
+    const jitoDontFrontTransaction = new web3_js_2.Transaction();
+    jitoDontFrontTransaction.add(createCustomComputeBudgetInstruction(tipPayer.publicKey, new web3_js_3.PublicKey('jitodontfront111111111111111111111111111111'), 100000));
+    jitoDontFrontTransaction.recentBlockhash = recentBlockhash;
+    jitoDontFrontTransaction.feePayer = tipPayer.publicKey;
+    jitoDontFrontTransaction.sign(tipPayer);
+    return jitoDontFrontTransaction;
+}
+function createCustomComputeBudgetInstruction(payerPubkey, jitodontfrontPubkey, units) {
+    const data = Buffer.alloc(5);
+    data.writeUInt8(2, 0);
+    data.writeUInt32LE(units, 1);
+    return new web3_js_2.TransactionInstruction({
+        keys: [
+            { pubkey: payerPubkey, isSigner: true, isWritable: true },
+            { pubkey: jitodontfrontPubkey, isSigner: false, isWritable: false },
+        ],
+        programId: web3_js_1.ComputeBudgetProgram.programId,
+        data: data,
+    });
+}

package/dist/quote/log_quote_price.d.ts

@@ -1,2 +1,2 @@
-import { PriceMessageType } from "@clonegod/ttd-core";
+import { PriceMessageType } from "@clonegod/ttd-common";
 export declare function log_quote_price(event_source: string, price_message: PriceMessageType, tx_hash: string): Promise<void>;

package/dist/quote/log_quote_price.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log_quote_price = log_quote_price;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 function log_quote_price(event_source, price_message, tx_hash) {
     return __awaiter(this, void 0, void 0, function* () {
         const { unique_orderbook_id, pool_name, pair, fee_rate, price_id, quote_amount_usd, ask, bid, time } = price_message;

package/dist/quote/publish_quote_price.d.ts

@@ -1,3 +1,3 @@
-import { PriceMessageType } from "@clonegod/ttd-core";
+import { PriceMessageType } from "@clonegod/ttd-common";
 import { AppConfig } from "../appconfig";
 export declare const publish_quote_price: (appConfig: AppConfig, price_msg: PriceMessageType) => void;

package/dist/quote/publish_quote_price.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publish_quote_price = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const publish_quote_price = (appConfig, price_msg) => {
     const chain_id = appConfig.env_args.chain_id;
     let price_id = price_msg.price_id;

package/dist/quote/to_price_message.d.ts

@@ -1,4 +1,4 @@
-import { PriceMessageType, QuoteTimeInfoType, StandardPoolInfoType } from '@clonegod/ttd-core';
+import { PriceMessageType, QuoteTimeInfoType, StandardPoolInfoType } from '@clonegod/ttd-common';
 import { AppConfig } from '../appconfig';
 export declare const get_quote_token_decimals: (pool_info: StandardPoolInfoType) => number;
 export declare function to_price_message(appConfig: AppConfig, quote_amount_usd: number, tx_price: number, quote_ask_price: number, quote_bid_price: number, pool_info: StandardPoolInfoType, time: QuoteTimeInfoType, slot?: string): Promise<PriceMessageType>;

package/dist/quote/to_price_message.js

@@ -17,7 +17,7 @@ exports.to_price_message = to_price_message;
 exports.normalize_pair_name = normalize_pair_name;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const uuid_1 = require("uuid");
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const get_quote_token_decimals = (pool_info) => {
     let decimals = 9;
     let { tokenA, tokenB, quote_token } = pool_info;

package/dist/send_tx/get_jito_tip_floor.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_latest_jito_tip = get_latest_jito_tip;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const web3_js_1 = require("@solana/web3.js");
 const jito_tip_stats_url = process.env.JITO_TIP_FEE_STATS_URL || 'https://bundles.jito.wtf/api/v1/bundles/tip_floor';
 const JITO_TIP_DEFAULT = 0.00018;

package/dist/send_tx/helius_client.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeliusClient = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const helius_sdk_v1_4_0_1 = require("../helius_sdk_v1.4.0");
 const strategy_util_1 = require("./strategy_util");
 const sol_gas_cache_1 = require("./sol_gas_cache");

package/dist/send_tx/strategy_util.d.ts

@@ -1,4 +1,4 @@
-import { StandardPoolInfoType, TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-core";
+import { StandardPoolInfoType, TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-common";
 import { JitoRegion } from "../helius_sdk_v1.4.0";
 import { Connection } from "@solana/web3.js";
 import { SolanaTradeRuntimeType } from "../../types";

package/dist/send_tx/strategy_util.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create_solana_trade_runtime = create_solana_trade_runtime;
 exports.calculate_gas_fee = calculate_gas_fee;
 exports.get_jito_region = get_jito_region;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const constants_1 = require("../common/constants");
 const get_jito_tip_floor_1 = require("./get_jito_tip_floor");
 const DEFAULT_TIP_RATIO = 0.3;

package/dist/token/get_token_info.js

@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_token_basic_info_from_raydium = exports.get_token_basic_info_from_jupiter = exports.get_token_basic_info = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const axios_1 = __importStar(require("axios"));
 const util_1 = require("./util");
 const get_token_basic_info = (symbol, mint_address) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/token/get_token_price.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_token_price_info_from_coingecko = exports.get_token_price_info_from_jupiter_v1 = exports.get_token_price_info_from_jupiter_v2 = exports.get_token_price_info_from_raydium = exports.get_token_price_info = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const axios_1 = __importDefault(require("axios"));
 const get_token_price_info = (mints) => __awaiter(void 0, void 0, void 0, function* () {
     let price_map = yield (0, exports.get_token_price_info_from_raydium)(mints);

package/dist/token/util.d.ts

@@ -1,3 +1,3 @@
-import { StandardTokenInfoType, TokenPriceWithAmountType } from "@clonegod/ttd-core";
+import { StandardTokenInfoType, TokenPriceWithAmountType } from "@clonegod/ttd-common";
 export declare const is_token_2022: (programId: string) => programId is "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb";
 export declare const calculate_token_amount: (token_info: StandardTokenInfoType, value_of_usd?: number) => Promise<TokenPriceWithAmountType>;

package/dist/token/util.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculate_token_amount = exports.is_token_2022 = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const get_token_price_1 = require("./get_token_price");
 const is_token_2022 = (programId) => {
     return programId === 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';

package/dist/trade/handle_order_message.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handle_order_message = exports.try_lock_order_msg = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const common_1 = require("../common");
 const tx_result_check_1 = require("./tx_result_check");
 const check_parse_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/trade/tx_result_check.d.ts

@@ -1,4 +1,4 @@
-import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeResultType } from "@clonegod/ttd-core";
+import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeResultType } from "@clonegod/ttd-common";
 import { Connection, PublicKey } from "@solana/web3.js";
 import { EventEmitter } from 'events';
 import { StandardSwapDetailType } from "../../types";

package/dist/trade/tx_result_check.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionResultChecker = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const dist_1 = require("@clonegod/ttd-common/dist");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../common/constants");
 const tx_result_parse_1 = require("./tx_result_parse");

package/dist/trade/tx_result_parse.d.ts

@@ -1,4 +1,4 @@
-import { StandardPoolInfoType } from '@clonegod/ttd-core';
+import { StandardPoolInfoType } from '@clonegod/ttd-common';
 import { ParsedTransactionWithMeta, PublicKey, TokenBalance } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import { StandardSwapDetailType } from '../../types';

package/dist/trade/tx_result_parse.js

@@ -1,7 +1,7 @@
 "use strict";
 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 dist_1 = require("@clonegod/ttd-common/dist");
 const send_tx_1 = require("../send_tx");
 class TransactionResultParser {
     constructor(env_args, wallet_pubkey, event_emitter) {

package/grpc/transaction/LThcUp2D5p4JgRMnWEUVVSdNEHiq5YfN5HXPGRYeWBfypMT3aTa1CaC9XdPT69CyMdoJ32XAkjXAa2TmBYBeZAy.json

@@ -0,0 +1 @@
+{"txid":"LThcUp2D5p4JgRMnWEUVVSdNEHiq5YfN5HXPGRYeWBfypMT3aTa1CaC9XdPT69CyMdoJ32XAkjXAa2TmBYBeZAy","tx_data":{"transaction":{"signature":{"type":"Buffer","data":[16,200,40,89,141,41,183,98,147,57,1,87,41,149,214,16,175,82,193,82,165,56,77,110,141,91,60,201,155,230,174,58,18,41,245,133,174,58,19,223,250,226,160,136,30,114,91,185,148,117,131,9,56,28,141,128,214,181,22,92,178,181,156,10]},"isVote":false,"transaction":{"signatures":[{"type":"Buffer","data":[16,200,40,89,141,41,183,98,147,57,1,87,41,149,214,16,175,82,193,82,165,56,77,110,141,91,60,201,155,230,174,58,18,41,245,133,174,58,19,223,250,226,160,136,30,114,91,185,148,117,131,9,56,28,141,128,214,181,22,92,178,181,156,10]}],"message":{"header":{"numRequiredSignatures":1,"numReadonlySignedAccounts":0,"numReadonlyUnsignedAccounts":9},"accountKeys":[{"type":"Buffer","data":[21,168,223,201,100,91,51,204,64,225,198,249,160,96,246,185,169,192,171,55,210,185,203,199,218,7,74,5,197,199,28,102]},{"type":"Buffer","data":[35,15,221,235,196,66,135,19,27,253,157,252,117,232,177,135,13,242,61,171,69,181,33,97,225,110,182,179,90,52,75,165]},{"type":"Buffer","data":[61,189,108,237,94,164,238,217,4,165,173,170,205,221,223,73,19,7,33,191,177,94,115,142,189,23,69,240,197,214,155,6]},{"type":"Buffer","data":[66,142,7,8,168,214,201,214,101,235,178,223,185,21,210,54,170,122,213,100,227,116,32,97,144,214,65,145,194,207,116,23]},{"type":"Buffer","data":[85,164,104,186,181,200,66,198,159,69,58,88,99,75,220,67,166,129,150,73,181,188,188,130,199,225,67,11,146,251,182,85]},{"type":"Buffer","data":[79,241,157,230,132,140,160,191,33,109,21,175,127,19,12,206,53,149,234,68,179,148,217,216,246,1,45,146,142,17,222,45]},{"type":"Buffer","data":[116,231,0,156,19,31,133,106,48,98,218,28,178,94,236,27,181,24,145,115,95,223,71,86,219,253,124,39,245,102,47,128]},{"type":"Buffer","data":[121,168,114,186,49,158,162,43,2,239,186,238,20,251,23,169,192,206,193,3,199,240,124,177,85,1,245,201,164,50,160,138]},{"type":"Buffer","data":[124,70,148,31,239,161,196,29,154,187,79,20,139,58,51,81,91,185,151,12,31,56,49,53,137,93,2,112,231,195,28,2]},{"type":"Buffer","data":[188,43,87,6,94,241,221,102,84,48,190,96,107,166,89,108,2,149,48,27,173,239,139,90,252,65,1,65,80,244,18,116]},{"type":"Buffer","data":[190,46,221,15,121,214,61,54,4,16,223,171,173,221,46,30,214,132,42,198,65,191,141,41,55,227,214,28,35,210,244,176]},{"type":"Buffer","data":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},{"type":"Buffer","data":[129,110,102,99,12,59,183,36,220,89,228,159,108,196,48,110,96,58,106,172,202,6,250,62,52,226,180,10,213,151,157,141]},{"type":"Buffer","data":[165,213,202,158,4,207,93,181,144,183,20,186,47,227,44,177,89,19,63,193,193,146,183,34,87,253,7,211,156,176,64,30]},{"type":"Buffer","data":[3,6,70,111,229,33,23,50,255,236,173,186,114,195,155,231,188,140,229,187,197,247,18,107,44,67,155,58,64,0,0,0]},{"type":"Buffer","data":[198,250,122,243,190,219,173,58,61,101,243,106,171,201,116,49,177,187,228,194,210,246,224,228,124,166,2,3,69,47,93,97]},{"type":"Buffer","data":[5,74,83,90,153,41,33,6,77,36,232,113,96,218,56,124,124,53,181,221,188,146,187,129,228,31,168,64,65,5,68,141]},{"type":"Buffer","data":[6,155,136,87,254,171,129,132,251,104,127,99,70,24,192,53,218,196,57,220,26,235,59,85,152,160,240,0,0,0,0,1]},{"type":"Buffer","data":[6,221,246,225,215,101,161,147,217,203,225,70,206,235,121,172,28,180,133,237,95,91,55,145,58,140,245,133,126,255,0,169]},{"type":"Buffer","data":[6,221,246,225,238,117,143,222,24,66,93,188,228,108,205,218,182,26,252,77,131,185,13,39,254,189,249,40,216,161,139,252]}],"recentBlockhash":{"type":"Buffer","data":[82,58,243,143,72,241,122,249,155,126,58,109,174,48,72,57,131,236,110,218,173,48,125,246,193,133,101,192,195,219,115,147]},"instructions":[{"programIdIndex":14,"accounts":{},"data":{"type":"Buffer","data":[2,192,212,1,0]}},{"programIdIndex":14,"accounts":{},"data":{"type":"Buffer","data":[3,1,0,0,0,0,0,0,0]}},{"programIdIndex":13,"accounts":{"type":"Buffer","data":[0,12,6,8,7,4,5,1,18,19,16,15,17,10,2,3]},"data":{"type":"Buffer","data":[43,4,237,11,26,201,30,98,232,3,0,0,0,0,0,0,147,26,0,0,0,0,0,0,154,87,105,78,169,26,92,132,177,196,254,255,0,0,0,0,1]}},{"programIdIndex":11,"accounts":{"type":"Buffer","data":[0,9]},"data":{"type":"Buffer","data":[2,0,0,0,32,191,2,0,0,0,0,0]}}],"versioned":false,"addressTableLookups":[]}},"meta":{"fee":"5001","preBalances":["77368771","32092760","72161280","72161280","2039480","22339146210826","1588677399","9876350","2039280","4445332","13641700","1","1705400","1141440","1","377950852239","521498880","994548950606","934087680","1141440"],"postBalances":["77183770","32092760","72161280","72161280","2039480","22339146203949","1588677399","9883227","2039280","4625332","13641700","1","1705400","1141440","1","377950852239","521498880","994548950606","934087680","1141440"],"innerInstructions":[{"index":2,"instructions":[{"programIdIndex":18,"accounts":{"type":"Buffer","data":[8,15,4,0]},"data":{"type":"Buffer","data":[12,232,3,0,0,0,0,0,0,6]},"stackHeight":2},{"programIdIndex":18,"accounts":{"type":"Buffer","data":[5,17,7,6]},"data":{"type":"Buffer","data":[12,221,26,0,0,0,0,0,0,9]},"stackHeight":2}]}],"innerInstructionsNone":false,"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK invoke [1]","Program log: Instruction: SwapV2","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]","Program log: Instruction: TransferChecked","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 6200 of 65508 compute units","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]","Program log: Instruction: TransferChecked","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 6238 of 55335 compute units","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success","Program data: QMbN6CYIceJ05wCcEx+FajBi2hyyXuwbtRiRc1/fR1bb/Xwn9WYvgBWo38lkWzPMQOHG+aBg9rmpwKs30rnLx9oHSgXFxxxmeahyujGeoisC77ruFPsXqcDOwQPH8HyxVQH1yaQyoIp8RpQf76HEHZq7TxSLOjNRW7mXDB84MTWJXQJw58McAt0aAAAAAAAAAAAAAAAAAADoAwAAAAAAAAAAAAAAAAAAAEEJYi+uQZFhAAAAAAAAAACl8LhRdAsAAAAAAAAAAAAAorT//w==","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK consumed 77126 of 119700 compute units","Program CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK success","Program 11111111111111111111111111111111 invoke [1]","Program 11111111111111111111111111111111 success"],"logMessagesNone":false,"preTokenBalances":[{"accountIndex":4,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":410438.861085,"decimals":6,"amount":"410438861085","uiAmountString":"410438.861085"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":5,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":22339.129336345,"decimals":9,"amount":"22339129336345","uiAmountString":"22339.129336345"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":7,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":0.00783707,"decimals":9,"amount":"7837070","uiAmountString":"0.00783707"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":8,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":0.308573,"decimals":6,"amount":"308573","uiAmountString":"0.308573"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"postTokenBalances":[{"accountIndex":4,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":410438.862085,"decimals":6,"amount":"410438862085","uiAmountString":"410438.862085"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":5,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":22339.129329468,"decimals":9,"amount":"22339129329468","uiAmountString":"22339.129329468"},"owner":"8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":7,"mint":"So11111111111111111111111111111111111111112","uiTokenAmount":{"uiAmount":0.007843947,"decimals":9,"amount":"7843947","uiAmountString":"0.007843947"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"},{"accountIndex":8,"mint":"EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v","uiTokenAmount":{"uiAmount":0.307573,"decimals":6,"amount":"307573","uiAmountString":"0.307573"},"owner":"2TYv4Tn9raGVs6peco6EkVRKVZt7WwMVNpn5mWEaP7fK","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"rewards":[],"loadedWritableAddresses":[],"loadedReadonlyAddresses":[],"returnDataNone":true,"computeUnitsConsumed":"77576"},"index":"1568"},"slot":"324979626"}}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.174",
+    "version": "1.0.180",
     "description": "",
     "main": "dist/index.js",
     "types": "types/index.d.ts",
@@ -13,8 +13,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-core": "2.0.21",
-        "@triton-one/yellowstone-grpc": "^1.4.1",
+        "@clonegod/ttd-common": "1.1.21",
         "@metaplex-foundation/mpl-token-metadata": "^2.5.2",
         "@solana/web3.js": "1.91.6",
         "rpc-websockets": "7.10.0",

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { StandardTokenInfoType, TradeRuntimeType } from "@clonegod/ttd-core";
+import { StandardTokenInfoType, TradeRuntimeType } from "@clonegod/ttd-common";
 import { Connection } from "@solana/web3.js";
 
 export interface StandardSwapDetailType {

package/dist/grpc/index.d.ts

@@ -1,23 +0,0 @@
-import { SolanaGrpcService } from './subscribe_grpc';
-export * from './subscribe_grpc';
-export type GrpcServiceConfig = {
-    endpoint: string;
-    token: string;
-    pingInterval?: number;
-    maxRetries?: number;
-    region?: string;
-};
-export type GrpcCallbacks = {
-    onConnectionStateChanged?: (status: 'connected' | 'disconnected' | 'reconnecting') => void;
-    onError?: (error: Error) => void;
-};
-export declare function getSolanaGrpcService(config: GrpcServiceConfig, callbacks?: GrpcCallbacks): SolanaGrpcService;
-export declare class GrpcServiceManager {
-    private static instance;
-    private service;
-    private connectionPromise;
-    private constructor();
-    static getInstance(): GrpcServiceManager;
-    getService(config: GrpcServiceConfig): Promise<SolanaGrpcService>;
-    disconnect(): Promise<void>;
-}

package/dist/grpc/index.js

@@ -1,104 +0,0 @@
-"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);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GrpcServiceManager = void 0;
-exports.getSolanaGrpcService = getSolanaGrpcService;
-const dist_1 = require("@clonegod/ttd-core/dist");
-const subscribe_grpc_1 = require("./subscribe_grpc");
-__exportStar(require("./subscribe_grpc"), exports);
-function getSolanaGrpcService(config, callbacks) {
-    var _a, _b;
-    if (!config.endpoint) {
-        throw new Error('GRPC_ENDPOINT is required');
-    }
-    const defaultCallbacks = {
-        onConnectionStateChanged: (status) => {
-            (0, dist_1.log_info)('grpc connection status:', status);
-            switch (status) {
-                case 'connected':
-                    (0, dist_1.log_info)('grpc connected success');
-                    break;
-                case 'disconnected':
-                    (0, dist_1.log_warn)('grpc disconnected');
-                    break;
-                case 'reconnecting':
-                    (0, dist_1.log_info)('grpc reconnecting...');
-                    break;
-            }
-        },
-        onError: (error) => {
-            (0, dist_1.log_error)('grpc error:', error);
-        }
-    };
-    return new subscribe_grpc_1.SolanaGrpcService({
-        grpc_endpoint: config.endpoint,
-        grpc_token: config.token,
-        pingInterval: (_a = config.pingInterval) !== null && _a !== void 0 ? _a : 30000,
-        maxRetries: (_b = config.maxRetries) !== null && _b !== void 0 ? _b : 5,
-    }, Object.assign(Object.assign({}, defaultCallbacks), callbacks));
-}
-class GrpcServiceManager {
-    constructor() {
-        this.service = null;
-        this.connectionPromise = null;
-    }
-    static getInstance() {
-        if (!GrpcServiceManager.instance) {
-            GrpcServiceManager.instance = new GrpcServiceManager();
-        }
-        return GrpcServiceManager.instance;
-    }
-    getService(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.connectionPromise) {
-                return this.connectionPromise;
-            }
-            if (this.service) {
-                return this.service;
-            }
-            this.connectionPromise = (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.service = getSolanaGrpcService(config);
-                    yield this.service.connect();
-                    return this.service;
-                }
-                finally {
-                    this.connectionPromise = null;
-                }
-            }))();
-            return this.connectionPromise;
-        });
-    }
-    disconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.service) {
-                yield this.service.disconnect();
-                this.service = null;
-            }
-            this.connectionPromise = null;
-        });
-    }
-}
-exports.GrpcServiceManager = GrpcServiceManager;

package/dist/grpc/subscribe_grpc.d.ts

@@ -1,90 +0,0 @@
-import { CommitmentLevel, SubscribeRequestAccountsDataSlice, SubscribeRequestFilterAccounts, SubscribeRequestFilterBlocks, SubscribeRequestFilterBlocksMeta, SubscribeRequestFilterEntry, SubscribeRequestFilterSlots, SubscribeRequestFilterTransactions } from "@triton-one/yellowstone-grpc";
-import { PublicKey } from '@solana/web3.js';
-export type GrpcConfig = {
-    grpc_endpoint: string;
-    grpc_token: string;
-    pingInterval?: number;
-    maxRetries?: number;
-};
-export type AccountData = {
-    pubkey: string;
-    owner: string;
-    lamports: number;
-    data: Buffer;
-    executable: boolean;
-    rentEpoch: number;
-};
-export type AccountUpdate = {
-    account: AccountData;
-    slot: number;
-    isStartup: boolean;
-};
-export type BlockFilter = {
-    accountInclude?: string[];
-    includeTransactions?: boolean;
-    includeAccounts?: boolean;
-    includeEntries?: boolean;
-};
-export type SubscribeRequest = {
-    slots: {
-        [key: string]: SubscribeRequestFilterSlots;
-    };
-    accounts: {
-        [key: string]: SubscribeRequestFilterAccounts;
-    };
-    transactions: {
-        [key: string]: SubscribeRequestFilterTransactions;
-    };
-    blocks: {
-        [key: string]: SubscribeRequestFilterBlocks;
-    };
-    blocksMeta: {
-        [key: string]: SubscribeRequestFilterBlocksMeta;
-    };
-    accountsDataSlice: SubscribeRequestAccountsDataSlice[];
-    commitment?: CommitmentLevel;
-    entry: {
-        [key: string]: SubscribeRequestFilterEntry;
-    };
-    transactionsStatus: {
-        [key: string]: SubscribeRequestFilterTransactions;
-    };
-};
-export type SubscriptionCallbacks = {
-    onNewBlock?: (block: any) => void;
-    onTransactionReceived?: (transaction: any) => void;
-    onAccountUpdated?: (accountUpdate: AccountUpdate) => void;
-    onProgramCalled?: (program: any) => void;
-    onError?: (error: Error) => void;
-    onConnectionStateChanged?: (status: 'connected' | 'disconnected' | 'reconnecting') => void;
-};
-export declare class SolanaGrpcService {
-    private client;
-    private subscriptions;
-    private isConnected;
-    private pingInterval;
-    private maxRetries;
-    private pingTimer?;
-    private retryCount;
-    private callbacks;
-    private region;
-    constructor(config: GrpcConfig, callbacks?: SubscriptionCallbacks);
-    connect(): Promise<void>;
-    disconnect(): Promise<void>;
-    private startPing;
-    private stopPing;
-    private reconnect;
-    subscribeAccount(accountAddress: string | PublicKey, callback: (account: AccountUpdate) => void, options?: {
-        owner?: string[];
-        filters?: any[];
-        commitment?: CommitmentLevel;
-    }): Promise<void>;
-    subscribeAccounts(accountAddresses: (string | PublicKey)[], callback: (account: AccountUpdate) => void, options?: {
-        owner?: string[];
-        filters?: any[];
-        commitment?: CommitmentLevel;
-    }): Promise<void>;
-    subscribeBlockMeta(callback: (blockMeta: any) => void, options?: {
-        commitment?: CommitmentLevel;
-    }): Promise<void>;
-}

package/dist/grpc/subscribe_grpc.js

@@ -1,261 +0,0 @@
-"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 __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;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaGrpcService = void 0;
-const yellowstone_grpc_1 = __importStar(require("@triton-one/yellowstone-grpc"));
-const web3_js_1 = require("@solana/web3.js");
-class SolanaGrpcService {
-    constructor(config, callbacks = {}) {
-        this.subscriptions = new Map();
-        this.isConnected = false;
-        this.retryCount = 0;
-        if (!config.grpc_endpoint) {
-            throw new Error('Endpoint is required');
-        }
-        this.client = new yellowstone_grpc_1.default(config.grpc_endpoint, config.grpc_token || '', undefined);
-        this.pingInterval = config.pingInterval || 30000;
-        this.maxRetries = config.maxRetries || 5;
-        this.callbacks = callbacks;
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            try {
-                const stream = yield this.client.subscribe();
-                stream.end();
-                this.isConnected = true;
-                this.startPing();
-                (_b = (_a = this.callbacks).onConnectionStateChanged) === null || _b === void 0 ? void 0 : _b.call(_a, 'connected');
-            }
-            catch (error) {
-                console.error('Failed to connect:', error);
-                (_d = (_c = this.callbacks).onError) === null || _d === void 0 ? void 0 : _d.call(_c, error);
-                throw error;
-            }
-        });
-    }
-    disconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            try {
-                this.stopPing();
-                for (const [key, stream] of this.subscriptions) {
-                    try {
-                        stream.end();
-                    }
-                    catch (error) {
-                        console.error(`Error closing stream ${key}:`, error);
-                    }
-                    this.subscriptions.delete(key);
-                }
-                this.isConnected = false;
-                (_b = (_a = this.callbacks).onConnectionStateChanged) === null || _b === void 0 ? void 0 : _b.call(_a, 'disconnected');
-            }
-            catch (error) {
-                console.error('Failed to disconnect:', error);
-                (_d = (_c = this.callbacks).onError) === null || _d === void 0 ? void 0 : _d.call(_c, error);
-                throw error;
-            }
-        });
-    }
-    startPing() {
-        this.stopPing();
-        this.pingTimer = setInterval(() => {
-            if (!this.isConnected) {
-                console.log('Connection lost, attempting to reconnect...');
-                this.reconnect();
-            }
-        }, this.pingInterval);
-    }
-    stopPing() {
-        if (this.pingTimer) {
-            clearInterval(this.pingTimer);
-            this.pingTimer = undefined;
-        }
-    }
-    reconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
-            if (this.retryCount >= this.maxRetries) {
-                const error = new Error(`Max retries reached. Last region: ${this.region}`);
-                (_b = (_a = this.callbacks).onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
-                (_d = (_c = this.callbacks).onConnectionStateChanged) === null || _d === void 0 ? void 0 : _d.call(_c, 'disconnected');
-                return;
-            }
-            this.retryCount++;
-            (_f = (_e = this.callbacks).onConnectionStateChanged) === null || _f === void 0 ? void 0 : _f.call(_e, 'reconnecting');
-            try {
-                yield this.connect();
-                for (const [key, stream] of this.subscriptions) {
-                    try {
-                        stream.end();
-                    }
-                    catch (error) {
-                        console.error(`Error closing stream ${key}:`, error);
-                    }
-                }
-                this.subscriptions.clear();
-                this.retryCount = 0;
-            }
-            catch (error) {
-                console.error('Reconnection failed:', error);
-                setTimeout(() => this.reconnect(), 1000 * Math.min(this.retryCount, 5));
-            }
-        });
-    }
-    subscribeAccount(accountAddress_1, callback_1) {
-        return __awaiter(this, arguments, void 0, function* (accountAddress, callback, options = {}) {
-            try {
-                const address = accountAddress instanceof web3_js_1.PublicKey ? accountAddress.toBase58() : accountAddress;
-                const request = {
-                    slots: {},
-                    accounts: {
-                        [address]: {
-                            account: [address],
-                            filters: options.filters || [],
-                            owner: options.owner || []
-                        }
-                    },
-                    transactions: {},
-                    blocks: {},
-                    blocksMeta: {},
-                    accountsDataSlice: [],
-                    commitment: options.commitment || yellowstone_grpc_1.CommitmentLevel.PROCESSED,
-                    entry: {},
-                    transactionsStatus: {}
-                };
-                const stream = yield this.client.subscribe();
-                stream.on('data', (data) => {
-                    if (data === null || data === void 0 ? void 0 : data.account) {
-                        callback(data.account);
-                    }
-                });
-                yield new Promise((resolve, reject) => {
-                    stream.write(request, (err) => {
-                        err ? reject(err) : resolve();
-                    });
-                });
-                this.subscriptions.set(`account_${address}`, stream);
-            }
-            catch (error) {
-                console.error('Failed to subscribe to account:', error);
-                throw error;
-            }
-        });
-    }
-    subscribeAccounts(accountAddresses_1, callback_1) {
-        return __awaiter(this, arguments, void 0, function* (accountAddresses, callback, options = {}) {
-            const addresses = accountAddresses.map(addr => addr instanceof web3_js_1.PublicKey ? addr.toBase58() : addr);
-            try {
-                const request = {
-                    slots: {},
-                    accounts: addresses.reduce((acc, addr) => (Object.assign(Object.assign({}, acc), { [addr]: {
-                            account: [addr],
-                            filters: options.filters || [],
-                            owner: options.owner || []
-                        } })), {}),
-                    transactions: {},
-                    blocks: {},
-                    blocksMeta: {},
-                    accountsDataSlice: [],
-                    commitment: options.commitment || yellowstone_grpc_1.CommitmentLevel.PROCESSED,
-                    entry: {},
-                    transactionsStatus: {}
-                };
-                const stream = yield this.client.subscribe();
-                stream.on('data', (data) => {
-                    if (data === null || data === void 0 ? void 0 : data.account) {
-                        callback(data.account);
-                    }
-                });
-                yield new Promise((resolve, reject) => {
-                    stream.write(request, (err) => {
-                        err ? reject(err) : resolve();
-                    });
-                });
-                this.subscriptions.set(`accounts_${addresses.join('_')}`, stream);
-            }
-            catch (error) {
-                console.error('Failed to subscribe to accounts:', error);
-                throw error;
-            }
-        });
-    }
-    subscribeBlockMeta(callback_1) {
-        return __awaiter(this, arguments, void 0, function* (callback, options = {}) {
-            try {
-                const request = {
-                    slots: {},
-                    accounts: {},
-                    transactions: {},
-                    blocks: {},
-                    blocksMeta: {
-                        blockmetadata: {}
-                    },
-                    accountsDataSlice: [],
-                    commitment: options.commitment || yellowstone_grpc_1.CommitmentLevel.PROCESSED,
-                    entry: {},
-                    transactionsStatus: {}
-                };
-                const stream = yield this.client.subscribe();
-                stream.on('data', (data) => {
-                    if (data === null || data === void 0 ? void 0 : data.blockMeta) {
-                        callback(data.blockMeta);
-                    }
-                });
-                yield new Promise((resolve, reject) => {
-                    stream.write(request, (err) => {
-                        err ? reject(err) : resolve();
-                    });
-                });
-                this.subscriptions.set('blockmeta', stream);
-            }
-            catch (error) {
-                console.error('Failed to subscribe to blockMeta:', error);
-                throw error;
-            }
-        });
-    }
-}
-exports.SolanaGrpcService = SolanaGrpcService;

package/dist/grpc/test_grpc.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/grpc/test_grpc.js

@@ -1,128 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const dist_1 = require("@clonegod/ttd-core/dist");
-const subscribe_grpc_1 = require("./subscribe_grpc");
-const web3_js_1 = require("@solana/web3.js");
-const yellowstone_grpc_1 = require("@triton-one/yellowstone-grpc");
-const dotenv_1 = __importDefault(require("dotenv"));
-const _1 = require(".");
-dotenv_1.default.config();
-function createGrpcService() {
-    return new subscribe_grpc_1.SolanaGrpcService({
-        grpc_endpoint: process.env.GRPC_ENDPOINT || '',
-        grpc_token: process.env.GRPC_TOKEN || '',
-        pingInterval: 30000,
-        maxRetries: 5,
-    }, {
-        onConnectionStateChanged: (status) => {
-            console.log('连接状态:', status);
-            switch (status) {
-                case 'connected':
-                    console.log('已连接到 Solana gRPC 服务');
-                    break;
-                case 'disconnected':
-                    console.log('与 Solana gRPC 服务断开连接');
-                    break;
-                case 'reconnecting':
-                    console.log('正在重新连接到 Solana gRPC 服务...');
-                    break;
-            }
-        },
-        onError: (error) => {
-            console.error('发生错误:', error);
-        }
-    });
-}
-function testAccountsSubscription() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const grpcService = createGrpcService();
-        try {
-            yield grpcService.connect();
-            console.log('开始测试多个账户订阅...');
-            const accounts = [
-                new web3_js_1.PublicKey('YrrUStgPugDp8BbfosqDeFssen6sA75ZS1QJvgnHtmY'),
-                new web3_js_1.PublicKey('22WrmyTj8x2TRVQen3fxxi2r4Rn6JDHWoMTpsSmn8RUd')
-            ];
-            yield grpcService.subscribeAccounts(accounts, (account) => {
-                console.log('收到多账户更新:', {
-                    pubkey: new web3_js_1.PublicKey(account.account.pubkey).toBase58(),
-                    owner: new web3_js_1.PublicKey(account.account.owner).toBase58(),
-                    lamports: account.account.lamports,
-                    executable: account.account.executable,
-                    rentEpoch: account.account.rentEpoch,
-                    slot: account.slot,
-                    isStartup: account.isStartup
-                });
-            }, {
-                commitment: yellowstone_grpc_1.CommitmentLevel.PROCESSED
-            });
-            yield new Promise(resolve => setTimeout(resolve, 30000));
-            yield grpcService.disconnect();
-        }
-        catch (error) {
-            console.error('账户变更订阅测试失败:', error);
-            yield grpcService.disconnect();
-        }
-    });
-}
-function testBlockMetaSubscription() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const grpcService = yield _1.GrpcServiceManager.getInstance().getService({
-            endpoint: process.env.GRPC_ENDPOINT || '',
-            token: process.env.GRPC_TOKEN || '',
-            pingInterval: 30000,
-            maxRetries: 5,
-        });
-        try {
-            yield grpcService.connect();
-            console.log('开始测试区块元数据订阅...');
-            yield grpcService.subscribeBlockMeta((blockMeta) => {
-                var _a;
-                const blockTimestamp = (_a = blockMeta.blockTime) === null || _a === void 0 ? void 0 : _a.timestamp;
-                const blockTime = blockTimestamp ? new Date(Number(blockTimestamp) * 1000) : null;
-                const receiveTime = new Date();
-                const receiveTimestamp = Math.floor(receiveTime.getTime() / 1000);
-                const delay = blockTimestamp ? receiveTimestamp - Number(blockTimestamp) : 0;
-                console.log((0, dist_1.getCurDateTime)(), '收到区块元数据:', Object.assign(Object.assign({}, blockMeta), { blockTime: Object.assign(Object.assign({}, blockMeta.blockTime), { dateString: (blockTime === null || blockTime === void 0 ? void 0 : blockTime.toISOString()) || '未知时间' }), networkDelay: {
-                        blockTime: blockTime === null || blockTime === void 0 ? void 0 : blockTime.toISOString(),
-                        recvTime: receiveTime.toISOString(),
-                        delaySeconds: delay
-                    } }));
-            });
-            yield new Promise(resolve => setTimeout(resolve, 30000));
-            yield grpcService.disconnect();
-        }
-        catch (error) {
-            console.error('区块元数据订阅测试失败:', error);
-            yield grpcService.disconnect();
-        }
-    });
-}
-function main() {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log('开始运行 gRPC 订阅测试...');
-        yield testBlockMetaSubscription();
-        console.log('区块元数据订阅测试完成');
-        console.log('所有测试完成');
-    });
-}
-process.on('SIGINT', () => {
-    console.log('程序被用户中断');
-    process.exit(0);
-});
-main().catch(error => {
-    console.error('测试过程中发生错误:', error);
-    process.exit(1);
-});