Merge branch 'master' of github.com:jedmccaleb/NewCoin

grunt.js

@@ -0,0 +1,69 @@
+module.exports = function(grunt) {
+  grunt.loadNpmTasks('grunt-webpack');
+
+  grunt.initConfig({
+    pkg: '<json:package.json',
+    meta: {
+      banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+        '<%= pkg.homepage ? "* " + pkg.homepage + "\n" : "" %>' +
+        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
+        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */'
+    },
+    concat: {
+      sjcl: {
+        src: [
+          "src/js/sjcl/core/sjcl.js",
+//          "src/js/sjcl/core/aes.js",
+          "src/js/sjcl/core/bitArray.js",
+          "src/js/sjcl/core/codecString.js",
+          "src/js/sjcl/core/codecHex.js",
+          "src/js/sjcl/core/codecBase64.js",
+          "src/js/sjcl/core/codecBytes.js",
+          "src/js/sjcl/core/sha256.js",
+          "src/js/sjcl/core/sha1.js",
+//          "src/js/sjcl/core/ccm.js",
+//          "src/js/sjcl/core/cbc.js",
+//          "src/js/sjcl/core/ocb2.js",
+//          "src/js/sjcl/core/hmac.js",
+//          "src/js/sjcl/core/pbkdf2.js",
+          "src/js/sjcl/core/random.js",
+          "src/js/sjcl/core/convenience.js",
+          "src/js/sjcl/core/bn.js",
+          "src/js/sjcl/core/ecc.js",
+          "src/js/sjcl/core/srp.js"
+        ],
+        dest: 'build/sjcl.js'
+      }
+    },
+    webpack: {
+      lib: {
+        src: "src/js/index.js",
+        dest: "build/ripple-<%= pkg.version %>.js"
+      },
+      lib_debug: {
+        src: "src/js/index.js",
+        dest: "build/ripple-<%= pkg.version %>.js",
+        debug: true
+      },
+      lib_min: {
+        src: "src/js/index.js",
+        dest: "build/ripple-<%= pkg.version %>.js",
+        minimize: true
+      }
+    },
+    watch: {
+      sjcl: {
+        files: ['<config:concat.sjcl.src>'],
+        tasks: 'concat:sjcl'
+      },
+      lib: {
+        files: 'src/js/*.js',
+        tasks: 'webpack'
+      }
+    }
+  });
+
+  // Tasks
+  grunt.registerTask('default', 'concat:sjcl webpack');
+};

package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "buster": "~0.6.2",
-    "webpack": "~0.7.17"
+    "grunt-webpack": "~0.4.0"
   },
   "scripts": {
     "test": "buster test"

src/cpp/ripple/LedgerEntrySet.cpp

@@ -626,12 +626,11 @@ TER LedgerEntrySet::dirDelete(
 	uint64				uNodeCur	= uNodeDir;
 	SLE::pointer		sleNode		= entryCache(ltDIR_NODE, uNodeCur ? Ledger::getDirNodeIndex(uRootIndex, uNodeCur) : uRootIndex);
 
-	assert(sleNode);
-
 	if (!sleNode)
 	{
 		cLog(lsWARNING) << "dirDelete: no such node";
 
+		assert(false);
 		return tefBAD_LEDGER;
 	}
 

src/js/amount.js

@@ -1,8 +1,8 @@
 // Represent Ripple amounts and currencies.
 // - Numbers in hex are big-endian.
 
-var sjcl    = require('./sjcl/core.js');
+var sjcl    = require('../../build/sjcl');
-var bn	    = require('./sjcl/core.js').bn;
+var bn	    = sjcl.bn;
 var utils   = require('./utils.js');
 var jsbn    = require('./jsbn.js');
 

webpack.js

@@ -1,68 +0,0 @@
-var pkg = require('./package.json');
-var webpack = require("webpack");
-var async = require("async");
-var extend = require("extend");
-
-var cfg = {
-  // General settings
-  baseName: pkg.name,
-  programPath: __dirname + "/src/js/index.js",
-
-  // CLI-configurable options
-  watch: false,
-  outputDir: __dirname + "/build"
-};
-for (var i = 0, l = process.argv.length; i < l; i++) {
-  var arg = process.argv[i];
-  if (arg === '-w' || arg === '--watch') {
-    cfg.watch = true;
-  } else if (arg === '-o') {
-    cfg.outputDir = process.argv[++i];
-  }
-};
-
-var builds = [{
-  filename: 'ripple-'+pkg.version+'.js',
-},{
-  filename: 'ripple-'+pkg.version+'-debug.js',
-  debug: true
-},{
-  filename: 'ripple-'+pkg.version+'-min.js',
-  minimize: true
-}];
-
-var defaultOpts = {
-  // [sic] Yes, this is the spelling upstream.
-  libary: 'ripple',
-  // However, it's fixed in webpack 0.8, so we include the correct spelling too:
-  library: 'ripple',
-  watch: cfg.watch
-};
-
-function build(opts) {
-  var opts = extend({}, defaultOpts, opts);
-  opts.output = cfg.outputDir + "/"+opts.filename;
-  return function (callback) {
-    var filename = opts.filename;
-    webpack(cfg.programPath, opts, function (err, result) {
-      console.log(' '+filename, result.hash, '['+result.modulesCount+']');
-      if ("function" === typeof callback) {
-        callback(err);
-      }
-    });
-  }
-}
-
-if (!cfg.watch) {
-  console.log('Compiling Ripple JavaScript...');
-  async.series(builds.map(build), function (err) {
-    if (err) {
-      console.error(err);
-    }
-  });
-} else {
-  console.log('Watching files for changes...');
-  builds.map(build).forEach(function (build) {
-    build();
-  });
-}