@clonegod/ttd-core 2.1.29 → 2.1.31

package/dist/app_config/AbstractTradeAppConfig.d.ts

@@ -6,6 +6,7 @@ export declare abstract class AbstractTradeAppConfig extends AppConfig {
     is_already_subscribe_wallet_raw_txn: boolean;
     trade_instance: AbastrcatTrade;
     tx_result_checker: AbstractTransactionResultCheck;
+    private is_order_event_subscribed;
     constructor();
     init(): Promise<void>;
     init_trade_runtime(): Promise<void>;

package/dist/app_config/AbstractTradeAppConfig.js

@@ -17,6 +17,7 @@ class AbstractTradeAppConfig extends AppConfig_1.AppConfig {
     constructor() {
         super();
         this.is_already_subscribe_wallet_raw_txn = false;
+        this.is_order_event_subscribed = false;
     }
     init() {
         const _super = Object.create(null, {
@@ -43,6 +44,11 @@ class AbstractTradeAppConfig extends AppConfig_1.AppConfig {
     }
     subscribe_order_event(trade_instance, new_tx_result_checker_factory) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.is_order_event_subscribed) {
+                (0, __1.log_warn)('subscribe_order_event called multiple times, skip');
+                return;
+            }
+            this.is_order_event_subscribed = true;
             let handler = (message) => (0, handle_order_message_1.handle_order_message)(this, trade_instance, new_tx_result_checker_factory, message);
             let group_id = this.trade_runtime.group.id;
             let pair_name = this.trade_runtime.pair_name;

package/dist/token/price/get_solana_token_price.js

@@ -120,7 +120,7 @@ function fetchPriceFromJupiter(addresses) {
                 if (response.data) {
                     for (const address of addresses) {
                         const key = address;
-                        if (response.data[key] !== undefined) {
+                        if (response.data[key] !== undefined && response.data[key]['usdPrice'] > 0) {
                             result.set(address, {
                                 address: address,
                                 price: response.data[key]['usdPrice'].toString(),
@@ -157,5 +157,6 @@ if (require.main === module) {
             "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN",
             "MEW1gQWJ3nEXg2qgERiKu7FAFj79PHvQVREQUzScPP5",
         ];
+        console.log(yield fetchPriceFromJupiter(addresses));
     }))();
 }

package/dist/trade/handle_order_message.js

@@ -56,6 +56,7 @@ const try_lock_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, v
     return is_lock_success;
 });
 exports.try_lock_order_msg = try_lock_order_msg;
+const order_trace_id_set = new Set();
 const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker_factory, recv_order_msg) => __awaiter(void 0, void 0, void 0, function* () {
     (0, __1.new_line)(3);
     console.log(`=================================================================================`);
@@ -70,15 +71,11 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
     let { price_msg, id_parts } = yield check_parse_order_msg(trade_appconfig, order_msg);
     let { order_trace_id } = order_msg;
     let { chain_id, dex_id, pool_id, fee_rate } = id_parts;
-    if (process.env.ENABLE_MULTIPLE_PROCESS === 'true') {
-        let lock_order = yield (0, exports.try_lock_order_msg)(trade_appconfig, order_msg);
-        if (!lock_order) {
-            (0, __1.log_warn)(`try lock order failed!`, {
-                chain_id, group_id, order_trace_id
-            });
-            return;
-        }
+    if (order_trace_id_set.has(order_trace_id)) {
+        (0, __1.log_warn)(`order_trace_id already processed, skip`, { order_trace_id });
+        return;
     }
+    order_trace_id_set.add(order_trace_id);
     let context;
     let txid = '';
     let order_submit_result;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "2.1.29",
+    "version": "2.1.31",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "types/index.d.ts",