capitalisk-dex 18.0.1 → 18.0.3

package/index.js

@@ -142,6 +142,10 @@ module.exports = class CapitaliskDEXModule {
       quoteMinPartialTake: BigInt(quoteChainOptions.minPartialTake || 0),
       priceDecimalPrecision: this.priceDecimalPrecision
     });
+    this.initialHeights = {
+      [this.baseChainSymbol]: 0,
+      [this.quoteChainSymbol]: 0
+    };
     this.processedHeights = {
       [this.baseChainSymbol]: 0,
       [this.quoteChainSymbol]: 0
@@ -832,6 +836,13 @@ module.exports = class CapitaliskDEXModule {
         break;
       }
       this.pendingTransfers.delete(txnId);
+      this.logger.error(
+        `Outbound multisig transaction ${
+          txnId
+        } expired before it could be processed by the ${
+          transfer.targetChain
+        } blockchain`
+      );
     }
   }
 
@@ -1232,6 +1243,8 @@ module.exports = class CapitaliskDEXModule {
       }
     }
 
+    this.initialHeights = {...this.processedHeights};
+
     while (true) {
       try {
         let [baseChainMaxBlock, quoteChainMaxBlock] = await Promise.all([
@@ -1441,7 +1454,7 @@ module.exports = class CapitaliskDEXModule {
         if (
           !this.passiveMode &&
           this.options.dexDisabledFromHeight != null &&
-          chainHeight % this.options.dexDisabledFromHeight === 0
+          chainHeight === this.options.dexDisabledFromHeight
         ) {
           let currentOrderBook = this.tradeEngine.getSnapshot();
           this.tradeEngine.clear();
@@ -2188,11 +2201,17 @@ module.exports = class CapitaliskDEXModule {
             this.updater.revertActiveUpdate();
             process.exit();
           }
-          this.pendingTransfers.clear();
-          let lastProcessedHeights = await this.revertToSafeSnapshot();
+
+          let lastProcessedHeights = this.revertToSafeSnapshot();
           this.processedHeights[this.baseChainSymbol] = lastProcessedHeights.baseChainHeight;
           this.processedHeights[this.quoteChainSymbol] = lastProcessedHeights.quoteChainHeight;
 
+          for (let [txnId, transfer] of this.pendingTransfers) {
+            if (transfer.height >= this.processedHeights[transfer.targetChain]) {
+              this.pendingTransfers.delete(txnId);
+            }
+          }
+
           let [baseChainNewTipBlock, quoteChainNewTipBlock] = await Promise.all([
             this._getBlockAtHeight(this.baseChainSymbol, this.processedHeights[this.baseChainSymbol]),
             this._getBlockAtHeight(this.quoteChainSymbol, this.processedHeights[this.quoteChainSymbol])
@@ -2231,12 +2250,12 @@ module.exports = class CapitaliskDEXModule {
         quoteChainLastProcessedBlock.id !== quoteChainLastDEXProcessedBlock.id
       );
       if (this.isBaseChainForked) {
-        this.logger.debug(
+        this.logger.error(
           `A fork was detected on the ${this.baseChainSymbol} chain at height ${baseChainLastDEXProcessedBlock.height}`
         );
       }
       if (this.isQuoteChainForked) {
-        this.logger.debug(
+        this.logger.error(
           `A fork was detected on the ${this.quoteChainSymbol} chain at height ${quoteChainLastDEXProcessedBlock.height}`
         );
       }
@@ -2816,17 +2835,21 @@ module.exports = class CapitaliskDEXModule {
     return {baseChainHeight, quoteChainHeight};
   }
 
-  async revertToSafeSnapshot() {
+  revertToSafeSnapshot() {
     if (this.finalizedSnapshot) {
       this.lastSnapshot = this.finalizedSnapshot;
     }
+    let baseChainHeight;
+    let quoteChainHeight;
     if (!this.lastSnapshot) {
       this.tradeEngine.clear();
-      return;
+      baseChainHeight = this.initialHeights[this.baseChainSymbol];
+      quoteChainHeight = this.initialHeights[this.quoteChainSymbol];
+      return {baseChainHeight, quoteChainHeight};
     }
     this.tradeEngine.setSnapshot(this.lastSnapshot.orderBook);
-    let baseChainHeight = this.lastSnapshot.chainHeights[this.baseChainSymbol];
-    let quoteChainHeight = this.lastSnapshot.chainHeights[this.quoteChainSymbol];
+    baseChainHeight = this.lastSnapshot.chainHeights[this.baseChainSymbol];
+    quoteChainHeight = this.lastSnapshot.chainHeights[this.quoteChainSymbol];
     return {baseChainHeight, quoteChainHeight};
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capitalisk-dex",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "Decentralized exchange module.",
   "main": "index.js",
   "scripts": {