From 522d38f1059ed5307c1454ec1a85f4a221c8cd8f Mon Sep 17 00:00:00 2001
From: Marshall Rose <mrose17@gmail.com>
Date: Mon, 12 Sep 2016 22:05:01 -0700
Subject: [PATCH] use latest version of ledger packages, and better use of
 callback delays

fixes https://github.com/brave/browser-laptop/issues/3943

auditor: @diracdeltas
---
 app/ledger.js | 23 ++++++++++++-----------
 package.json  |  8 ++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/ledger.js b/app/ledger.js
index 8037c5156c4..4485d1270b7 100644
--- a/app/ledger.js
+++ b/app/ledger.js
@@ -150,7 +150,7 @@ var boot = () => {
       bootP = false
       return console.log('ledger client boot error: ' + ex.toString() + '\n' + ex.stack)
     }
-    if (client.sync(callback) === true) run(random.randomInt({ min: 1, max: 10 }) * msecs.minute)
+    if (client.sync(callback) === true) run(random.randomInt({ min: msecs.minute, max: 10 * msecs.minute }))
     getBalance()
 
     bootP = false
@@ -374,7 +374,7 @@ var initialize = (onoff) => {
         } catch (ex) {
           return console.log('ledger client creation error: ' + ex.toString() + '\n' + ex.stack)
         }
-        if (client.sync(callback) === true) run(random.randomInt({ min: 1, max: 10 }) * msecs.minute)
+        if (client.sync(callback) === true) run(random.randomInt({ min: msecs.minute, max: 10 * msecs.minute }))
         cacheRuleSet(state.ruleset)
 
         // Make sure bravery props are up-to-date with user settings
@@ -850,7 +850,7 @@ var callback = (err, result, delayTime) => {
     console.log('ledger client error(1): ' + JSON.stringify(err, null, 2) + (err.stack ? ('\n' + err.stack) : ''))
     if (!client) return
 
-    if (typeof delayTime === 'undefined') delayTime = random.randomInt({ min: 1 * msecs.minute, max: 10 * msecs.minute })
+    if (typeof delayTime === 'undefined') delayTime = random.randomInt({ min: msecs.minute, max: 10 * msecs.minute })
   }
 
   if (!result) return run(delayTime)
@@ -863,7 +863,8 @@ var callback = (err, result, delayTime) => {
   }
   cacheRuleSet(result.ruleset)
 
-  syncWriter(pathName(statePath), result, () => { run(delayTime) })
+  syncWriter(pathName(statePath), result, () => {})
+  run(delayTime)
 }
 
 var roundtrip = (params, options, callback) => {
@@ -937,7 +938,7 @@ var roundtrip = (params, options, callback) => {
 var runTimeoutId = false
 
 var run = (delayTime) => {
-//  if (clientOptions.verboseP) console.log('\nledger client run: clientP=' + (!!client) + ' delayTime=' + delayTime)
+  if (clientOptions.verboseP) console.log('\nledger client run: clientP=' + (!!client) + ' delayTime=' + delayTime)
 
   if ((typeof delayTime === 'undefined') || (!client)) return
 
@@ -967,13 +968,13 @@ var run = (delayTime) => {
     } catch (ex) {
       delayTime = false
     }
-    if (delayTime === false) delayTime = random.randomInt({ min: 1, max: 10 }) * msecs.minute
+    if (delayTime === false) delayTime = random.randomInt({ min: msecs.minute, max: 10 * msecs.minute })
   }
   if (delayTime > 0) {
     if (runTimeoutId) return console.log('\ninterception')
 
     active = client
-    if (delayTime > msecs.day) delayTime = msecs.day
+    if (delayTime > (1 * msecs.hour)) delayTime = random.randomInt({ min: 3 * msecs.minute, max: msecs.hour })
 
     runTimeoutId = setTimeout(() => {
       runTimeoutId = false
@@ -1166,11 +1167,11 @@ var cacheReturnValue = () => {
  * low-level utilities
  */
 
-var syncP = {}
+var syncingP = {}
 
 var syncWriter = (path, obj, options, cb) => {
-  if (syncP[path]) return
-  syncP[path] = true
+  if (syncingP[path]) return
+  syncingP[path] = true
 
   if (typeof options === 'function') {
     cb = options
@@ -1179,7 +1180,7 @@ var syncWriter = (path, obj, options, cb) => {
   options = underscore.defaults(options || {}, { encoding: 'utf8', mode: parseInt('644', 8) })
 
   fs.writeFile(path, JSON.stringify(obj, null, 2), options, (err) => {
-    syncP[path] = false
+    delete syncingP[path]
 
     if (err) console.log('write error: ' + err.toString())
 
diff --git a/package.json b/package.json
index 6d418169bcc..4a3d447497b 100644
--- a/package.json
+++ b/package.json
@@ -89,10 +89,10 @@
     "immutablepatch": "^0.2.2",
     "keytar": "^3.0.0",
     "l20n": "^3.5.1",
-    "ledger-balance": "^0.8.46",
-    "ledger-client": "^0.8.59",
-    "ledger-geoip": "https://github.com/brave/ledger-geoip.git",
-    "ledger-publisher": "^0.8.61",
+    "ledger-balance": "^0.8.60",
+    "ledger-client": "^0.8.70",
+    "ledger-geoip": "^0.8.70",
+    "ledger-publisher": "^0.8.63",
     "lru_cache": "^1.0.0",
     "qr-image": "^3.1.0",
     "random-lib": "2.1.0",