Merge pull request #497 from DemocracyEarth/simplelogger

Updates all NPM packages

imports/api/server/oracles.js → imports/startup/both/modules/oracles.js

@@ -93,6 +93,10 @@ const _setReplicaScore = (user) => {
   }
 };
 
+
+/**
+* @summary general function to call oracles
+*/
 const _oracleReplicas = () => {
   const pendingReplicas = Meteor.users.find({ 'profile.replica': { $exists: false } }).fetch();
   log(`[oracle] Refreshing replica scores for ${pendingReplicas.length} users...`);

imports/ui/templates/layout/main.js

@@ -15,8 +15,6 @@ Buckminster Fuller, Great San Francisco Architect.
 
 A Roma, <3
 
-*/
-
 /* global alert */
 
 import { Meteor } from 'meteor/meteor';

lib/dao.js

@@ -5,9 +5,13 @@ import { getEvents, syncDAOGuilds, getBlockHeight } from '/lib/web3';
 import { log, defaults } from '/lib/const';
 import { Contracts } from '/imports/api/contracts/Contracts';
 import { Tokens } from '/imports/api/tokens/tokens';
+import { oracleReplicas } from '/imports/startup/both/modules/oracles';
+
+import { CronJob } from 'cron';
 
 const daoCollectives = [];
 let lastServerSyncedBlock = 0;
+let finishedSetup = false;
 
 const _daoToCollective = (dao) => {
   Collectives.insert(dao, (error, result) => {
@@ -178,6 +182,7 @@ const _setupDAOs = async () => {
   await _insertDAOs().then(async (res) => {
     if (res) {
       await _refresh();
+      finishedSetup = true;
     }
   });
 };
@@ -187,8 +192,24 @@ const _main = async () => {
   await _setupDAOs();
 };
 
+
 if (Meteor.isServer) {
   _main();
+
+  const cronjob = new CronJob({
+    cronTime: defaults.CRON_JOB_TIMER,
+    onTick: Meteor.bindEnvironment(async () => {
+      if (finishedSetup) {
+        log('[cron] Syncing with blockchain...');
+        await _refresh();
+        oracleReplicas();
+      } else {
+        log('[cron] Awaiting setup to finish...');
+      }
+    }),
+    start: true,
+  });
+  log(`[startup] Cron job started with schedule: '${cronjob.cronTime}'`);
 }
 
 export const computeDAOStats = _computeDAOStats;

lib/web3.js

@@ -858,7 +858,7 @@ const _writeEvents = async (event, smartContract, state, collectiveId) => {
 */
 const _getStructLength = async (dao, lengthGetter) => {
   let result;
-  await dao.methods[lengthGetter].call({}, (err, res) => {
+  await dao.methods[lengthGetter]().call({}, (err, res) => {
     if (err) {
       log(err);
     }
@@ -907,7 +907,7 @@ const _getState = async (smartContract) => {
         default:
           log(`[web3] Getting information for method ${smartContract.parameter[i].name}...`);
           if (dao.methods[smartContract.parameter[i].name]) {
-            await dao.methods[smartContract.parameter[i].name].call({}, (err, res) => {
+            await dao.methods[smartContract.parameter[i].name]().call({}, (err, res) => {
               if (err) {
                 log(err);
               }