aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-10-12 05:32:03 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-10-12 05:32:03 +0800
commited03b89e266ab25444d69f23e5f9f0070f0080d7 (patch)
tree97b51cb1bfff54be42218ec7bce83ce0a852c208
parent89780bd22a87692f73f42f56b4774aba64986e9a (diff)
downloadtangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar.gz
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar.bz2
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar.lz
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar.xz
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.tar.zst
tangerine-wallet-browser-ed03b89e266ab25444d69f23e5f9f0070f0080d7.zip
Move tos hash logic to build phase. Create dynamic global variables based on build.
-rw-r--r--app/scripts/config.js3
-rw-r--r--gulpfile.js9
-rw-r--r--package.json1
-rw-r--r--ui/app/store.js2
4 files changed, 12 insertions, 3 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js
index b7e72eb64..e40b5e104 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -2,7 +2,8 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
const TESTNET_RPC_URL = 'https://morden.infura.io/metamask'
const DEFAULT_RPC_URL = TESTNET_RPC_URL
-global.METAMASK_DEBUG = false
+global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+global.TOS_HASH = 'GULP_TOS_HASH'
module.exports = {
network: {
diff --git a/gulpfile.js b/gulpfile.js
index 9f1acbf67..26ad0c1f8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,8 +18,15 @@ var path = require('path')
var manifest = require('./app/manifest.json')
var gulpif = require('gulp-if')
var replace = require('gulp-replace')
+var disclaimer = fs.readFileSync(path.join(__dirname, 'USER_AGREEMENT.md')).toString()
+var crypto = require('crypto')
+var hash = crypto.createHash('sha256')
+
+hash.update(disclaimer)
+var tosHash = hash.digest('hex')
var disableLiveReload = gutil.env.disableLiveReload
+var debug = gutil.env.debug
// browser reload
@@ -237,6 +244,8 @@ function bundleTask(opts) {
.on('error', gutil.log.bind(gutil, 'Browserify Error'))
.pipe(source(opts.filename))
.pipe(brfs())
+ .pipe(replace('GULP_TOS_HASH', tosHash))
+ .pipe(replace('\'GULP_METAMASK_DEBUG\'', debug))
// optional, remove if you don't need to buffer file contents
.pipe(buffer())
// optional, remove if you dont want sourcemaps
diff --git a/package.json b/package.json
index 1e2ee6d4a..273117f8a 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
"redux-thunk": "^1.0.2",
"request-promise": "^4.1.1",
"sandwich-expando": "^1.0.5",
- "string-hash": "^1.1.0",
"textarea-caret": "^3.0.1",
"three.js": "^0.73.2",
"through2": "^2.0.1",
diff --git a/ui/app/store.js b/ui/app/store.js
index 8d891bdc9..ba9e58b49 100644
--- a/ui/app/store.js
+++ b/ui/app/store.js
@@ -4,7 +4,7 @@ const thunkMiddleware = require('redux-thunk')
const rootReducer = require('./reducers')
const createLogger = require('redux-logger')
-global.METAMASK_DEBUG = false
+global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
module.exports = configureStore