Merge remote-tracking branch 'refs/remotes/dashpay/master' into feat/…

…upgrade-dashcore-lib # Conflicts: # package-lock.json # package.json
dashpay · Sep 27, 2024 · 8f25062 · 8f25062
2 parents 17902f7 + 99bd888
commit 8f25062
Show file tree

Hide file tree

Showing 4 changed files with 6,732 additions and 136 deletions.
diff --git a/lib/services/dashd.js b/lib/services/dashd.js
@@ -5,7 +5,7 @@ var path = require('path');
 var spawn = require('child_process').spawn;
 var util = require('util');
 var dashcore = require('@dashevo/dashcore-lib');
-var zmq = require('zeromq');
+var zmq = require('@pshenmic/zeromq/v5-compat');
 var async = require('async');
 var LRU = require('lru-cache');
 var DashdRPC = require('@dashevo/dashd-rpc');
@@ -2253,6 +2253,8 @@ Dash.prototype.getDetailedTransaction = function(txid, callback) {
       var address = null;
       if (out.scriptPubKey && out.scriptPubKey.addresses && out.scriptPubKey.addresses.length === 1) {
         address = out.scriptPubKey.addresses[0];
+      } else if(out.scriptPubKey.address){
+        address = out.scriptPubKey.address;
       }
       tx.outputs.push({
         satoshis: out.valueSat,
@@ -2280,21 +2282,18 @@ Dash.prototype.getDetailedTransaction = function(txid, callback) {
 
     if (result.proRegTx !== undefined) {
       tx.proRegTx = result.proRegTx;
-    }
-    if (result.proUpServTx !== undefined) {
+    }else if (result.proUpServTx !== undefined) {
       tx.proUpServTx = result.proUpServTx;
-    }
-    if (result.proUpRegTx !== undefined) {
+    }else if (result.proUpRegTx !== undefined) {
       tx.proUpRegTx = result.proUpRegTx;
-    }
-    if (result.proUpRevTx !== undefined) {
+    }else if (result.proUpRevTx !== undefined) {
       tx.proUpRevTx = result.proUpRevTx;
-    }
-    if (result.cbTx !== undefined) {
+    }else if (result.cbTx !== undefined) {
       tx.cbTx = result.cbTx;
-    }
-    if (result.qcTx !== undefined) {
+    }else if (result.qcTx !== undefined) {
       tx.qcTx = result.qcTx;
+    }else if (result.mnhfTx !== undefined) {
+      tx.mnhfTx = result.mnhfTx;
     }
   }