From 10fa46403b80e3df620d2a9041a8173cc683830c Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Wed, 7 Oct 2015 20:35:05 -0400 Subject: [PATCH 1/6] Upgrade browserify. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5dc818..bee0775 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "devDependencies": { "benchmark": "^1.0.0", "bundle-collapser": "^1.2.1", - "browserify": "=6.1.0", + "browserify": "~11.2.0", "chai": "=1.9.1", "gulp": "^3.8.10", "gulp-bump": "^0.1.11", From ff3efed8ca2c1ab3dd1410ed499039128e33ad4d Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 9 Oct 2015 18:48:54 -0400 Subject: [PATCH 2/6] Run tests against Node.js v4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 379d258..cfceddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false node_js: - '0.10' - '0.12' + - '4' before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start From 6422d7221e85fde6a50a23f112cbdc49b80b01b8 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 9 Oct 2015 19:01:07 -0400 Subject: [PATCH 3/6] Add C++11 compiler in travis configuration. --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfceddf..d621d14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,16 @@ language: node_js sudo: false +compiler: + - gcc + - clang +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 + - clang node_js: - '0.10' - '0.12' @@ -8,6 +19,5 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start install: + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - npm install - - From 2cb0c9aa8eefaeb2ca731151678347a1f9a3d1b9 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 9 Oct 2015 19:10:24 -0400 Subject: [PATCH 4/6] Move CXX export to before_install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d621d14..d01e3fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ node_js: before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + - export CXX="g++-4.8" CC="gcc-4.8" install: - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - npm install From f6f0e92e43b428e98330205512b63948c75ec061 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Mon, 9 Nov 2015 18:51:02 -0500 Subject: [PATCH 5/6] Update secp256k1 library to 1.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bee0775..0a3c5c7 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "dependencies": { "bs58": "^2.0.0", "elliptic": "=1.0.0", - "secp256k1": "=1.1.3" + "secp256k1": "=1.1.5" }, "devDependencies": { "benchmark": "^1.0.0", From d39b01afa2b726fa8f66f530f2872d6648b25623 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Tue, 10 Nov 2015 14:59:07 -0500 Subject: [PATCH 6/6] Fix examples --- examples/client.js | 2 +- examples/server.js | 6 +++--- lib/middleware/rawbody.js | 2 +- package.json | 11 +++++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/examples/client.js b/examples/client.js index ae678f0..cdeb258 100644 --- a/examples/client.js +++ b/examples/client.js @@ -1,5 +1,5 @@ var request = require('request'); -var bitauth = require('../lib/bitauth'); +var bitauth = require('..'); // or require('bitauth'); // These can be generated with bitauth.generateSin() var keys = { diff --git a/examples/server.js b/examples/server.js index cfa8e47..490d5a4 100644 --- a/examples/server.js +++ b/examples/server.js @@ -1,7 +1,7 @@ var express = require('express'); var bodyParser = require('body-parser'); var rawBody = require('../lib/middleware/rawbody'); -var bitauth = require('../lib/middleware/bitauth'); +var bitauthMiddleware = require('../lib/middleware/bitauth'); var users = { 'Tf7UNQnxB8SccfoyZScQmb34V2GdEtQkzDz': {name: 'Alice'}, @@ -15,12 +15,12 @@ app.use(rawBody); app.use(bodyParser()); -app.get('/user', bitauth, function(req, res) { +app.get('/user', bitauthMiddleware, function(req, res) { if(!req.sin || !users[req.sin]) return res.send(401, {error: 'Unauthorized'}); res.send(200, users[req.sin]); }); -app.post('/pizzas', bitauth, function(req, res) { +app.post('/pizzas', bitauthMiddleware, function(req, res) { if(!req.sin || !users[req.sin]) return res.send(401, {error: 'Unauthorized'}); var pizza = req.body; pizza.owner = users[req.sin].name; diff --git a/lib/middleware/rawbody.js b/lib/middleware/rawbody.js index 6d92be6..960e9a2 100644 --- a/lib/middleware/rawbody.js +++ b/lib/middleware/rawbody.js @@ -4,4 +4,4 @@ module.exports = function(req, res, next) { req.rawBody += chunk; }); next(); -}; \ No newline at end of file +}; diff --git a/package.json b/package.json index 0a3c5c7..5df16b4 100644 --- a/package.json +++ b/package.json @@ -36,20 +36,23 @@ }, "devDependencies": { "benchmark": "^1.0.0", - "bundle-collapser": "^1.2.1", + "body-parser": "^1.14.1", "browserify": "~11.2.0", + "bundle-collapser": "^1.2.1", "chai": "=1.9.1", + "express": "^4.13.3", "gulp": "^3.8.10", "gulp-bump": "^0.1.11", - "gulp-mocha": "^2.0.0", "gulp-git": "^0.5.5", + "gulp-mocha": "^2.0.0", "gulp-shell": "^0.2.10", "karma": "^0.13.9", "karma-firefox-launcher": "^0.1.4", "karma-mocha": "^0.1.9", + "mocha": "~1.20.1", + "request": "^2.65.0", "run-sequence": "^1.0.2", - "uglify-js": "~2.4.14", - "mocha": "~1.20.1" + "uglify-js": "~2.4.14" }, "license": "MIT" }