From 20d24a2f4370e8171821cf15f67aa07ac55f08a2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 2 Sep 2017 20:55:25 -0700 Subject: drop rates --- app.js | 6 +----- package.json | 1 + routes/rates.js | 37 ------------------------------------- yarn.lock | 31 ++++++++++++++++++++----------- 4 files changed, 22 insertions(+), 53 deletions(-) delete mode 100644 routes/rates.js diff --git a/app.js b/app.js index 2b25b35b..8d7e17ca 100644 --- a/app.js +++ b/app.js @@ -4,6 +4,7 @@ const cookieParser = require('cookie-parser') const passport = require('./passport') const cache = require('./cache') const dotenv = require('dotenv') +const ba = require('bitcoinaverage') dotenv.config() require('dotenv').config() @@ -31,11 +32,6 @@ app["delete"]('/:user/transactions/:txid', transactions["delete"]) app.get('/:user.json', users.json) app.get("/secret", passport.authenticate('jwt', { session: false }), users.secret) -const rates = require('./routes/rates') -rates.fetchRates() -app.get('/rates', cache, rates.index) -app.get('/ticker', cache, rates.ticker) - app.use(function(err, req, res, next) { res.status(500) res.send('An error occurred') diff --git a/package.json b/package.json index e680ad37..2e94de9d 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "bcoin": "^1.0.0-beta.14", "bcrypt": "^1.0.2", "bip39": "^2.2.0", + "bitcoinaverage": "^0.1.4", "bitcoinjs-lib": "^2.3.0", "bluebird": "^3.4.6", "body-parser": "^1.5.0", diff --git a/routes/rates.js b/routes/rates.js deleted file mode 100644 index 99eb3773..00000000 --- a/routes/rates.js +++ /dev/null @@ -1,37 +0,0 @@ -const request = require('request') - -module.exports = (function (app) { - return { - fetchRates () { - request("https://api.bitcoinaverage.com/exchanges/all", function(error, response, body) { - try { - require('util').isDate(JSON.parse(body).timestamp) - app.set('rates', body) - } catch (undefined) {} - }) - return setTimeout(module.exports.fetchRates, 120000) - }, - index (req, res) { - res.write(app.get('rates')) - }, - ticker (req, res) { - fs = require('fs') - var base, base1, base2, e, error1, exchange - (base = req.query).currency || (base.currency = 'CAD') - (base1 = req.query).symbol || (base1.symbol = 'quadrigacx') - (base2 = req.query).type || (base2.type = 'bid') - try { - exchange = JSON.parse(app.get('rates'))[req.query.currency][req.query.symbol]['rates'][req.query.type].toString() - } catch (error1) { - e = error1 - exchange = "0" - } - res.writeHead(200, { - 'Content-Length': exchange.length, - 'Content-Type': 'text/plain' - }) - res.write(exchange) - return res.end() - } - } -}).call(this) diff --git a/yarn.lock b/yarn.lock index 95e475c0..5640a7b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -684,6 +684,14 @@ bip66@^1.1.0, bip66@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.4.tgz#8a59f8ae16eccb94681c3c2a7b224774605aadfb" +bitcoinaverage@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/bitcoinaverage/-/bitcoinaverage-0.1.4.tgz#9850003b47eb84120d1f9e4d73ee8af42a0969b0" + dependencies: + crypto-js "^3.1.9-1" + request "^2.81.0" + ws "^3.0.0" + bitcoinjs-lib@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/bitcoinjs-lib/-/bitcoinjs-lib-2.3.0.tgz#fa4d27b9696415d5b30357eeac5d222713e1966a" @@ -1166,6 +1174,10 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" +crypto-js@^3.1.9-1: + version "3.1.9-1" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8" + csswring@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/csswring/-/csswring-5.0.0.tgz#b06fc18ead33426f593953300aa80b4cecd08d6f" @@ -3257,6 +3269,10 @@ safe-buffer@^5.0.1, safe-buffer@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" +safe-buffer@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + scmp@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/scmp/-/scmp-0.0.3.tgz#3648df2d7294641e7f78673ffc29681d9bad9073" @@ -3857,18 +3873,11 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -ws@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018" - dependencies: - options ">=0.0.5" - ultron "1.0.x" - -ws@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80" +ws@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-3.1.0.tgz#8afafecdeab46d572e5397ee880739367aa2f41c" dependencies: - safe-buffer "~5.0.1" + safe-buffer "~5.1.0" ultron "~1.1.0" wtf-8@1.0.0: -- cgit v1.2.3