Skip to content

Commit

Permalink
fix sjcl issue on npm install
Browse files Browse the repository at this point in the history
...by including sjcl locally
  • Loading branch information
Ryan X. Charles committed Jun 6, 2014
1 parent 1e97ab8 commit 338158c
Show file tree
Hide file tree
Showing 7 changed files with 171 additions and 113 deletions.
2 changes: 1 addition & 1 deletion bitcore.js
Expand Up @@ -31,7 +31,7 @@ requireWhenAccessed('ECIES', './lib/ECIES');
requireWhenAccessed('log', './util/log');
requireWhenAccessed('networks', './networks');
requireWhenAccessed('SecureRandom', './lib/SecureRandom');
requireWhenAccessed('sjcl', 'sjcl');
requireWhenAccessed('sjcl', './lib/sjcl');
requireWhenAccessed('util', './util/util');
requireWhenAccessed('EncodedData', './util/EncodedData');
requireWhenAccessed('VersionedData', './util/VersionedData');
Expand Down
4 changes: 1 addition & 3 deletions browser/build.js
Expand Up @@ -11,9 +11,6 @@ var puts = function(error, stdout, stderr) {
//sys.puts(stderr);
};

//compile sjcl
exec('cd node_modules/sjcl && ./configure --without-all --with-aes --with-convenience --with-cbc --with-codecHex --with-codecBase64 --with-sha512 --with-hmac && make && cd ../..;', puts);

var pack = function (params) {
var file = require.resolve('soop');
var dir = file.substr(0, file.length - String('soop.js').length);
Expand Down Expand Up @@ -51,6 +48,7 @@ var modules = [
'lib/ScriptInterpreter',
'lib/SecureRandom',
'lib/Sign',
'lib/sjcl',
'lib/Transaction',
'lib/TransactionBuilder',
'lib/Wallet',
Expand Down
216 changes: 109 additions & 107 deletions browser/bundle.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions buildsjcl.sh
@@ -0,0 +1,2 @@
#!/bin/bash
cd node_modules/sjcl && ./configure --without-all --with-aes --with-convenience --with-cbc --with-codecHex --with-codecBase64 --with-sha512 --with-hmac && make && cd ../.. && cp node_modules/sjcl/sjcl.js lib/
2 changes: 1 addition & 1 deletion lib/browser/ECIES.js
@@ -1,6 +1,6 @@
'use strict';
var imports = require('soop').imports();
var sjcl = require('sjcl');
var sjcl = require('../sjcl');
var ECIES = require('../common/ECIES');

ECIES.symmetricEncrypt = function(key, iv, message) {
Expand Down
56 changes: 56 additions & 0 deletions lib/sjcl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion util/util.js
Expand Up @@ -3,7 +3,7 @@ var bignum = require('bignum');
var Binary = require('binary');
var Put = require('bufferput');
var buffertools = require('buffertools');
var sjcl = require('sjcl');
var sjcl = require('../lib/sjcl');
var browser;
var inBrowser = !process.versions;
if (inBrowser) {
Expand Down

0 comments on commit 338158c

Please sign in to comment.