hot patch: fix whitelist for contributions and deal with the run(0) i…

…ssue

“fixes” #3452 and related
issue in #2994

auditor: @diracdeltas

app/ledger.js

@@ -773,13 +773,7 @@ var callback = (err, result, delayTime) => {
     console.log('ledger client error(1): ' + err.toString() + (err.stack ? ('\n' + err.stack) : ''))
     if (!client) return
 
-/* TBD: avoid error lock-up in sync preventing future reconciliations
-    return setTimeout(() => {
-      if (client.sync(callback) === true) run(random.randomInt({ min: 1, max: 10 * msecs.minute }))
-    }, 1 * msecs.hour)
- */
-
-    if (typeof delayTime === 'undefined') delayTime = 0
+    if (typeof delayTime === 'undefined') delayTime = random.randomInt({ min: 1, max: 10 * msecs.minute })
   }
 
   if (!result) return run(delayTime)
@@ -896,7 +890,7 @@ var run = (delayTime) => {
 
       if (!client) return console.log('\n\n*** MTR says this can\'t happen(1)... please tell him that he\'s wrong!\n\n')
 
-      if (client.sync(callback) === true) return run(0)
+      if (client.sync(callback) === true) return run(random.randomInt({ min: 1, max: 10 * msecs.minute }))
     }, delayTime)
   }
 
@@ -934,18 +928,16 @@ var getStateInfo = (state) => {
     if (transaction.stamp < then) break
 
     ballots = underscore.clone(transaction.ballots || {})
-    underscore.keys(state.ballots).forEach((ballot) => {
+    state.ballots.forEach((ballot) => {
       if (ballot.viewingId !== transaction.viewingId) return
 
       if (!ballots[ballot.publisher]) ballots[ballot.publisher] = 0
       ballots[ballot.publisher]++
     })
 
     ledgerInfo.transactions.push(underscore.extend(underscore.pick(transaction,
-                                                                   [ 'viewingId', 'submissionStamp', 'satoshis',
-                                                                     'contribution'
-                                                                   ]),
-                                                   transaction.fee, { ballots: ballots }))
+                                                                   [ 'viewingId', 'contribution', 'submissionStamp', 'count' ]),
+                                                                   { ballots: ballots }))
   }
 
   updateLedgerInfo()