15m-filter

Author: tripolskypetr

packages/api-binance/src/helper/holdUSDT.ts

@@ -117,22 +117,15 @@ export const createHoldUSDT = (binance: Binance, logger: LoggerService) => {
 
   const hasOpenOrders = async (symbol = 'ETHUSDT') => {
     let totalOrders = await binance.openOrders({ symbol });
-    const myOrders = new Set(PENDING_ORDERS_LIST.map(({ orderId }) => orderId));
+    const activeOrders = PENDING_ORDERS_LIST.filter(
+      ({ stamp }) => dayjs().diff(dayjs(stamp), 'minute') <= 15,
+    );
+    const myOrders = new Set(activeOrders.map(({ orderId }) => orderId));
+    PENDING_ORDERS_LIST = activeOrders;
     totalOrders = totalOrders.filter(({ orderId }) => myOrders.has(orderId));
     return !!totalOrders.length;
   };
 
-  const ignoreStuckOrders = async (/* symbol = 'ETHUSDT' */) => {
-    const stuckSet = new Set(
-      PENDING_ORDERS_LIST.filter(
-        ({ stamp }) => dayjs().diff(dayjs(stamp), 'minute') >= 15,
-      ).map(({ orderId }) => orderId),
-    );
-    PENDING_ORDERS_LIST = PENDING_ORDERS_LIST.filter(
-      ({ orderId }) => !stuckSet.has(orderId),
-    );
-  };
-
   const isOrderFullfilled = async (symbol = 'ETHUSDT', orderId: number) => {
     const { status } = await binance.getOrder({
       symbol,
@@ -269,7 +262,6 @@ export const createHoldUSDT = (binance: Binance, logger: LoggerService) => {
   };
 
   (globalThis as any).hasOpenOrders = hasOpenOrders;
-  (globalThis as any).ignoreStuckOrders = ignoreStuckOrders;
   (globalThis as any).getBalance = getBalance;
   (globalThis as any).getTradeFee = getTransactionFee;
   (globalThis as any).getMarketPrice = getMarketPrice;
@@ -282,6 +274,5 @@ export const createHoldUSDT = (binance: Binance, logger: LoggerService) => {
 
   return {
     holdUSDT,
-    ignoreStuckOrders,
   };
 };

packages/api-binance/src/service/api.service.ts

@@ -14,9 +14,6 @@ export class ApiService implements OnModuleInit {
   private binance: ReturnType<typeof Binance> = null as never;
 
   private holdUSDT: ReturnType<typeof createHoldUSDT>['holdUSDT'];
-  private ignoreStuckOrders: ReturnType<
-    typeof createHoldUSDT
-  >['ignoreStuckOrders'];
 
   constructor(
     private readonly configService: ConfigService,
@@ -31,12 +28,8 @@ export class ApiService implements OnModuleInit {
         apiSecret: undefined,
       }),
     });
-    const { holdUSDT, ignoreStuckOrders } = createHoldUSDT(
-      this.binance,
-      this.loggerService,
-    );
+    const { holdUSDT } = createHoldUSDT(this.binance, this.loggerService);
     this.holdUSDT = holdUSDT;
-    this.ignoreStuckOrders = ignoreStuckOrders;
   }
 
   getCandleEmitter() {
@@ -77,6 +70,5 @@ export class ApiService implements OnModuleInit {
 
   async doRollback() {
     this.loggerService.log(`api-service do_rollback`);
-    await this.ignoreStuckOrders();
   }
 }