From 919625708f27c0dac92509c62f6995e2e2159a70 Mon Sep 17 00:00:00 2001 From: "Marshall T. Rose" Date: Fri, 21 Apr 2017 14:56:12 -0700 Subject: [PATCH] Use ledger-client@0.9.15 and handle some timing issues Fixes #8423 --- app/ledger.js | 5 +- npm-shrinkwrap.json | 147 +++++++++++++++++++++++++++----------------- package.json | 2 +- 3 files changed, 96 insertions(+), 58 deletions(-) diff --git a/app/ledger.js b/app/ledger.js index 9151f7ec1e1..c05a0838ddc 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -671,6 +671,7 @@ var initialize = (paymentsEnabled) => { getStateInfo(state) try { + var timeUntilReconcile clientprep() client = ledgerClient(state.personaId, underscore.extend(state.options, { roundtrip: roundtrip }, clientOptions), @@ -679,7 +680,7 @@ var initialize = (paymentsEnabled) => { // Scenario: User enables Payments, disables it, waits 30+ days, then // enables it again -> reconcileStamp is in the past. // In this case reset reconcileStamp to the future. - let timeUntilReconcile = client.timeUntilReconcile() + try { timeUntilReconcile = client.timeUntilReconcile() } catch (ex) {} let ledgerWindow = (synopsis.options.numFrames - 1) * synopsis.options.frameSize if (typeof timeUntilReconcile === 'number' && timeUntilReconcile < -ledgerWindow) { client.setTimeUntilReconcile(null, (err, stateResult) => { @@ -1856,6 +1857,8 @@ var getStateInfo = (state) => { var info = state.paymentInfo var then = underscore.now() - msecs.year + if (!state.properties.wallet) return + ledgerInfo.paymentId = state.properties.wallet.paymentId ledgerInfo.passphrase = state.properties.wallet.keychains.passphrase diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 07eb9d26a9e..a826c980ba0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "brave", - "version": "0.15.0", + "version": "0.14.2", "dependencies": { "abab": { "version": "1.0.3", @@ -57,7 +57,19 @@ "ad-block": { "version": "3.0.0", "from": "ad-block@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/ad-block/-/ad-block-3.0.0.tgz" + "resolved": "https://registry.npmjs.org/ad-block/-/ad-block-3.0.0.tgz", + "dependencies": { + "bloom-filter-cpp": { + "version": "1.1.6", + "from": "bloom-filter-cpp@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.1.6.tgz" + }, + "hashset-cpp": { + "version": "1.0.17", + "from": "hashset-cpp@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-1.0.17.tgz" + } + } }, "addr-to-ip-port": { "version": "1.4.2", @@ -1249,11 +1261,6 @@ } } }, - "bloom-filter-cpp": { - "version": "1.1.6", - "from": "bloom-filter-cpp@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.1.6.tgz" - }, "bluebird": { "version": "3.5.0", "from": "bluebird@>=3.3.4 <4.0.0", @@ -2161,14 +2168,14 @@ "version": "3.2.4", "from": "cross-env@>=3.1.4 <4.0.0", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-3.2.4.tgz", - "dev": true - }, - "cross-spawn": { - "version": "5.1.0", - "from": "cross-spawn@>=5.1.0 <6.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "dev": true, "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "from": "cross-spawn@>=5.1.0 <6.0.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "dev": true + }, "lru-cache": { "version": "4.0.2", "from": "lru-cache@>=4.0.1 <5.0.0", @@ -3635,6 +3642,12 @@ "from": "fs-extra@>=0.30.0 <0.31.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "optional": true + }, + "yargs": { + "version": "4.8.1", + "from": "yargs@^4.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "optional": true } } }, @@ -4015,20 +4028,6 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz", "dev": true }, - "espree": { - "version": "3.1.7", - "from": "espree@>=3.1.7 <3.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz", - "dev": true, - "dependencies": { - "acorn": { - "version": "3.3.0", - "from": "acorn@>=3.3.0 <4.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "dev": true - } - } - }, "esprima": { "version": "3.1.3", "from": "esprima@>=3.0.0 <4.0.0", @@ -6021,11 +6020,6 @@ "from": "hash.js@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz" }, - "hashset-cpp": { - "version": "1.0.17", - "from": "hashset-cpp@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-1.0.17.tgz" - }, "hawk": { "version": "3.1.3", "from": "hawk@>=3.1.3 <3.2.0", @@ -6833,11 +6827,23 @@ "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.4.3.tgz", "dev": true, "dependencies": { + "acorn": { + "version": "3.3.0", + "from": "acorn@>=3.3.0 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "dev": true + }, "bluebird": { "version": "3.4.7", "from": "bluebird@>=3.4.6 <3.5.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", "dev": true + }, + "espree": { + "version": "3.1.7", + "from": "espree@>=3.1.7 <3.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz", + "dev": true } } }, @@ -7093,9 +7099,9 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" }, "ledger-balance": { - "version": "0.8.64", - "from": "ledger-balance@>=0.8.64 <0.9.0", - "resolved": "https://registry.npmjs.org/ledger-balance/-/ledger-balance-0.8.64.tgz", + "version": "0.9.0", + "from": "ledger-balance@0.9.0", + "resolved": "https://registry.npmjs.org/ledger-balance/-/ledger-balance-0.9.0.tgz", "dependencies": { "hoek": { "version": "4.1.1", @@ -7110,13 +7116,13 @@ } }, "ledger-client": { - "version": "0.9.11", - "from": "ledger-client@>=0.9.11 <0.10.0", - "resolved": "https://registry.npmjs.org/ledger-client/-/ledger-client-0.9.11.tgz", + "version": "0.9.15", + "from": "ledger-client@0.9.15", + "resolved": "https://registry.npmjs.org/ledger-client/-/ledger-client-0.9.15.tgz", "dependencies": { "hoek": { "version": "4.1.1", - "from": "hoek@>=4.0.0 <5.0.0", + "from": "hoek@4.x.x", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.1.1.tgz" }, "joi": { @@ -7132,13 +7138,13 @@ } }, "ledger-geoip": { - "version": "0.8.75", - "from": "ledger-geoip@>=0.8.75 <0.9.0", - "resolved": "https://registry.npmjs.org/ledger-geoip/-/ledger-geoip-0.8.75.tgz", + "version": "0.9.0", + "from": "ledger-geoip@0.9.0", + "resolved": "https://registry.npmjs.org/ledger-geoip/-/ledger-geoip-0.9.0.tgz", "dependencies": { "hoek": { "version": "4.1.1", - "from": "hoek@>=4.0.0 <5.0.0", + "from": "hoek@4.x.x", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.1.1.tgz" }, "joi": { @@ -7149,9 +7155,9 @@ } }, "ledger-publisher": { - "version": "0.9.1", - "from": "ledger-publisher@>=0.9.1 <0.10.0", - "resolved": "https://registry.npmjs.org/ledger-publisher/-/ledger-publisher-0.9.1.tgz", + "version": "0.9.4", + "from": "ledger-publisher@0.9.4", + "resolved": "https://registry.npmjs.org/ledger-publisher/-/ledger-publisher-0.9.4.tgz", "dependencies": { "acorn": { "version": "2.7.0", @@ -7160,7 +7166,7 @@ }, "hoek": { "version": "4.1.1", - "from": "hoek@>=4.0.0 <5.0.0", + "from": "hoek@4.x.x", "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.1.1.tgz" }, "joi": { @@ -9137,12 +9143,26 @@ "postcss-modules-local-by-default": { "version": "0.0.12", "from": "postcss-modules-local-by-default@0.0.12", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-0.0.12.tgz" + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-0.0.12.tgz", + "dependencies": { + "css-selector-tokenizer": { + "version": "0.5.4", + "from": "css-selector-tokenizer@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz" + } + } }, "postcss-modules-scope": { "version": "0.0.8", "from": "postcss-modules-scope@0.0.8", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-0.0.8.tgz" + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-0.0.8.tgz", + "dependencies": { + "css-selector-tokenizer": { + "version": "0.5.4", + "from": "css-selector-tokenizer@^0.5.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz" + } + } }, "postcss-modules-values": { "version": "1.2.2", @@ -10200,7 +10220,15 @@ "version": "0.7.5", "from": "signcode-tf@>=0.7.3 <0.8.0", "resolved": "https://registry.npmjs.org/signcode-tf/-/signcode-tf-0.7.5.tgz", - "dev": true + "dev": true, + "dependencies": { + "yargs": { + "version": "4.8.1", + "from": "yargs@>=4.8.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "dev": true + } + } }, "simple-concat": { "version": "1.0.0", @@ -12185,7 +12213,19 @@ "tracking-protection": { "version": "1.1.6", "from": "tracking-protection@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/tracking-protection/-/tracking-protection-1.1.6.tgz" + "resolved": "https://registry.npmjs.org/tracking-protection/-/tracking-protection-1.1.6.tgz", + "dependencies": { + "cppunitlite": { + "version": "1.0.0", + "from": "cppunitlite@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/cppunitlite/-/cppunitlite-1.0.0.tgz" + }, + "hashset-cpp": { + "version": "1.0.17", + "from": "hashset-cpp@>=1.0.13 <2.0.0", + "resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-1.0.17.tgz" + } + } }, "traverse": { "version": "0.3.9", @@ -13291,11 +13331,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "dev": true }, - "yargs": { - "version": "4.8.1", - "from": "yargs@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz" - }, "yargs-parser": { "version": "2.4.1", "from": "yargs-parser@>=2.4.1 <3.0.0", diff --git a/package.json b/package.json index 06357e638c6..720c32a31ef 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "keytar": "^3.0.0", "l20n": "^3.5.1", "ledger-balance": "^0.9.0", - "ledger-client": "^0.9.14", + "ledger-client": "^0.9.15", "ledger-geoip": "^0.9.0", "ledger-publisher": "^0.9.4", "lru-cache": "^1.0.0",