Merge pull request #92 from iden3/feature/fix-checks

Feature/fix checks
iden3 · Feb 12, 2020 · e8abf9b · e8abf9b
2 parents 4dfc7fe + 4e1fb65
commit e8abf9b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/rollup-operator/src/loop-manager.js b/rollup-operator/src/loop-manager.js
@@ -556,11 +556,15 @@ class LoopManager{
     async _checkStateRollup(){
         const currentStateRoot = await this.rollupSynch.getCurrentStateRoot();
         const currentOnchainHash = await this.rollupSynch.getMiningOnchainHash();
-
-        if (BigInt(currentStateRoot) === this.infoCurrentBatch.batchData.getNewStateRoot() &&
+        
+        if (BigInt(currentStateRoot) === this.infoCurrentBatch.batchData.getOldStateRoot() &&
         BigInt(currentOnchainHash) === this.infoCurrentBatch.batchData.getOnChainHash()) {
             return true;
         } else { 
+            let info = `${chalk.yellowBright("OPERATOR STATE: ")}${chalk.white(strState[this.state])}`;
+            info += " | info ==> ";
+            info += `${chalk.white.bold("Current information of state root and/or onChain hash does not match with SC")}`;
+            this.logger.info(info);
             return false;
         }
     }

diff --git a/rollup-operator/src/server-proof.js b/rollup-operator/src/server-proof.js
@@ -62,7 +62,8 @@ async function genProof() {
 }
 ///// Server configuration
 const app = express();
-app.use(bodyParser.json());
+app.use(bodyParser.json({ limit: "50mb" }));
+app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
 app.use(cors());
 app.use(morgan("dev"));
 

diff --git a/rollup-operator/src/synch-pool-service/synch-pool-service.js b/rollup-operator/src/synch-pool-service/synch-pool-service.js
@@ -148,16 +148,31 @@ class SynchPool {
         this.info += `last block synched: ${lastSynchBlock}`;
         this.info += addedTokens;
 
-        this.logger.info(this.info);        
+        this.logger.info(this.info);
+    }
+
+    _logError(message){
+        let info = `${chalk.cyan("POOL SYNCH")} | `;
+        info += "info ==>  ";
+        info += chalk.white.bold(message);
+        this.logger.info(info); 
     }
 
     async _updateTokensPrice() {
-        const listMarkets = await this.apiBitfinex.getTraddingPairs();
+        let listMarkets;
+        try {
+            listMarkets = await this.apiBitfinex.getTraddingPairs();
+        } catch (error) {
+            this._logError("api to get tokens price is not responding");
+            listMarkets = null;
+        }
+
         for (const id in this.tokensList) {
             const tokenSymbol = this.tokensList[id].tokenSymbol;
-            let infoToken;
+            let infoToken = undefined;
             // get api information
-            infoToken = await this._getInfoToken(tokenSymbol, listMarkets);
+            if (listMarkets)
+                infoToken = await this._getInfoToken(tokenSymbol, listMarkets);
             if (infoToken) {
                 this.tokensList[id].price = infoToken;
             } else {