From 173bf35964f685a32d1e81c6e44ae02ee781de90 Mon Sep 17 00:00:00 2001
From: rouzwelt <rouzweltt@gmail.com>
Date: Thu, 24 Aug 2023 17:58:04 +0000
Subject: [PATCH] add block number to logs

- shorten repeatative large data
---
 docs/html/curve.js.html  |  4 +++-
 docs/html/global.html    |  4 ++--
 docs/html/index.html     |  2 +-
 docs/html/index.js.html  |  2 +-
 docs/html/query.js.html  |  2 +-
 docs/html/router.js.html |  4 +++-
 docs/html/utils.js.html  | 47 ++++++++++++++++++++--------------------
 docs/html/zeroex.js.html |  4 +++-
 src/curve.js             |  2 ++
 src/router.js            |  2 ++
 src/utils.js             | 45 +++++++++++++++++++-------------------
 src/zeroex.js            |  2 ++
 12 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/docs/html/curve.js.html b/docs/html/curve.js.html
index ae82b279..2d6a2328 100644
--- a/docs/html/curve.js.html
+++ b/docs/html/curve.js.html
@@ -481,6 +481,7 @@ <h1 class="page-title">Source: curve.js</h1>
                     );
                     if (ethPrice === undefined) console.log("can not get ETH price, skipping...", "\n");
                     else {
+                        console.log("Block Number: " + await signer.provider.getBlockNumber());
                         const gasLimit = await arb.estimateGas.arb(
                             takeOrdersConfigStruct,
                             // set to zero for estimation
@@ -520,6 +521,7 @@ <h1 class="page-title">Source: curve.js</h1>
                                     36 - bundledOrders[i].buyTokenDecimals
                                 )
                             );
+                            console.log("Block Number: " + await signer.provider.getBlockNumber());
                             const tx = await arb.arb(
                                 takeOrdersConfigStruct,
                                 // set to zero because only profitable transactions are submitted
@@ -657,7 +659,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/global.html b/docs/html/global.html
index 2407fd44..e87bdd23 100644
--- a/docs/html/global.html
+++ b/docs/html/global.html
@@ -5622,7 +5622,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1007">line 1007</a>
+        <a href="utils.js.html">utils.js</a>, <a href="utils.js.html#line1006">line 1006</a>
     </li></ul></dd>
     
 
@@ -6606,7 +6606,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/index.html b/docs/html/index.html
index a6aa5b87..2b0f4810 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/index.js.html b/docs/html/index.js.html
index dedcf4ca..a56cc0a0 100644
--- a/docs/html/index.js.html
+++ b/docs/html/index.js.html
@@ -273,7 +273,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/query.js.html b/docs/html/query.js.html
index c9d1a5ae..6fd14f69 100644
--- a/docs/html/query.js.html
+++ b/docs/html/query.js.html
@@ -146,7 +146,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/router.js.html b/docs/html/router.js.html
index 42e5cb9a..66816f67 100644
--- a/docs/html/router.js.html
+++ b/docs/html/router.js.html
@@ -410,6 +410,7 @@ <h1 class="page-title">Source: router.js</h1>
                         );
                         if (ethPrice === undefined) console.log("can not get ETH price, skipping...", "\n");
                         else {
+                            console.log("Block Number: " + await signer.provider.getBlockNumber());
                             const gasLimit = await arb.estimateGas.arb(
                                 takeOrdersConfigStruct,
                                 // set to zero because only profitable transactions are submitted
@@ -449,6 +450,7 @@ <h1 class="page-title">Source: router.js</h1>
                                         36 - bundledOrders[i].buyTokenDecimals
                                     )
                                 );
+                                console.log("Block Number: " + await signer.provider.getBlockNumber());
                                 const tx = await arb.arb(
                                     takeOrdersConfigStruct,
                                     // set to zero because only profitable transactions are submitted
@@ -588,7 +590,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/utils.js.html b/docs/html/utils.js.html
index 526819d4..2a72a295 100644
--- a/docs/html/utils.js.html
+++ b/docs/html/utils.js.html
@@ -969,6 +969,7 @@ <h1 class="page-title">Source: utils.js</h1>
         const orgConsole = console[methodName];
         console[methodName] = function (...params) {
             const modifiedParams = [];
+            const shortenedLogs = [];
             for (let i = 0; i &lt; params.length; i++) {
                 let logItem = params[i];
                 if (
@@ -985,35 +986,33 @@ <h1 class="page-title">Source: utils.js</h1>
                             "**********"
                         );
                     }
-                    // let _skipFirst = true;
-                    // logItem = logItem.replace(
-                    //     largeDataPattern,
-                    //     largeData => {
-                    //         if (_skipFirst) {
-                    //             _skipFirst = false;
-                    //             return largeData;
-                    //         }
-                    //         else return largeData.slice(0, 67) + "...";
-                    //     }
-                    // );
+                    logItem = logItem.replace(
+                        largeDataPattern,
+                        largeData => {
+                            if (!shortenedLogs.includes(largeData)) {
+                                shortenedLogs.push(largeData);
+                                return largeData;
+                            }
+                            else return largeData.slice(0, 67) + "...";
+                        }
+                    );
                 }
                 else if (typeof logItem === "object" &amp;&amp; logItem !== null) {
                     logItem = objStringify(logItem);
                     if (scrub) for (let j = 0; j &lt; _data.length; j++) {
                         logItem = objStrReplacer(logItem, _data[j], "**********");
                     }
-                    // let _skipFirst = true;
-                    // logItem = objStrReplacer(
-                    //     logItem,
-                    //     largeDataPattern,
-                    //     largeData => {
-                    //         if (_skipFirst) {
-                    //             _skipFirst = false;
-                    //             return largeData;
-                    //         }
-                    //         else return largeData.slice(0, 67) + "...";
-                    //     }
-                    // );
+                    logItem = objStrReplacer(
+                        logItem,
+                        largeDataPattern,
+                        largeData => {
+                            if (!shortenedLogs.includes(largeData)) {
+                                shortenedLogs.push(largeData);
+                                return largeData;
+                            }
+                            else return largeData.slice(0, 67) + "...";
+                        }
+                    );
                 }
                 modifiedParams.push(logItem);
             }
@@ -1082,7 +1081,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/html/zeroex.js.html b/docs/html/zeroex.js.html
index a5942b71..bc733c69 100644
--- a/docs/html/zeroex.js.html
+++ b/docs/html/zeroex.js.html
@@ -430,6 +430,7 @@ <h1 class="page-title">Source: zeroex.js</h1>
                                 );
                                 console.log(">>> Estimating the profit for this token pair...", "\n");
                                 let gasLimit;
+                                console.log("Block Number: " + await signer.provider.getBlockNumber());
                                 if (mode) gasLimit = await arb.estimateGas.arb(
                                     takeOrdersConfigStruct,
                                     0,
@@ -471,6 +472,7 @@ <h1 class="page-title">Source: zeroex.js</h1>
                                         )
                                     );
                                     let tx;
+                                    console.log("Block Number: " + await signer.provider.getBlockNumber());
                                     if (mode) tx = await arb.arb(
                                         takeOrdersConfigStruct,
                                         gasCostInToken.mul(gasCoveragePercentage).div(100),
@@ -633,7 +635,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:38:57 GMT+0000 (Coordinated Universal Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Thu Aug 24 2023 17:57:16 GMT+0000 (Coordinated Universal Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/src/curve.js b/src/curve.js
index b0c8dbae..16f13ace 100644
--- a/src/curve.js
+++ b/src/curve.js
@@ -453,6 +453,7 @@ const curveClear = async(
                     );
                     if (ethPrice === undefined) console.log("can not get ETH price, skipping...", "\n");
                     else {
+                        console.log("Block Number: " + await signer.provider.getBlockNumber());
                         const gasLimit = await arb.estimateGas.arb(
                             takeOrdersConfigStruct,
                             // set to zero for estimation
@@ -492,6 +493,7 @@ const curveClear = async(
                                     36 - bundledOrders[i].buyTokenDecimals
                                 )
                             );
+                            console.log("Block Number: " + await signer.provider.getBlockNumber());
                             const tx = await arb.arb(
                                 takeOrdersConfigStruct,
                                 // set to zero because only profitable transactions are submitted
diff --git a/src/router.js b/src/router.js
index 61e06a61..d9cd1b5a 100644
--- a/src/router.js
+++ b/src/router.js
@@ -382,6 +382,7 @@ const routerClear = async(
                         );
                         if (ethPrice === undefined) console.log("can not get ETH price, skipping...", "\n");
                         else {
+                            console.log("Block Number: " + await signer.provider.getBlockNumber());
                             const gasLimit = await arb.estimateGas.arb(
                                 takeOrdersConfigStruct,
                                 // set to zero because only profitable transactions are submitted
@@ -421,6 +422,7 @@ const routerClear = async(
                                         36 - bundledOrders[i].buyTokenDecimals
                                     )
                                 );
+                                console.log("Block Number: " + await signer.provider.getBlockNumber());
                                 const tx = await arb.arb(
                                     takeOrdersConfigStruct,
                                     // set to zero because only profitable transactions are submitted
diff --git a/src/utils.js b/src/utils.js
index 5c2751b5..e2adddc2 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -941,6 +941,7 @@ const appGlobalLogger = (scrub, ...data) => {
         const orgConsole = console[methodName];
         console[methodName] = function (...params) {
             const modifiedParams = [];
+            const shortenedLogs = [];
             for (let i = 0; i < params.length; i++) {
                 let logItem = params[i];
                 if (
@@ -957,35 +958,33 @@ const appGlobalLogger = (scrub, ...data) => {
                             "**********"
                         );
                     }
-                    // let _skipFirst = true;
-                    // logItem = logItem.replace(
-                    //     largeDataPattern,
-                    //     largeData => {
-                    //         if (_skipFirst) {
-                    //             _skipFirst = false;
-                    //             return largeData;
-                    //         }
-                    //         else return largeData.slice(0, 67) + "...";
-                    //     }
-                    // );
+                    logItem = logItem.replace(
+                        largeDataPattern,
+                        largeData => {
+                            if (!shortenedLogs.includes(largeData)) {
+                                shortenedLogs.push(largeData);
+                                return largeData;
+                            }
+                            else return largeData.slice(0, 67) + "...";
+                        }
+                    );
                 }
                 else if (typeof logItem === "object" && logItem !== null) {
                     logItem = objStringify(logItem);
                     if (scrub) for (let j = 0; j < _data.length; j++) {
                         logItem = objStrReplacer(logItem, _data[j], "**********");
                     }
-                    // let _skipFirst = true;
-                    // logItem = objStrReplacer(
-                    //     logItem,
-                    //     largeDataPattern,
-                    //     largeData => {
-                    //         if (_skipFirst) {
-                    //             _skipFirst = false;
-                    //             return largeData;
-                    //         }
-                    //         else return largeData.slice(0, 67) + "...";
-                    //     }
-                    // );
+                    logItem = objStrReplacer(
+                        logItem,
+                        largeDataPattern,
+                        largeData => {
+                            if (!shortenedLogs.includes(largeData)) {
+                                shortenedLogs.push(largeData);
+                                return largeData;
+                            }
+                            else return largeData.slice(0, 67) + "...";
+                        }
+                    );
                 }
                 modifiedParams.push(logItem);
             }
diff --git a/src/zeroex.js b/src/zeroex.js
index f92fcae7..550ceaaa 100644
--- a/src/zeroex.js
+++ b/src/zeroex.js
@@ -402,6 +402,7 @@ const zeroExClear = async(
                                 );
                                 console.log(">>> Estimating the profit for this token pair...", "\n");
                                 let gasLimit;
+                                console.log("Block Number: " + await signer.provider.getBlockNumber());
                                 if (mode) gasLimit = await arb.estimateGas.arb(
                                     takeOrdersConfigStruct,
                                     0,
@@ -443,6 +444,7 @@ const zeroExClear = async(
                                         )
                                     );
                                     let tx;
+                                    console.log("Block Number: " + await signer.provider.getBlockNumber());
                                     if (mode) tx = await arb.arb(
                                         takeOrdersConfigStruct,
                                         gasCostInToken.mul(gasCoveragePercentage).div(100),