Merge pull request #134 from maraoz/feature/configurable-bundle

browser files refactor and name changes

.gitignore

@@ -1,5 +1,6 @@
 build/
 browser/bundle.js
+browser/vendor-bundle.js
 browser/testdata.js
 node_modules/
 *.swp

Key.js

@@ -5,7 +5,7 @@ if (process.versions) {
   module.exports = require('bindings')('KeyModule');
 } else {
   // pure js version
-  var ECKey = require('./browser/bitcoinjs-lib.js').ECKey;
+  var ECKey = require('./browser/vendor-bundle.js').ECKey;
   var buffertools = require('buffertools');
 
   var bufferToArray = function(buffer) {
@@ -89,10 +89,11 @@ if (process.versions) {
     }
 
     var eck = new ECKey();
-    eck.setPub( bufferToArray(self.public));
+    eck.setPub(bufferToArray(self.public));
     eck.setCompressed(self.compressed);
     var sigA = bufferToArray(sig);
-    return eck.verify(hash,sigA);
+    var ret = eck.verify(hash,sigA);
+    return ret;
   };
 
 

browser/bitcoin.js

@@ -1,2 +0,0 @@
-Bitcoin = {};
-

browser/browser.js

@@ -1 +0,0 @@
-if ('undefined' === typeof window) window = this;

browser/browserify.js

@@ -11,6 +11,17 @@ var fs = require('fs');
 var browserify = require('browserify');
 var browserPack = require('browser-pack');
 
+// concat browser vendor files
+var exec = require('child_process').exec;
+var sys = require('sys');
+var puts = function(error, stdout, stderr) {
+  if (error) console.log(error);
+  sys.puts(stdout);
+  sys.puts(stderr);
+};
+
+exec('cd browser; sh concat.sh', puts);
+
 
 var pack = function (params) {
   var preludePath  = 'node_modules/soop/example/custom_prelude.js';

browser/concat.sh

@@ -1,3 +1,7 @@
 #! /bin/bash
 
-cat browser.js crypto.js ripemd160.js bitcoin.js navigator-adapter.js jsbn.js jsbn2.js prng4.js util.js rng.js ec.js sec.js ecdsa.js eckey.js > bitcoinjs-lib.js
+cd vendor/
+cat browser-adapter.js crypto.js ripemd160.js jsbn.js jsbn2.js prng4.js util.js rng.js ec.js sec.js ecdsa.js eckey.js > vendor-bundle.js
+mv vendor-bundle.js ../
+cd ../
+

browser/navigator-adapter.js → browser/vendor/browser-adapter.js

@@ -1,7 +1,6 @@
-
+if ('undefined' === typeof window) window = this;
-
+Bitcoin = {};
 if (typeof navigator === 'undefined') {
   var navigator = {};
   navigator.appName = 'NodeJS';
-
 }

browser/ecdsa.js → browser/vendor/ecdsa.js

@@ -41,24 +41,34 @@ ECPointFp.prototype.getEncoded = function (compressed) {
   return enc;
 };
 
-ECPointFp.decodeFrom = function (curve, enc) {
+ECPointFp.decodeFrom = function (ecparams, enc) {
   var type = enc[0];
   var dataLen = enc.length-1;
 
   // Extract x and y as byte arrays
-  var xBa = enc.slice(1, 1 + dataLen/2);
+  if (type === 4) {
-  var yBa = enc.slice(1 + dataLen/2, 1 + dataLen);
+    var xBa = enc.slice(1, 1 + dataLen/2),
-
+        yBa = enc.slice(1 + dataLen/2, 1 + dataLen),
-  // Prepend zero byte to prevent interpretation as negative integer
+        x = BigInteger.fromByteArrayUnsigned(xBa),
-  xBa.unshift(0);
+        y = BigInteger.fromByteArrayUnsigned(yBa);
-  yBa.unshift(0);
+  }
-
+  else {
-  // Convert to BigIntegers
+    var xBa = enc.slice(1),
-  var x = new BigInteger(xBa);
+        x = BigInteger.fromByteArrayUnsigned(xBa),
-  var y = new BigInteger(yBa);
+        p = ecparams.getQ(),
+        xCubedPlus7 = x.multiply(x).multiply(x).add(new BigInteger('7')).mod(p),
+        pPlus1Over4 = p.add(new BigInteger('1'))
+                       .divide(new BigInteger('4')),
+        y = xCubedPlus7.modPow(pPlus1Over4,p);
+    if (y.mod(new BigInteger('2')).toString() != ''+(type % 2)) {
+        y = p.subtract(y)
+    }
+  }
 
   // Return point
-  return new ECPointFp(curve, curve.fromBigInteger(x), curve.fromBigInteger(y));
+  return new ECPointFp(ecparams,
+                       ecparams.fromBigInteger(x),
+                       ecparams.fromBigInteger(y));
 };
 
 ECPointFp.prototype.add2D = function (b) {

util/util.js

@@ -4,10 +4,10 @@ var bignum = require('bignum');
 var Binary = require('binary');
 var Put = require('bufferput');
 var buffertools = require('buffertools');
-var bjs;
+var browser;
 if (!process.versions) {
   // browser version
-  bjs = require('../browser/bitcoinjs-lib.js');
+  browser = require('../browser/vendor-bundle.js');
 }
 
 
@@ -17,8 +17,8 @@ var sha256 = exports.sha256 = function (data) {
 
 var ripe160 = exports.ripe160 = function (data) {
   if (!process.versions) {
-    var RIPEMD160 = bjs.RIPEMD160;
+    var RIPEMD160 = browser.RIPEMD160;
-    var WordArray = bjs.WordArray;
+    var WordArray = browser.WordArray;
     data = data.toString();
     var result = RIPEMD160(data) + '';
     return new Buffer(result, 'hex');