@clonegod/ttd-sol-common 1.0.34 → 1.0.35

package/dist/common/context.d.ts

@@ -1,7 +1,7 @@
 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 { SolanaTradeRuntimeType } from "../../types";
 export declare class TradeContext {
     connection: Connection;
     trade_runtime: TradeRuntimeType;

package/dist/common/index.d.ts

@@ -1,3 +1,2 @@
 export * from './constants';
 export * from './context';
-export * from './types';

package/dist/common/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./context"), exports);
-__exportStar(require("./types"), exports);

package/dist/helius_sdk_v1.4.0/RpcClient.d.ts

@@ -3,7 +3,7 @@
 import { BlockhashWithExpiryBlockHeight, VersionedTransaction, AddressLookupTableAccount, Transaction, TransactionInstruction, TransactionSignature, Commitment, PublicKey, AccountInfo, GetLatestBlockhashConfig, RpcResponseAndContext, SignatureResult, Blockhash, Connection, ParsedAccountData, SendOptions, Signer, SerializeConfig } from '@solana/web3.js';
 import { DAS } from './types/das-types';
 import { GetPriorityFeeEstimateRequest, GetPriorityFeeEstimateResponse, JitoRegion, PollTransactionOptions, SmartTransactionContext, HeliusSendOptions } from './types';
-import { SolanaTradeRuntimeType } from '../common';
+import { SolanaTradeRuntimeType } from '../../types';
 export type SendAndConfirmTransactionResponse = {
     signature: TransactionSignature;
     confirmResponse: RpcResponseAndContext<SignatureResult>;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './common';
+export * from './config';
 export * from './helius_geyser_ws';
 export * from './send_tx';
 export * from './trade';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common"), exports);
+__exportStar(require("./config"), exports);
 __exportStar(require("./helius_geyser_ws"), exports);
 __exportStar(require("./send_tx"), exports);
 __exportStar(require("./trade"), exports);

package/dist/send_tx/send_transaction.d.ts

@@ -1,6 +1,6 @@
 import { SendOptions, Signer, TransactionInstruction } from "@solana/web3.js";
 import { Helius } from "../helius_sdk_v1.4.0";
-import { SolanaTradeRuntimeType } from '../common/types';
+import { SolanaTradeRuntimeType } from '../../types';
 export declare class HeliusClient {
     signers: Signer[];
     sendOptions: SendOptions;

package/dist/send_tx/strategy_util.d.ts

@@ -1,7 +1,7 @@
 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 "../common/types";
+import { SolanaTradeRuntimeType } from "../../types";
 export declare function create_solana_trade_runtime(connection: Connection, trade_runtime: TradeRuntimeType, pool_info: StandardPoolInfoType): SolanaTradeRuntimeType;
 export declare function calculate_gas_fee(trade_strategy: TradeStrategyType): number;
 export declare function get_jito_region(): JitoRegion;

package/dist/trade/abstract_trade.d.ts

@@ -1,4 +1,6 @@
+import { StandardPoolInfoType } from "@clonegod/ttd-common";
 import { TradeContext } from "../common/context";
 export declare abstract class AbastrcatTrade {
+    abstract init(pool_list: StandardPoolInfoType[]): void;
     abstract execute(context: TradeContext): Promise<string>;
 }

package/dist/trade/handle_order_message.d.ts

@@ -0,0 +1,4 @@
+import { AppConfig } from "../config";
+import { AbastrcatTrade } from "./abstract_trade";
+export declare const try_lock_order_msg: (appConfig: AppConfig, order_msg: any) => Promise<boolean>;
+export declare const handle_order_message: (appConfig: AppConfig, trade: AbastrcatTrade, message: string) => Promise<void>;

package/dist/trade/handle_order_message.js

@@ -0,0 +1,116 @@
+"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());
+    });
+};
+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 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* () {
+    let { unique_orderbook_id, price_id, group_id, unique_order_msg_id } = order_msg;
+    const runtime_group_id = appConfig.trade_runtime.group.id;
+    if (group_id !== runtime_group_id) {
+        throw new Error(`group_id not match!!! ${(0, dist_1.to_json_str)({ group_id, runtime_group_id })}`);
+    }
+    if ((0, dist_1.isEmpty)(unique_order_msg_id)) {
+        throw new Error(`unique_order_msg_id is empty or null! unique_order_msg_id=${unique_order_msg_id}`);
+    }
+    let price_msg = yield appConfig.arb_cache.get_price_message(price_id);
+    if ((0, dist_1.isEmpty)(price_msg)) {
+        throw new Error(`price_msg not found in the cache! price_id=${price_id}`);
+    }
+    let id_parts = (0, dist_1.parse_unique_orderbook_id)(unique_orderbook_id);
+    if (id_parts.dex_id != price_msg.dex_id ||
+        id_parts.pool_id != price_msg.pool_id) {
+        (0, dist_1.log_warn)(`check data: order_msg VS price_msg, not match!!!`, {
+            order_msg,
+            uinique_orderbook: id_parts,
+            price_msg,
+        });
+    }
+    return {
+        price_msg,
+        id_parts
+    };
+});
+const try_lock_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, void 0, function* () {
+    let { chain_id, group_id, price_id, order_trace_id } = order_msg;
+    let lock_order_key = (0, dist_1.format_order_lock_key)(chain_id, group_id, price_id, order_trace_id);
+    (0, dist_1.log_info)(`try_lock_order_msg, key=${lock_order_key}`);
+    let is_lock_success = yield appConfig.arb_cache.redis_cmd.set_nx(lock_order_key, '');
+    if (is_lock_success) {
+        (0, dist_1.log_info)(`try_lock_order_msg, key=${lock_order_key}, success`);
+        appConfig.arb_cache.redis_cmd.expire(lock_order_key, 60)
+            .then(res => (0, dist_1.log_trace)(`expire lock: key=${lock_order_key}, success`))
+            .catch(err => (0, dist_1.log_error)(`expire lock: key=${lock_order_key}, error!`, err));
+    }
+    else {
+        (0, dist_1.log_info)(`try_lock_order_msg, key=${lock_order_key}, acquire lock failed!`);
+    }
+    return is_lock_success;
+});
+exports.try_lock_order_msg = try_lock_order_msg;
+const handle_order_message = (appConfig, trade, message) => __awaiter(void 0, void 0, void 0, function* () {
+    (0, dist_1.new_line)(3);
+    (0, dist_1.log_info)(`handle_order_message, on message: `, message);
+    setTimeout(() => {
+        console.log(`=================================================================================`);
+        console.log(`|                              NEW ORDER MESSAGE                                |`);
+        console.log(`=================================================================================`);
+    }, 0);
+    let order_event_message = JSON.parse(message);
+    if (dist_1.LOG.debug) {
+        (0, dist_1.log_debug)(`order_event_msg`, order_event_message);
+    }
+    let { event_time, event_type, group_id, data: order_msg } = order_event_message;
+    let { price_msg, id_parts } = yield check_parse_order_msg(appConfig, order_msg);
+    let { order_trace_id } = order_msg;
+    let { chain_id, dex_id, pool_id, fee_rate } = id_parts;
+    let lock_order = yield (0, exports.try_lock_order_msg)(appConfig, order_msg);
+    if (!lock_order) {
+        (0, dist_1.log_warn)(`try lock order failed!`, {
+            chain_id, group_id, order_trace_id
+        });
+        return;
+    }
+    let context;
+    let txid = '';
+    let order_submit_result;
+    try {
+        let { env_args, trade_runtime } = appConfig;
+        context = new common_1.TradeContext(price_msg, order_msg);
+        yield context.init(trade_runtime);
+        txid = yield trade.execute(context);
+        order_msg.order_submit_time = Date.now();
+        order_submit_result = {
+            success: true,
+            msg: 'SUCCESS',
+            txid
+        };
+        new tx_result_check_1.TransactionResultChecker(env_args, appConfig, context, txid).init_tx_status().check();
+    }
+    catch (err) {
+        (0, dist_1.log_error)(`handle_order_message error!`, err);
+        order_submit_result = {
+            success: false,
+            msg: (err === null || err === void 0 ? void 0 : err.message) || 'FAILED',
+            txid
+        };
+    }
+    finally {
+        appConfig.arb_cache.cache_order_message(Object.assign(Object.assign({}, order_msg), { order_submit_result })).then(res => {
+            (0, dist_1.log_info)(`cache order submit result, success`, { order_msg, order_submit_result, res });
+        }).catch(err => {
+            (0, dist_1.log_warn)('cache order submit result, error!', { order_msg, order_submit_result, err });
+            console.log(err);
+        });
+    }
+});
+exports.handle_order_message = handle_order_message;

package/dist/trade/index.d.ts

@@ -1,3 +1,4 @@
 export * from './abstract_trade';
 export * from './tx_result_check';
 export * from './tx_result_parse';
+export * from './handle_order_message';

package/dist/trade/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./abstract_trade"), exports);
 __exportStar(require("./tx_result_check"), exports);
 __exportStar(require("./tx_result_parse"), exports);
+__exportStar(require("./handle_order_message"), exports);

package/dist/trade/tx_result_check.d.ts

@@ -2,8 +2,8 @@
 import { OrderMessageType, PriceMessageType, StandardPoolInfoType, TradeResultType } from "@clonegod/ttd-common";
 import { Connection, PublicKey } from "@solana/web3.js";
 import { EventEmitter } from 'events';
+import { StandardSwapDetailType } from "../../types";
 import { TradeContext } from "../common/context";
-import { StandardSwapDetailType } from "../common/types";
 import { TransactionResultParser } from "./tx_result_parse";
 export declare class TransactionResultChecker {
     env_args: any;

package/dist/trade/tx_result_parse.d.ts

@@ -2,7 +2,7 @@
 import { StandardPoolInfoType } from '@clonegod/ttd-common';
 import { ParsedTransactionWithMeta, PublicKey, TokenBalance } from '@solana/web3.js';
 import { EventEmitter } from 'events';
-import { StandardSwapDetailType } from '../common/types';
+import { StandardSwapDetailType } from '../../types';
 export declare class TransactionResultParser {
     env_args: any;
     event_emitter: EventEmitter;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.34",
+    "version": "1.0.35",
     "description": "",
     "main": "dist/index.js",
     "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-common": "1.0.145",
+        "@clonegod/ttd-common": "1.0.146",
         "@solana/web3.js": "1.91.6",
         "@irys/sdk": "^0.2.10",
         "@metaplex-foundation/mpl-token-metadata": "^2.5.2",

package/types/index.d.ts

@@ -1,23 +1,53 @@
-import { TradeRuntimeType, TradeStrategyType } from "@clonegod/ttd-common";
-import { SendOptions, Signer, TransactionInstruction } from "@solana/web3.js";
-import { Helius, JitoRegion } from "./helius_sdk_v1.4.0";
-import { _Context } from "./context";
-export declare class HeliusClient {
-    signers: Signer[];
-    sendOptions: SendOptions;
-    cluster: string;
-    helius_mainnet: Helius;
-    helius_staked: Helius;
-    _context: _Context;
-    constructor(signers: Signer[]);
-    send_transaction(trade_runtime: TradeRuntimeType, instructions: TransactionInstruction[]): Promise<string>;
-    private send_smart_transaction;
-    private send_transaction_by_jito;
-    get_jito_region(): JitoRegion;
-    get_gas_fee(trade_strategy: TradeStrategyType): number;
-    get_excat_fee_by_speed(speed: string, fee_exact: number): number;
-    get_dynamic_fee_by_speed(speed: string, estimate_priority_fee: number, fee_max_cap: number): number;
+import { StandardTokenInfoType, TradeRuntimeType } from "@clonegod/ttd-common";
+import { Connection } from "@solana/web3.js";
+
+export interface StandardSwapDetailType {
+    success: boolean
+    error_code: string
+
+    wallet: string,
+    txid: string,
+    block_time: number
+    block_number: number
+
+    pool_address: string
+    tokenA: TokenBalChangeType
+    tokenB: TokenBalChangeType
+    tx_price: string
+
+    gas_fee: GasFeeType
+}
+
+
+
+export interface TokenBalChangeType extends StandardTokenInfoType {
+    pre_bal: number
+    post_bal: number
+    change: string
+}
+
+
+
+export interface GasFeeType {
+    base_fee: number
+    priority_fee: number
+    total_fee: number
 }
 
 
 
+export interface SolanaTradeRuntimeType extends TradeRuntimeType {
+    // common connection
+    connection: Connection
+
+    // priority fee
+    priority_fee: number
+
+    // Compute Budget: SetComputeUnitPrice
+    cu_price: number
+
+    // Compute Budget: SetComputeUnitLimit
+    cu_limit: number
+}
+
+