capitalisk-dex 18.0.2 → 18.0.4

package/index.js

@@ -39,6 +39,10 @@ module.exports = class CapitaliskDEXModule {
     this.options = {...defaultConfig, ...config};
     this.appConfig = appConfig;
     this.alias = alias || DEFAULT_MODULE_ALIAS;
+    this.networkAlias = (
+      (this.options.moduleRedirects && this.options.moduleRedirects[this.alias]) ||
+      this.alias
+    );
     this.updater = updater;
     if (!updates) {
       updates = [];
@@ -142,6 +146,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
@@ -1239,6 +1247,8 @@ module.exports = class CapitaliskDEXModule {
       }
     }
 
+    this.initialHeights = {...this.processedHeights};
+
     while (true) {
       try {
         let [baseChainMaxBlock, quoteChainMaxBlock] = await Promise.all([
@@ -1290,7 +1300,7 @@ module.exports = class CapitaliskDEXModule {
 
     let hasMultisigWalletsInfo = false;
 
-    this.channel.subscribe(`network:event:${this.alias}:signatures`, async ({data}) => {
+    this.channel.subscribe(`network:event:${this.networkAlias}:signatures`, async ({data}) => {
       if (!hasMultisigWalletsInfo) {
         return;
       }
@@ -1448,7 +1458,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();
@@ -2195,11 +2205,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])
@@ -2238,12 +2254,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}`
         );
       }
@@ -2697,7 +2713,7 @@ module.exports = class CapitaliskDEXModule {
 
   // Broadcast the signature to all DEX nodes with a matching baseAddress and quoteAddress
   async _broadcastSignaturesToSubnet(signatureDataList) {
-    let actionRouteString = `${this.alias}?baseAddress=${this.baseAddress}&quoteAddress=${this.quoteAddress}`;
+    let actionRouteString = `${this.networkAlias}?baseAddress=${this.baseAddress}&quoteAddress=${this.quoteAddress}`;
     try {
       await this.channel.invoke('network:emit', {
         event: `${actionRouteString}:signatures`,
@@ -2823,17 +2839,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.2",
+  "version": "18.0.4",
   "description": "Decentralized exchange module.",
   "main": "index.js",
   "scripts": {