@clonegod/ttd-sol-common 1.0.172 → 1.0.174

package/dist/appconfig/app_config.d.ts

@@ -1,4 +1,4 @@
-import { ArbCache, ArbEventSubscriber, TradeResponseType, TradeRuntimeType } from "@clonegod/ttd-common";
+import { ArbCache, ArbEventSubscriber, TradeResponseType, TradeRuntimeType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist";
+import { CHAIN_ID } from "@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/dist");
 class EnvArgs {
     constructor() {
         this.init();

package/dist/common/context.d.ts

@@ -1,5 +1,5 @@
-import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeRuntimeType } from "@clonegod/ttd-common";
-import { CHAIN_ID, DEX_ID } from "@clonegod/ttd-common/dist";
+import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeRuntimeType } from "@clonegod/ttd-core";
+import { CHAIN_ID, DEX_ID } from "@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/dist");
 const send_tx_1 = require("../send_tx");
 class TradeContext {
     constructor(price_msg, order_msg) {

package/dist/grpc/index.d.ts

@@ -1 +1,23 @@
+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

@@ -13,5 +13,92 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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/test_grpc.js

@@ -17,6 +17,7 @@ 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({
@@ -78,7 +79,12 @@ function testAccountsSubscription() {
 }
 function testBlockMetaSubscription() {
     return __awaiter(this, void 0, void 0, function* () {
-        const grpcService = createGrpcService();
+        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('开始测试区块元数据订阅...');

package/dist/helius_geyser_ws/subscribe_pool_change_by_geyser.d.ts

@@ -1,3 +1,3 @@
-import { StandardPoolInfoType } from "@clonegod/ttd-common";
+import { StandardPoolInfoType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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,7 +18,7 @@ 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/dist");
 const common_1 = require("../common");
 const jito_1 = require("../jito");
 class RpcClient {

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/quote/log_quote_price.d.ts

@@ -1,2 +1,2 @@
-import { PriceMessageType } from "@clonegod/ttd-common";
+import { PriceMessageType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common";
+import { PriceMessageType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common';
+import { PriceMessageType, QuoteTimeInfoType, StandardPoolInfoType } from '@clonegod/ttd-core';
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common";
+import { StandardPoolInfoType, TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common";
+import { StandardTokenInfoType, TokenPriceWithAmountType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common";
+import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeResultType } from "@clonegod/ttd-core";
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/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-common';
+import { StandardPoolInfoType } from '@clonegod/ttd-core';
 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-common/dist");
+const dist_1 = require("@clonegod/ttd-core/dist");
 const send_tx_1 = require("../send_tx");
 class TransactionResultParser {
     constructor(env_args, wallet_pubkey, event_emitter) {

package/package.json

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

package/types/index.d.ts

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