@clonegod/ttd-core 2.0.11 → 2.0.13

package/dist/app_config/env_args.d.ts

@@ -6,23 +6,21 @@ export declare class EnvArgs {
     app_name: string;
     redis_host: string;
     redis_port: string;
+    config_center_host: string;
+    trade_analyze_url: string;
     rpc_endpoint: string;
     ws_endpoint: string;
     grpc_endpoint: string;
     grpc_token: string;
-    config_center_host: string;
-    token_market_price_url: string;
-    trade_analyze_url: string;
-    quote_pair: string;
-    quote_amount_usd: number;
     auto_quote_enable: boolean;
     auto_quote_interval_mills: number;
+    quote_pair: string;
+    quote_amount_usd: number;
+    quote_pool_address: string;
+    quote_pool_name: string;
+    quote_pool_fee_rate: number;
     trade_group_id: string;
     trade_pair: string;
-    trade_dex_id: DEX_ID;
-    trade_pool_address: string;
-    trade_pool_name: string;
-    trade_pool_fee_rate: number;
     token_price_cache_seconds: number;
     constructor(chain_id?: CHAIN_ID, dex_id?: DEX_ID);
 }

package/dist/app_config/env_args.js

@@ -4,7 +4,7 @@ exports.EnvArgs = void 0;
 const __1 = require("..");
 class EnvArgs {
     constructor(chain_id, dex_id) {
-        var _a, _b, _c;
+        var _a, _b;
         this.app_name = process.env.APP_NAME || '';
         this.chain_id = chain_id || ((_a = process.env.CHAIN_ID) === null || _a === void 0 ? void 0 : _a.toUpperCase());
         if ((0, __1.isEmpty)(this.chain_id)) {
@@ -16,23 +16,21 @@ class EnvArgs {
         this.app_base_dir = process.env.APP_BASE_DIR || '';
         this.redis_host = process.env.REDIS_HOST;
         this.redis_port = process.env.REDIS_PORT;
+        this.config_center_host = process.env.CONFIG_CENTER_HOST;
+        this.trade_analyze_url = process.env.TRADE_ANALYZE_URL;
         this.rpc_endpoint = process.env.RPC_ENDPOINT;
         this.ws_endpoint = process.env.WS_ENDPOINT;
         this.grpc_endpoint = process.env.GRPC_ENDPOINT;
         this.grpc_token = process.env.GRPC_TOKEN;
-        this.config_center_host = process.env.CONFIG_CENTER_HOST;
-        this.token_market_price_url = process.env.TOKEN_PRICE_URL || process.env.TOKEN_MARKET_PRICE_URL;
-        this.trade_analyze_url = process.env.TRADE_ANALYZE_URL;
-        this.quote_pair = process.env.QUOTE_PAIR;
-        this.quote_amount_usd = parseInt(process.env.QUOTE_AMOUNT_USD || '100');
         this.auto_quote_enable = process.env.AUTO_QUOTE_ENABLE === 'true';
         this.auto_quote_interval_mills = parseInt(process.env.AUTO_QUOTE_INTERVAL_MILLS || '60000');
+        this.quote_pair = process.env.QUOTE_PAIR;
+        this.quote_amount_usd = parseInt(process.env.QUOTE_AMOUNT_USD || '100');
+        this.quote_pool_address = process.env.QUOTE_POOL_ADDRESS;
+        this.quote_pool_name = process.env.QUOTE_POOL_NAME;
+        this.quote_pool_fee_rate = parseInt(process.env.QUOTE_POOL_FEE_RATE || '25');
         this.trade_group_id = process.env.TRADE_GROUP_ID;
         this.trade_pair = process.env.TRADE_PAIR;
-        this.trade_dex_id = (_c = process.env.TRADE_DEX_ID) === null || _c === void 0 ? void 0 : _c.toUpperCase();
-        this.trade_pool_address = process.env.TRADE_POOL_ADDRESS;
-        this.trade_pool_name = process.env.TRADE_POOL_NAME;
-        this.trade_pool_fee_rate = parseInt(process.env.TRADE_POOL_FEE_RATE || '0');
         this.token_price_cache_seconds = parseInt(process.env.TOKEN_PRICE_CACHE_SECONDS || '600');
         (0, __1.log_info)('EnvArgs init finish', this);
     }

package/dist/app_config/index.d.ts

@@ -1,4 +1,5 @@
 import { AppConfig } from './app_config';
 export * from './env_args';
 export * from './app_config';
+export * from './app_trade_config';
 export declare const getGlobalAppConfig: () => AppConfig;

package/dist/app_config/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalAppConfig = void 0;
 __exportStar(require("./env_args"), exports);
 __exportStar(require("./app_config"), exports);
+__exportStar(require("./app_trade_config"), exports);
 const getGlobalAppConfig = () => {
     let app_config = global.app_config;
     if (!app_config) {

package/dist/trade/abstract_tx_check.d.ts

@@ -16,7 +16,9 @@ export declare abstract class AbstractTransactionResultCheck {
     intervalId: any;
     check_count: number;
     trade_result_already_processed: boolean;
-    constructor(env_args: EnvArgs, event_emitter: EventEmitter, context: TradeContext, txid: string);
+    constructor(env_args: EnvArgs, event_emitter: EventEmitter);
+    set_context(context: TradeContext): this;
+    set_txid(txid: string): this;
     init_tx_status(): this;
     check(): Promise<void>;
     abstract check_tx_result_interval(): void;

package/dist/trade/abstract_tx_check.js

@@ -12,19 +12,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractTransactionResultCheck = void 0;
 const __1 = require("..");
 class AbstractTransactionResultCheck {
-    constructor(env_args, event_emitter, context, txid) {
+    constructor(env_args, event_emitter) {
         this.env_args = env_args;
         this.event_emitter = event_emitter;
+        this.check_count = 0;
+        this.trade_result_already_processed = false;
+    }
+    set_context(context) {
         this.context = context;
         this.group_id = context.group_id;
         this.wallet = context.trade_runtime.wallet.public_key;
-        this.txid = txid;
         this.price_msg = context.price_msg;
         this.order_msg = context.order_msg;
         this.pool_info = context.pool_info;
         this.trace_id = context.order_msg.order_trace_id;
-        this.check_count = 0;
-        this.trade_result_already_processed = false;
+        return this;
+    }
+    set_txid(txid) {
+        this.txid = txid;
+        return this;
     }
     init_tx_status() {
         let empty_trade_result = JSON.parse(JSON.stringify({

package/dist/trade/handle_order_message.js

@@ -94,7 +94,7 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
             txid
         };
         global.event_emitter = trade_appconfig;
-        tx_result_checker.init_tx_status().check();
+        tx_result_checker.set_context(context).set_txid(txid).init_tx_status().check();
         trade_appconfig.subscribe_wallet_raw_txn_event();
     }
     catch (err) {

package/package.json

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