From a98bf3c589ea61204dd6e787f64df8cb80f9d724 Mon Sep 17 00:00:00 2001
From: sairajzero <sairaj0630@gmail.com>
Date: Thu, 18 Aug 2022 00:18:23 +0530
Subject: [PATCH] Improve resolved values for some multisig fns

- createTx resolved pipeline id
- signTx resolves an object {tx_hex, *txid}
- store the message type for multisig pipeline
- Added loadDataFromBlockchain to messenger init fn
- Adding pipeline list to getChatOrder
---
 scripts/messenger.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/messenger.js b/scripts/messenger.js
index fa7aaa3..36fdf7c 100644
--- a/scripts/messenger.js
+++ b/scripts/messenger.js
@@ -375,9 +375,12 @@
                 .sort((a, b) => b[0] - a[0]).map(a => a[1]);
             result.group = Object.keys(_loaded.groups).map(a => [parseInt(_loaded.appendix[`lastReceived_${a}`]), a])
                 .sort((a, b) => b[0] - a[0]).map(a => a[1]);
+            result.pipeline = Object.keys(_loaded.pipeline).map(a => [parseInt(_loaded.appendix[`lastReceived_${a}`]), a])
+                .sort((a, b) => b[0] - a[0]).map(a => a[1]);
         } else {
             result = Object.keys(_loaded.chats).map(a => [_loaded.chats[a], a])
                 .concat(Object.keys(_loaded.groups).map(a => [parseInt(_loaded.appendix[`lastReceived_${a}`]), a]))
+                .concat(Object.keys(_loaded.pipeline).map(a => [parseInt(_loaded.appendix[`lastReceived_${a}`]), a]))
                 .sort((a, b) => b[0] - a[0]).map(a => a[1])
         }
         return result;
@@ -909,13 +912,15 @@
                     for (let p in data.pipeline)
                         if (data.pipeline[p].disabled !== true)
                             requestPipelineInbox(p, data.pipeline[p].model);
-                    resolve("Messenger initiated");
+                    loadDataFromBlockchain()
+                        .then(result => resolve("Messenger initiated"))
+                        .catch(error => reject(error))
                 }).catch(error => reject(error));
             })
         })
     }
 
-    messenger.loadDataFromBlockchain = function() {
+    const loadDataFromBlockchain = messenger.loadDataFromBlockchain = function() {
         return new Promise((resolve, reject) => {
             let user_floID = floCrypto.toFloID(user.id);
             if (!user_floID)
@@ -1027,7 +1032,7 @@
                 createPipeline(TYPE_BTC_MULTISIG, co_owners, 32).then(pipeline => {
                     let message = encrypt(tx, pipeline.eKey);
                     sendRaw(message, pipeline.id, "TRANSACTION", false)
-                        .then(result => resolve(result))
+                        .then(result => resolve(pipeline.id))
                         .catch(error => reject(error))
                 }).catch(error => reject(error))
             }).catch(error => reject(error))
@@ -1046,14 +1051,18 @@
                 let message = encrypt(tx_hex_signed, pipeline.eKey);
                 sendRaw(message, pipeline.id, "TRANSACTION", false).then(result => {
                     if (!btcOperator.checkSigned(tx_hex_signed))
-                        return resolve(tx_hex_signed);
+                        return resolve({
+                            tx_hex: tx_hex_signed
+                        });
                     debugger;
                     btcOperator.broadcast(tx_hex_signed).then(result => {
                         let txid = result.txid;
                         console.debug(txid);
                         sendRaw(encrypt(txid, pipeline.eKey), pipeline.id, "BROADCAST", false)
-                            .then(result => resolve(txid))
-                            .catch(error => reject(error))
+                            .then(result => resolve({
+                                tx_hex: tx_hex_signed,
+                                txid: txid
+                            })).catch(error => reject(error))
                     }).catch(error => reject(error))
                 }).catch(error => reject(error))
             }).catch(error => console.error(error))
@@ -1174,6 +1183,7 @@
             unparsed.message = decrypt(unparsed.message, k)
             //store the pubKey if not stored already
             floDapps.storePubKey(unparsed.senderID, unparsed.pubKey);
+            data.type = unparsed.type;
             if (unparsed.type === "TRANSACTION") {
                 data.message = encrypt(unparsed.message);
             } else if (unparsed.type === "BROADCAST") {