Merge branch 'release'

Conflicts:
	npm-shrinkwrap.json
	package.json

.flowconfig

@@ -0,0 +1,7 @@
+[ignore]
+
+[include]
+
+[libs]
+
+[options]

.gitignore

@@ -17,7 +17,7 @@
 
 # Ignore object files.
 *.o
-build
+build/*.js
 tags
 bin/rippled
 Debug/*.*
@@ -25,6 +25,7 @@ Release/*.*
 
 # Ignore locally installed node_modules
 node_modules
+!test/node_modules
 
 # Ignore tmp directory.
 tmp
@@ -37,3 +38,26 @@ db/*.db-*
 rippled.cfg
 validators.txt
 test/config.js
+
+# Ignore coverage files
+/lib-cov
+/src-cov
+/coverage.html
+/coverage
+
+# Ignore IntelliJ files
+.idea
+
+# Ignore npm-debug
+npm-debug.log
+
+# Ignore dist folder, build for bower
+dist/
+
+# Ignore flow output directory
+out/
+
+# Ignore perf test cache
+scripts/cache
+
+eslintrc

.npmignore

@@ -1,2 +1,3 @@
-build
 deploy
+lib-cov
+coverage.html

.travis.yml

@@ -0,0 +1,18 @@
+language: node_js
+node_js:
+  - "0.10"
+before_script:
+  - npm install -g eslint
+  - curl 'https://raw.githubusercontent.com/ripple/javascript-style-guide/master/eslintrc' > ./eslintrc
+  - eslint --reset -c ./eslintrc $(git --no-pager diff --name-only --diff-filter=AM --relative $(git merge-base FETCH_HEAD origin/HEAD) FETCH_HEAD | grep "\.js$")
+script: MOCHA_REPORTER=tap npm test --coverage
+after_success:
+- npm run coveralls
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/d1ec4245f90231619d30
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

Gruntfile.js

@@ -1,100 +0,0 @@
-module.exports = function(grunt) {
-  grunt.loadNpmTasks('grunt-webpack');
-  grunt.loadNpmTasks('grunt-dox');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('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/sha512.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",
-          "src/js/sjcl-custom/sjcl-secp256k1.js",
-          "src/js/sjcl-custom/sjcl-ripemd160.js",
-          "src/js/sjcl-custom/sjcl-extramath.js",
-          "src/js/sjcl-custom/sjcl-validecc.js",
-          "src/js/sjcl-custom/sjcl-ecdsa-der.js"
-        ],
-        dest: 'build/sjcl.js'
-      }
-    },
-    webpack: {
-      options: {
-        entry: "./src/js/ripple/index.js",
-        output: {
-          library: "ripple"
-        }
-      },
-      lib: {
-        output: {
-          filename: "build/ripple-<%= pkg.version %>.js"
-        }
-      },
-      lib_debug: {
-        output: {
-          filename: "build/ripple-<%= pkg.version %>-debug.js"
-        },
-        debug: true,
-        devtool: 'eval'
-      },
-      lib_min: {
-        output: {
-          filename: "build/ripple-<%= pkg.version %>-min.js"
-        },
-        optimize: {
-          minimize: true
-        }
-      }
-    },
-    watch: {
-      sjcl: {
-        files: ['<%= concat.sjcl.src %>'],
-        tasks: 'concat:sjcl'
-      },
-      lib: {
-        files: 'src/js/*.js',
-        tasks: 'webpack'
-      }
-    },
-    dox: {
-      libdocs: {
-        options: {
-          title: "Test"
-        },
-        src: ['src/js/ripple/'],
-        dest: 'build/docs'
-      }
-    }
-  });
-
-  // Tasks
-  grunt.registerTask('default', ['concat:sjcl', 'webpack']);
-
-};

Gulpfile.js

@@ -0,0 +1,197 @@
+'use strict';
+var gulp = require('gulp');
+var gutil = require('gulp-util');
+var watch = require('gulp-watch');
+var plumber = require('gulp-plumber');
+var filelog = require('gulp-filelog');
+var cleanDest = require('gulp-clean-dest');
+var concat = require('gulp-concat');
+var uglify = require('gulp-uglify');
+var rename = require('gulp-rename');
+var webpack = require('webpack');
+var bump = require('gulp-bump');
+var react = require('gulp-react');
+var flow = require('gulp-flowtype');
+var argv = require('yargs').argv;
+// var header = require('gulp-header');
+
+var pkg = require('./package.json');
+
+var sjclSrc = [
+  '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/sha512.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',
+  'src/js/sjcl-custom/sjcl-ecc-pointextras.js',
+  'src/js/sjcl-custom/sjcl-secp256k1.js',
+  'src/js/sjcl-custom/sjcl-ripemd160.js',
+  'src/js/sjcl-custom/sjcl-extramath.js',
+  'src/js/sjcl-custom/sjcl-montgomery.js',
+  'src/js/sjcl-custom/sjcl-validecc.js',
+  'src/js/sjcl-custom/sjcl-ecdsa-canonical.js',
+  'src/js/sjcl-custom/sjcl-ecdsa-der.js',
+  'src/js/sjcl-custom/sjcl-ecdsa-recoverablepublickey.js',
+  'src/js/sjcl-custom/sjcl-jacobi.js'
+];
+
+function logPluginError(error) {
+  gutil.log(error.toString());
+}
+
+gulp.task('concat-sjcl', function() {
+  return gulp.src(sjclSrc)
+  .pipe(concat('sjcl.js'))
+  .pipe(gulp.dest('./build/'));
+});
+
+gulp.task('build', ['concat-sjcl'], function(callback) {
+  webpack({
+    cache: true,
+    entry: './src/js/ripple/index.js',
+    output: {
+      library: 'ripple',
+      path: './build/',
+      filename: ['ripple-', '.js'].join(pkg.version)
+    }
+  }, callback);
+});
+
+gulp.task('build-min', ['build'], function() {
+  return gulp.src(['./build/ripple-', '.js'].join(pkg.version))
+  .pipe(uglify())
+  .pipe(rename(['ripple-', '-min.js'].join(pkg.version)))
+  .pipe(gulp.dest('./build/'));
+});
+
+gulp.task('build-debug', ['concat-sjcl'], function(callback) {
+  webpack({
+    cache: true,
+    entry: './src/js/ripple/index.js',
+    output: {
+      library: 'ripple',
+      path: './build/',
+      filename: ['ripple-', '-debug.js'].join(pkg.version)
+    },
+    debug: true,
+    devtool: 'eval'
+  }, callback);
+});
+
+/**
+ * Generate a WebPack external for a given unavailable module which replaces
+ * that module's constructor with an error-thrower
+ */
+
+function buildUseError(cons) {
+  return ('var {<CONS>:function(){throw new Error('
+          + '"Class is unavailable in this build: <CONS>")}}')
+          .replace(new RegExp('<CONS>', 'g'), cons);
+}
+
+gulp.task('build-core', ['concat-sjcl'], function(callback) {
+  webpack({
+    entry: [
+      './src/js/ripple/remote.js'
+    ],
+    externals: [
+      {
+        './transaction': buildUseError('Transaction'),
+        './orderbook': buildUseError('OrderBook'),
+        './account': buildUseError('Account'),
+        './serializedobject': buildUseError('SerializedObject')
+      }
+    ],
+    output: {
+      library: 'ripple',
+      path: './build/',
+      filename: ['ripple-', '-core.js'].join(pkg.version)
+    },
+    plugins: [
+      new webpack.optimize.UglifyJsPlugin()
+    ]
+  }, callback);
+});
+
+gulp.task('bower-build', ['build'], function() {
+  return gulp.src(['./build/ripple-', '.js'].join(pkg.version))
+  .pipe(rename('ripple.js'))
+  .pipe(gulp.dest('./dist/'));
+});
+
+gulp.task('bower-build-min', ['build-min'], function() {
+  return gulp.src(['./build/ripple-', '-min.js'].join(pkg.version))
+  .pipe(rename('ripple-min.js'))
+  .pipe(gulp.dest('./dist/'));
+});
+
+gulp.task('bower-build-debug', ['build-debug'], function() {
+  return gulp.src(['./build/ripple-', '-debug.js'].join(pkg.version))
+  .pipe(rename('ripple-debug.js'))
+  .pipe(gulp.dest('./dist/'));
+});
+
+gulp.task('bower-version', function() {
+  gulp.src('./dist/bower.json')
+  .pipe(bump({version: pkg.version}))
+  .pipe(gulp.dest('./dist/'));
+});
+
+gulp.task('bower', ['bower-build', 'bower-build-min', 'bower-build-debug',
+                    'bower-version']);
+
+gulp.task('watch', function() {
+  gulp.watch('src/js/ripple/*', ['build-debug']);
+});
+
+// To use this, each javascript file must have /* @flow */ on the first line
+gulp.task('typecheck', function() {
+  return gulp.src('src/js/ripple/*.js')
+  .pipe(flow({      // note: do not set the 'all' option, it is broken
+    weak: true,   // remove this after all errors are addressed
+    killFlow: true
+  }));
+});
+
+gulp.task('strip', function() {
+  return gulp.src('src/js/ripple/*.js')
+  .pipe(watch('src/js/ripple/*.js'))
+  .pipe(cleanDest('out'))   // delete outdated output file before stripping
+  .pipe(plumber())        // prevent an error in one file from ending build
+  .pipe(react({stripTypes: true}).on('error', logPluginError))
+  .pipe(filelog())
+  .pipe(gulp.dest('out'));
+});
+
+gulp.task('version-bump', function() {
+  if (!argv.type) {
+    throw new Error('No type found, pass it in using the --type argument');
+  }
+
+  gulp.src('./package.json')
+  .pipe(bump({type: argv.type}))
+  .pipe(gulp.dest('./'));
+});
+
+gulp.task('version-beta', function() {
+  gulp.src('./package.json')
+  .pipe(bump({version: pkg.version + '-beta'}))
+  .pipe(gulp.dest('./'));
+});
+
+gulp.task('default', ['concat-sjcl', 'build', 'build-debug', 'build-min']);

HISTORY.md

@@ -0,0 +1,382 @@
+##0.12.4
+
++ [Improve entropy security](https://github.com/ripple/ripple-lib/commit/c7ba822320880037796f57876d1abb4e525648ed)
+
++ [Remove unused crypt.js file](https://github.com/ripple/ripple-lib/commit/1f68eba1461bca03a4d22872450d15ae5a185334)
+
+##0.12.3
+
++ [Add getLedgerSequence to Remote](https://github.com/ripple/ripple-lib/commit/d09548d04d3238fca653d482ec1d5faa7254559a)
+
++ [Improve randomness when generating ECDSA signatures](https://github.com/ripple/ripple-lib/commit/fe7e30b737ead6e71adfa466f5835ba546feab31)
+
++ [Improve SerializedObject.append performance](https://github.com/ripple/ripple-lib/commit/f7c35b118ebba549a64bcaa1a0629385ec6dbf6f)
+
++ [Add `Amount.scale`. Multiply an amount’s value by a scale factor](https://github.com/ripple/ripple-lib/commit/74dac97b368493056474468520f05671f458a69f)
+
+
+##0.12.2
+
++ [Check that stack trace is available, fixes logging in browser](https://github.com/ripple/ripple-lib/commit/53cae3a66d48e88e8a6bbb96d6489ce7b9e22975)
+
+
+##0.12.1
+
+**Breaking Changes**
+
++ [Removed support for parsing native amounts in floating point format](https://github.com/ripple/ripple-lib/commit/e80cd1ff55deae9cd5b0ae85be957f86856b887e)
+
+
+**Changes**
+
++ [Fix taker pays funded calculation](https://github.com/ripple/ripple-lib/commit/5af824f5cf46c7b9caa58ee0a757bf854d26c8dc)
+
++ [Fix order funded amount calculation](https://github.com/ripple/ripple-lib/commit/b2cdb1a6aed968b1f306e8dadbd4b7ca37e5aa03)
+
++ [Fix handling of quality in order book](https://github.com/ripple/ripple-lib/commit/2a5a8b498da60df738ba18d5c265f34771e8a1af)
+
++ [Fix currency parsing of non-alphanumeric and no-currency currencies](https://github.com/ripple/ripple-lib/commit/2166bb2e88eae8d5f1aba77338f69e8a9edf6a6f)
+
++ [Add Amount.strict_mode for toggling range validation](https://github.com/ripple/ripple-lib/commit/b5ed8f59a7dab1a17491618b8d9193646c314fb4)
+
++ [Add filename and line number to log, use log.warn() for deprecations](https://github.com/ripple/ripple-lib/commit/90329d3d73f1a76675063655b407513e32dc048b)
+
++ [Add GlobalFreeze and NoFreeze flags](https://github.com/ripple/ripple-lib/commit/e2ed2bdbf6f01c7d4d690c2cf0b83fba94558dd7)
+
++ [Fix handling of falsy parameters in requestLedger](https://github.com/ripple/ripple-lib/commit/6023efed41b7812b3bab660a1c0dc9f0a21000b9)
+
++ [Fix Base:decode](https://github.com/ripple/ripple-lib/commit/719f39c01c6941d9a650aa94f95617793dd53ea0)
+
++ [Fix Amount: clone in ratio_human, product_human](https://github.com/ripple/ripple-lib/commit/19e17a8431550cf156b1ad669a19dedfe4e28e4a)
+
++ [Fix Amount.to_human for very small numbers](https://github.com/ripple/ripple-lib/commit/6abfa759aa09d68074ac558d96c4b126a7cd1719)
+
++ [Refactor base conversion](https://github.com/ripple/ripple-lib/commit/f2b63fa4a80663eb29472bc6bb1aea8159f1f205)
+
++ [Update binary transaction format](https://github.com/ripple/ripple-lib/commit/8e134918fb4c22983320a3102f955e4568bb1dfb)
+
++ [Add DefaultRipple account flag](https://github.com/ripple/ripple-lib/commit/3e249902c4cf25b4da5e75048c84ae391be83b10)
+
++ [Remove `Features` field requirement in `SetFee` transaction format](https://github.com/ripple/ripple-lib/commit/a20a649013646710c078d4ce1e210f87c7fe74fe)
+
++ [Remove `RegularKey` field requirement in `SetRegularKey` transaction format](https://github.com/ripple/ripple-lib/commit/c275174f27877ba8f389eb4efe969feb514d6e46)
+
+
+##0.12.0
+
+**Breaking Changes**
+
++ REMOVED Remote storage interface
++ REMOVED Remote `ping` configuration
++ REMOVED Old/deprecated Remote server configuration (websocket_ip, websocket_port)
++ REMOVED browser `online` reconnect listener
+    - [Cleanup, deprecations - 2833a7b6](https://github.com/ripple/ripple-lib/commit/2833a7b66e696dab427464625077f9b93092d0d5)
+
++ Remove `jsbn` and use `bignumber.js` instead for big number math
++ The `allow_nan` flag has been removed. Results for invalid amounts will always be `NaN`
+    - [Refactor to use bignumber.js - d025b4a0](https://github.com/ripple/ripple-lib/commit/d025b4a0c3a98a6de27a1bee9573c85347bcd66b)
+    - [Handle invalid input in parse_human - c8f18c8c](https://github.com/ripple/ripple-lib/commit/c8f18c8c8590b7b48e370e0325b6677b7720294f)
+    - [Check for null in isNumber - b86790c8](https://github.com/ripple/ripple-lib/commit/b86790c8543c239a532fd7697d4652829019d385)
+    - [Cleanup amount.js - d0fb291c](https://github.com/ripple/ripple-lib/commit/d0fb291c4e330193a244902156f1d74730da357d)
+
+
+**Changes**
+
++ [Add deprecation warnings to request constructors. The first argument to request constructor functions should be an object containing request properties](https://github.com/ripple/ripple-lib/commit/35d76b3520934285f80059c1badd6c522539104c)
+
++ [Fix taker_gets_funded exceeding offer.TakerGets](https://github.com/ripple/ripple-lib/commit/b19ecb4482b589d575382b7a5d0480b963383bb1)
+
++ [Fix unsymmetric memo serializing](https://github.com/ripple/ripple-lib/commit/1ed36fabdbd54f4d31078c2b0eaa3becc0fe2821)
+
++ [Fix IOU value passed to `Amount.from_json()`](https://github.com/ripple/ripple-lib/commit/fd1b64393dffb3d1819cd40b8d43df43a4db042d)
+
++ [Update transaction binary parsing to account for XRP delivered amounts](https://github.com/ripple/ripple-lib/commit/35a346a674e6ee1e1e495db93700d55984efc7dd)
+
++ [Bumped dependencies](https://github.com/ripple/ripple-lib/commit/f9bc7cc746b44b24b61bbe260ae2e9d9617286da)
+
+
+
+##0.11.0
+
++ [Track the funded status of an order based on cumulative account orders](https://github.com/ripple/ripple-lib/commit/67d39737a4d5e0fcd9d9b47b9083ee00e5a9e652) and [67d3973](https://github.com/ripple/ripple-lib/commit/b6b99dde022e1e14c4797e454b1d7fca50e49482)
+
++ Remove blobvault client from ripple-lib, use the [`ripple-vault-client`](https://github.com/ripple/ripple-vault-client) instead [9b3d62b7](https://github.com/ripple/ripple-lib/commit/9b3d62b765c4c25beae6eb0fa57ef3a07f2581b1)
+
++ [Add support for `ledger` option in requestBookOffers](https://github.com/ripple/ripple-lib/commit/34c0677c453c409ef0a5b351959abdc176d3bacb)
+
++ [Add support for `limit` option in requestBookOffers](https://github.com/ripple/ripple-lib/commit/d1d4452217c878d0b377d24830b4cd8b3162f6e0)
+
++ [Add `ledgerSelect` request constructor in `Remote`](https://github.com/ripple/ripple-lib/commit/98f40abfc3aa74dec5067a2d90002756cc8acd01)
+
++ [Default to binary data for commands that accept the binary flag](https://github.com/ripple/ripple-lib/commit/7cb113fcbcfc1e3e9830a999148b3e78df3387cc)
+
++ [Fix metadata account check](https://github.com/ripple/ripple-lib/commit/3f61598d6c87e3cc877af60e2d515f9eff73dfe1)
+
++ [Double check `tes` code before emitting `success`](https://github.com/ripple/ripple-lib/commit/97a8c874903eb7309d8f755955ac80872f670582)
+
++ [Decrease redundancy in binary account_tx parsing](https://github.com/ripple/ripple-lib/commit/0aba638e6e7f4f6e22cb6424eed3897ebad90a5a)
+
++ [Abort server connection on unrecoverable TLS error](https://github.com/ripple/ripple-lib/commit/000a2ea00c57157044aeca0fb3f24b37669b163c)
+
++ [Fix complete ledgers check on subscription that is not initial](https://github.com/ripple/ripple-lib/commit/89de91301e682a46dc60aaacc7ae152e8fe1b7c7)
+
+
+##0.10.0
+
++ [Transaction changes](https://github.com/ripple/ripple-lib/pull/221)
+
++ **Important** `tef*` and `tel*` and errors will no longer be presented as
+final. Rather than considering these errors final, ripple-lib will wait until
+the `LastLedgerSequence` specified in the transaction is exceeded.  This makes
+failures more definitive, and ensures that no transaction will resubmit
+indefinitely.
+
++ A new, final tej-class error is introduced to account for transactions that
+are locally determined to have expired: `tejMaxLedger`.
+
++ [Allow per transaction fees to be set, `transaction.setFixedFee()`](https://github.com/ripple/ripple-lib/commit/9b22f279bcbe60ee6bcf4b7fa60a48e9c197a828)
+
++ [Improve memo support](https://github.com/ripple/ripple-lib/commit/1704ac4ae144c0ce54afad86f644c75a632080b1)
+    - Add `MemoFormat` property for memo
+    - Enforce `MemoFormat` and `MemoType` to be valid ASCII
+    - Support `text` and `json` MemoFormat
+
++ [Update jscl library](https://github.com/ripple/ripple-lib/commit/3204998fcb6f31d6c90532a737a4adb8a1e420f6)
+    - Improved entropy by taking advantage of platform crypto
+    - Use jscl's k256 curve instead of altering the c256 curve with k256 configuration
+    - **deprecated:** the c256 curve is linked to the k256 curve to provide backwards compatibility, this link will be removed in the future
+
++ [Fix empty queue check on reconnect](https://github.com/ripple/ripple-lib/commit/3c21994adcf72d1fbd87d453ceb917f9ad6df4ec)
+
+##0.9.4
+
++ [Normalize offers from book_offers and transaction stream](https://github.com/ripple/ripple-lib/commit/86ed24b94cf7c8929c87db3a63e9bbea7f767e9c)
+
++ [Fix: Amount.to_human() precision rounding](https://github.com/ripple/ripple-lib/commit/e371cc2c3ceccb3c1cfdf18b98d80093147dd8b2)
+
++ [Fix: fractional drops in funded taker_pays setter](https://github.com/ripple/ripple-lib/commit/0d7fc0a573a144caac15dd13798b23eeb1f95fb4)
+
+##0.9.3
+
++ [Change `presubmit` to emit immediately before transaction submit](https://github.com/ripple/ripple-lib/commit/7a1feaa89701bf861ab31ebd8ffdc8d8d1474e29)
+
++ [Add a "core" browser build of ripple-lib which has a subset of features and smaller file size](https://github.com/ripple/ripple-lib/pull/205)
+
++ [Update binformat with missing fields from rippled](https://github.com/ripple/ripple-lib/commit/cae980788efb00191bfd0988ed836d60cdf7a9a2)
+
++ [Wait for transaction validation before returning `tec` error](https://github.com/ripple/ripple-lib/commit/6bdd4b2670906588852fc4dda457607b4aac08e4)
+
++ [Change default `max_fee` on `Remote` to `1 XRP`](https://github.com/ripple/ripple-lib/commit/d6b1728c23ff85c3cc791bed6982a750641fd95f)
+
++ [Fix: Request ledger_accept should return the Remote](https://github.com/ripple/ripple-lib/pull/209)
+
+##0.9.2
+
++ [**Breaking change**: Change accountRequest method signature](https://github.com/ripple/ripple-lib/commit/6f5d1104aa3eb440c518ec4f39e264fdce15fa15)
+
++ [Add paging behavior for account requests, `account_lines` and `account_offers`](https://github.com/ripple/ripple-lib/commit/722f4e175dbbf378e51b49142d0285f87acb22d7)
+
++ [Add max_fee setter to transactions to set max fee the submitter is willing to pay] (https://github.com/ripple/ripple-lib/commit/24587fab9c8ad3840d7aa345a7037b48839e09d7)
+
++ [Fix: cap IOU Amounts to their max and min value] (https://github.com/ripple/ripple-lib/commit/f05941fbc46fdb7c6fe7ad72927af02d527ffeed)
+
+Example on how to use paging with `account_offers`:
+```
+// A valid `ledger_index` or `ledger_hash` is required to provide a reliable result.
+// Results can change between ledger closes, so the provided ledger will be used as base.
+var options = {
+    account: < rippleAccount >,
+    limit: < Number between 10 and 400 >,
+    ledger: < valid ledger_index or ledger_hash >
+}
+
+// The `marker` comes back in an account request if there are more results than are returned
+// in the current response. The amount of results per response are determined by the `limit`.
+if (marker) {
+    options.marker = < marker >;
+}
+
+var request = remote.requestAccountOffers(options);
+```
+
+[Full working example](https://github.com/geertweening/ripple-lib-scripts/blob/master/account_offers_paging.js)
+
+
+##0.9.1
+
++ Switch account requests to use ledgerSelect rather than ledgerChoose ([278df90](https://github.com/ripple/ripple-lib/commit/278df9025a20228de22379a53c76ca12d40fa591))
+
++ **Deprecated** setting `ident` and `account_index` on account requests ([278df90](https://github.com/ripple/ripple-lib/commit/278df9025a20228de22379a53c76ca12d40fa591))
+
++ Change initial account transaction sequence to 1 ([a3c1d06](https://github.com/ripple/ripple-lib/commit/a3c1d06eba883dc84fe2bfe700e4309795c84cac))
+
++ Fix: instance transaction withoute remote ([d3b6b81](https://github.com/ripple/ripple-lib/commit/d3b6b8127c7b01e416b400c25abf1719bdd008ca))
+
++ Fix: account root request ledger argument ([bc1f9f8](https://github.com/ripple/ripple-lib/commit/bc1f9f8a286b187d36ebaf552694e31e73742293))
+
++ Fix: rsign.js local signing and example ([d3b6b81](https://github.com/ripple/ripple-lib/commit/d3b6b8127c7b01e416b400c25abf1719bdd008ca) and [f1004c6](https://github.com/ripple/ripple-lib/commit/f1004c6db2a0ce59bbabbb8f2b355a9fd9995fd8))
+
+
+##0.9.0
+
++ Add routes to the vault client for KYC attestations ([ed2da574](https://github.com/ripple/ripple-lib/commit/ed2da57475acf5e9d2cf3373858f4274832bd83f))
+
++ Currency: add `show_interest` flag to show or hide interest in `Currency.to_human()` and `Currency.to_json()` [Example use in tests](https://github.com/ripple/ripple-lib/blob/947ec3edc2e7c8f1ef097e496bf552c74366e749/test/currency-test.js#L123)
+
++ Configurable maxAttempts for transaction submission ([d107092](https://github.com/ripple/ripple-lib/commit/d10709254061e9e4416d2cb78b5cac1ec0d7ffa5))
+
++ Binformat: added missing TransactionResult options ([6abed8d](https://github.com/ripple/ripple-lib/commit/6abed8dd5311765b2eb70505dadbdf5121439ca8))
+
++ **Breaking change:** make maxLoops in seed.get_key optional. [Example use in tests](https://github.com/ripple/ripple-lib/blob/23e473b6886c457781949c825b3ff48b3984e51f/test/seed-test.js) ([23e473b](https://github.com/ripple/ripple-lib/commit/23e473b6886c457781949c825b3ff48b3984e51f))
+
++ Shrinkwrap packages for dependency locking ([2dcd5f9](2dcd5f94fbc71200eb08a5044c76ef94f7971913))
+
++ Fix: Amount.to_human() precision bugs ([4be209e](https://github.com/ripple/ripple-lib/commit/4be209e286b5b209bec7bcd1212098985e15ff2f) and [7708c64](https://github.com/ripple/ripple-lib/commit/7708c64576e70ce3ac190442daceb30e4446aab7))
+
++ Fix: change handling of requestLedger options ([57b7030](https://github.com/ripple/ripple-lib/commit/57b70300f5f0c7534ede118ddbb5d8762668a4f8))
+
+
+##0.8.2
+
++ Currency: Allow mixed letters and numbers in currencies
+
++ Deprecate account_tx map/reduce/filterg
+
++ Fix: correct requestLedger arguments
+
++ Fix: missing subscription on error events for some server methods
+
++ Fix: orderbook reset on reconnect
+
++ Fix: ripple-lib crashing. Add potential missing error handlers
+
+
+##0.8.1
+
++ Wallet: Add Wallet class that generates wallets
+
++ Make npm test runnable in Windows.
+
++ Fix several stability issues, see merged PR's for details
+
++ Fix bug in Amount.to_human_full()
+
++ Fix undefined fee states when connecting to a rippled that is syncing
+
+
+##0.8.0
+
++ Orderbook: Added tracking of offer funds for determining when offers are not funded
+
++ Orderbook: Added tests
+
++ Orderbook: Update owner funds
+
++ Transactions: If transaction errs with `tefALREADY`, wait until all possible submissions err with the same before emitting `error`. Fixes a client "Transaction malformed" bug.
+
++ Transactions: Track submissions, don't bother submitting to unconnected servers
+
++ Request: `request.request()` now accepts an array of servers as first argument. Servers can be represented with URL, or the server object itself.
+
++ Request: `request.broadcast()` now returns the number of servers request was sent to
+
++ Server: Acquire host information from server without additional request
+
++ Amount: Add a constant for the maximum canonical value that can be expressed as a Ripple value
+
++ Amount: Make Constants static fields on the class, instead of a seperate export
+
+
+##0.7.39
+
++ Improvements to multi-server support. Fixed an issue where a server's score was not reset and connections would keep dropping after being connected for a significant amount of time.
+
++ Improvements in order book support. Added support for currency pairs with interest bearing currencies. You can request an order book with hex, ISO code or full name for the currency.
+
++ Fix value parsing for amount/currency order pairs, e.g. `Amount.from_human("XAU 12345.6789")`
+
++ Improved Amount parsing from human readable string given a hex currency, e.g. `Amount.from_human("10 015841551A748AD2C1F76FF6ECB0CCCD00000000")`
+
++ Improvements to username normalization in the vault client
+
++ Add 2-factor authentication support for vault client
+
++ Removed vestiges of Grunt, switched to Gulp
+
+
+##0.7.37
+
++ **Deprecations**
+
+    1. Removed humanistic amount detection in `transaction.payment`. Passing `1XRP` as the payment amount no longer works.
+    2. `remote.setServer` uses full server URL rather than hostname. Example: `remote.setServer('wss://s`.ripple.com:443')`
+    3. Removed constructors for deprecated transaction types from `transaction.js`.
+    4. Removed `invoiceID` option from `transaction.payment`. Instead, use the `transaction.invoiceID` method.
+    5. Removed `transaction.transactionManager` getter.
+
++ Improved multi-server support. Servers are now ranked dynamically, and transactions are broadcasted to all connected servers.
+
++ Automatically ping connected servers. Client configuration now should contain `ping: <seconds>` to specify the ping interval.
+
++ Added `transaction.lastLedger` to specify `LastLedgerSequence`. Setting it this way also ensures that the sequence is not bumped on subsequent requests.
+
++ Added optional `remote.accountTx` binary parsing.
+    ```js
+      {
+        binary: true,
+        parseBinary: false
+      }
+    ```
++ Added full currency name support, e.g. `Currency.from_json('XRP').to_human({full_name:'Ripples'})` will return `XRP - Ripples`
+
++ Improved interest bearing currency support, e.g. `Currency.from_human('USD - US Dollar (2.5%pa)')`
+
++ Improve test coverage
+
++ Added blob vault client.  The vault client facilitates interaction with ripple's namespace and blob vault or 3rd party blob vaults using ripple's blob vault software (https://github.com/ripple/ripple-blobvault). A list of the available functions can be found at [docs/VAULTCLIENT.md](docs/VAULTCLIENT.md)
+
+
+##0.7.35
+
++ `LastLedgerSequence` is set by default on outgoing transactions. This refers to the last valid ledger index (AKA sequence) for a transaction. By default, this index is set to the current index (at submission time) plus 8. In theory, this allows ripple-lib to deterministically fail a transaction whose submission request timed out, but whose associated server continues to emit ledger_closed events.
+
++ Transactions that err with `telINSUF_FEE_P` will be automatically resubmitted. This error indicates that the `Fee` supplied in the transaction submission request was inadquate. Ideally, the `Fee` is tracked by ripple-lib in real-time, and the resubmitted transaction will most likely succeed.
+
++ Added Transaction.iff(function(callback) { }). Callback expects first argument to be an Error or null, second argument is a boolean which indicates whether or not to proceed with the transaction submission. If an `iff` function is specified, it will be executed prior to every submission of the transaction (including resubmissions).
+
++ Transactions will now emit `presubmit` and `postsubmit` events. They will be emitted before and after a transaction is submitted, respectively.
+
++ Added Transaction.summary(). Returns a summary of a transaction in semi-human-readable form. JSON-stringifiable.
+
++ Remote.requestAccountTx() with `binary: true` will automatically parse transactions.
+
++ Added Remote.requestAccountTx filter, map, and reduce.
+
+```js
+  remote.requestAccountTx({
+    account: 'retc',
+    ledger_index_min: -1,
+    ledger_index_max: -1,
+    limit: 100,
+    binary: true,
+
+    filter: function(transaction) {
+      return transaction.tx.TransactionType === 'Payment';
+    },
+
+    map: function(transaction) {
+      return Number(transaction.tx.Amount);
+    },
+
+    reduce: function(a, b) {
+      return a + b;
+    },
+
+    pluck: 'transactions'
+  }, console.log)
+```
+
++ Added persistence hooks.
+
++ General performance improvements, especially for long-running processes.
+

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012,2013 OpenCoin, Inc.
+Copyright (c) 2012,2013,2014 Ripple Labs Inc.
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -12,39 +12,39 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+--------------------------------------
+
 Some code from Tom Wu:
 This software is covered under the following copyright:
 
-/*
- * Copyright (c) 2003-2005  Tom Wu
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
- *
- * IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
- * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * In addition, the following condition applies:
- *
- * All redistributions must retain an intact copy of this copyright notice
- * and disclaimer.
- */
+Copyright (c) 2003-2005  Tom Wu
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+
+IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+In addition, the following condition applies:
+
+All redistributions must retain an intact copy of this copyright notice
+and disclaimer.
 
 Address all questions regarding this license to:
 

README.md

@@ -1,123 +1,100 @@
-Ripple JavaScript Library - ripple-lib
-======================================
+#ripple-lib
 
-This library can connect to the Ripple network via the WebSocket protocol and runs in Node.js as well as in the browser.
+A JavaScript API for interacting with Ripple in Node.js and the browser
 
-* https://ripple.com/wiki/Ripple_JavaScript_library
-* https://ripple.com
-* https://ripple.com/wiki
+[![Build Status](https://travis-ci.org/ripple/ripple-lib.svg?branch=develop)](https://travis-ci.org/ripple/ripple-lib) [![Coverage Status](https://coveralls.io/repos/ripple/ripple-lib/badge.png?branch=develop)](https://coveralls.io/r/ripple/ripple-lib?branch=develop)
 
-##Initializing a remote connection
+[![NPM](https://nodei.co/npm/ripple-lib.png)](https://www.npmjs.org/package/ripple-lib)
 
-[ripple-lib.remote](https://github.com/ripple/ripple-lib/blob/develop/src/js/ripple/remote.js) is responsible for managing connections to rippled servers.
+###Features
+
++ Connect to a rippled server in JavaScript (Node.js or browser)
++ Issue [rippled API](https://ripple.com/build/rippled-apis/) requests
++ Listen to events on the Ripple network (transaction, ledger, etc.)
++ Sign and submit transactions to the Ripple network
+
+###In this file
+
+1. [Installation](#installation)
+2. [Quick start](#quick-start)
+3. [Running tests](#running-tests)
+
+###Additional documentation
+
+1. [Guides](docs/GUIDES.md)
+2. [API Reference](docs/REFERENCE.md)
+3. [Wiki](https://ripple.com/wiki/Ripple_JavaScript_library)
+
+###Also see
+
++ [The Ripple wiki](https://ripple.com/wiki)
++ [ripple.com](https://ripple.com)
+
+##Installation
+
+**Via npm for Node.js**
+
+```
+  $ npm install ripple-lib
+```
+
+**Via bower (for browser use)**
+
+```
+  $ bower install ripple
+```
+
+See the [bower-ripple repo](https://github.com/ripple/bower-ripple) for additional bower instructions
+
+
+**Building ripple-lib for browser environments**
+
+ripple-lib uses Gulp to generate browser builds. These steps will generate minified and non-minified builds of ripple-lib in the `build/` directory.
+
+```
+  $ git clone https://github.com/ripple/ripple-lib
+  $ npm install
+  $ npm run build
+```
+
+**Restricted browser builds**
+
+You may generate browser builds that contain a subset of features. To do this, run `./node_modules/.bin/gulp build-<name>`
+
++ `build-core` Contains the functionality to make requests and listen for events such as `ledgerClose`. Only `ripple.Remote` is currently exposed. Advanced features like transaction submission and orderbook tracking are excluded from this build.
+
+##Quick start
+
+`Remote.js` ([remote.js](https://github.com/ripple/ripple-lib/blob/develop/src/js/ripple/remote.js)) is the point of entry for interacting with rippled
 
 ```js
+/* Loading ripple-lib with Node.js */
 var Remote = require('ripple-lib').Remote;
 
+/* Loading ripple-lib in a webpage */
+// var Remote = ripple.Remote;
+
 var remote = new Remote({
-  trusted: false,
-  servers: [ 
-    { 
-        host: ''
-      , port: 1111,
-      , secure: true
-    } 
-  ]
+  // see the API Reference for available options
+  servers: [ 'wss://s1.ripple.com:443' ]
 });
 
-remote.connect();
-```
-
-Once a connection is formed to any of the supplied servers, a `connect` event is emitted, indicating that the remote is ready to begin fulfilling requests. When there are no more connected servers to fulfill requests, a `disconnect` event is emitted. If you send requests before ripple-lib is connected to any servers, requests are deferred until the `connect` event is received.
-
-```js
-var remote = new Remote({ /* options */ }).connect();
-remote.request_server_info(function(err, info) { }); // will defer until connected
-```
-
-##Remote functions
-
-Each remote function returns a `Request` object. is object is an `EventEmitter`. You may listen for success or failure events from each request, or provide a callback. Example:
-
-```js
-var request = remote.request_server_info();
-request.on('success', function(res) { 
-  //handle success conditions
+remote.connect(function() {
+  /* remote connected */
+  remote.requestServerInfo(function(err, info) {
+    // process err and info
   });
-request.on('error', function(err) { 
-  //handle error conditions
-});
-request.request();
-```
-
-Or:
-
-```js
-remote.request_server_info(function(err, res) {
-  
 });
 ```
 
-**request_server_info([callback])**
+##Running tests
 
-**request_ledger(ledger, [opts], [callback])**
+1. Clone the repository
 
-**request_ledger_hash([callback])**
+2. `cd` into the repository and install dependencies with `npm install`
 
-**request_ledger_header([callback])**
+3. `npm test`
 
-**request_ledger_current([callback])**
+**Generating code coverage**
 
-**request_ledger_entry(type, [callback])**
-
-**request_subscribe(streams, [callback])**
-
-**request_unsubscribe(streams, [callback])**
-
-**request_transaction_entry(hash, [callback])**
-
-**request_tx(hash, [callback])**
-
-**request_account_info(accountID, [callback])**
-
-**request_account_lines(accountID, account_index, current, [callback])**
-
-**request_account_offers(accountID, account_index, current, [callback])**
-
-**request_account_tx(opts, [callback])**
-
-**request_book_offers(gets, pays, taker, [callback])**
-
-**request_wallet_accounts(seed, [callback])**
-
-+ requires trusted **remote
-
-**request_sign(secret, tx_json, [callback])**
-
-+ requires trusted **remote
-
-**request_submit([callback])**
-
-**request_account_balance(account, current, [callback])**
-
-**request_account_flags(account, current, [callback])**
-
-**request_owner_count(account, current, [callback])**
-
-**request_ripple_balance(account, issuer, currency, current, [callback])**
-
-**request_ripple_path_find(src_account, dst_account, dst_amount, src_currencies, [callback])**
-
-**request_unl_list([callback])**
-
-**request_unl_add(addr, comment, [callback])**
-
-**request_unl_delete(node, [callback])**
-
-**request_peers([callback])**
-
-**request_connect(ip, port, [callback])**
-
-**transaction()**
-
-+ returns a [Transaction](https://github.com/ripple/ripple-lib/blob/develop/src/js/ripple/transaction.js) object
+ripple-lib uses `istanbul` to generate code coverage. To create a code coverage report, run `npm test --coverage`. The report will be created in `coverage/lcov-report/`.

bench/modpow.js

@@ -0,0 +1,44 @@
+var Benchmark;
+try {
+  Benchmark = require('benchmark');
+} catch (e) {
+  console.error("Please install Benchmark.js: npm install benchmark");
+  process.exit(1);
+}
+
+var sjcl = require('../build/sjcl');
+var jsbn = require('../src/js/jsbn/jsbn');
+
+var base = "3f70f29d3f3ae354a6d2536ceafba83cfc787cd91e7acd2b6bde05e62beb8295ae18e3f786726f8d034bbc15bf8331df959f59d431736d5f306aaba63dacec279484e39d76db9b527738072af15730e8b9956a64e8e4dbe868f77d1414a8a8b8bf65380a1f008d39c5fabe1a9f8343929342ab7b4f635bdc52532d764701ff3d8072c475c012ff0c59373e8bc423928d99f58c3a6d9f6ab21ee20bc8e8818fc147db09f60c81906f2c6f73dc69725f075853a89f0cd02a30a8dd86b660ccdeffc292f398efb54088c822774445a6afde471f7dd327ef9996296898a5747726ccaeeceeb2e459df98b4128cb5ab8c7cd20c563f960a1aa770f3c81f13f967b6cc";
+var exponent = "322e393f76a1c22b147e7d193c00c023afb7c1500b006ff1bc1cc8d391fc38bd";
+var modulus = "c7f1bc1dfb1be82d244aef01228c1409c198894eca9e21430f1669b4aa3864c9f37f3d51b2b4ba1ab9e80f59d267fda1521e88b05117993175e004543c6e3611242f24432ce8efa3b81f0ff660b4f91c5d52f2511a6f38181a7bf9abeef72db056508bbb4eeb5f65f161dd2d5b439655d2ae7081fcc62fdcb281520911d96700c85cdaf12e7d1f15b55ade867240722425198d4ce39019550c4c8a921fc231d3e94297688c2d77cd68ee8fdeda38b7f9a274701fef23b4eaa6c1a9c15b2d77f37634930386fc20ec291be95aed9956801e1c76601b09c413ad915ff03bfdc0b6b233686ae59e8caf11750b509ab4e57ee09202239baee3d6e392d1640185e1cd";
+var expected = "5b3823974b3eda87286d3f38499de290bd575d8b02f06720acacf3d50950f9ca0ff6b749f3be03913ddca0b291e0b263bdab6c9cb97e4ab47ee9c235ff20931a8ca358726fab93614e2c549594f5c50b1c979b34f840b6d4fc51d6feb2dd072995421d17862cb405e040fc1ed662a3245a1f97bbafa6d1f7f76c7db6a802e3037acdf01ab5053f5da518d6753477193b9c25e1720519dcb9e2f6e70d5786656d356151845a49861dfc40187eff0e85cd18b1f3f3b97c476472edfa090b868b2388edfffecc521c20df8cebb8aacfb3669b020330dd6ea64b2a3067a972b8f249bccc19347eff43893e916f0949bd5789a5cce0f8b7cd87cece909d679345c0d4";
+
+var BigInteger = jsbn.BigInteger;
+var jsbnBase = new BigInteger(base, 16);
+var jsbnExponent = new BigInteger(exponent, 16);
+var jsbnModulus = new BigInteger(modulus, 16);
+
+var bn = sjcl.bn;
+var sjclBase = new bn(base);
+var sjclExponent = new bn(exponent);
+var sjclModulus = new bn(modulus);
+
+var suite = new Benchmark.Suite;
+
+// add tests
+suite.add('jsbn#modPow', function() {
+  jsbnBase.modPow(jsbnExponent, jsbnModulus);
+});
+suite.add('sjcl#powermodMontgomery', function() {
+  sjclBase.powermodMontgomery(sjclExponent, sjclModulus);
+});
+suite.on('cycle', function(event) {
+  console.log(String(event.target));
+});
+suite.on('complete', function() {
+  console.log('Fastest is ' + this.filter('fastest').pluck('name'));
+});
+// run async
+console.log("Running benchmark...");
+suite.run({ 'async': false });

bin/decode_binary.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+
+var SerializedObject = require('../src/js/ripple/serializedobject').SerializedObject;
+
+var argv = process.argv.slice(2);
+
+var blob;
+
+blob = argv.shift();
+
+if (blob === '-') {
+  read_input(ready);
+} else {
+  ready();
+}
+
+function read_input(callback) {
+  tx_json = '';
+  process.stdin.on('data', function(data) { tx_json += data; });
+  process.stdin.on('end', callback);
+  process.stdin.resume();
+}
+
+function ready() {
+  var valid_arguments = blob;
+
+  if (!valid_arguments) {
+    console.error('Invalid arguments\n');
+    print_usage();
+  } else {
+      decode();
+    }
+}
+
+function print_usage() {
+  console.log(
+    'Usage: decode_binary.js <hex_blob>\n\n',
+    'Example: decode_binary.js 120000240000000161D6871AFD498D00000000000000000000000000005553440000000000550FC62003E785DC231A1058A05E56E3F09CF4E668400000000000000A732102AE75B908F0A95F740A7BFA96057637E5C2170BC8DAD13B2F7B52AE75FAEBEFCF811450F97A072F1C4357F1AD84566A609479D927C9428314550FC62003E785DC231A1058A05E56E3F09CF4E6'
+  );
+};
+
+function decode() {
+  buffer = new SerializedObject(blob);
+  console.log(buffer.to_json());
+};
+
+// vim:sw=2:sts=2:ts=8:et

bin/rsign.js

@@ -1,65 +1,96 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 
 var Transaction = require('../src/js/ripple/transaction').Transaction;
 
-var cursor      = 2;
+var argv = process.argv.slice(2);
+
 var verbose;
 var secret;
 var tx_json;
 
-var usage = function () {
+if (~argv.indexOf('-v')){
+  argv.splice(argv.indexOf('-v'), 1);
+  verbose = true;
+}
+
+secret  = argv.shift();
+tx_json = argv.shift();
+
+if (tx_json === '-') {
+  read_input(ready);
+} else {
+  ready();
+}
+
+function read_input(callback) {
+  tx_json = '';
+  process.stdin.on('data', function(data) { tx_json += data; });
+  process.stdin.on('end', callback);
+  process.stdin.resume();
+}
+
+function ready() {
+  var valid_arguments = secret && tx_json;
+
+  if (!valid_arguments) {
+    console.error('Invalid arguments\n');
+    print_usage();
+  } else {
+    var valid_json = true;
+
+    try {
+      tx_json = JSON.parse(tx_json);
+    } catch(exception) {
+      valid_json = false;
+    }
+
+    if (!valid_json) {
+      console.error('Invalid JSON\n');
+      print_usage();
+    } else {
+      sign_transaction();
+    }
+  }
+}
+
+function print_usage() {
   console.log(
-    "Usage: rsign.js <secret> <json>\n"
-    + "  Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC '{ \"TransactionType\" : \"Payment\", \"Account\" : \"r3P9vH81KBayazSTrQj6S25jW6kDb779Gi\", \"Destination\" : \"r3kmLJN5D28dHuH8vZNUZpMC43pEHpaocV\", \"Amount\" : \"200000000\", \"Fee\" : \"10\", \"Sequence\" : \"1\" }'"
+    'Usage: rsign.js <secret> <json>\n\n',
+    'Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC','\''+
+    JSON.stringify({
+      TransactionType: 'Payment',
+      Account: 'r3P9vH81KBayazSTrQj6S25jW6kDb779Gi',
+      Destination: 'r3kmLJN5D28dHuH8vZNUZpMC43pEHpaocV',
+      Amount: '200000000',
+      Fee: '10',
+      Sequence: 1
+    })+'\''
     );
 };
 
-if (process.argv.length > cursor && process.argv[cursor] === "-v")
-{
-  verbose = true;
-  cursor++;
-}
-
-if (process.argv.length > cursor)
-{
-  secret = process.argv[cursor++];
-}
-
-if (process.argv.length > cursor)
-{
-  tx_json = JSON.parse(process.argv[cursor++]);
-}
-
-if (process.argv.length !== cursor || !secret || !tx_json)
-{
-  usage();
-}
-else
-{
+function sign_transaction() {
   var tx = new Transaction();
 
   tx.tx_json = tx_json;
   tx._secret = secret;
   tx.complete();
 
-    var unsigned      = tx.serialize().to_hex();
+  var unsigned_blob = tx.serialize().to_hex();
+  var unsigned_hash = tx.signingHash();
   tx.sign();
 
-    if (verbose)
-    {
+  if (verbose) {
     var sim = { };
 
     sim.tx_blob         = tx.serialize().to_hex();
     sim.tx_json         = tx.tx_json;
-      sim.tx_signing_hash = tx.signing_hash().to_hex();
-      sim.tx_unsigned     = unsigned;
+    sim.tx_signing_hash = unsigned_hash;
+    sim.tx_unsigned     = unsigned_blob;
 
-      console.log(JSON.stringify(sim, undefined, 2));
-    }
-    else
-    {
+    console.log(JSON.stringify(sim, null, 2));
+  } else {
     console.log(tx.serialize().to_hex());
   }
-}
+};
 
 // vim:sw=2:sts=2:ts=8:et

bin/validate_address.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+var UInt160 = require('../').UInt160;
+var address = process.argv[2];
+
+if (address === '-') {
+  readInput(validateAddress);
+} else {
+  validateAddress(address);
+}
+
+function readInput(callback) {
+  var result = '';
+  process.stdin.resume();
+  process.stdin.setEncoding('utf8');
+  process.stdin.on('data', function(data) {
+    result += data;
+  });
+  process.stdin.on('end', function() {
+    callback(result);
+  });
+};
+
+function validateAddress(address) {
+  process.stdout.write((UInt160.is_valid(address.trim()) ? '0' : '1') + '\r\n');
+};

docs/BUILD.md

@@ -0,0 +1,20 @@
+Using Flow typechecking
+=======================
+
+Stage 1
+-------
+1. Add /* @flow */ to the top of a file you want to typecheck
+2. Run `gulp typecheck` to generate a list of warnings
+
+Stage 2
+-------
+When all source files have the /* @flow */ header and all warnings have been
+addressed, remove the `weak: true` option from Gulpfile.js, run
+`gulp typecheck` and remove all the additional warnings.
+
+Stage 3
+-------
+Add type annotations to the source code and run `gulp strip` to strip
+the type annotations and write the output to the `out` directory. After
+type annotations are added, the program must be run from the `out` directory
+because Node does not understand the annotations

docs/GUIDES.md

@@ -0,0 +1,252 @@
+#Guides
+
+This file provides step-by-step walkthroughs for some of the most common usages of `ripple-lib`.
+
+###In this document
+
+1. [Connecting to the Ripple network with `Remote`](GUIDES.md#connecting-to-the-ripple-network)
+2. [Using `Remote` functions and `Request` objects](GUIDES.md#sending-rippled-API-requests)
+3. [Listening to the network](GUIDES.md#listening-to-the-network)
+4. [Submitting a payment to the network](GUIDES.md#submitting-a-payment-to-the-network)
+   * [A note on transaction fees](GUIDES.md#a-note-on-transaction-fees)
+5. [Submitting a trade offer to the network](GUIDES.md#submitting-a-trade-offer-to-the-network)
+
+###Also see
+
+1. [The ripple-lib README](../README.md)
+2. [The ripple-lib API Reference](REFERENCE.md)
+
+##Connecting to the Ripple network
+
+1. [Get ripple-lib](../README.md#installation)
+2. Load the ripple-lib module into a Node.js file or webpage:
+  ```js
+  /* Loading ripple-lib with Node.js */
+  var Remote = require('ripple-lib').Remote;
+
+  /* Loading ripple-lib in a webpage */
+  // var Remote = ripple.Remote;
+  ```
+3. Create a new `Remote` and connect to the network:
+  ```js
+
+  var options = {
+    trace :         false,
+    trusted:        true,
+    local_signing:  true,
+    servers: [
+      { host: 's-west.ripple.com', port: 443, secure: true }
+    ]
+  }
+
+  var remote = new Remote(options);
+
+  remote.connect(function(err, res) {
+    /* remote connected, use some remote functions here */
+  });
+  ```
+  __NOTE:__ See the API Reference for available [`Remote` options](REFERENCE.md#1-remote-options)
+
+4. You're connected! Read on to see what to do now.
+
+##Generating a new Ripple Wallet
+
+  ```js
+    var ripple = require('ripple-lib');
+
+    // subscribing to a server allows for more entropy
+    var remote = new ripple.Remote({
+      servers: [
+        { host: 's1.ripple.com', port: 443, secure: true }
+      ]
+    });
+
+    remote.connect(function(err, res) {
+     /* remote connected */
+    });
+
+    // Wait for randomness to have been added.
+    // The entropy of the random generator is increased
+    // by random data received from a rippled
+    remote.once('random', function(err, info) {
+      var wallet = ripple.Wallet.generate();
+      console.log(wallet);
+      // { address: 'rEf4sbVobiiDGExrNj2PkNHGMA8eS6jWh3',
+      //   secret: 'shFh4a38EZpEdZxrLifEnVPAoBRce' }
+    });
+  ```
+
+
+##Sending rippled API requests
+
+`Remote` contains functions for constructing a `Request` object.
+
+A `Request` is an `EventEmitter` so you can listen for success or failure events -- or, instead, you can provide a callback.
+
+Here is an example, using [requestServerInfo](https://ripple.com/wiki/JSON_Messages#server_info).
+
++ Constructing a `Request` with event listeners
+```js
+var request = remote.requestServerInfo();
+
+request.on('success', function onSuccess(res) {
+  //handle success
+});
+
+request.on('error', function onError(err) {
+  //handle error
+});
+
+request.request();
+```
+
++ Using a callback:
+```js
+remote.request('server_info', function(err, res) {
+  if (err) {
+    //handle error
+  } else {
+    //handle success
+  }
+});
+```
+
+__NOTE:__ See the API Reference for available [`Remote` functions](REFERENCE.md#2-remote-functions)
+
+
+##Listening to the network
+
+See the [wiki](https://ripple.com/wiki/JSON_Messages#subscribe) for details on subscription requests.
+
+```js
+ /* Loading ripple-lib with Node.js */
+  var Remote = require('ripple-lib').Remote;
+
+  /* Loading ripple-lib in a webpage */
+  // var Remote = ripple.Remote;
+
+  var remote = new Remote({options});
+
+  remote.connect(function() {
+    var remote = new Remote({
+      // see the API Reference for available options
+      servers: [ 'wss://s1.ripple.com:443' ]
+    });
+
+    remote.connect(function() {
+      console.log('Remote connected');
+
+      var streams = [
+        'ledger',
+        'transactions'
+      ];
+
+      var request = remote.requestSubscribe(streams);
+
+      request.on('error', function(error) {
+        console.log('request error: ', error);
+      });
+
+
+      // the `ledger_closed` and `transaction` will come in on the remote
+      // since the request for subscribe is finalized after the success return
+      // the streaming events will still come in, but not on the initial request
+      remote.on('ledger_closed', function(ledger) {
+        console.log('ledger_closed: ', JSON.stringify(ledger, null, 2));
+      });
+
+      remote.on('transaction', function(transaction) {
+        console.log('transaction: ', JSON.stringify(transaction, null, 2));
+      });
+
+      remote.on('error', function(error) {
+        console.log('remote error: ', error);
+      });
+
+      // fire the request
+      request.request();
+    });
+  });
+```
+* https://ripple.com/wiki/RPC_API#transactions_stream_messages
+* https://ripple.com/wiki/RPC_API#ledger_stream_messages
+
+##Submitting a payment to the network
+
+Submitting a payment transaction to the Ripple network involves connecting to a `Remote`, creating a transaction, signing it with the user's secret, and submitting it to the `rippled` server. Note that the `Amount` module is used to convert human-readable amounts like '1XRP' or '10.50USD' to the type of Amount object used by the Ripple network.
+
+```js
+/* Loading ripple-lib Remote and Amount modules in Node.js */
+var Remote = require('ripple-lib').Remote;
+var Amount = require('ripple-lib').Amount;
+
+/* Loading ripple-lib Remote and Amount modules in a webpage */
+// var Remote = ripple.Remote;
+// var Amount = ripple.Amount;
+
+var MY_ADDRESS = 'rrrMyAddress';
+var MY_SECRET  = 'secret';
+var RECIPIENT  = 'rrrRecipient';
+var AMOUNT     = Amount.from_human('1XRP');
+
+var remote = new Remote({ /* Remote options */ });
+
+remote.connect(function() {
+  remote.setSecret(MY_ADDRESS, MY_SECRET);
+
+  var transaction = remote.createTransaction('Payment', {
+    account: MY_ADDRESS,
+    destination: RECIPIENT,
+    amount: AMOUNT
+  });
+
+  transaction.submit(function(err, res) {
+    /* handle submission errors / success */
+  });
+});
+```
+
+###A note on transaction fees
+
+A full description of network transaction fees can be found on the [Ripple Wiki](https://ripple.com/wiki/Transaction_Fee).
+
+In short, transaction fees are very small amounts (on the order of ~10) of [XRP drops](https://ripple.com/wiki/Ripple_credits#Notes_on_drops) spent and destroyed with every transaction. They are largely used to account for network load and prevent spam. With `ripple-lib`, transaction fees are calculated locally by default and the fee you are willing to pay is submitted along with your transaction.
+
+Since the fee required for a transaction may change between the time when the original fee was calculated and the time when the transaction is submitted, it is wise to use the [`fee_cushion`](REFERENCE.md#1-remote-options) to ensure that the transaction will go through. For example, suppose the original fee calculated for a transaction was 10 XRP drops but at the instant the transaction is submitted the server is experiencing a higher load and it has raised its minimum fee to 12 XRP drops. Without a `fee_cusion`, this transaction would not be processed by the server, but with a `fee_cusion` of, say, 1.5 it would be processed and you would just pay the 2 extra XRP drops.
+
+The [`max_fee`](REFERENCE.md#1-remote-options) option can be used to avoid submitting a transaction to a server that is charging unreasonably high fees.
+
+
+##Submitting a trade offer to the network
+
+Submitting a trade offer to the network is similar to submitting a payment transaction. Here is an example offering to sell 1 USD in exchange for 100 XRP:
+
+```js
+/* Loading ripple-lib Remote and Amount modules in Node.js */
+var Remote = require('ripple-lib').Remote;
+var Amount = require('ripple-lib').Amount;
+
+/* Loading ripple-lib Remote and Amount modules in a webpage */
+// var Remote = ripple.Remote;
+// var Amount = ripple.Amount;
+
+var MY_ADDRESS = 'rrrMyAddress';
+var MY_SECRET  = 'secret';
+var GATEWAY = 'rrrGateWay';
+
+var remote = new Remote({ /* Remote options */ });
+
+remote.connect(function() {
+  remote.setSecret(MY_ADDRESS, MY_SECRET);
+
+  var transaction = remote.createTransaction('OfferCreate', {
+    account: MY_ADDRESS,
+    taker_pays: '100',
+    taker_gets: '1/USD/' + GATEWAY
+  });
+
+  transaction.submit(function(err, res) {
+    /* handle submission errors / success */
+  });
+});
+```

docs/REFERENCE.md

@@ -0,0 +1,354 @@
+#API Reference
+
+__(More examples coming soon!)__
+
+###In this document:
+
+1. [`Remote` options](REFERENCE.md#remote-options)
+2. [`Request` constructors](REFERENCE.md#request-constructor-functions)
+  + [Server requests](REFERENCE.md#server-requests)
+  + [Ledger requests](REFERENCE.md#ledger-requests)
+  + [Transaction requests](REFERENCE.md#transaction-requests)
+  + [Account requests](REFERENCE.md#account-requests)
+  + [Orderbook requests](REFERENCE.md#orderbook-requests)
+  + [Transaction requests](REFERENCE.md#transaction-requests)
+3. [`Transaction` constructors](REFERENCE.md#transaction-constructors)
+  + [Transaction events](REFERENCE.md#transaction-events)
+
+###Also see:
+
+1. [The ripple-lib README](../README.md)
+2. [The ripple-lib GUIDES](GUIDES.md)a
+
+#Remote options
+
+```js
+/* Loading ripple-lib with Node.js */
+var Remote = require('ripple-lib').Remote;
+
+/* Loading ripple-lib in a webpage */
+// var Remote = ripple.Remote;
+
+var options = { };
+
+var remote = new Remote(options);
+```
+
+A new `Remote` can be created with the following options:
+
++ `trace` *boolean default: false* Log all of the events emitted
++ `max_listeners` *number default: 0* Set maxListeners for servers
++ `trusted` *boolean default: false*, if remote is trusted (boolean)
++ `local_signing` *boolean default: true*
++ `local_fee` *boolean default: true* Set whether the transaction fee range will be set locally, see [A note on transaction fees](GUIDES.md#a-note-on-transaction-fees))
++ `fee_cushion` *number default: 1.2* Extra fee multiplier to account for async fee changes, see [A note on transaction fees](GUIDES.md#a-note-on-transaction-fees))
++ `max_fee` *number default: Infinity* Maximum acceptable transaction fee, see [A note on transaction fees](GUIDES.md#a-note-on-transaction-fees)
++ `servers` *array* Array of server objects of the following form:
+
+```js
+{
+  host:    <string>,
+  port:    <number>,
+  secure:  <boolean>
+}
+```
+
+or
+
+```js
+ 'wss://host:port'
+```
+
+#Request constructor functions
+
+Some requests have helper methods to construct the requests object and set properties on the message object. These will often be the more used requests and the helper methods is the preferred way of constructing these requests.
+Other request can still be made, but the type will have to be passed in directly to request constructor. See examples below.
+
+If the method is camelCased and starts with `request`, it's a helper method that wraps the request constructor.
+
+##Server requests
+
+**[requestServerInfo([callback])](https://ripple.com/wiki/JSON_Messages#server_info)**
+
+Returns information about the state of the server. If you are connected to multiple servers and want to select by a particular host, use `request.setServer`. Example:
+
+```js
+var request = remote.requestServerInfo();
+
+request.setServer('wss://s1.ripple.com');
+
+request.request(function(err, res) {
+
+});
+```
+**[requestPeers([callback])](https://ripple.com/wiki/JSON_Messages#peers)**
+
+**[requestConnect(ip, port, [callback])](https://ripple.com/wiki/JSON_Messages#connect)**
+
+**[unl_list([callback])](https://ripple.com/wiki/JSON_Messages#unl_list)**
+
+```js
+var request = remote.request('un_list');
+
+request.setServer('wss://s1.ripple.com');
+
+request.request(function(err, res) {
+
+});
+```
+
+**[unl_add(addr, comment, [callback])](https://ripple.com/wiki/JSON_Messages#unl_add)**
+
+**[unl_delete(node, [callback])](https://ripple.com/wiki/JSON_Messages#unl_delete)**
+
+
+
+##Ledger requests
+
+**[requestLedger([opts], [callback])](https://ripple.com/wiki/JSON_Messages#ledger)**
+
+**[requestLedgerHeader([callback])](https://wiki.ripple.com/JSON_Messages#ledger_data)**
+
+**[requestLedgerCurrent([callback])](https://ripple.com/wiki/JSON_Messages#ledger_current)**
+
+**[requestLedgerEntry(type, [callback])](https://ripple.com/wiki/JSON_Messages#ledger_entry)**
+
+**[requestSubscribe([streams], [callback])](https://ripple.com/wiki/JSON_Messages#subscribe)**
+
+Start receiving selected streams from the server.
+
+**[requestUnsubscribe([streams], [callback])](https://ripple.com/wiki/JSON_Messages#unsubscribe)**
+
+Stop receiving selected streams from the server.
+
+##Account requests
+
+**[requestAccountInfo(options, [callback])](https://ripple.com/wiki/JSON_Messages#account_info)**
+
+Return information about the specified account.
+
+```
+var options = {
+  account: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+  ledger: 'validated'
+};
+
+var request = remote.requestAccountInfo(options, function(err, info) {
+  /* process info */
+});
+
+
+// response
+{
+  ledger_current_index: <number>,
+  account_data: {
+    Account:            <string>,
+    Balance:            <number>,
+    Flags:              <number>,
+    LedgerEntryType:    <string>,
+    OwnerCount:         <number>,
+    PreviousTxnID:      <string>,
+    PreviousTxnLgrSeq:  <number>,
+    Sequence:           <number> ,
+    index:              <string>
+  }
+}
+```
+
+**[requestAccountLines(options, [callback])](https://ripple.com/wiki/JSON_Messages#account_lines)**
+
+**[requestAccountOffers(options, [callback])](https://ripple.com/wiki/JSON_Messages#account_offers)**
+
+Return the specified account's outstanding offers.
+
+Requests for both `account_lines` and `account_offers` support paging. The amount of results per response can be configured with the `limit`.
+The responses can be paged through by using the `marker`.
+
+```
+// A valid `ledger_index` or `ledger_hash` is required to provide a reliable result.
+// Results can change between ledger closes, so the provided ledger will be used as base.
+var options = {
+    account: < rippleAccount >,
+    limit: < Number between 10 and 400 >,
+    ledger: < valid ledger_index or ledger_hash >
+}
+
+// The `marker` comes back in an account request if there are more results than are returned 
+// in the current response. The amount of results per response are determined by the `limit`.
+if (marker) {
+    options.marker = < marker >;
+}
+
+var request = remote.requestAccountOffers(options);
+```
+
+
+**[requestAccountTransactions(options, [callback])](https://ripple.com/wiki/JSON_Messages#account_tx)**
+
+Fetch a list of transactions that applied to this account.
+
+Options:
+
++ `account`
++ `ledger_index_min`
++ `ledger_index_max`
++  `binary` *false*
++ `count` *false*
++  `descending` *false*
++  `offset` *0*
++  `limit`
++ `forward` *false*
++ `fwd_marker`
++ `rev_marker`
+
+**[requestWalletAccounts(seed, [callback])](https://ripple.com/wiki/JSON_Messages#wallet_accounts)**
+
+Return a list of accounts for a wallet. *Requires trusted remote*
+
+**requestAccountBalance(account, [ledger], [callback])**
+
+Get the balance for an account. Returns an [Amount](https://github.com/ripple/ripple-lib/blob/develop/src/js/ripple/amount.js) object.
+
+**requestAccountFlags(account, [ledger], [callback])**
+
+Return the flags for an account.
+
+**requestOwnerCount(account, [ledger], [callback])**
+
+Return the owner count for an account.
+
+**requestRippleBalance(account, issuer, currency, [ledger], [callback])**
+
+Return a request to get a ripple balance
+
+##Orderbook requests
+
+**[requestBookOffers(options, [callback])](https://ripple.com/wiki/JSON_Messages#book_offers)**
+
+Return the offers for an order book, also called a *snapshot*
+
+```js
+var options = {
+  gets: {
+    issuer: < issuer >,
+    currency: < currency >
+  },
+  pays: {
+    issuer: < issuer >,
+    currency: < currency >
+  },
+  limit: < limit >
+};
+
+var request = remote.requestBookOffers(options);
+
+request.request(function(err, offers) {
+  //handle offers
+});
+```
+
+##Transaction requests
+
+**[requestTransactionEntry(hash, [ledger_hash], [callback])](https://ripple.com/wiki/JSON_Messages#transaction_entry)**
+
+Searches a particular ledger for a transaction hash. Default ledger is the open ledger.
+
+**[requestTransaction(hash, [callback])](https://ripple.com/wiki/JSON_Messages#tx)**
+
+Searches ledger history for validated transaction hashes.
+
+**[requestSign(secret, tx_json, [callback])](https://ripple.com/wiki/JSON_Messages#sign)**
+
+Sign a transaction. *Requires trusted remote*
+
+**[requestSubmit([callback])](https://ripple.com/wiki/JSON_Messages#submit)**
+
+Submit a transaction to the network. This command is used internally to submit transactions with a greater degree of reliability. See [Submitting a payment to the network](GUIDES.md#3-submitting-a-payment-to-the-network) for details.
+
+**[pathFind(src_account, dst_account, dst_amount, src_currencies)](https://ripple.com/wiki/JSON_Messages#path_find)**
+
+#Transaction constructors
+
+Use `remote.createTransaction('TransactionType', [options])` to construct a transaction. To submit, use `transaction.submit([callback])`.
+
+**Payment**
+
+```js
+var transaction = remote.createTransaction('Payment', {
+  account: MY_ADDRESS,
+  destination: DEST_ADDRESS,
+  amount: AMOUNT
+});
+```
+
+**AccountSet**
+
+```js
+var transaction = remote.createTransaction('AccountSet', {
+  account: MY_ADDRESS,
+  set: 'RequireDest',
+  clear: 'RequireAuth'
+});
+```
+
+**TrustSet**
+
+```js
+var transaction = remote.createTransaction('TrustSet', {
+  account: MY_ADDRESS,
+  limit: '1/USD/rrrrrrrrrrrrrrrrrrrrBZbvji'
+});
+```
+
+**OfferCreate**
+
+```js
+var transaction = remote.createTransaction('OfferCreate', {
+  account: MY_ADDRESS,
+  taker_pays: '1',
+  taker_gets: '1/USD/rrrrrrrrrrrrrrrrrrrrBZbvji'
+});
+```
+
+##Transaction events
+
+[Transaction](https://github.com/ripple/ripple-lib/blob/develop/src/js/ripple/transaction.js) objects are EventEmitters. They may emit the following events.
+
++ `final` Transaction has erred or succeeded. This event indicates that the transaction has finished processing.
++ `error` Transaction has erred. This event is a final state.
++ `success` Transaction succeeded. This event is a final state.
++ `presubmit` Immediately before transaction is submitted
++ `postsubmit` Immediately after transaction is submitted
++ `submitted` Transaction has been submitted to the network. The submission may result in a remote error or success.
++ `resubmitted` Transaction is beginning resubmission.
++ `proposed` Transaction has been submitted *successfully* to the network. The transaction at this point is awaiting validation in a ledger.
++ `timeout` Transaction submission timed out. The transaction will be resubmitted.
++ `fee_adjusted` Transaction fee has been adjusted during its pending state. The transaction fee will only be adjusted if the remote is configured for local fees, which it is by default.
++ `abort` Transaction has been aborted. Transactions are only aborted by manual calls to `#abort`.
++ `missing` Four ledgers have closed without detecting validated transaction
++ `lost` Eight ledgers have closed without detecting validated transaction. Consider the transaction lost and err/finalize.
+
+##Complete payment example
+
+```js
+remote.setSecret(MY_ADDRESS, MY_SECRET);
+
+var transaction = remote.createTransaction('Payment', {
+  account: MY_ADDRESS,
+  destination: DEST_ADDRESS,
+  amount: AMOUNT
+});
+
+transaction.on('resubmitted', function() {
+  // initial submission failed, resubmitting
+});
+
+transaction.submit(function(err, res) {
+ // submission has finalized with either an error or success.
+ // the transaction will not be retried after this point
+});
+```
+
+#Amount objects
+
+Coming Soon

docs/VAULTCLIENT.md

@@ -0,0 +1,168 @@
+ripple-vault-client
+===================
+
+A javascript / http client to interact with Ripple Vault servers.
+
+The purpose of this tool is to enable applications in any javascript
+environment to login with the ripple vault and access the decrypted
+data stored using credentials originally obtained at ripple.com
+     
+        
+## Vault Client Usage
+
+    vaultClient = new ripple.VaultClient(domain);
+    
+    vaultClient.getAuthInfo(username, callback);
+    
+    vaultClient.getRippleName(address, url, callback);
+
+    vaultClient.exists(username, callback);
+    
+        
+
+    vaultClient.login(username, password, callback);
+
+    vaultClient.relogin(id, cryptKey, callback);
+
+    vaultClient.unlock(username, password, encryptSecret, callback);
+
+    vaultClient.loginAndUnlock(username, password, callback);
+    
+    
+    
+    vaultClient.register(options, callback);
+    
+    vaultClient.deleteBlob(options, callback);
+    
+    vaultClient.recoverBlob(options, callback);
+        
+    vaultClient.rename(options, callback);
+    
+    vaultClient.changePassword(options, callback);
+     
+    vaultClient.verify(username, token, callback);
+    
+    vaultClient.resendEmail(options, callback);
+    
+    vaultClient.updateProfile(options, fn);
+    
+
+# Blob Methods
+    
+    blob.encrypt();
+    
+    blob.decrypt(encryptedBlob);
+    
+    blob.encryptSecret(encryptionKey);
+    
+    blob.decryptSecret(encryptionKey, secret);
+    
+    blob.set(pointer, value, callback);
+    
+    blob.unset(pointer, callback);
+    
+    blob.extend(pointer, value, callback);
+    
+    blob.unshift(pointer, value, callback);
+    
+    blob.filter(pointer, field, value, subcommands, callback);
+    
+    
+## Identity Vault
+
+  The identity vault stores identity information inside the encrypted 
+  blob vault.  The identity fields can be additionally encrypted with the 
+  unlock key, that encrypts the secret, for added security. Methods are 
+  accessed from the 'identity' property of the blob object.
+
+
+# Identity fields
+  + name
+  + entityType (individual, corporation, organization)
+  + email
+  + phone
+  + address
+    + contact
+    + line1
+    + line2
+    + city
+    + postalCode
+    + region - state/province/region
+    + country
+  + nationalID
+    + number
+    + type (ssn, taxID, passport, driversLicense, other)
+    + country - issuing country
+  + birthday
+  + birthplace
+  
+  
+# Identity Methods
+
+    blob.identity.set(pointer, key, value, callback);
+    
+    blob.identity.unset(pointer, key, callback);
+    
+    blob.identity.get(pointer, key);
+    
+    blob.identity.getAll(key);
+    
+    blob.identity.getFullAddress(key);  //get text string of full address
+    
+
+## Spec Tests
+
+Run `npm test` to test the high-level behavior specs 
+
+  Ripple Txt
+    ✓ should get the content of a ripple.txt file from a given domain 
+    ✓ should get currencies from a ripple.txt file for a given domain
+    ✓ should get the domain from a given url 
+
+  AuthInfo
+    ✓ should get auth info 
+
+  VaultClient
+    #initialization
+      ✓ should be initialized with a domain 
+      ✓ should default to ripple.com without a domain 
+    #exists
+      ✓ should determine if a username exists on the domain 
+    #login
+      ✓ with username and password should retrive the blob, crypt key, and id
+    #relogin
+      ✓ should retrieve the decrypted blob with blob vault url, id, and crypt key 
+    #unlock
+      ✓ should access the wallet secret using encryption secret, username and password
+    #loginAndUnlock
+      ✓ should get the decrypted blob and decrypted secret given name and password
+    #register
+      ✓ should create a new blob
+    #deleteBlob
+      ✓ should remove an existing blob
+    #updateProfile
+      ✓ should update profile parameters associated with a blob 
+
+  Blob
+    ✓ #set 
+    ✓ #extend 
+    ✓ #unset 
+    ✓ #unshift 
+    ✓ #filter 
+    ✓ #consolidate 
+    #rename
+      ✓ should change the username of a blob
+    #changePassword
+      ✓ should change the password and keys of a blob
+    #recoverBlob
+      ✓ should recover the blob given a username and secret
+    #verifyEmail
+      ✓ should verify an email given a username and token 
+    #resendVerifcationEmail
+      ✓ should resend a verification given options
+    identity
+      ✓ #identity_set 
+      ✓ #identity_get 
+      ✓ #identity_getAll 
+      ✓ #identity_getFullAddress 
+      ✓ #identity_unset 

npm-shrinkwrap.json

@@ -0,0 +1,74 @@
+{
+  "name": "ripple-lib",
+  "version": "0.12.4",
+  "npm-shrinkwrap-version": "5.3.0",
+  "node-version": "v0.10.38",
+  "dependencies": {
+    "async": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+    },
+    "bignumber.js": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.7.tgz"
+    },
+    "extend": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"
+    },
+    "lodash": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"
+    },
+    "lru-cache": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"
+    },
+    "ripple-wallet-generator": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.3.tgz"
+    },
+    "ws": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-0.7.1.tgz",
+      "dependencies": {
+        "bufferutil": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz",
+          "dependencies": {
+            "bindings": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+            },
+            "nan": {
+              "version": "1.6.2",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz"
+            }
+          }
+        },
+        "options": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+        },
+        "ultron": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"
+        },
+        "utf-8-validate": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz",
+          "dependencies": {
+            "bindings": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+            },
+            "nan": {
+              "version": "1.6.2",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-1.6.2.tgz"
+            }
+          }
+        }
+      }
+    }
+  }
+}

package.json

@@ -1,39 +1,62 @@
 {
   "name": "ripple-lib",
-  "version": "0.7.18",
-  "description": "Ripple JavaScript client library",
+  "version": "0.12.4",
+  "description": "A JavaScript API for interacting with Ripple in Node.js and the browser",
   "files": [
-    "src/js/ripple/*.js",
-    "build/sjcl.js",
-    "bin/rsign.js"
+    "src/js/*",
+    "bin/*",
+    "build/*",
+    "test/*",
+    "Makefile",
+    "Gulpfile.js"
   ],
   "main": "src/js/ripple",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "async": "~0.2.9",
-    "ws": "~0.4.27",
-    "extend": "~1.1.3",
-    "simple-jsonrpc": "~0.0.2",
-    "jshint-loader": "~0.5.0"
+    "async": "~0.9.0",
+    "bignumber.js": "^2.0.3",
+    "extend": "~1.2.1",
+    "lodash": "^3.1.0",
+    "lru-cache": "~2.5.0",
+    "ripple-wallet-generator": "^1.0.3",
+    "ws": "~0.7.1"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-watch": "~0.4.4",
-    "grunt-webpack": "~0.10.5",
-    "grunt-dox": "~0.5.0",
-    "buster": "~0.6.12"
+    "assert-diff": "^1.0.1",
+    "coveralls": "~2.10.0",
+    "eslint": "^0.18.0",
+    "gulp": "~3.8.10",
+    "gulp-bump": "~0.1.13",
+    "gulp-clean-dest": "^0.1.0",
+    "gulp-concat": "~2.4.3",
+    "gulp-filelog": "^0.4.1",
+    "gulp-flowtype": "^0.4.1",
+    "gulp-plumber": "^0.6.6",
+    "gulp-react": "^2.0.0",
+    "gulp-rename": "~1.2.0",
+    "gulp-uglify": "~1.1.0",
+    "gulp-util": "^3.0.3",
+    "gulp-watch": "^4.1.0",
+    "istanbul": "~0.3.5",
+    "map-stream": "~0.1.0",
+    "mocha": "~2.1.0",
+    "nock": "^0.34.1",
+    "webpack": "~1.5.3",
+    "yargs": "~1.3.1"
   },
   "scripts": {
-    "test": "node_modules/buster/bin/buster-test",
-    "build": "node_modules/.bin/grunt"
+    "build": "node_modules/.bin/gulp",
+    "pretest": "node_modules/.bin/gulp concat-sjcl",
+    "test": "./node_modules/.bin/istanbul test -x build/sjcl.js -x src/js/jsbn/* ./node_modules/mocha/bin/_mocha -- --reporter ${MOCHA_REPORTER:=spec} --timeout 10000 --slow 500 test/*-test.js",
+    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
+    "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/master/eslintrc'; fi; eslint --reset -c eslintrc src/js/ripple/*.js",
+    "perf": "./scripts/perf_test.sh"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/rippleFoundation/ripple-lib.git"
+    "url": "git://github.com/ripple/ripple-lib.git"
   },
   "readmeFilename": "README.md",
   "engines": {

scripts/perf_test.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+URL="https://www.dropbox.com/s/a0gy7vbb86eeqlq/ledger-full-1000000.json?dl=1"
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DEST="$DIR/cache/ledger-full-1000000.json"
+if [ ! -e "$DEST" ]
+then
+  echo "Downloading test data..."
+  mkdir -p "$DIR/cache"
+  curl -L "$URL" > "$DEST"
+fi
+time node "$DIR/verify_ledger_json.js" "$DEST"

scripts/publish

@@ -0,0 +1,43 @@
+echo "PUBLISH"
+
+function exit_on_error {
+  res=$?
+  [[ ${res:-99} -eq 0 ]] || exit $res
+}
+
+rm -rf build
+
+npm install
+gulp
+npm test
+exit_on_error
+
+echo ""
+echo "publish to npm"
+npm publish
+exit_on_error
+
+rm -rf dist
+echo ""
+echo "publish to bower"
+
+git clone git@github.com:ripple/bower-ripple.git dist
+gulp bower
+exit_on_error
+
+cd dist
+version=$(cat bower.json | grep -Eo '([0-9]\.?)+(-rc[0-9])?')
+echo "version: $version"
+git add ripple.js ripple-debug.js ripple-min.js bower.json
+exit_on_error
+
+git commit -m "[TASK] add v$version"
+exit_on_error
+
+git tag "v$version"
+exit_on_error
+
+git push origin master
+git push --tags origin master
+
+cd ..

scripts/publish_rc

@@ -0,0 +1,43 @@
+echo "PUBLISH RELEASE CANDIDATE"
+
+function exit_on_error {
+  res=$?
+  [[ ${res:-99} -eq 0 ]] || exit $res
+}
+
+rm -rf build
+
+npm install
+gulp
+npm test
+exit_on_error
+
+echo ""
+echo "publish rc to npm"
+npm publish --tag beta
+exit_on_error
+
+rm -rf dist
+echo ""
+echo "publish to bower"
+
+git clone git@github.com:ripple/bower-ripple.git dist
+gulp bower
+exit_on_error
+
+cd dist
+version=$(cat bower.json | grep -Eo '([0-9]\.?)+(-rc[0-9])?')
+echo "version: $version"
+git add ripple.js ripple-debug.js ripple-min.js bower.json
+exit_on_error
+
+git commit -m "[TASK] add v$version"
+exit_on_error
+
+git tag "v$version"
+exit_on_error
+
+git push origin master
+git push --tags origin master
+
+cd ..

scripts/publish_to_bower

@@ -0,0 +1,12 @@
+rm -rf dist
+git clone git@github.com:ripple/bower-ripple.git dist
+gulp bower
+cd dist
+version=$(cat bower.json | grep -Eo '([0-9]\.?)+(-rc[0-9])?')
+echo "version: $version"
+git add ripple.js ripple-debug.js ripple-min.js bower.json
+git commit -m "[TASK] add v$version"
+git tag "v$version"
+git push origin master
+git push --tags origin master
+cd ..

scripts/verify_ledger_json.js

@@ -0,0 +1,65 @@
+'use strict';
+
+var fs = require('fs');
+var Amount = require('../src/js/ripple').Amount;
+var Ledger = require('../src/js/ripple/ledger').Ledger;
+
+function parse_options(from, flags) {
+  var argv = from.slice(),
+      opts_ = {argv: argv};
+
+  flags.forEach(function(f) {
+    // Do we have the flag?
+    var flag_index = argv.indexOf('--' + f);
+    // normalize the name of the flag
+    f = f.replace('-', '_');
+    // opts_ has Boolean value for normalized flag key
+    opts_[f] = flag_index !== -1;
+    if (opts_[f]) {
+      // remove the flag from the argv
+      argv.splice(flag_index, 1);
+    }
+  });
+  return opts_;
+}
+
+var opts = parse_options(process.argv.slice(2), // remove `node` and `this.js`
+                        ['sanity-test']);
+
+if (opts.argv.length < 1) {
+  console.error('Usage: scripts/verify_ledger_json path/to/ledger.json');
+  console.error('       optional: --sanity-test (json>binary>json>binary)');
+  process.exit(1);
+}
+
+var json = fs.readFileSync(opts.argv[0], 'utf-8');
+var ledger = Ledger.from_json(JSON.parse(json));
+
+// This will serialize each accountState object to binary and then back to json
+// before finally serializing for hashing. This is mostly to expose any issues
+// with ripple-libs binary <--> json codecs.
+if (opts.sanity_test) {
+  console.log('All accountState nodes will be processed from ' +
+              'json->binary->json->binary. This may take some time ' +
+              'with large ledgers.');
+}
+
+// To recompute the hashes of some ledgers, we must allow values that slipped in
+// before strong policies were in place.
+Amount.strict_mode = false;
+
+console.log('Transaction hash in header:    ' +
+             ledger.ledger_json.transaction_hash);
+console.log('Calculated transaction hash:   ' +
+             ledger.calc_tx_hash().to_hex());
+
+console.log('Account state hash in header:  ' +
+             ledger.ledger_json.account_hash);
+
+if (ledger.ledger_json.accountState) {
+  console.log('Calculated account state hash: ' +
+               ledger.calc_account_hash({sanity_test: opts.sanity_test})
+                                                      .to_hex());
+} else {
+  console.log('Ledger has no accountState');
+}

src/js/ripple/account.js

@@ -9,18 +9,26 @@
 //   balance_proposed
 //
 
-// var network = require("./network.js");
-
-var EventEmitter = require('events').EventEmitter;
+// var network = require('./network.js');
+var async              = require('async');
 var util               = require('util');
-
+var extend             = require('extend');
+var EventEmitter       = require('events').EventEmitter;
 var Amount             = require('./amount').Amount;
 var UInt160            = require('./uint160').UInt160;
+var TransactionManager = require('./transactionmanager').TransactionManager;
+var sjcl               = require('./utils').sjcl;
+var Base               = require('./base').Base;
 
-var extend = require('extend');
+/**
+ * @constructor Account
+ * @param {Remote} remote
+ * @param {String} account
+ */
 
-var Account = function (remote, account) {
+function Account(remote, account) {
   EventEmitter.call(this);
+
   var self = this;
 
   this._remote = remote;
@@ -32,46 +40,65 @@ var Account = function (remote, account) {
   // Important: This must never be overwritten, only extend()-ed
   this._entry = { };
 
-  this.on('newListener', function (type, listener) {
-    if (Account.subscribe_events.indexOf(type) !== -1) {
-      if (!self._subs && 'open' === self._remote._online_state) {
+  function listenerAdded(type, listener) {
+    if (~Account.subscribeEvents.indexOf(type)) {
+      if (!self._subs && self._remote._connected) {
         self._remote.request_subscribe()
-          .accounts(self._account_id)
-          .request();
+        .add_account(self._account_id)
+        .broadcast().request();
       }
       self._subs += 1;
     }
-  });
+  };
 
-  this.on('removeListener', function (type, listener) {
-    if (Account.subscribe_events.indexOf(type) !== -1) {
+  this.on('newListener', listenerAdded);
+
+  function listenerRemoved(type, listener) {
+    if (~Account.subscribeEvents.indexOf(type)) {
       self._subs -= 1;
-
-      if (!self._subs && 'open' === self._remote._online_state) {
+      if (!self._subs && self._remote._connected) {
         self._remote.request_unsubscribe()
-          .accounts(self._account_id)
-          .request();
+        .add_account(self._account_id)
+        .broadcast().request();
       }
     }
-  });
+  };
 
-  this._remote.on('prepare_subscribe', function (request) {
-    if (self._subs) request.accounts(self._account_id);
-  });
+  this.on('removeListener', listenerRemoved);
+
+  function attachAccount(request) {
+    if (self._account.is_valid() && self._subs) {
+      request.add_account(self._account_id);
+    }
+  };
+
+  this._remote.on('prepare_subscribe', attachAccount);
+
+  function handleTransaction(transaction) {
+    if (!transaction.mmeta) {
+      return;
+    }
 
-  this.on('transaction', function (msg) {
     var changed = false;
-    msg.mmeta.each(function (an) {
-      if (an.entryType === 'AccountRoot' &&
-          an.fields.Account === self._account_id) {
+
+    transaction.mmeta.each(function(an) {
+      var isAccount = an.fields.Account === self._account_id;
+      var isAccountRoot = isAccount && (an.entryType === 'AccountRoot');
+
+      if (isAccountRoot) {
         extend(self._entry, an.fieldsNew, an.fieldsFinal);
         changed = true;
       }
     });
+
     if (changed) {
       self.emit('entry', self._entry);
     }
-  });
+  };
+
+  this.on('transaction', handleTransaction);
+
+  this._transactionManager = new TransactionManager(this);
 
   return this;
 };
@@ -81,10 +108,10 @@ util.inherits(Account, EventEmitter);
 /**
  * List of events that require a remote subscription to the account.
  */
-Account.subscribe_events = ['transaction', 'entry'];
 
-Account.prototype.to_json = function ()
-{
+Account.subscribeEvents = [ 'transaction', 'entry' ];
+
+Account.prototype.toJson = function() {
   return this._account.to_json();
 };
 
@@ -93,36 +120,133 @@ Account.prototype.to_json = function ()
  *
  * Note: This does not tell you whether the account exists in the ledger.
  */
-Account.prototype.is_valid = function ()
-{
+
+Account.prototype.isValid = function() {
   return this._account.is_valid();
 };
 
+/**
+ * Request account info
+ *
+ * @param {Function} callback
+ */
+
+Account.prototype.getInfo = function(callback) {
+  return this._remote.requestAccountInfo({account: this._account_id}, callback);
+};
+
 /**
  * Retrieve the current AccountRoot entry.
  *
  * To keep up-to-date with changes to the AccountRoot entry, subscribe to the
- * "entry" event.
+ * 'entry' event.
  *
- * @param {function (err, entry)} callback Called with the result
+ * @param {Function} callback
  */
-Account.prototype.entry = function (callback)
-{
+
+Account.prototype.entry = function(callback) {
   var self = this;
+  var callback = typeof callback === 'function' ? callback : function(){};
 
-  self._remote.request_account_info(this._account_id)
-    .on('success', function (e) {
-      extend(self._entry, e.account_data);
+  function accountInfo(err, info) {
+    if (err) {
+      callback(err);
+    } else {
+      extend(self._entry, info.account_data);
       self.emit('entry', self._entry);
-
-      if ("function" === typeof callback) {
-        callback(null, e);
+      callback(null, info);
     }
-    })
-    .on('error', function (e) {
-      callback(e);
-    })
-    .request();
+  };
+
+  this.getInfo(accountInfo);
+
+  return this;
+};
+
+Account.prototype.getNextSequence = function(callback) {
+  var callback = typeof callback === 'function' ? callback : function(){};
+
+  function isNotFound(err) {
+    return err && typeof err === 'object'
+    && typeof err.remote === 'object'
+    && err.remote.error === 'actNotFound';
+  };
+
+  function accountInfo(err, info) {
+    if (isNotFound(err)) {
+      // New accounts will start out as sequence one
+      callback(null, 1);
+    } else if (err) {
+      callback(err);
+    } else {
+      callback(null, info.account_data.Sequence);
+    }
+  };
+
+  this.getInfo(accountInfo);
+
+  return this;
+};
+
+/**
+ * Retrieve this account's Ripple trust lines.
+ *
+ * To keep up-to-date with changes to the AccountRoot entry, subscribe to the
+ * 'lines' event. (Not yet implemented.)
+ *
+ * @param {function(err, lines)} callback Called with the result
+ */
+
+Account.prototype.lines = function(callback) {
+  var self = this;
+  var callback = typeof callback === 'function' ? callback : function(){};
+
+  function accountLines(err, res) {
+    if (err) {
+      callback(err);
+    } else {
+      self._lines = res.lines;
+      self.emit('lines', self._lines);
+      callback(null, res);
+    }
+  }
+
+  this._remote.requestAccountLines({account: this._account_id}, accountLines);
+
+  return this;
+};
+
+/**
+ * Retrieve this account's single trust line.
+ *
+ * @param {string} currency Currency
+ * @param {string} address Ripple address
+ * @param {function(err, line)} callback Called with the result
+ * @returns {Account}
+ */
+
+Account.prototype.line = function(currency, address, callback) {
+  var self = this;
+  var callback = typeof callback === 'function' ? callback : function(){};
+
+  self.lines(function(err, data) {
+    if (err) {
+      return callback(err);
+    }
+
+    var line;
+
+    top:
+    for (var i=0; i<data.lines.length; i++) {
+      var l = data.lines[i];
+      if (l.account === address && l.currency === currency) {
+        line = l;
+        break top;
+      }
+    }
+
+    callback(null, line);
+  });
 
   return this;
 };
@@ -132,14 +256,138 @@ Account.prototype.entry = function (callback)
  *
  * This is only meant to be called by the Remote class. You should never have to
  * call this yourself.
+ *
+ * @param {Object} message
  */
-Account.prototype.notifyTx = function (message)
-{
+
+Account.prototype.notify =
+Account.prototype.notifyTx = function(transaction) {
   // Only trigger the event if the account object is actually
   // subscribed - this prevents some weird phantom events from
   // occurring.
-  if (this._subs) {
-    this.emit('transaction', message);
+  if (!this._subs) {
+    return;
+  }
+
+  this.emit('transaction', transaction);
+
+  var account = transaction.transaction.Account;
+
+  if (!account) {
+    return;
+  }
+
+  var isThisAccount = (account === this._account_id);
+
+  this.emit(isThisAccount ? 'transaction-outbound' : 'transaction-inbound', transaction);
+};
+
+/**
+ * Submit a transaction to an account's
+ * transaction manager
+ *
+ * @param {Transaction} transaction
+ */
+
+Account.prototype.submit = function(transaction) {
+  this._transactionManager.submit(transaction);
+};
+
+
+/**
+ *  Check whether the given public key is valid for this account
+ *
+ *  @param {Hex-encoded String|RippleAddress} public_key
+ *  @param {Function} callback
+ *
+ *  @callback
+ *  @param {Error} err
+ *  @param {Boolean} true if the public key is valid and active, false otherwise
+ */
+Account.prototype.publicKeyIsActive = function(public_key, callback) {
+  var self = this;
+  var public_key_as_uint160;
+
+  try {
+    public_key_as_uint160 = Account._publicKeyToAddress(public_key);
+  } catch (err) {
+    return callback(err);
+  }
+
+  function getAccountInfo(async_callback) {
+    self.getInfo(function(err, account_info_res){
+
+      // If the remote responds with an Account Not Found error then the account
+      // is unfunded and thus we can assume that the master key is active
+      if (err && err.remote && err.remote.error === 'actNotFound') {
+        async_callback(null, null);
+      } else {
+        async_callback(err, account_info_res);
+      }
+    });
+  };
+
+  function publicKeyIsValid(account_info_res, async_callback) {
+    // Catch the case of unfunded accounts
+    if (!account_info_res) {
+
+      if (public_key_as_uint160 === self._account_id) {
+        async_callback(null, true);
+      } else {
+        async_callback(null, false);
+      }
+
+      return;
+    }
+
+    var account_info = account_info_res.account_data;
+
+    // Respond with true if the RegularKey is set and matches the given public key or
+    // if the public key matches the account address and the lsfDisableMaster is not set
+    if (account_info.RegularKey &&
+      account_info.RegularKey === public_key_as_uint160) {
+      async_callback(null, true);
+    } else if (account_info.Account === public_key_as_uint160 &&
+      ((account_info.Flags & 0x00100000) === 0)) {
+      async_callback(null, true);
+    } else {
+      async_callback(null, false);
+    }
+  };
+
+  var steps = [
+    getAccountInfo,
+    publicKeyIsValid
+  ];
+
+  async.waterfall(steps, callback);
+};
+
+/**
+ *  Convert a hex-encoded public key to a Ripple Address
+ *
+ *  @static
+ *
+ *  @param {Hex-encoded string|RippleAddress} public_key
+ *  @returns {RippleAddress}
+ */
+Account._publicKeyToAddress = function(public_key) {
+  // Based on functions in /src/js/ripple/keypair.js
+  function hexToUInt160(public_key) {
+    var bits = sjcl.codec.hex.toBits(public_key);
+    var hash = sjcl.hash.ripemd160.hash(sjcl.hash.sha256.hash(bits));
+    var address = UInt160.from_bits(hash);
+    address.set_version(Base.VER_ACCOUNT_ID);
+
+    return address.to_json();
+  };
+
+  if (UInt160.is_valid(public_key)) {
+    return public_key;
+  } else if (/^[0-9a-fA-F]+$/.test(public_key)) {
+    return hexToUInt160(public_key);
+  } else {
+    throw new Error('Public key is invalid. Must be a UInt160 or a hex string');
   }
 };
 

src/js/ripple/base.js

@@ -1,121 +1,112 @@
-
-var sjcl    = require('../../../build/sjcl');
+'use strict';
+var _ = require('lodash');
+var sjcl = require('./utils').sjcl;
 var utils = require('./utils');
-var jsbn    = require('./jsbn');
 var extend = require('extend');
-
-var BigInteger = jsbn.BigInteger;
-var nbi        = jsbn.nbi;
+var convertBase = require('./baseconverter');
 
 var Base = {};
 
 var alphabets = Base.alphabets = {
-  'ripple'  : "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz",
-  'tipple'  : "RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz",
-  'bitcoin' : "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
+  ripple: 'rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz',
+  tipple: 'RPShNAF39wBUDnEGHJKLM4pQrsT7VWXYZ2bcdeCg65jkm8ofqi1tuvaxyz',
+  bitcoin: '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 };
 
 extend(Base, {
-  'VER_NONE'              : 1,
-  'VER_NODE_PUBLIC'       : 28,
-  'VER_NODE_PRIVATE'      : 32,
-  'VER_ACCOUNT_ID'        : 0,
-  'VER_ACCOUNT_PUBLIC'    : 35,
-  'VER_ACCOUNT_PRIVATE'   : 34,
-  'VER_FAMILY_GENERATOR'  : 41,
-  'VER_FAMILY_SEED'       : 33
+  VER_NONE: 1,
+  VER_NODE_PUBLIC: 28,
+  VER_NODE_PRIVATE: 32,
+  VER_ACCOUNT_ID: 0,
+  VER_ACCOUNT_PUBLIC: 35,
+  VER_ACCOUNT_PRIVATE: 34,
+  VER_FAMILY_GENERATOR: 41,
+  VER_FAMILY_SEED: 33
 });
 
-var sha256  = function (bytes) {
-  return sjcl.codec.bytes.fromBits(sjcl.hash.sha256.hash(sjcl.codec.bytes.toBits(bytes)));
-};
+function sha256(bytes) {
+  return sjcl.codec.bytes.fromBits(
+    sjcl.hash.sha256.hash(sjcl.codec.bytes.toBits(bytes)));
+}
 
-var sha256hash = function (bytes) {
-  return sha256(sha256(bytes));
+function encodeString(alphabet, input) {
+  if (input.length === 0) {
+    return '';
+  }
+
+  var leadingZeros = _.takeWhile(input, function(d) {
+    return d === 0;
+  });
+  var out = convertBase(input, 256, 58).map(function(digit) {
+    if (digit < 0 || digit >= alphabet.length) {
+      throw new Error('Value ' + digit + ' is out of bounds for encoding');
+    }
+    return alphabet[digit];
+  });
+  var prefix = leadingZeros.map(function() {
+    return alphabet[0];
+  });
+  return prefix.concat(out).join('');
+}
+
+function decodeString(indexes, input) {
+  if (input.length === 0) {
+    return [];
+  }
+
+  var input58 = input.split('').map(function(c) {
+    var charCode = c.charCodeAt(0);
+    if (charCode >= indexes.length || indexes[charCode] === -1) {
+      throw new Error('Character ' + c + ' is not valid for encoding');
+    }
+    return indexes[charCode];
+  });
+  var leadingZeros = _.takeWhile(input58, function(d) {
+    return d === 0;
+  });
+  var out = convertBase(input58, 58, 256);
+  return leadingZeros.concat(out);
+}
+
+function Base58(alphabet) {
+  var indexes = utils.arraySet(128, -1);
+  for (var i = 0; i < alphabet.length; i++) {
+    indexes[alphabet.charCodeAt(i)] = i;
+  }
+  return {
+    decode: decodeString.bind(null, indexes),
+    encode: encodeString.bind(null, alphabet)
   };
+}
+
+Base.encoders = {};
+Object.keys(alphabets).forEach(function(alphabet) {
+  Base.encoders[alphabet] = new Base58(alphabets[alphabet]);
+});
 
 // --> input: big-endian array of bytes.
 // <-- string at least as long as input.
 Base.encode = function(input, alpha) {
-  var alphabet	= alphabets[alpha || 'ripple'];
-  var bi_base	= new BigInteger(String(alphabet.length));
-  var bi_q	= nbi();
-  var bi_r	= nbi();
-  var bi_value	= new BigInteger(input);
-  var buffer	= [];
-
-  while (bi_value.compareTo(BigInteger.ZERO) > 0)
-  {
-    bi_value.divRemTo(bi_base, bi_q, bi_r);
-    bi_q.copyTo(bi_value);
-
-    buffer.push(alphabet[bi_r.intValue()]);
-  }
-
-  var i;
-
-  for (i = 0; i != input.length && !input[i]; i += 1) {
-    buffer.push(alphabet[0]);
-  }
-
-  return buffer.reverse().join("");
+  return this.encoders[alpha || 'ripple'].encode(input);
 };
 
 // --> input: String
 // <-- array of bytes or undefined.
 Base.decode = function(input, alpha) {
-  if ("string" !== typeof input) return undefined;
-
-  var alphabet	= alphabets[alpha || 'ripple'];
-  var bi_base	= new BigInteger(String(alphabet.length));
-  var bi_value	= nbi();
-  var i;
-
-  for (i = 0; i != input.length && input[i] === alphabet[0]; i += 1)
-    ;
-
-  for (; i != input.length; i += 1) {
-    var	v = alphabet.indexOf(input[i]);
-
-    if (v < 0)
+  if (typeof input !== 'string') {
+    return undefined;
+  }
+  try {
+    return this.encoders[alpha || 'ripple'].decode(input);
+  } catch (e) {
     return undefined;
-
-    var r = nbi();
-
-    r.fromInt(v);
-
-    bi_value  = bi_value.multiply(bi_base).add(r);
   }
-
-  // toByteArray:
-  // - Returns leading zeros!
-  // - Returns signed bytes!
-  var bytes =  bi_value.toByteArray().map(function (b) { return b ? b < 0 ? 256+b : b : 0; });
-  var extra = 0;
-
-  while (extra != bytes.length && !bytes[extra])
-    extra += 1;
-
-  if (extra)
-    bytes = bytes.slice(extra);
-
-  var zeros = 0;
-
-  while (zeros !== input.length && input[zeros] === alphabet[0])
-    zeros += 1;
-
-  return [].concat(utils.arraySet(zeros, 0), bytes);
 };
 
 Base.verify_checksum = function(bytes) {
-  var computed	= sha256hash(bytes.slice(0, -4)).slice(0, 4);
+  var computed = sha256(sha256(bytes.slice(0, -4))).slice(0, 4);
   var checksum = bytes.slice(-4);
-
-  for (var i = 0; i < 4; i++)
-    if (computed[i] !== checksum[i])
-      return false;
-
-  return true;
+  return _.isEqual(computed, checksum);
 };
 
 // --> input: Array
@@ -125,37 +116,39 @@ Base.encode_check = function (version, input, alphabet) {
   var check = sha256(sha256(buffer)).slice(0, 4);
 
   return Base.encode([].concat(buffer, check), alphabet);
-}
+};
 
 // --> input : String
-// <-- NaN || BigInteger
+// <-- NaN || sjcl.bn
 Base.decode_check = function(version, input, alphabet) {
   var buffer = Base.decode(input, alphabet);
 
-  if (!buffer || buffer.length < 5)
+  if (!buffer || buffer.length < 5) {
     return NaN;
+  }
 
   // Single valid version
-  if ("number" === typeof version && buffer[0] !== version)
+  if (typeof version === 'number' && buffer[0] !== version) {
     return NaN;
+  }
 
   // Multiple allowed versions
-  if ("object" === typeof version && Array.isArray(version)) {
-    var match = false;
-    for (var i = 0, l = version.length; i < l; i++) {
-      match |= version[i] === buffer[0];
-    }
-    if (!match) return NaN;
+  if (Array.isArray(version) && _.every(version, function(v) {
+          return v !== buffer[0];
+      })) {
+    return NaN;
   }
 
-  if (!Base.verify_checksum(buffer))
+  if (!Base.verify_checksum(buffer)) {
     return NaN;
+  }
 
   // We'll use the version byte to add a leading zero, this ensures JSBN doesn't
   // intrepret the value as a negative number
   buffer[0] = 0;
 
-  return new BigInteger(buffer.slice(0, -4), 256);
-}
+  return sjcl.bn.fromBits(
+      sjcl.codec.bytes.toBits(buffer.slice(0, -4)));
+};
 
 exports.Base = Base;

src/js/ripple/baseconverter.js

@@ -0,0 +1,32 @@
+'use strict';
+
+function normalize(digitArray) {
+  while (digitArray[0] === 0) {
+    digitArray.shift();
+  }
+  return digitArray;
+}
+
+function divmod(digitArray, base, divisor) {
+  var remainder = 0;
+  var quotient = [];
+  for (var j = 0; j < digitArray.length; j++) {
+    var temp = remainder * base + parseInt(digitArray[j], 10);
+    quotient.push(Math.floor(temp / divisor));
+    remainder = temp % divisor;
+  }
+  return {quotient: normalize(quotient), remainder: remainder};
+}
+
+function convertBase(digitArray, fromBase, toBase) {
+  var result = [];
+  var dividend = digitArray;
+  while (dividend.length > 0) {
+    var qr = divmod(dividend, fromBase, toBase);
+    result.unshift(qr.remainder);
+    dividend = qr.quotient;
+  }
+  return normalize(result);
+}
+
+module.exports = convertBase;

src/js/ripple/binformat.js

@@ -1,90 +1,438 @@
-var ST = require("./serializedtypes");
+'use strict';
+
+/*eslint no-multi-spaces:0,space-in-brackets:0,key-spacing:0,comma-spacing:0*/
+
+/**
+ * Data type map.
+ *
+ * Mapping of type ids to data types. The type id is specified by the high
+ *
+ * For reference, see rippled's definition:
+ * https://github.com/ripple/rippled/blob/develop/src/ripple/data/protocol
+ *                                                              /SField.cpp
+ */
+
+exports.types = [
+  undefined,
+
+  // Common
+  'Int16',    // 1
+  'Int32',    // 2
+  'Int64',    // 3
+  'Hash128',  // 4
+  'Hash256',  // 5
+  'Amount',   // 6
+  'VL',       // 7
+  'Account',  // 8
+
+  // 9-13 reserved
+  undefined,    // 9
+  undefined,    // 10
+  undefined,    // 11
+  undefined,    // 12
+  undefined,    // 13
+
+  'Object',   // 14
+  'Array',    // 15
+
+  // Uncommon
+  'Int8',     // 16
+  'Hash160',  // 17
+  'PathSet',  // 18
+  'Vector256' // 19
+];
+
+/**
+ * Field type map.
+ *
+ * Mapping of field type id to field type name.
+ */
+
+var FIELDS_MAP = exports.fields = {
+  // Common types
+  1: { // Int16
+    1: 'LedgerEntryType',
+    2: 'TransactionType'
+  },
+  2: { // Int32
+    2: 'Flags',
+    3: 'SourceTag',
+    4: 'Sequence',
+    5: 'PreviousTxnLgrSeq',
+    6: 'LedgerSequence',
+    7: 'CloseTime',
+    8: 'ParentCloseTime',
+    9: 'SigningTime',
+    10: 'Expiration',
+    11: 'TransferRate',
+    12: 'WalletSize',
+    13: 'OwnerCount',
+    14: 'DestinationTag',
+    // Skip 15
+    16: 'HighQualityIn',
+    17: 'HighQualityOut',
+    18: 'LowQualityIn',
+    19: 'LowQualityOut',
+    20: 'QualityIn',
+    21: 'QualityOut',
+    22: 'StampEscrow',
+    23: 'BondAmount',
+    24: 'LoadFee',
+    25: 'OfferSequence',
+    26: 'FirstLedgerSequence',
+    27: 'LastLedgerSequence',
+    28: 'TransactionIndex',
+    29: 'OperationLimit',
+    30: 'ReferenceFeeUnits',
+    31: 'ReserveBase',
+    32: 'ReserveIncrement',
+    33: 'SetFlag',
+    34: 'ClearFlag'
+  },
+  3: { // Int64
+    1: 'IndexNext',
+    2: 'IndexPrevious',
+    3: 'BookNode',
+    4: 'OwnerNode',
+    5: 'BaseFee',
+    6: 'ExchangeRate',
+    7: 'LowNode',
+    8: 'HighNode'
+  },
+  4: { // Hash128
+    1: 'EmailHash'
+  },
+  5: { // Hash256
+    1: 'LedgerHash',
+    2: 'ParentHash',
+    3: 'TransactionHash',
+    4: 'AccountHash',
+    5: 'PreviousTxnID',
+    6: 'LedgerIndex',
+    7: 'WalletLocator',
+    8: 'RootIndex',
+    9: 'AccountTxnID',
+    16: 'BookDirectory',
+    17: 'InvoiceID',
+    18: 'Nickname',
+    19: 'Amendment',
+    20: 'TicketID'
+  },
+  6: { // Amount
+    1: 'Amount',
+    2: 'Balance',
+    3: 'LimitAmount',
+    4: 'TakerPays',
+    5: 'TakerGets',
+    6: 'LowLimit',
+    7: 'HighLimit',
+    8: 'Fee',
+    9: 'SendMax',
+    16: 'MinimumOffer',
+    17: 'RippleEscrow',
+    18: 'DeliveredAmount'
+  },
+  7: { // VL
+    1: 'PublicKey',
+    2: 'MessageKey',
+    3: 'SigningPubKey',
+    4: 'TxnSignature',
+    5: 'Generator',
+    6: 'Signature',
+    7: 'Domain',
+    8: 'FundCode',
+    9: 'RemoveCode',
+    10: 'ExpireCode',
+    11: 'CreateCode',
+    12: 'MemoType',
+    13: 'MemoData',
+    14: 'MemoFormat'
+  },
+  8: { // Account
+    1: 'Account',
+    2: 'Owner',
+    3: 'Destination',
+    4: 'Issuer',
+    7: 'Target',
+    8: 'RegularKey'
+  },
+  14: { // Object
+    1: undefined,  // end of Object
+    2: 'TransactionMetaData',
+    3: 'CreatedNode',
+    4: 'DeletedNode',
+    5: 'ModifiedNode',
+    6: 'PreviousFields',
+    7: 'FinalFields',
+    8: 'NewFields',
+    9: 'TemplateEntry',
+    10: 'Memo'
+  },
+  15: { // Array
+    1: undefined,  // end of Array
+    2: 'SigningAccounts',
+    3: 'TxnSignatures',
+    4: 'Signatures',
+    5: 'Template',
+    6: 'Necessary',
+    7: 'Sufficient',
+    8: 'AffectedNodes',
+    9: 'Memos'
+  },
+
+  // Uncommon types
+  16: { // Int8
+    1: 'CloseResolution',
+    2: 'TemplateEntryType',
+    3: 'TransactionResult'
+  },
+  17: { // Hash160
+    1: 'TakerPaysCurrency',
+    2: 'TakerPaysIssuer',
+    3: 'TakerGetsCurrency',
+    4: 'TakerGetsIssuer'
+  },
+  18: { // PathSet
+    1: 'Paths'
+  },
+  19: { // Vector256
+    1: 'Indexes',
+    2: 'Hashes',
+    3: 'Amendments'
+  }
+};
+
+var INVERSE_FIELDS_MAP = exports.fieldsInverseMap = { };
+
+Object.keys(FIELDS_MAP).forEach(function(k1) {
+  Object.keys(FIELDS_MAP[k1]).forEach(function(k2) {
+    INVERSE_FIELDS_MAP[FIELDS_MAP[k1][k2]] = [ Number(k1), Number(k2) ];
+  });
+});
 
 var REQUIRED = exports.REQUIRED = 0,
     OPTIONAL = exports.OPTIONAL = 1,
     DEFAULT  = exports.DEFAULT  = 2;
 
-ST.Int16.id               = 1;
-ST.Int32.id               = 2;
-ST.Int64.id               = 3;
-ST.Hash128.id             = 4;
-ST.Hash256.id             = 5;
-ST.Amount.id              = 6;
-ST.VariableLength.id      = 7;
-ST.Account.id             = 8;
-ST.Object.id              = 14;
-ST.Array.id               = 15;
-ST.Int8.id                = 16;
-ST.Hash160.id             = 17;
-ST.PathSet.id             = 18;
-ST.Vector256.id           = 19;
-
 var base = [
-  [ 'TransactionType'    , REQUIRED,  2, ST.Int16 ],
-  [ 'Flags'              , OPTIONAL,  2, ST.Int32 ],
-  [ 'SourceTag'          , OPTIONAL,  3, ST.Int32 ],
-  [ 'Account'            , REQUIRED,  1, ST.Account ],
-  [ 'Sequence'           , REQUIRED,  4, ST.Int32 ],
-  [ 'Fee'                , REQUIRED,  8, ST.Amount ],
-  [ 'OperationLimit'     , OPTIONAL, 29, ST.Int32 ],
-  [ 'SigningPubKey'      , REQUIRED,  3, ST.VariableLength ],
-  [ 'TxnSignature'       , OPTIONAL,  4, ST.VariableLength ]
+  [ 'TransactionType'    , REQUIRED ],
+  [ 'Flags'              , OPTIONAL ],
+  [ 'SourceTag'          , OPTIONAL ],
+  [ 'LastLedgerSequence' , OPTIONAL ],
+  [ 'Account'            , REQUIRED ],
+  [ 'Sequence'           , REQUIRED ],
+  [ 'Fee'                , REQUIRED ],
+  [ 'OperationLimit'     , OPTIONAL ],
+  [ 'SigningPubKey'      , REQUIRED ],
+  [ 'TxnSignature'       , OPTIONAL ]
 ];
 
 exports.tx = {
   AccountSet: [3].concat(base, [
-    [ 'EmailHash'          , OPTIONAL,  1, ST.Hash128 ],
-    [ 'WalletLocator'      , OPTIONAL,  7, ST.Hash256 ],
-    [ 'WalletSize'         , OPTIONAL, 12, ST.Int32 ],
-    [ 'MessageKey'         , OPTIONAL,  2, ST.VariableLength ],
-    [ 'Domain'             , OPTIONAL,  7, ST.VariableLength ],
-    [ 'TransferRate'       , OPTIONAL, 11, ST.Int32 ]
+    [ 'EmailHash'          , OPTIONAL ],
+    [ 'WalletLocator'      , OPTIONAL ],
+    [ 'WalletSize'         , OPTIONAL ],
+    [ 'MessageKey'         , OPTIONAL ],
+    [ 'Domain'             , OPTIONAL ],
+    [ 'TransferRate'       , OPTIONAL ],
+    [ 'SetFlag'            , OPTIONAL ],
+    [ 'ClearFlag'          , OPTIONAL ]
   ]),
   TrustSet: [20].concat(base, [
-    [ 'LimitAmount'        , OPTIONAL,  3, ST.Amount ],
-    [ 'QualityIn'          , OPTIONAL, 20, ST.Int32 ],
-    [ 'QualityOut'         , OPTIONAL, 21, ST.Int32 ]
+    [ 'LimitAmount'        , OPTIONAL ],
+    [ 'QualityIn'          , OPTIONAL ],
+    [ 'QualityOut'         , OPTIONAL ]
   ]),
   OfferCreate: [7].concat(base, [
-    [ 'TakerPays'          , REQUIRED,  4, ST.Amount ],
-    [ 'TakerGets'          , REQUIRED,  5, ST.Amount ],
-    [ 'Expiration'         , OPTIONAL, 10, ST.Int32 ]
+    [ 'TakerPays'          , REQUIRED ],
+    [ 'TakerGets'          , REQUIRED ],
+    [ 'Expiration'         , OPTIONAL ],
+    [ 'OfferSequence'      , OPTIONAL ]
   ]),
   OfferCancel: [8].concat(base, [
-    [ 'OfferSequence'      , REQUIRED, 25, ST.Int32 ]
+    [ 'OfferSequence'      , REQUIRED ]
   ]),
   SetRegularKey: [5].concat(base, [
-    [ 'RegularKey'         , REQUIRED,  8, ST.Account ]
+    [ 'RegularKey'         , OPTIONAL ]
   ]),
   Payment: [0].concat(base, [
-    [ 'Destination'        , REQUIRED,  3, ST.Account ],
-    [ 'Amount'             , REQUIRED,  1, ST.Amount ],
-    [ 'SendMax'            , OPTIONAL,  9, ST.Amount ],
-    [ 'Paths'              , DEFAULT ,  1, ST.PathSet ],
-    [ 'InvoiceID'          , OPTIONAL, 17, ST.Hash256 ],
-    [ 'DestinationTag'     , OPTIONAL, 14, ST.Int32 ]
+    [ 'Destination'        , REQUIRED ],
+    [ 'Amount'             , REQUIRED ],
+    [ 'SendMax'            , OPTIONAL ],
+    [ 'Paths'              , DEFAULT  ],
+    [ 'InvoiceID'          , OPTIONAL ],
+    [ 'DestinationTag'     , OPTIONAL ]
   ]),
   Contract: [9].concat(base, [
-    [ 'Expiration'         , REQUIRED, 10, ST.Int32 ],
-    [ 'BondAmount'         , REQUIRED, 23, ST.Int32 ],
-    [ 'StampEscrow'        , REQUIRED, 22, ST.Int32 ],
-    [ 'RippleEscrow'       , REQUIRED, 17, ST.Amount ],
-    [ 'CreateCode'         , OPTIONAL, 11, ST.VariableLength ],
-    [ 'FundCode'           , OPTIONAL,  8, ST.VariableLength ],
-    [ 'RemoveCode'         , OPTIONAL,  9, ST.VariableLength ],
-    [ 'ExpireCode'         , OPTIONAL, 10, ST.VariableLength ]
+    [ 'Expiration'         , REQUIRED ],
+    [ 'BondAmount'         , REQUIRED ],
+    [ 'StampEscrow'        , REQUIRED ],
+    [ 'RippleEscrow'       , REQUIRED ],
+    [ 'CreateCode'         , OPTIONAL ],
+    [ 'FundCode'           , OPTIONAL ],
+    [ 'RemoveCode'         , OPTIONAL ],
+    [ 'ExpireCode'         , OPTIONAL ]
   ]),
   RemoveContract: [10].concat(base, [
-    [ 'Target'             , REQUIRED,  7, ST.Account ]
+    [ 'Target'             , REQUIRED ]
   ]),
   EnableFeature: [100].concat(base, [
-    [ 'Feature'            , REQUIRED, 19, ST.Hash256 ]
+    [ 'Feature'            , REQUIRED ]
+  ]),
+  EnableAmendment: [100].concat(base, [
+    [ 'Amendment'          , REQUIRED ]
   ]),
   SetFee: [101].concat(base, [
-    [ 'Features'           , REQUIRED,  9, ST.Array ],
-    [ 'BaseFee'            , REQUIRED,  5, ST.Int64 ],
-    [ 'ReferenceFeeUnits'  , REQUIRED, 30, ST.Int32 ],
-    [ 'ReserveBase'        , REQUIRED, 31, ST.Int32 ],
-    [ 'ReserveIncrement'   , REQUIRED, 32, ST.Int32 ]
+    [ 'BaseFee'            , REQUIRED ],
+    [ 'ReferenceFeeUnits'  , REQUIRED ],
+    [ 'ReserveBase'        , REQUIRED ],
+    [ 'ReserveIncrement'   , REQUIRED ]
+  ]),
+  TicketCreate: [10].concat(base, [
+    [ 'Target'             , OPTIONAL ],
+    [ 'Expiration'         , OPTIONAL ]
+  ]),
+  TicketCancel: [11].concat(base, [
+    [ 'TicketID'           , REQUIRED ]
   ])
 };
+
+var sleBase = [
+  ['LedgerIndex',          OPTIONAL],
+  ['LedgerEntryType',      REQUIRED],
+  ['Flags',                REQUIRED]
+];
+
+exports.ledger = {
+  AccountRoot: [97].concat(sleBase,[
+    ['Sequence',           REQUIRED],
+    ['PreviousTxnLgrSeq',  REQUIRED],
+    ['TransferRate',       OPTIONAL],
+    ['WalletSize',         OPTIONAL],
+    ['OwnerCount',         REQUIRED],
+    ['EmailHash',          OPTIONAL],
+    ['PreviousTxnID',      REQUIRED],
+    ['AccountTxnID',       OPTIONAL],
+    ['WalletLocator',      OPTIONAL],
+    ['Balance',            REQUIRED],
+    ['MessageKey',         OPTIONAL],
+    ['Domain',             OPTIONAL],
+    ['Account',            REQUIRED],
+    ['RegularKey',         OPTIONAL]]),
+  Contract: [99].concat(sleBase,[
+    ['PreviousTxnLgrSeq',  REQUIRED],
+    ['Expiration',         REQUIRED],
+    ['BondAmount',         REQUIRED],
+    ['PreviousTxnID',      REQUIRED],
+    ['Balance',            REQUIRED],
+    ['FundCode',           OPTIONAL],
+    ['RemoveCode',         OPTIONAL],
+    ['ExpireCode',         OPTIONAL],
+    ['CreateCode',         OPTIONAL],
+    ['Account',            REQUIRED],
+    ['Owner',              REQUIRED],
+    ['Issuer',             REQUIRED]]),
+  DirectoryNode: [100].concat(sleBase,[
+    ['IndexNext',          OPTIONAL],
+    ['IndexPrevious',      OPTIONAL],
+    ['ExchangeRate',       OPTIONAL],
+    ['RootIndex',          REQUIRED],
+    ['Owner',              OPTIONAL],
+    ['TakerPaysCurrency',  OPTIONAL],
+    ['TakerPaysIssuer',    OPTIONAL],
+    ['TakerGetsCurrency',  OPTIONAL],
+    ['TakerGetsIssuer',    OPTIONAL],
+    ['Indexes',            REQUIRED]]),
+  EnabledFeatures: [102].concat(sleBase,[
+    ['Features',           REQUIRED]]),
+  FeeSettings: [115].concat(sleBase,[
+    ['ReferenceFeeUnits',  REQUIRED],
+    ['ReserveBase',        REQUIRED],
+    ['ReserveIncrement',   REQUIRED],
+    ['BaseFee',            REQUIRED],
+    ['LedgerIndex',        OPTIONAL]]),
+  GeneratorMap: [103].concat(sleBase,[
+    ['Generator',          REQUIRED]]),
+  LedgerHashes: [104].concat(sleBase,[
+    ['LedgerEntryType',      REQUIRED],
+    ['Flags',                REQUIRED],
+    ['FirstLedgerSequence',  OPTIONAL],
+    ['LastLedgerSequence',   OPTIONAL],
+    ['LedgerIndex',          OPTIONAL],
+    ['Hashes',               REQUIRED]]),
+  Nickname: [110].concat(sleBase,[
+    ['LedgerEntryType',     REQUIRED],
+    ['Flags',               REQUIRED],
+    ['LedgerIndex',         OPTIONAL],
+    ['MinimumOffer',        OPTIONAL],
+    ['Account',             REQUIRED]]),
+  Offer: [111].concat(sleBase,[
+    ['LedgerEntryType',     REQUIRED],
+    ['Flags',               REQUIRED],
+    ['Sequence',            REQUIRED],
+    ['PreviousTxnLgrSeq',   REQUIRED],
+    ['Expiration',          OPTIONAL],
+    ['BookNode',            REQUIRED],
+    ['OwnerNode',           REQUIRED],
+    ['PreviousTxnID',       REQUIRED],
+    ['LedgerIndex',         OPTIONAL],
+    ['BookDirectory',       REQUIRED],
+    ['TakerPays',           REQUIRED],
+    ['TakerGets',           REQUIRED],
+    ['Account',             REQUIRED]]),
+  RippleState: [114].concat(sleBase,[
+    ['LedgerEntryType',     REQUIRED],
+    ['Flags',               REQUIRED],
+    ['PreviousTxnLgrSeq',   REQUIRED],
+    ['HighQualityIn',       OPTIONAL],
+    ['HighQualityOut',      OPTIONAL],
+    ['LowQualityIn',        OPTIONAL],
+    ['LowQualityOut',       OPTIONAL],
+    ['LowNode',             OPTIONAL],
+    ['HighNode',            OPTIONAL],
+    ['PreviousTxnID',       REQUIRED],
+    ['LedgerIndex',         OPTIONAL],
+    ['Balance',             REQUIRED],
+    ['LowLimit',            REQUIRED],
+    ['HighLimit',           REQUIRED]])
+};
+
+exports.metadata = [
+  [ 'TransactionIndex'     , REQUIRED ],
+  [ 'TransactionResult'    , REQUIRED ],
+  [ 'AffectedNodes'        , REQUIRED ]
+];
+
+exports.ter = {
+  tesSUCCESS               : 0,
+  tecCLAIM                 : 100,
+  tecPATH_PARTIAL          : 101,
+  tecUNFUNDED_ADD          : 102,
+  tecUNFUNDED_OFFER        : 103,
+  tecUNFUNDED_PAYMENT      : 104,
+  tecFAILED_PROCESSING     : 105,
+  tecDIR_FULL              : 121,
+  tecINSUF_RESERVE_LINE    : 122,
+  tecINSUF_RESERVE_OFFER   : 123,
+  tecNO_DST                : 124,
+  tecNO_DST_INSUF_XRP      : 125,
+  tecNO_LINE_INSUF_RESERVE : 126,
+  tecNO_LINE_REDUNDANT     : 127,
+  tecPATH_DRY              : 128,
+  tecUNFUNDED              : 129,  // Deprecated, old ambiguous unfunded.
+  tecMASTER_DISABLED       : 130,
+  tecNO_REGULAR_KEY        : 131,
+  tecOWNERS                : 132,
+  tecNO_ISSUER             : 133,
+  tecNO_AUTH               : 134,
+  tecNO_LINE               : 135,
+  tecINSUFF_FEE            : 136,
+  tecFROZEN                : 137,
+  tecNO_TARGET             : 138,
+  tecNO_PERMISSION         : 139,
+  tecNO_ENTRY              : 140,
+  tecINSUFFICIENT_RESERVE  : 141,
+  tecNEED_MASTER_KEY       : 142,
+  tecDST_TAG_NEEDED        : 143,
+  tecINTERNAL              : 144
+};

src/js/ripple/config.js

@@ -1,6 +1,6 @@
 // This object serves as a singleton to store config options
 
-var extend = require("extend");
+var extend = require('extend');
 
 var config = module.exports = {
   load: function (newOpts) {

src/js/ripple/currency.js

@@ -1,10 +1,15 @@
+'use strict';
+
+var extend = require('extend');
+var UInt160 = require('./uint160').UInt160;
+var utils = require('./utils');
+var Float = require('./ieee754').Float;
 
 //
 // Currency support
 //
 
-// XXX Internal form should be UInt160.
-var Currency = function () {
+var Currency = extend(function() {
   // Internal form: 0 = XRP. 3 letter-code.
   // XXX Internal should be 0 or hex with three letter annotation when valid.
 
@@ -14,74 +19,384 @@ var Currency = function () {
   // XXX Should support hex, C++ doesn't currently allow it.
 
   this._value = NaN;
-}
+  this._update();
+}, UInt160);
 
-// Given "USD" return the json.
-Currency.json_rewrite = function (j) {
-  return Currency.from_json(j).to_json();
+Currency.prototype = extend({}, UInt160.prototype);
+Currency.prototype.constructor = Currency;
+
+Currency.HEX_CURRENCY_BAD = '0000000000000000000000005852500000000000';
+
+/**
+ * Tries to correctly interpret a Currency as entered by a user.
+ *
+ * Examples:
+ *
+ *  USD                               => currency
+ *  USD - Dollar                      => currency with optional full currency
+ *                                       name
+ *  XAU (-0.5%pa)                     => XAU with 0.5% effective demurrage rate
+ *                                       per year
+ *  XAU - Gold (-0.5%pa)              => Optionally allowed full currency name
+ *  USD (1%pa)                        => US dollars with 1% effective interest
+ *                                       per year
+ *  INR - Indian Rupees               => Optional full currency name with spaces
+ *  TYX - 30-Year Treasuries          => Optional full currency with numbers
+ *                                       and a dash
+ *  TYX - 30-Year Treasuries (1.5%pa) => Optional full currency with numbers,
+ *                                       dash and interest rate
+ *
+ *  The regular expression below matches above cases, broken down for better
+ *  understanding:
+ *
+ *  ^\s*                      // start with any amount of whitespace
+ *  ([a-zA-Z]{3}|[0-9]{3})    // either 3 letter alphabetic currency-code or 3
+ *                               digit numeric currency-code. See ISO 4217
+ *  (\s*-\s*[- \w]+)          // optional full currency name following the dash
+ *                               after currency code, full currency code can
+ *                               contain letters, numbers and dashes
+ *  (\s*\(-?\d+\.?\d*%pa\))?  // optional demurrage rate, has optional - and
+ *                               . notation (-0.5%pa)
+ *  \s*$                      // end with any amount of whitespace
+ *
+ */
+
+/*eslint-disable max-len*/
+Currency.prototype.human_RE = /^\s*([a-zA-Z0-9\<\>\(\)\{\}\[\]\|\?\!\@\#\$\%\^\&]{3})(\s*-\s*[- \w]+)?(\s*\(-?\d+\.?\d*%pa\))?\s*$/;
+/*eslint-enable max-len*/
+
+Currency.from_json = function(j, shouldInterpretXrpAsIou) {
+    return (new Currency()).parse_json(j, shouldInterpretXrpAsIou);
 };
 
-Currency.from_json = function (j) {
-  if (j instanceof Currency) return j.clone();
-  else if ('string' === typeof j || 'number' === typeof j) return (new Currency()).parse_json(j);
-  else return new Currency(); // NaN
-};
-
-Currency.is_valid = function (j) {
-  return Currency.from_json(j).is_valid();
-};
-
-Currency.prototype.clone = function() {
-  return this.copyTo(new Currency());
-};
-
-// Returns copy.
-Currency.prototype.copyTo = function (d) {
-  d._value = this._value;
-
-  return d;
-};
-
-Currency.prototype.equals = function (d) {
-  return ('string' !== typeof this._value && isNaN(this._value))
-    || ('string' !== typeof d._value && isNaN(d._value)) ? false : this._value === d._value;
+Currency.from_human = function(j, opts) {
+  return (new Currency().parse_human(j, opts));
 };
 
 // this._value = NaN on error.
-Currency.prototype.parse_json = function (j) {
-  if ("" === j || "0" === j || "XRP" === j) {
-    this._value	= 0;
-  }
-  else if ('number' === typeof j) {
-    // XXX This is a hack
-    this._value	= j;
-  }
-  else if ('string' != typeof j || 3 !== j.length) {
+Currency.prototype.parse_json = function(j, shouldInterpretXrpAsIou) {
   this._value = NaN;
+
+  if (j instanceof Currency) {
+    this._value = j.copyTo({})._value;
+    this._update();
+    return this;
   }
-  else {
-    this._value	= j;
+
+  switch (typeof j) {
+    case 'number':
+      if (!isNaN(j)) {
+        this.parse_number(j);
+      }
+      break;
+    case 'string':
+      if (!j || j === '0') {
+        // Empty string or XRP
+        this.parse_hex(shouldInterpretXrpAsIou
+          ? Currency.HEX_CURRENCY_BAD
+          : Currency.HEX_ZERO);
+        break;
+      }
+
+      if (j === '1') {
+        // 'no currency'
+        this.parse_hex(Currency.HEX_ONE);
+        break;
+      }
+
+      if (/^[A-F0-9]{40}$/.test(j)) {
+        // Hex format
+        this.parse_hex(j);
+        break;
+      }
+
+      // match the given string to see if it's in an allowed format
+      var matches = j.match(this.human_RE);
+
+      if (matches) {
+        var currencyCode = matches[1];
+
+        // for the currency 'XRP' case
+        // we drop everything else that could have been provided
+        // e.g. 'XRP - Ripple'
+        if (!currencyCode || /^(0|XRP)$/.test(currencyCode)) {
+          this.parse_hex(shouldInterpretXrpAsIou
+            ? Currency.HEX_CURRENCY_BAD
+            : Currency.HEX_ZERO);
+
+          // early break, we can't have interest on XRP
+          break;
+        }
+
+        // the full currency is matched as it is part of the valid currency
+        // format, but not stored
+        // var full_currency = matches[2] || '';
+        var interest = matches[3] || '';
+
+        // interest is defined as interest per year, per annum (pa)
+        var percentage = interest.match(/(-?\d+\.?\d+)/);
+
+        currencyCode = currencyCode.toUpperCase();
+
+        var currencyData = utils.arraySet(20, 0);
+
+        if (percentage) {
+          /*
+           * 20 byte layout of a interest bearing currency
+           *
+           * 01 __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __
+           *    CURCODE- DATE------- RATE------------------- RESERVED---
+           */
+
+          // byte 1 for type, use '1' to denote demurrage currency
+          currencyData[0] = 1;
+
+          // byte 2-4 for currency code
+          currencyData[1] = currencyCode.charCodeAt(0) & 0xff;
+          currencyData[2] = currencyCode.charCodeAt(1) & 0xff;
+          currencyData[3] = currencyCode.charCodeAt(2) & 0xff;
+
+          // byte 5-8 are for reference date, but should always be 0 so we
+          // won't fill it
+
+          // byte 9-16 are for the interest
+          percentage = parseFloat(percentage[0]);
+
+          // the interest or demurrage is expressed as a yearly (per annum)
+          // value
+          var secondsPerYear = 31536000; // 60 * 60 * 24 * 365
+
+          // Calculating the interest e-fold
+          // 0.5% demurrage is expressed 0.995, 0.005 less than 1
+          // 0.5% interest is expressed as 1.005, 0.005 more than 1
+          var interestEfold = secondsPerYear / Math.log(1 + percentage / 100);
+          var bytes = Float.toIEEE754Double(interestEfold);
+
+          for (var i = 0; i <= bytes.length; i++) {
+            currencyData[8 + i] = bytes[i] & 0xff;
+          }
+
+          // the last 4 bytes are reserved for future use, so we won't fill
+          // those
+
+        } else {
+          currencyData[12] = currencyCode.charCodeAt(0) & 0xff;
+          currencyData[13] = currencyCode.charCodeAt(1) & 0xff;
+          currencyData[14] = currencyCode.charCodeAt(2) & 0xff;
+        }
+
+        this.parse_bytes(currencyData);
+      }
+      break;
   }
 
   return this;
 };
 
+Currency.prototype.parse_human = function(j) {
+  return this.parse_json(j);
+};
+
+/**
+ * Recalculate internal representation.
+ *
+ * You should never need to call this.
+ */
+
+Currency.prototype._update = function() {
+  var bytes = this.to_bytes();
+
+  // is it 0 everywhere except 12, 13, 14?
+  var isZeroExceptInStandardPositions = true;
+
+  if (!bytes) {
+    return;
+  }
+
+  this._native = false;
+  this._type = -1;
+  this._interest_start = NaN;
+  this._interest_period = NaN;
+  this._iso_code = '';
+
+  for (var i = 0; i < 20; i++) {
+    isZeroExceptInStandardPositions = isZeroExceptInStandardPositions
+    && (i === 12 || i === 13 || i === 14 || bytes[i] === 0);
+  }
+
+  if (isZeroExceptInStandardPositions) {
+    this._iso_code = String.fromCharCode(bytes[12])
+                   + String.fromCharCode(bytes[13])
+                   + String.fromCharCode(bytes[14]);
+
+    if (this._iso_code === '\u0000\u0000\u0000') {
+      this._native = true;
+      this._iso_code = 'XRP';
+    }
+
+    this._type = 0;
+  } else if (bytes[0] === 0x01) { // Demurrage currency
+    this._iso_code = String.fromCharCode(bytes[1])
+                   + String.fromCharCode(bytes[2])
+                   + String.fromCharCode(bytes[3]);
+
+    this._type = 1;
+    this._interest_start = (bytes[4] << 24) +
+                           (bytes[5] << 16) +
+                           (bytes[6] << 8) +
+                           (bytes[7]);
+    this._interest_period = Float.fromIEEE754Double(bytes.slice(8, 16));
+  }
+};
+
+// XXX Probably not needed anymore?
+/*
+Currency.prototype.parse_bytes = function(byte_array) {
+  if (Array.isArray(byte_array) && byte_array.length === 20) {
+    var result;
+    // is it 0 everywhere except 12, 13, 14?
+    var isZeroExceptInStandardPositions = true;
+
+    for (var i=0; i<20; i++) {
+      isZeroExceptInStandardPositions = isZeroExceptInStandardPositions
+      && (i===12 || i===13 || i===14 || byte_array[0]===0)
+    }
+
+    if (isZeroExceptInStandardPositions) {
+      var currencyCode = String.fromCharCode(byte_array[12])
+      + String.fromCharCode(byte_array[13])
+      + String.fromCharCode(byte_array[14]);
+      if (/^[A-Z0-9]{3}$/.test(currencyCode) && currencyCode !== 'XRP' ) {
+        this._value = currencyCode;
+      } else if (currencyCode === '\0\0\0') {
+        this._value = 0;
+      } else {
+        this._value = NaN;
+      }
+    } else {
+      // XXX Should support non-standard currency codes
+      this._value = NaN;
+    }
+  } else {
+    this._value = NaN;
+  }
+  return this;
+};
+*/
+
 Currency.prototype.is_native = function() {
-  return !isNaN(this._value) && !this._value;
+  return this._native;
 };
 
-Currency.prototype.is_valid = function () {
-  return 'string' === typeof this._value || !isNaN(this._value);
+/**
+ * @return {Boolean} whether this currency is an interest-bearing currency
+ */
+
+Currency.prototype.has_interest = function() {
+  return this._type === 1
+  && !isNaN(this._interest_start)
+  && !isNaN(this._interest_period);
 };
 
-Currency.prototype.to_json = function () {
-  return this._value ? this._value : "XRP";
+/**
+ *
+ * @param {number} referenceDate number of seconds since the Ripple Epoch
+ * (0:00 on January 1, 2000 UTC) used to calculate the
+ * interest over provided interval pass in one years
+ * worth of seconds to ge the yearly interest
+ * @returns {number} interest for provided interval, can be negative for
+ * demurred currencies
+ */
+Currency.prototype.get_interest_at = function(referenceDate) {
+  if (!this.has_interest()) {
+    return 0;
+  }
+
+  // use one year as a default period
+  if (!referenceDate) {
+    referenceDate = this._interest_start + 3600 * 24 * 365;
+  }
+
+  if (referenceDate instanceof Date) {
+    referenceDate = utils.fromTimestamp(referenceDate.getTime());
+  }
+
+  // calculate interest by e-fold number
+  return Math.exp((referenceDate - this._interest_start)
+                / this._interest_period);
 };
 
-Currency.prototype.to_human = function () {
-  return this._value ? this._value : "XRP";
+Currency.prototype.get_interest_percentage_at
+= function(referenceDate, decimals) {
+  var interest = this.get_interest_at(referenceDate, decimals);
+
+  // convert to percentage
+  interest = (interest * 100) - 100;
+  var decimalMultiplier = decimals ? Math.pow(10, decimals) : 100;
+
+  // round to two decimals behind the dot
+  return Math.round(interest * decimalMultiplier) / decimalMultiplier;
+};
+
+// XXX Currently we inherit UInt.prototype.is_valid, which is mostly fine.
+//
+//     We could be doing further checks into the internal format of the
+//     currency data, since there are some values that are invalid.
+//
+// Currency.prototype.is_valid = function() {
+//  return UInt.prototype.is_valid() && ...;
+// };
+
+Currency.prototype.to_json = function(opts) {
+  if (!this.is_valid()) {
+    // XXX This is backwards compatible behavior, but probably not very good.
+    return 'XRP';
+  }
+
+  if (!opts) {
+    opts = {};
+  }
+
+  var currency;
+  var fullName = opts && opts.full_name ? ' - ' + opts.full_name : '';
+  opts.show_interest = opts.show_interest !== undefined
+  ? opts.show_interest
+  : this.has_interest();
+
+  if (!opts.force_hex && /^[A-Z0-9]{3}$/.test(this._iso_code)) {
+    currency = this._iso_code + fullName;
+    if (opts.show_interest) {
+      var decimals = !isNaN(opts.decimals) ? opts.decimals : undefined;
+      var interestPercentage = this.has_interest()
+      ? this.get_interest_percentage_at(
+          this._interest_start + 3600 * 24 * 365, decimals
+        )
+      : 0;
+      currency += ' (' + interestPercentage + '%pa)';
+    }
+
+  } else {
+    // Fallback to returning the raw currency hex
+    currency = this.to_hex();
+
+    // XXX This is to maintain backwards compatibility, but it is very, very
+    // odd behavior, so we should deprecate it and get rid of it as soon as
+    //  possible.
+    if (currency === Currency.HEX_ONE) {
+      currency = 1;
+    }
+  }
+
+  return currency;
+};
+
+Currency.prototype.to_human = function(opts) {
+  // to_human() will always print the human-readable currency code if available.
+  return this.to_json(opts);
+};
+
+Currency.prototype.get_iso = function() {
+  return this._iso_code;
 };
 
 exports.Currency = Currency;
-
-// vim:sw=2:sts=2:ts=8:et

src/js/ripple/float.js

@@ -0,0 +1,59 @@
+/**
+ * IEEE 754 floating-point.
+ *
+ * Supports single- or double-precision
+ */
+var Float = exports.Float = {};
+
+var allZeros = /^0+$/;
+var allOnes = /^1+$/;
+
+Float.fromBytes = function(bytes) {
+  // Render in binary.  Hackish.
+  var b = '';
+
+  for (var i = 0, n = bytes.length; i < n; i++) {
+    var bits = (bytes[i] & 0xff).toString(2);
+
+    while (bits.length < 8) {
+      bits = '0' + bits;
+    }
+
+    b += bits;
+  }
+
+  // Determine configuration.  This could have all been precomputed but it is fast enough.
+  var exponentBits = bytes.length === 4 ? 4 : 11;
+  var mantissaBits = (bytes.length * 8) - exponentBits - 1;
+  var bias = Math.pow(2, exponentBits - 1) - 1;
+  var minExponent = 1 - bias - mantissaBits;
+
+  // Break up the binary representation into its pieces for easier processing.
+  var s = b[0];
+  var e = b.substring(1, exponentBits + 1);
+  var m = b.substring(exponentBits + 1);
+
+  var value = 0;
+  var multiplier = (s === '0' ? 1 : -1);
+
+  if (allZeros.test(e)) {
+    // Zero or denormalized
+    if (!allZeros.test(m)) {
+      value = parseInt(m, 2) * Math.pow(2, minExponent);
+    }
+  } else if (allOnes.test(e)) {
+    // Infinity or NaN
+    if (allZeros.test(m)) {
+      value = Infinity;
+    } else {
+      value = NaN;
+    }
+  } else {
+    // Normalized
+    var exponent = parseInt(e, 2) - bias;
+    var mantissa = parseInt(m, 2);
+    value = (1 + (mantissa * Math.pow(2, -mantissaBits))) * Math.pow(2, exponent);
+  }
+
+  return value * multiplier;
+};

src/js/ripple/hashprefixes.js

@@ -0,0 +1,25 @@
+/**
+ * Prefix for hashing functions.
+ *
+ * These prefixes are inserted before the source material used to
+ * generate various hashes. This is done to put each hash in its own
+ * "space." This way, two different types of objects with the
+ * same binary data will produce different hashes.
+ *
+ * Each prefix is a 4-byte value with the last byte set to zero
+ * and the first three bytes formed from the ASCII equivalent of
+ * some arbitrary string. For example "TXN".
+ */
+
+// transaction plus signature to give transaction ID
+exports.HASH_TX_ID           = 0x54584E00; // 'TXN'
+// transaction plus metadata
+exports.HASH_TX_NODE         = 0x534E4400; // 'TND'
+// inner node in tree
+exports.HASH_INNER_NODE      = 0x4D494E00; // 'MIN'
+// leaf node in tree
+exports.HASH_LEAF_NODE       = 0x4D4C4E00; // 'MLN'
+// inner transaction to sign
+exports.HASH_TX_SIGN         = 0x53545800; // 'STX'
+// inner transaction to sign (TESTNET)
+exports.HASH_TX_SIGN_TESTNET = 0x73747800; // 'stx'

src/js/ripple/ieee754.js

@@ -0,0 +1,107 @@
+// Convert a JavaScript number to IEEE-754 Double Precision
+// value represented as an array of 8 bytes (octets)
+//
+// Based on:
+// http://cautionsingularityahead.blogspot.com/2010/04/javascript-and-ieee754-redux.html
+//
+// Found and modified from:
+// https://gist.github.com/bartaz/1119041
+
+var Float = exports.Float = {};
+
+Float.toIEEE754 = function(v, ebits, fbits) {
+
+  var bias = (1 << (ebits - 1)) - 1;
+
+  // Compute sign, exponent, fraction
+  var s, e, f;
+  if (isNaN(v)) {
+    e = (1 << bias) - 1; f = 1; s = 0;
+  }
+  else if (v === Infinity || v === -Infinity) {
+    e = (1 << bias) - 1; f = 0; s = (v < 0) ? 1 : 0;
+  }
+  else if (v === 0) {
+    e = 0; f = 0; s = (1 / v === -Infinity) ? 1 : 0;
+  }
+  else {
+    s = v < 0;
+    v = Math.abs(v);
+
+    if (v >= Math.pow(2, 1 - bias)) {
+      var ln = Math.min(Math.floor(Math.log(v) / Math.LN2), bias);
+      e = ln + bias;
+      f = v * Math.pow(2, fbits - ln) - Math.pow(2, fbits);
+    }
+    else {
+      e = 0;
+      f = v / Math.pow(2, 1 - bias - fbits);
+    }
+  }
+
+  // Pack sign, exponent, fraction
+  var i, bits = [];
+  for (i = fbits; i; i -= 1) { bits.push(f % 2 ? 1 : 0); f = Math.floor(f / 2); }
+  for (i = ebits; i; i -= 1) { bits.push(e % 2 ? 1 : 0); e = Math.floor(e / 2); }
+  bits.push(s ? 1 : 0);
+  bits.reverse();
+  var str = bits.join('');
+
+  // Bits to bytes
+  var bytes = [];
+  while (str.length) {
+    bytes.push(parseInt(str.substring(0, 8), 2));
+    str = str.substring(8);
+  }
+  return bytes;
+}
+
+Float.fromIEEE754 = function(bytes, ebits, fbits) {
+
+  // Bytes to bits
+  var bits = [];
+  for (var i = bytes.length; i; i -= 1) {
+    var byte = bytes[i - 1];
+    for (var j = 8; j; j -= 1) {
+      bits.push(byte % 2 ? 1 : 0); byte = byte >> 1;
+    }
+  }
+  bits.reverse();
+  var str = bits.join('');
+
+  // Unpack sign, exponent, fraction
+  var bias = (1 << (ebits - 1)) - 1;
+  var s = parseInt(str.substring(0, 1), 2) ? -1 : 1;
+  var e = parseInt(str.substring(1, 1 + ebits), 2);
+  var f = parseInt(str.substring(1 + ebits), 2);
+
+  // Produce number
+  if (e === (1 << ebits) - 1) {
+    return f !== 0 ? NaN : s * Infinity;
+  }
+  else if (e > 0) {
+    return s * Math.pow(2, e - bias) * (1 + f / Math.pow(2, fbits));
+  }
+  else if (f !== 0) {
+    return s * Math.pow(2, -(bias-1)) * (f / Math.pow(2, fbits));
+  }
+  else {
+    return s * 0;
+  }
+}
+
+Float.fromIEEE754Double = function(b) { return Float.fromIEEE754(b, 11, 52); }
+Float.toIEEE754Double = function(v) { return   Float.toIEEE754(v, 11, 52); }
+Float.fromIEEE754Single = function(b) { return Float.fromIEEE754(b,  8, 23); }
+Float.toIEEE754Single = function(v) { return   Float.toIEEE754(v,  8, 23); }
+
+
+// Convert array of octets to string binary representation
+// by bartaz
+
+Float.toIEEE754DoubleString = function(v) {
+  return exports.toIEEE754Double(v)
+    .map(function(n){ for(n = n.toString(2);n.length < 8;n="0"+n); return n })
+    .join('')
+    .replace(/(.)(.{11})(.{52})/, "$1 $2 $3")
+}

src/js/ripple/index.js

@@ -1,13 +1,27 @@
+'use strict';
 exports.Remote = require('./remote').Remote;
+exports.Request = require('./request').Request;
 exports.Amount = require('./amount').Amount;
+exports.Account = require('./account').Account;
+exports.Transaction = require('./transaction').Transaction;
 exports.Currency = require('./currency').Currency;
 exports.Base = require('./base').Base;
-exports.UInt160     = require('./amount').UInt160;
-exports.Seed        = require('./amount').Seed;
-exports.Transaction = require('./transaction').Transaction;
+exports.UInt128 = require('./uint128').UInt128;
+exports.UInt160 = require('./uint160').UInt160;
+exports.UInt256 = require('./uint256').UInt256;
+exports.Seed = require('./seed').Seed;
 exports.Meta = require('./meta').Meta;
-
+exports.SerializedObject = require('./serializedobject').SerializedObject;
+exports.RippleError = require('./rippleerror').RippleError;
+exports.Message = require('./message').Message;
+exports.binformat = require('./binformat');
 exports.utils = require('./utils');
+exports.Server = require('./server').Server;
+exports.Wallet = require('./wallet');
+exports.Ledger = require('./ledger').Ledger;
+exports.TransactionQueue = require('./transactionqueue').TransactionQueue;
+exports.RangeSet = require('./rangeset').RangeSet;
+exports.convertBase = require('./baseconverter');
 
 // Important: We do not guarantee any specific version of SJCL or for any
 // specific features to be included. The version and configuration may change at
@@ -16,8 +30,35 @@ exports.utils       = require('./utils');
 // However, for programs that are tied to a specific version of ripple.js like
 // the official client, it makes sense to expose the SJCL instance so we don't
 // have to include it twice.
-exports.sjcl      = require('../../../build/sjcl');
+exports.sjcl = require('./utils').sjcl;
+exports.types = require('./serializedtypes');
 
 exports.config = require('./config');
 
+// camelCase to under_scored API conversion
+function attachUnderscored(name) {
+ var o = exports[name];
+
+ Object.keys(o.prototype).forEach(function(key) {
+   var UPPERCASE = /([A-Z]{1})[a-z]+/g;
+
+   if (!UPPERCASE.test(key)) {
+     return;
+   }
+
+   var underscored = key.replace(UPPERCASE, function(c) {
+     return '_' + c.toLowerCase();
+   });
+
+   o.prototype[underscored] = o.prototype[key];
+ });
+}
+
+['Remote',
+ 'Request',
+ 'Transaction',
+ 'Account',
+ 'Server'
+].forEach(attachUnderscored);
+
 // vim:sw=2:sts=2:ts=8:et

src/js/ripple/keypair.js

@@ -1,40 +1,39 @@
-var sjcl    = require('../../../build/sjcl');
+'use strict';
 
+/*eslint new-cap: 1*/
+
+var sjcl = require('./utils').sjcl;
+
+var UInt160 = require('./uint160').UInt160;
 var UInt256 = require('./uint256').UInt256;
+var Base = require('./base').Base;
 
-var KeyPair = function ()
-{
-  this._curve = sjcl.ecc.curves['c256'];
+function KeyPair() {
+  this._curve = sjcl.ecc.curves.k256;
   this._secret = null;
   this._pubkey = null;
-};
-
-KeyPair.from_bn_secret = function (j)
-{
-  if (j instanceof this) {
-    return j.clone();
-  } else {
-    return (new this()).parse_bn_secret(j);
 }
+
+KeyPair.from_bn_secret = function(j) {
+  return (j instanceof this) ? j.clone() : (new this()).parse_bn_secret(j);
 };
 
-KeyPair.prototype.parse_bn_secret = function (j)
-{
-  this._secret = new sjcl.ecc.ecdsa.secretKey(sjcl.ecc.curves['c256'], j);
+KeyPair.prototype.parse_bn_secret = function(j) {
+  this._secret = new sjcl.ecc.ecdsa.secretKey(sjcl.ecc.curves.k256, j);
   return this;
 };
 
 /**
- * Returns public key as sjcl public key.
- *
  * @private
+ *
+ * @return {sjcl.ecc.ecdsa.publicKey} public key
  */
-KeyPair.prototype._pub = function ()
-{
+KeyPair.prototype._pub = function() {
   var curve = this._curve;
 
   if (!this._pubkey && this._secret) {
     var exponent = this._secret._exponent;
+
     this._pubkey = new sjcl.ecc.ecdsa.publicKey(curve, curve.G.mult(exponent));
   }
 
@@ -42,26 +41,62 @@ KeyPair.prototype._pub = function ()
 };
 
 /**
- * Returns public key as hex.
+ * @private
  *
- * Key will be returned as a compressed pubkey - 33 bytes converted to hex.
+ * @return {sjcl.bitArray} public key bits in compressed form
  */
-KeyPair.prototype.to_hex_pub = function ()
-{
+KeyPair.prototype._pub_bits = function() {
   var pub = this._pub();
-  if (!pub) return null;
+
+  if (!pub) {
+    return null;
+  }
 
   var point = pub._point, y_even = point.y.mod(2).equals(0);
-  return sjcl.codec.hex.fromBits(sjcl.bitArray.concat(
+
+  return sjcl.bitArray.concat(
     [sjcl.bitArray.partial(8, y_even ? 0x02 : 0x03)],
     point.x.toBits(this._curve.r.bitLength())
-  )).toUpperCase();
+  );
 };
 
-KeyPair.prototype.sign = function (hash)
-{
+/**
+ * @return {String} public key bytes in compressed form, hex encoded.
+ */
+KeyPair.prototype.to_hex_pub = function() {
+  var bits = this._pub_bits();
+
+  if (!bits) {
+    return null;
+  }
+
+  return sjcl.codec.hex.fromBits(bits).toUpperCase();
+};
+
+function sha256_ripemd160(bits) {
+  return sjcl.hash.ripemd160.hash(sjcl.hash.sha256.hash(bits));
+}
+
+KeyPair.prototype.get_address = function() {
+  var bits = this._pub_bits();
+
+  if (!bits) {
+    return null;
+  }
+
+  var hash = sha256_ripemd160(bits);
+
+  var address = UInt160.from_bits(hash);
+  address.set_version(Base.VER_ACCOUNT_ID);
+  return address;
+};
+
+KeyPair.prototype.sign = function(hash) {
+  var PARANOIA_256_BITS = 6; // sjcl constant for ensuring 256 bits of entropy
   hash = UInt256.from_json(hash);
-  return this._secret.signDER(hash.to_bits(), 0);
+  var sig = this._secret.sign(hash.to_bits(), PARANOIA_256_BITS);
+  sig = this._secret.canonicalizeSignature(sig);
+  return this._secret.encodeDER(sig);
 };
 
 exports.KeyPair = KeyPair;

src/js/ripple/ledger.js

@@ -0,0 +1,166 @@
+/* eslint-disable valid-jsdoc */
+'use strict';
+var Transaction = require('./transaction').Transaction;
+var SHAMap = require('./shamap').SHAMap;
+var SHAMapTreeNode = require('./shamap').SHAMapTreeNode;
+var SerializedObject = require('./serializedobject').SerializedObject;
+var stypes = require('./serializedtypes');
+var UInt160 = require('./uint160').UInt160;
+var Currency = require('./currency').Currency;
+
+function Ledger() {
+  this.ledger_json = {};
+}
+
+Ledger.from_json = function(v) {
+  var ledger = new Ledger();
+  ledger.parse_json(v);
+  return ledger;
+};
+
+Ledger.space = require('./ledgerspaces');
+
+/**
+ * Generate the key for an AccountRoot entry.
+ *
+ * @param {String|UInt160} account Ripple Account
+ * @return {UInt256}
+ */
+Ledger.calcAccountRootEntryHash =
+Ledger.prototype.calcAccountRootEntryHash = function(account) {
+  account = UInt160.from_json(account);
+
+  var index = new SerializedObject();
+
+  index.append([0, Ledger.space.account.charCodeAt(0)]);
+  index.append(account.to_bytes());
+
+  return index.hash();
+};
+
+/**
+ * Generate the key for an Offer entry.
+ *
+ * @param {String|UInt160} account Ripple Account
+ * @param {Number} sequence Sequence number of the OfferCreate transaction
+ *   that instantiated this offer.
+ * @return {UInt256}
+ */
+Ledger.calcOfferEntryHash =
+Ledger.prototype.calcOfferEntryHash = function(account, sequence) {
+  account = UInt160.from_json(account);
+  sequence = parseInt(sequence, 10);
+
+  var index = new SerializedObject();
+
+  index.append([0, Ledger.space.offer.charCodeAt(0)]);
+  index.append(account.to_bytes());
+  stypes.Int32.serialize(index, sequence);
+
+  return index.hash();
+};
+
+/**
+ * Generate the key for a RippleState entry.
+ *
+ * The ordering of the two account parameters does not matter.
+ *
+ * @param {String|UInt160} account1 First Ripple Account
+ * @param {String|UInt160} account2 Second Ripple Account
+ * @param {String|Currency} currency The currency code
+ * @return {UInt256}
+ */
+Ledger.calcRippleStateEntryHash =
+Ledger.prototype.calcRippleStateEntryHash = function(
+    account1, account2, currency) {
+  currency = Currency.from_json(currency);
+  account1 = UInt160.from_json(account1);
+  account2 = UInt160.from_json(account2);
+
+  if (!account1.is_valid()) {
+    throw new Error('Invalid first account');
+  }
+  if (!account2.is_valid()) {
+    throw new Error('Invalid second account');
+  }
+  if (!currency.is_valid()) {
+    throw new Error('Invalid currency');
+  }
+
+  // The lower ID has to come first
+  if (account1.to_bn().greaterEquals(account2.to_bn())) {
+    var tmp = account2;
+    account2 = account1;
+    account1 = tmp;
+  }
+
+  var index = new SerializedObject();
+
+  index.append([0, Ledger.space.rippleState.charCodeAt(0)]);
+  index.append(account1.to_bytes());
+  index.append(account2.to_bytes());
+  index.append(currency.to_bytes());
+
+  return index.hash();
+};
+
+Ledger.prototype.parse_json = function(v) {
+  this.ledger_json = v;
+};
+
+Ledger.prototype.calc_tx_hash = function() {
+  var tx_map = new SHAMap();
+
+  this.ledger_json.transactions.forEach(function(tx_json) {
+    var tx = Transaction.from_json(tx_json);
+    var meta = SerializedObject.from_json(tx_json.metaData);
+
+    var data = new SerializedObject();
+    stypes.VariableLength.serialize(data, tx.serialize().to_hex());
+    stypes.VariableLength.serialize(data, meta.to_hex());
+    tx_map.add_item(tx.hash(), data, SHAMapTreeNode.TYPE_TRANSACTION_MD);
+  });
+
+  return tx_map.hash();
+};
+
+/**
+* @param options .sanity_test {Boolean}
+* @return hash of shamap
+*
+*   If `true`, will serialize each accountState item to binary and then back to
+*   json before finally serializing for hashing. This is mostly to expose any
+*   issues with ripple-lib's binary <--> json codecs.
+*
+*/
+Ledger.prototype.calc_account_hash = function(options) {
+  var account_map = new SHAMap();
+  var erred;
+
+  this.ledger_json.accountState.forEach(function(le) {
+    var data = SerializedObject.from_json(le);
+
+    var json;
+    if (options && options.sanity_test) {
+      try {
+        json = data.to_json();
+        data = SerializedObject.from_json(json);
+      } catch (e) {
+        console.log('account state item: ', le);
+        console.log('to_json() ', json);
+        console.log('exception: ', e);
+        erred = true;
+      }
+    }
+
+    account_map.add_item(le.index, data, SHAMapTreeNode.TYPE_ACCOUNT_STATE);
+  });
+
+  if (erred) {
+    throw new Error('There were errors with sanity_test'); // all logged above
+  }
+
+  return account_map.hash();
+};
+
+exports.Ledger = Ledger;

src/js/ripple/ledgerspaces.js

@@ -0,0 +1,22 @@
+/**
+ * Ripple ledger namespace prefixes.
+ *
+ * The Ripple ledger is a key-value store. In order to avoid name collisions,
+ * names are partitioned into namespaces.
+ *
+ * Each namespace is just a single character prefix.
+ */
+module.exports = {
+  account        : 'a',
+  dirNode        : 'd',
+  generatorMap   : 'g',
+  nickname       : 'n',
+  rippleState    : 'r',
+  offer          : 'o',  // Entry for an offer.
+  ownerDir       : 'O',  // Directory of things owned by an account.
+  bookDir        : 'B',  // Directory of order books.
+  contract       : 'c',
+  skipList       : 's',
+  amendment      : 'f',
+  feeSettings    : 'e'
+};

src/js/ripple/log.js

@@ -0,0 +1,173 @@
+'use strict';
+
+/**
+ * Logging functionality for ripple-lib and any applications built on it.
+ *
+ * @param {String} namespace logging prefix
+ * @return {Void} this function does not return...
+ */
+function Log(namespace) {
+  if (!namespace) {
+    this._namespace = [];
+  } else if (Array.isArray(namespace)) {
+    this._namespace = namespace;
+  } else {
+    this._namespace = [String(namespace)];
+  }
+
+  this._prefix = this._namespace.concat(['']).join(': ');
+}
+
+/**
+ * Create a sub-logger.
+ *
+ * You can have a hierarchy of loggers.
+ *
+ * @example
+ *
+ *   var log = require('ripple').log.sub('server');
+ *
+ *   log.info('connection successful');
+ *   // prints: 'server: connection successful'
+ *
+ * @param {String} namespace logging prefix
+ * @return {Log} sub logger
+ */
+Log.prototype.sub = function(namespace) {
+  var subNamespace = this._namespace.slice();
+
+  if (namespace && typeof namespace === 'string') {
+    subNamespace.push(namespace);
+  }
+
+  var subLogger = new Log(subNamespace);
+  subLogger._setParent(this);
+  return subLogger;
+};
+
+Log.prototype._setParent = function(parentLogger) {
+  this._parent = parentLogger;
+};
+
+Log.makeLevel = function(level) {
+  return function() {
+    var args = Array.prototype.slice.apply(arguments);
+    args[0] = this._prefix + args[0];
+    Log.engine.logObject.apply(Log, [level].concat(args[0], [args.slice(2)]));
+  };
+};
+
+Log.prototype.debug = Log.makeLevel(1);
+Log.prototype.info = Log.makeLevel(2);
+Log.prototype.warn = Log.makeLevel(3);
+Log.prototype.error = Log.makeLevel(4);
+
+/**
+ * @param {String} message
+ * @param {Array} details
+ * @return {Array} prepared log info
+ */
+
+function getLogInfo(message, args) {
+  var stack = new Error().stack;
+
+  return [
+    // Timestamp
+    '[' + new Date().toISOString() + ']',
+    message,
+    '--',
+    // Location
+    (typeof stack === 'string') ? stack.split('\n')[4].replace(/^\s+/, '') : '',
+    '\n'
+  ].concat(args);
+}
+
+/**
+ * @param {Number} log level
+ * @param {Array} log info
+ */
+
+function logMessage(logLevel, args) {
+  switch (logLevel) {
+    case 1:
+    case 2:
+      console.log.apply(console, args);
+      break;
+    case 3:
+      console.warn.apply(console, args);
+      break;
+    case 4:
+      console.error.apply(console, args);
+      break;
+  }
+}
+
+/**
+ * Basic logging connector.
+ *
+ * This engine has no formatting and works with the most basic of 'console.log'
+ * implementations. This is the logging engine used in Node.js.
+ */
+var BasicLogEngine = {
+  logObject: function logObject(level, message, args) {
+    args = args.map(function(arg) {
+      return JSON.stringify(arg, null, 2);
+    });
+
+    logMessage(level, getLogInfo(message, args));
+  }
+};
+
+/**
+ * Log engine for browser consoles.
+ *
+ * Browsers tend to have better consoles that support nicely formatted
+ * JavaScript objects. This connector passes objects through to the logging
+ * function without any stringification.
+ */
+var InteractiveLogEngine = {
+  logObject: function(level, message, args) {
+    args = args.map(function(arg) {
+      return /MSIE/.test(navigator.userAgent)
+      ? JSON.stringify(arg, null, 2)
+      : arg;
+    });
+
+    logMessage(level, getLogInfo(message, args));
+  }
+};
+/**
+ * Null logging connector.
+ *
+ * This engine simply swallows all messages. Used when console.log is not
+ * available.
+ */
+var NullLogEngine = {
+  logObject: function() {}
+};
+
+if (typeof window !== 'undefined' && typeof console !== 'undefined') {
+  Log.engine = InteractiveLogEngine;
+} else if (typeof console !== 'undefined' && console.log) {
+  Log.engine = BasicLogEngine;
+} else {
+  Log.engine = NullLogEngine;
+}
+
+/**
+ * Provide a root logger as our main export.
+ *
+ * This means you can use the logger easily on the fly:
+ *     ripple.log.debug('My object is', myObj);
+ */
+module.exports = new Log();
+
+/**
+ * This is the logger for ripple-lib internally.
+ */
+module.exports.internal = module.exports.sub();
+
+/**
+ * Expose the class as well.
+ */
+module.exports.Log = Log;

src/js/ripple/message.js

@@ -0,0 +1,215 @@
+/* eslint-disable valid-jsdoc */
+'use strict';
+var async = require('async');
+var sjcl = require('./utils').sjcl;
+var Remote = require('./remote').Remote;
+var Seed = require('./seed').Seed;
+var KeyPair = require('./keypair').KeyPair;
+var Account = require('./account').Account;
+var UInt160 = require('./uint160').UInt160;
+
+// Message class (static)
+var Message = {};
+
+Message.hashFunction = sjcl.hash.sha512.hash;
+Message.MAGIC_BYTES = 'Ripple Signed Message:\n';
+
+var REGEX_HEX = /^[0-9a-fA-F]+$/;
+var REGEX_BASE64 =
+  /^([A-Za-z0-9\+]{4})*([A-Za-z0-9\+]{2}==)|([A-Za-z0-9\+]{3}=)?$/;
+
+/**
+ *  Produce a Base64-encoded signature on the given message with
+ *  the string 'Ripple Signed Message:\n' prepended.
+ *
+ *  Note that this signature uses the signing function that includes
+ *  a recovery_factor to be able to extract the public key from the signature
+ *  without having to pass the public key along with the signature.
+ *
+ *  @static
+ *
+ *  @param {String} message
+ *  @param {sjcl.ecc.ecdsa.secretKey|Any format accepted by Seed.from_json}
+ *         secret_key
+ *  @param {RippleAddress} [The first key] account Field to specify the signing
+ *      account. If this is omitted the first account produced by the secret
+ *      generator will be used.
+ *  @return {Base64-encoded String} signature
+ */
+Message.signMessage = function(message, secret_key, account) {
+  return Message.signHash(Message.hashFunction(Message.MAGIC_BYTES + message),
+    secret_key, account);
+};
+
+/**
+ *  Produce a Base64-encoded signature on the given hex-encoded hash.
+ *
+ *  Note that this signature uses the signing function that includes
+ *  a recovery_factor to be able to extract the public key from the signature
+ *  without having to pass the public key along with the signature.
+ *
+ *  @static
+ *
+ *  @param {bitArray|Hex-encoded String} hash
+ *  @param {sjcl.ecc.ecdsa.secretKey|Any format accepted by Seed.from_json}
+ *          secret_key
+ *  @param {RippleAddress} [The first key] account Field to specify the
+ *          signing account. If this is omitted the first account produced by
+ *          the secret generator will be used.
+ *  @returns {Base64-encoded String} signature
+ */
+Message.signHash = function(hash, secret_key, account) {
+
+  if (typeof hash === 'string' && /^[0-9a-fA-F]+$/.test(hash)) {
+    hash = sjcl.codec.hex.toBits(hash);
+  }
+
+  if (typeof hash !== 'object' || hash.length <= 0
+      || typeof hash[0] !== 'number') {
+    throw new Error('Hash must be a bitArray or hex-encoded string');
+  }
+
+  if (!(secret_key instanceof sjcl.ecc.ecdsa.secretKey)) {
+    secret_key = Seed.from_json(secret_key).get_key(account)._secret;
+  }
+
+  var PARANOIA_256_BITS = 6; // sjcl constant for ensuring 256 bits of entropy
+  var signature_bits = secret_key.signWithRecoverablePublicKey(hash,
+    PARANOIA_256_BITS);
+  var signature_base64 = sjcl.codec.base64.fromBits(signature_bits);
+
+  return signature_base64;
+
+};
+
+
+/**
+ *  Verify the signature on a given message.
+ *
+ *  Note that this function is asynchronous.
+ *  The ripple-lib remote is used to check that the public
+ *  key extracted from the signature corresponds to one that is currently
+ *  active for the given account.
+ *
+ *  @static
+ *
+ *  @param {String} data.message
+ *  @param {RippleAddress} data.account
+ *  @param {Base64-encoded String} data.signature
+ *  @param {ripple-lib Remote} remote
+ *  @param {Function} callback
+ *
+ *  @callback callback
+ *  @param {Error} error
+ *  @param {boolean} is_valid true if the signature is valid, false otherwise
+ */
+Message.verifyMessageSignature = function(data, remote, callback) {
+
+  if (typeof data.message === 'string') {
+    data.hash = Message.hashFunction(Message.MAGIC_BYTES + data.message);
+  } else {
+    return callback(new Error(
+      'Data object must contain message field to verify signature'));
+  }
+
+  return Message.verifyHashSignature(data, remote, callback);
+
+};
+
+
+/**
+ *  Verify the signature on a given hash.
+ *
+ *  Note that this function is asynchronous.
+ *  The ripple-lib remote is used to check that the public
+ *  key extracted from the signature corresponds to one that is currently
+ *  active for the given account.
+ *
+ *  @static
+ *
+ *  @param {bitArray|Hex-encoded String} data.hash
+ *  @param {RippleAddress} data.account
+ *  @param {Base64-encoded String} data.signature
+ *  @param {ripple-lib Remote} remote
+ *  @param {Function} callback
+ *
+ *  @callback callback
+ *  @param {Error} error
+ *  @param {boolean} is_valid true if the signature is valid, false otherwise
+ */
+Message.verifyHashSignature = function(data, remote, callback) {
+
+  var hash,
+    account,
+    signature;
+
+  if (typeof callback !== 'function') {
+    throw new Error('Must supply callback function');
+  }
+
+  hash = data.hash;
+  if (hash && typeof hash === 'string' && REGEX_HEX.test(hash)) {
+    hash = sjcl.codec.hex.toBits(hash);
+  }
+
+  if (typeof hash !== 'object' || hash.length <= 0
+      || typeof hash[0] !== 'number') {
+    return callback(new Error('Hash must be a bitArray or hex-encoded string'));
+  }
+
+  account = data.account || data.address;
+  if (!account || !UInt160.from_json(account).is_valid()) {
+    return callback(new Error('Account must be a valid ripple address'));
+  }
+
+  signature = data.signature;
+  if (typeof signature !== 'string' || !REGEX_BASE64.test(signature)) {
+    return callback(new Error('Signature must be a Base64-encoded string'));
+  }
+  signature = sjcl.codec.base64.toBits(signature);
+
+  if (!(remote instanceof Remote) || remote.state !== 'online') {
+    return callback(new Error(
+      'Must supply connected Remote to verify signature'));
+  }
+
+  function recoverPublicKey(async_callback) {
+
+    var public_key;
+    try {
+      public_key =
+        sjcl.ecc.ecdsa.publicKey.recoverFromSignature(hash, signature);
+    } catch (err) {
+      return async_callback(err);
+    }
+
+    if (public_key) {
+      async_callback(null, public_key);
+    } else {
+      async_callback(new Error('Could not recover public key from signature'));
+    }
+
+  }
+
+  function checkPublicKeyIsValid(public_key, async_callback) {
+
+    // Get hex-encoded public key
+    var key_pair = new KeyPair();
+    key_pair._pubkey = public_key;
+    var public_key_hex = key_pair.to_hex_pub();
+
+    var account_class_instance = new Account(remote, account);
+    account_class_instance.publicKeyIsActive(public_key_hex, async_callback);
+
+  }
+
+  var steps = [
+    recoverPublicKey,
+    checkPublicKeyIsValid
+  ];
+
+  async.waterfall(steps, callback);
+
+};
+
+exports.Message = Message;

src/js/ripple/meta.js

@@ -4,36 +4,211 @@ var UInt160 = require('./uint160').UInt160;
 var Amount  = require('./amount').Amount;
 
 /**
- * Meta data processing facility.
+ * Meta data processing facility
+ *
+ * @constructor
+ * @param {Object} transaction metadata
  */
-var Meta = function (raw_data)
-{
+
+function Meta(data) {
+  var self = this;
+
   this.nodes = [ ];
 
-  for (var i = 0, l = raw_data.AffectedNodes.length; i < l; i++) {
-    var an = raw_data.AffectedNodes[i],
-        result = {};
+  if (typeof data !== 'object') {
+    throw new TypeError('Missing metadata');
+  }
 
-    ["CreatedNode", "ModifiedNode", "DeletedNode"].forEach(function (x) {
-      if (an[x]) result.diffType = x;
-    });
+  if (!Array.isArray(data.AffectedNodes)) {
+    throw new TypeError('Metadata missing AffectedNodes');
+  }
 
-    if (!result.diffType) return null;
+  data.AffectedNodes.forEach(this.addNode, this);
+};
 
-    an = an[result.diffType];
+Meta.NODE_TYPES = [
+  'CreatedNode',
+  'ModifiedNode',
+  'DeletedNode'
+];
 
-    result.entryType = an.LedgerEntryType;
-    result.ledgerIndex = an.LedgerIndex;
+Meta.AMOUNT_FIELDS_AFFECTING_ISSUER = [
+  'LowLimit',
+  'HighLimit',
+  'TakerPays',
+  'TakerGets'
+];
 
-    result.fields = extend({}, an.PreviousFields, an.NewFields, an.FinalFields);
-    result.fieldsPrev = an.PreviousFields || {};
-    result.fieldsNew = an.NewFields || {};
-    result.fieldsFinal = an.FinalFields || {};
+Meta.ACCOUNT_FIELDS = [
+  'Account',
+  'Owner',
+  'Destination',
+  'Issuer',
+  'Target'
+];
+
+/**
+ * @param {Object} node
+ * @api private
+ */
+
+Meta.prototype.getNodeType = function(node) {
+  var result = null;
+
+  for (var i=0; i<Meta.NODE_TYPES.length; i++) {
+    var type = Meta.NODE_TYPES[i];
+    if (node.hasOwnProperty(type)) {
+      result = type;
+      break;
+    }
+  }
+
+  return result;
+};
+
+/**
+ * @param {String} field
+ * @api private
+ */
+
+Meta.prototype.isAccountField = function(field) {
+  return Meta.ACCOUNT_FIELDS.indexOf(field) !== -1;
+};
+
+/**
+ * Add node to metadata
+ *
+ * @param {Object} node
+ * @api private
+ */
+
+Meta.prototype.addNode = function(node) {
+  this._affectedAccounts = void(0);
+  this._affectedBooks = void(0);
+
+  var result = { };
+
+  if ((result.nodeType = this.getNodeType(node))) {
+    node = node[result.nodeType];
+    result.diffType    = result.nodeType;
+    result.entryType   = node.LedgerEntryType;
+    result.ledgerIndex = node.LedgerIndex;
+    result.fields      = extend({ }, node.PreviousFields, node.NewFields, node.FinalFields);
+    result.fieldsPrev  = node.PreviousFields || { };
+    result.fieldsNew   = node.NewFields || { };
+    result.fieldsFinal = node.FinalFields || { };
+
+    // getAffectedBooks will set this
+    // result.bookKey   = undefined;
 
     this.nodes.push(result);
   }
 };
 
+/**
+ * Get affected nodes array
+ *
+ * @param {Object} filter options
+ * @return {Array} nodes
+ */
+
+Meta.prototype.getNodes = function(options) {
+  if (typeof options === 'object') {
+    return this.nodes.filter(function(node) {
+      if (options.nodeType && options.nodeType !== node.nodeType) {
+        return false;
+      }
+      if (options.entryType && options.entryType !== node.entryType) {
+        return false;
+      }
+      if (options.bookKey && options.bookKey !== node.bookKey) {
+        return false;
+      }
+      return true;
+    });
+  } else {
+    return this.nodes;
+  }
+};
+
+Meta.prototype.getAffectedAccounts = function(from) {
+  if (this._affectedAccounts) {
+    return this._affectedAccounts;
+  }
+
+  var accounts = [ ];
+
+  // This code should match the behavior of the C++ method:
+  // TransactionMetaSet::getAffectedAccounts
+  for (var i=0; i<this.nodes.length; i++) {
+    var node = this.nodes[i];
+    var fields = (node.nodeType === 'CreatedNode')
+    ? node.fieldsNew
+    : node.fieldsFinal;
+
+    for (var fieldName in fields) {
+      var field = fields[fieldName];
+
+      if (this.isAccountField(fieldName) && UInt160.is_valid(field)) {
+        accounts.push(field);
+      } else if (~Meta.AMOUNT_FIELDS_AFFECTING_ISSUER.indexOf(fieldName)) {
+        var amount = Amount.from_json(field);
+        var issuer = amount.issuer();
+        if (issuer.is_valid() && !issuer.is_zero()) {
+          accounts.push(issuer.to_json());
+        }
+      }
+    }
+  }
+
+  this._affectedAccounts = utils.arrayUnique(accounts);
+
+  return this._affectedAccounts;
+};
+
+Meta.prototype.getAffectedBooks = function() {
+  if (this._affectedBooks) {
+    return this._affectedBooks;
+  }
+
+  var books = [ ];
+
+  for (var i=0; i<this.nodes.length; i++) {
+    var node = this.nodes[i];
+
+    if (node.entryType !== 'Offer') {
+      continue;
+    }
+
+    var gets = Amount.from_json(node.fields.TakerGets);
+    var pays = Amount.from_json(node.fields.TakerPays);
+    var getsKey = gets.currency().to_json();
+    var paysKey = pays.currency().to_json();
+
+    if (getsKey !== 'XRP') {
+      getsKey += '/' + gets.issuer().to_json();
+    }
+
+    if (paysKey !== 'XRP') {
+      paysKey += '/' + pays.issuer().to_json();
+    }
+
+    var key = getsKey + ':' + paysKey;
+
+    // Hell of a lot of work, so we are going to cache this. We can use this
+    // later to good effect in OrderBook.notify to make sure we only process
+    // pertinent offers.
+    node.bookKey = key;
+
+    books.push(key);
+  }
+
+  this._affectedBooks = utils.arrayUnique(books);
+
+  return this._affectedBooks;
+};
+
+
 /**
  * Execute a function on each affected node.
  *
@@ -42,7 +217,7 @@ var Meta = function (raw_data)
  *
  *   {
  *     // Type of diff, e.g. CreatedNode, ModifiedNode
- *     diffType: 'CreatedNode'
+ *     nodeType: 'CreatedNode'
  *
  *     // Type of node affected, e.g. RippleState, AccountRoot
  *     entryType: 'RippleState',
@@ -53,7 +228,7 @@ var Meta = function (raw_data)
  *     // Contains all fields with later versions taking precedence
  *     //
  *     // This is a shorthand for doing things like checking which account
- *     // this affected without having to check the diffType.
+ *     // this affected without having to check the nodeType.
  *     fields: {...},
  *
  *     // Old fields (before the change)
@@ -65,73 +240,21 @@ var Meta = function (raw_data)
  *     // Changed fields
  *     fieldsFinal: {...}
  *   }
- *
- * The second parameter to the callback is the index of the node in the metadata
- * (first entry is index 0).
  */
-Meta.prototype.each = function (fn)
-{
-  for (var i = 0, l = this.nodes.length; i < l; i++) {
-    fn(this.nodes[i], i);
-  }
+
+[
+ 'forEach',
+ 'map',
+ 'filter',
+ 'every',
+ 'some',
+ 'reduce'
+].forEach(function(fn) {
+  Meta.prototype[fn] = function() {
+    return Array.prototype[fn].apply(this.nodes, arguments);
   };
-
-var amountFieldsAffectingIssuer = [
-  "LowLimit", "HighLimit", "TakerPays", "TakerGets"
-];
-Meta.prototype.getAffectedAccounts = function ()
-{
-  var accounts = [];
-
-  // This code should match the behavior of the C++ method:
-  // TransactionMetaSet::getAffectedAccounts
-  this.each(function (an) {
-    var fields = (an.diffType === "CreatedNode") ? an.fieldsNew : an.fieldsFinal;
-
-    for (var i in fields) {
-      var field = fields[i];
-
-      if ("string" === typeof field && UInt160.is_valid(field)) {
-        accounts.push(field);
-      } else if (amountFieldsAffectingIssuer.indexOf(i) !== -1) {
-        var amount = Amount.from_json(field);
-        var issuer = amount.issuer();
-        if (issuer.is_valid() && !issuer.is_zero()) {
-          accounts.push(issuer.to_json());
-        }
-      }
-    }
 });
 
-  accounts = utils.arrayUnique(accounts);
-
-  return accounts;
-};
-
-Meta.prototype.getAffectedBooks = function ()
-{
-  var books = [];
-
-  this.each(function (an) {
-    if (an.entryType !== 'Offer') return;
-
-    var gets = Amount.from_json(an.fields.TakerGets);
-    var pays = Amount.from_json(an.fields.TakerPays);
-
-    var getsKey = gets.currency().to_json();
-    if (getsKey !== 'XRP') getsKey += '/' + gets.issuer().to_json();
-
-    var paysKey = pays.currency().to_json();
-    if (paysKey !== 'XRP') paysKey += '/' + pays.issuer().to_json();
-
-    var key = getsKey + ":" + paysKey;
-
-    books.push(key);
-  });
-
-  books = utils.arrayUnique(books);
-
-  return books;
-};
+Meta.prototype.each = Meta.prototype.forEach;
 
 exports.Meta = Meta;

src/js/ripple/network.js

@@ -1,58 +0,0 @@
-//
-// Access to the Ripple network via multiple untrusted servers or a single trusted server.
-//
-// Overview:
-//  Network configuration.
-//  Can leverage local storage to remember network configuration
-//  Aquires the network
-// events:
-//   online
-//   offline
-//
-
-var remote  = require("./remote.js");
-
-var opts_default = {
-    DEFAULT_VALIDATORS_SITE : "redstem.com",
-
-    ips = {
-    }
-};
-
-//
-// opts : {
-//  cache : undefined || {
-//    get : function () { return cached_value; },
-//    set : function (value) { cached_value = value; },
-//  },
-//
-//  // Where to get validators.txt if needed.
-//  DEFAULT_VALIDATORS_SITE : _domain_,
-//
-//  // Validator.txt to use.
-//  validators : _txt_,
-// }
-//
-
-var Network = function (opts) {
-
-};
-
-// Set the network configuration.
-Network.protocol.configure = function () {
-
-};
-
-// Target state: connectted
-Network.protocol.start = function () {
-
-};
-
-// Target state: disconnect
-Network.protocol.stop = function () {
-
-};
-
-exports.Network	= Network;
-
-// vim:sw=2:sts=2:ts=8:et

src/js/ripple/pathfind.js

@@ -0,0 +1,85 @@
+var EventEmitter = require('events').EventEmitter;
+var util         = require('util');
+var Amount       = require('./amount').Amount;
+var extend       = require('extend');
+
+/**
+ * Represents a persistent path finding request.
+ *
+ * Only one path find request is allowed per connection, so when another path
+ * find request is triggered it will supercede the existing one, making it emit
+ * the 'end' and 'superceded' events.
+ */
+function PathFind(remote, src_account, dst_account, dst_amount, src_currencies) {
+  EventEmitter.call(this);
+
+  this.remote = remote;
+
+  this.src_account    = src_account;
+  this.dst_account    = dst_account;
+  this.dst_amount     = dst_amount;
+  this.src_currencies = src_currencies;
+};
+
+util.inherits(PathFind, EventEmitter);
+
+/**
+ * Submits a path_find_create request to the network.
+ *
+ * This starts a path find request, superceding all previous path finds.
+ *
+ * This will be called automatically by Remote when this object is instantiated,
+ * so you should only have to call it if the path find was closed or superceded
+ * and you wish to restart it.
+ */
+PathFind.prototype.create = function () {
+  var self = this;
+
+  var req = this.remote.request_path_find_create(
+    this.src_account,
+    this.dst_account,
+    this.dst_amount,
+    this.src_currencies);
+
+  req.once('error', function(err) {
+    self.emit('error', err);
+  });
+  req.once('success', function(msg) {
+    self.notify_update(msg);
+  });
+
+  // XXX We should add ourselves to prepare_subscribe or a similar mechanism so
+  // that we can resubscribe after a reconnection.
+
+  req.broadcast().request();
+};
+
+PathFind.prototype.close = function () {
+  this.remote.request_path_find_close().broadcast().request();
+  this.emit('end');
+  this.emit('close');
+};
+
+PathFind.prototype.notify_update = function (message) {
+  var src_account = message.source_account;
+  var dst_account = message.destination_account;
+  var dst_amount  = Amount.from_json(message.destination_amount);
+
+  // Only pass the event along if this path find response matches what we were
+  // looking for.
+  if (this.src_account === src_account &&
+      this.dst_account === dst_account &&
+      this.dst_amount.equals(dst_amount)) {
+    this.emit('update', message);
+  }
+};
+
+PathFind.prototype.notify_superceded = function () {
+  // XXX If we're set to re-subscribe whenever we connect to a new server, then
+  // we should cancel that behavior here. See PathFind#create.
+
+  this.emit('end');
+  this.emit('superceded');
+};
+
+exports.PathFind = PathFind;

src/js/ripple/rangeset.js

@@ -0,0 +1,67 @@
+var assert = require('assert');
+var lodash = require('lodash');
+
+function RangeSet() {
+  this._ranges = [ ];
+};
+
+/**
+ * Add a ledger range
+ *
+ * @param {Number|String} range string (n-n2,n3-n4)
+ */
+
+RangeSet.prototype.add = function(range) {
+  assert(typeof range !== 'number' || !isNaN(range), 'Ledger range malformed');
+
+  range = String(range).split(',');
+
+  if (range.length > 1) {
+    return range.forEach(this.add, this);
+  }
+
+  range = range[0].split('-').map(Number);
+
+  var lRange = {
+    start: range[0],
+    end: range[range.length === 1 ? 0 : 1]
+  };
+
+  // Comparisons on NaN should be falsy
+  assert(lRange.start <= lRange.end, 'Ledger range malformed');
+
+  var insertionPoint = lodash.sortedIndex(this._ranges, lRange, function(r) {
+    return r.start;
+  });
+
+  this._ranges.splice(insertionPoint, 0, lRange);
+};
+
+
+/*
+ * Check presence of ledger in range
+ *
+ * @param {Number|String} ledger
+ * @return Boolean
+ */
+
+RangeSet.prototype.has =
+RangeSet.prototype.contains = function(ledger) {
+  assert(ledger != null && !isNaN(ledger), 'Ledger must be a number');
+
+  ledger = Number(ledger);
+
+  return this._ranges.some(function(r) {
+    return ledger >= r.start && ledger <= r.end;
+  });
+};
+
+/**
+ * Reset ledger ranges
+ */
+
+RangeSet.prototype.reset = function() {
+  this._ranges = [ ];
+};
+
+exports.RangeSet = RangeSet;

src/js/ripple/request.js

@@ -0,0 +1,562 @@
+var EventEmitter = require('events').EventEmitter;
+var util         = require('util');
+var async        = require('async');
+var UInt160      = require('./uint160').UInt160;
+var Currency     = require('./currency').Currency;
+var RippleError  = require('./rippleerror').RippleError;
+var Server       = require('./server').Server;
+
+// Request events emitted:
+//  'success' : Request successful.
+//  'error'   : Request failed.
+//  'remoteError'
+//  'remoteUnexpected'
+//  'remoteDisconnected'
+
+/**
+ * Request
+ *
+ * @param {Remote} remote
+ * @param {String} command
+ */
+
+function Request(remote, command) {
+  EventEmitter.call(this);
+
+  this.remote = remote;
+  this.requested = false;
+  this.reconnectTimeout = 1000 * 3;
+  this.successEvent = 'success';
+  this.errorEvent = 'error';
+  this.message = {
+    command: command,
+    id: void(0)
+  };
+};
+
+util.inherits(Request, EventEmitter);
+
+// Send the request to a remote.
+Request.prototype.request = function(servers, callback) {
+  this.emit('before');
+
+  if (typeof servers === 'function') {
+    callback = servers;
+  }
+
+  this.callback(callback);
+
+  if (this.requested) {
+    return this;
+  }
+
+  this.requested = true;
+  this.on('error', function(){});
+  this.emit('request', this.remote);
+
+  if (Array.isArray(servers)) {
+    servers.forEach(function(server) {
+      this.setServer(server);
+      this.remote.request(this);
+    }, this);
+  } else {
+    this.remote.request(this);
+  }
+
+  return this;
+};
+
+/**
+ * Broadcast request to all servers, filter responses if a function is
+ * provided. Return first response that satisfies the filter. Pre-filter
+ * requests by ledger_index (if a ledger_index is set on the request), and
+ * automatically retry servers when they reconnect--if they are expected to
+ *
+ * Whew
+ *
+ * @param [Function] fn
+ */
+
+Request.prototype.filter =
+Request.prototype.addFilter =
+Request.prototype.broadcast = function(filterFn) {
+  var self = this;
+
+  if (!this.requested) {
+    // Defer until requested, and prevent the normal request() from executing
+    this.once('before', function() {
+      self.requested = true;
+      self.broadcast(filterFn);
+    });
+    return this;
+  }
+
+  var filterFn = typeof filterFn === 'function' ? filterFn : Boolean;
+  var lastResponse = new Error('No servers available');
+  var connectTimeouts = { };
+  var emit = this.emit;
+
+  this.emit = function(event, a, b) {
+    // Proxy success/error events
+    switch (event) {
+      case 'success':
+      case 'error':
+        emit.call(self, 'proposed', a, b);
+        break;
+      default:
+        emit.apply(self, arguments);
+    }
+  };
+
+  function iterator(server, callback) {
+    // Iterator is called in parallel
+
+    if (server.isConnected()) {
+      // Listen for proxied success/error event and apply filter
+      self.once('proposed', function(res) {
+        lastResponse = res;
+        callback(filterFn(res));
+      });
+
+      return server._request(self);
+    }
+
+    // Server is disconnected but should reconnect. Wait for it to reconnect,
+    // and abort after a timeout
+    var serverID = server.getServerID();
+
+    function serverReconnected() {
+      clearTimeout(connectTimeouts[serverID]);
+      connectTimeouts[serverID] = null;
+      iterator(server, callback);
+    };
+
+    connectTimeouts[serverID] = setTimeout(function() {
+      server.removeListener('connect', serverReconnected);
+      callback(false);
+    }, self.reconnectTimeout);
+
+    server.once('connect', serverReconnected);
+  };
+
+  function complete(success) {
+    // Emit success if the filter is satisfied by any server
+    // Emit error if the filter is not satisfied by any server
+    // Include the last response
+    emit.call(self, success ? 'success' : 'error', lastResponse);
+  };
+
+  var servers = this.remote._servers.filter(function(server) {
+    // Pre-filter servers that are disconnected and should not reconnect
+    return (server.isConnected() || server._shouldConnect)
+    // Pre-filter servers that do not contain the ledger in request
+    && (!self.message.hasOwnProperty('ledger_index')
+        || server.hasLedger(self.message.ledger_index))
+    && (!self.message.hasOwnProperty('ledger_index_min')
+      || self.message.ledger_index_min === -1
+      || server.hasLedger(self.message.ledger_index_min))
+    && (!self.message.hasOwnProperty('ledger_index_max')
+      || self.message.ledger_index_max === -1
+      || server.hasLedger(self.message.ledger_index_max))
+  });
+
+  // Apply iterator in parallel to connected servers, complete when the
+  // supplied filter function is satisfied once by a server's response
+  async.some(servers, iterator, complete);
+
+  return this;
+};
+
+Request.prototype.cancel = function() {
+  this.removeAllListeners();
+  this.on('error', function(){});
+
+  return this;
+};
+
+Request.prototype.setCallback = function(fn) {
+  if (typeof fn === 'function') {
+    this.callback(fn);
+  }
+
+  return this;
+};
+
+Request.prototype.setReconnectTimeout = function(timeout) {
+  if (typeof timeout === 'number' && !isNaN(timeout)) {
+    this.reconnectTimeout = timeout;
+  }
+
+  return this;
+};
+
+Request.prototype.callback = function(callback, successEvent, errorEvent) {
+  var self = this;
+
+  if (typeof callback !== 'function') {
+    return this;
+  }
+
+  if (typeof successEvent === 'string') {
+    this.successEvent = successEvent;
+  }
+  if (typeof errorEvent === 'string') {
+    this.errorEvent = errorEvent;
+  }
+
+  var called = false;
+
+  function requestSuccess(message) {
+    if (!called) {
+      called = true;
+      callback.call(self, null, message);
+    }
+  };
+
+  function requestError(error) {
+    if (!called) {
+      called = true;
+
+      if (!(error instanceof RippleError)) {
+        error = new RippleError(error);
+      }
+
+      callback.call(self, error);
+    }
+  };
+
+  this.once(this.successEvent, requestSuccess);
+  this.once(this.errorEvent, requestError);
+  this.request();
+
+  return this;
+};
+
+Request.prototype.timeout = function(duration, callback) {
+  var self = this;
+
+  function requested() {
+    self.timeout(duration, callback);
+  };
+
+  if (!this.requested) {
+    // Defer until requested
+    return this.once('request', requested);
+  }
+
+  var emit = this.emit;
+  var timed_out = false;
+
+  var timeout = setTimeout(function() {
+    timed_out = true;
+
+    if (typeof callback === 'function') {
+      callback();
+    }
+
+    emit.call(self, 'timeout');
+    self.cancel();
+  }, duration);
+
+  this.emit = function() {
+    if (!timed_out) {
+      clearTimeout(timeout);
+      emit.apply(self, arguments);
+    }
+  };
+
+  return this;
+};
+
+Request.prototype.setServer = function(server) {
+  var selected = null;
+
+  switch (typeof server) {
+    case 'object':
+      selected = server;
+      break;
+
+    case 'string':
+      // Find server by URL
+      var servers = this.remote._servers;
+
+      for (var i=0, s; (s=servers[i]); i++) {
+        if (s._url === server) {
+          selected = s;
+          break;
+        }
+      }
+      break;
+  };
+
+  this.server = selected;
+
+  return this;
+};
+
+Request.prototype.buildPath = function(build) {
+  if (this.remote.local_signing) {
+    throw new Error(
+      '`build_path` is completely ignored when doing local signing as '
+      + '`Paths` is a component of the signed blob. The `tx_blob` is signed,'
+      + 'sealed and delivered, and the txn unmodified after' );
+  }
+
+  if (build) {
+    this.message.build_path = true;
+  } else {
+    // ND: rippled currently intreprets the mere presence of `build_path` as the
+    // value being `truthy`
+    delete this.message.build_path;
+  }
+
+  return this;
+};
+
+Request.prototype.ledgerChoose = function(current) {
+  if (current) {
+    this.message.ledger_index = this.remote._ledger_current_index;
+  } else {
+    this.message.ledger_hash  = this.remote._ledger_hash;
+  }
+
+  return this;
+};
+
+// Set the ledger for a request.
+// - ledger_entry
+// - transaction_entry
+Request.prototype.ledgerHash = function(hash) {
+  this.message.ledger_hash = hash;
+  return this;
+};
+
+// Set the ledger_index for a request.
+// - ledger_entry
+Request.prototype.ledgerIndex = function(ledger_index) {
+  this.message.ledger_index = ledger_index;
+  return this;
+};
+
+/**
+ * Set either ledger_index or ledger_hash based on heuristic
+ *
+ * @param {Number|String} ledger identifier
+ */
+
+Request.prototype.selectLedger =
+Request.prototype.ledgerSelect = function(ledger) {
+  switch (ledger) {
+    case 'current':
+    case 'closed':
+    case 'validated':
+      this.message.ledger_index = ledger;
+      break;
+    default:
+      if (Number(ledger) && isFinite(Number(ledger))) {
+        this.message.ledger_index = Number(ledger);
+      } else if (/^[A-F0-9]{64}$/.test(ledger)) {
+        this.message.ledger_hash = ledger;
+      }
+      break;
+  }
+
+  return this;
+};
+
+Request.prototype.accountRoot = function(account) {
+  this.message.account_root = UInt160.json_rewrite(account);
+  return this;
+};
+
+Request.prototype.index = function(index) {
+  this.message.index = index;
+  return this;
+};
+
+// Provide the information id an offer.
+// --> account
+// --> seq : sequence number of transaction creating offer (integer)
+Request.prototype.offerId = function(account, sequence) {
+  this.message.offer = {
+    account: UInt160.json_rewrite(account),
+    seq: sequence
+  };
+  return this;
+};
+
+// --> index : ledger entry index.
+Request.prototype.offerIndex = function(index) {
+  this.message.offer = index;
+  return this;
+};
+
+Request.prototype.secret = function(secret) {
+  if (secret) {
+    this.message.secret = secret;
+  }
+  return this;
+};
+
+Request.prototype.txHash = function(hash) {
+  this.message.tx_hash = hash;
+  return this;
+};
+
+Request.prototype.txJson = function(json) {
+  this.message.tx_json = json;
+  return this;
+};
+
+Request.prototype.txBlob = function(json) {
+  this.message.tx_blob = json;
+  return this;
+};
+
+Request.prototype.rippleState = function(account, issuer, currency) {
+  this.message.ripple_state = {
+    currency: currency,
+    accounts: [
+      UInt160.json_rewrite(account),
+      UInt160.json_rewrite(issuer)
+    ]
+  };
+  return this;
+};
+
+Request.prototype.setAccounts =
+Request.prototype.accounts = function(accounts, proposed) {
+  if (!Array.isArray(accounts)) {
+    accounts = [ accounts ];
+  }
+
+  // Process accounts parameters
+  var processedAccounts = accounts.map(function(account) {
+    return UInt160.json_rewrite(account);
+  });
+
+  if (proposed) {
+    this.message.accounts_proposed = processedAccounts;
+  } else {
+    this.message.accounts = processedAccounts;
+  }
+
+  return this;
+};
+
+Request.prototype.addAccount = function(account, proposed) {
+  if (Array.isArray(account)) {
+    account.forEach(this.addAccount, this);
+    return this;
+  }
+
+  var processedAccount = UInt160.json_rewrite(account);
+  var prop = proposed === true ? 'accounts_proposed' : 'accounts';
+  this.message[prop] = (this.message[prop] || []).concat(processedAccount);
+
+  return this;
+};
+
+Request.prototype.setAccountsProposed =
+Request.prototype.rtAccounts =
+Request.prototype.accountsProposed = function(accounts) {
+  return this.accounts(accounts, true);
+};
+
+Request.prototype.addAccountProposed = function(account) {
+  if (Array.isArray(account)) {
+    account.forEach(this.addAccountProposed, this);
+    return this;
+  }
+
+  return this.addAccount(account, true);
+};
+
+Request.prototype.setBooks =
+Request.prototype.books = function(books, snapshot) {
+  // Reset list of books (this method overwrites the current list)
+  this.message.books = [ ];
+
+  for (var i=0, l=books.length; i<l; i++) {
+    var book = books[i];
+    this.addBook(book, snapshot);
+  }
+
+  return this;
+};
+
+Request.prototype.addBook = function(book, snapshot) {
+  if (Array.isArray(book)) {
+    book.forEach(this.addBook, this);
+    return this;
+  }
+
+  var json = { };
+
+  function processSide(side) {
+    if (!book[side]) {
+      throw new Error('Missing ' + side);
+    }
+
+    var obj = json[side] = {
+      currency: Currency.json_rewrite(book[side].currency, { force_hex: true })
+    };
+
+    if (!Currency.from_json(obj.currency).is_native()) {
+      obj.issuer = UInt160.json_rewrite(book[side].issuer);
+    }
+  }
+
+  [ 'taker_gets', 'taker_pays' ].forEach(processSide);
+
+  if (typeof snapshot !== 'boolean') {
+    json.snapshot = true;
+  } else if (snapshot) {
+    json.snapshot = true;
+  } else {
+    delete json.snapshot;
+  }
+
+  if (book.both) {
+    json.both = true;
+  }
+
+  this.message.books = (this.message.books || []).concat(json);
+
+  return this;
+};
+
+Request.prototype.addStream = function(stream, values) {
+  var self = this;
+
+  if (Array.isArray(values)) {
+    switch (stream) {
+      case 'accounts':
+        this.addAccount(values);
+        break;
+      case 'accounts_proposed':
+        this.addAccountProposed(values);
+        break;
+      case 'books':
+        this.addBook(values);
+        break;
+    }
+  } else if (arguments.length > 1) {
+    for (arg in arguments) {
+      this.addStream(arguments[arg]);
+    }
+    return;
+  }
+
+  if (!Array.isArray(this.message.streams)) {
+    this.message.streams = [ ];
+  }
+
+  if (this.message.streams.indexOf(stream) === -1) {
+    this.message.streams.push(stream);
+  }
+
+  return this;
+};
+
+exports.Request = Request;

src/js/ripple/rippleerror.js

@@ -0,0 +1,33 @@
+var util   = require('util');
+var extend = require('extend');
+
+function RippleError(code, message) {
+  switch (typeof code) {
+    case 'object':
+      extend(this, code);
+      break;
+
+    case 'string':
+      this.result = code;
+      this.result_message = message;
+      break;
+  }
+
+  this.engine_result = this.result = (this.result || this.engine_result || this.error || 'Error');
+  this.engine_result_message = this.result_message = (this.result_message || this.engine_result_message || this.error_message || 'Error');
+  this.result_message = this.message = (this.result_message);
+
+  var stack;
+
+  if (!!Error.captureStackTrace) {
+    Error.captureStackTrace(this, code || this);
+  } else if ((stack = new Error().stack)) {
+    this.stack = stack;
+  }
+};
+
+util.inherits(RippleError, Error);
+
+RippleError.prototype.name = 'RippleError';
+
+exports.RippleError = RippleError;

src/js/ripple/seed.js

@@ -1,22 +1,20 @@
+'use strict';
+
 //
 // Seed support
 //
 
-var sjcl    = require('../../../build/sjcl');
-var utils   = require('./utils');
-var jsbn    = require('./jsbn');
 var extend = require('extend');
+var utils = require('./utils');
+var sjcl = utils.sjcl;
 
-var BigInteger = jsbn.BigInteger;
-
-var Base = require('./base').Base,
-    UInt = require('./uint').UInt,
-    UInt256 = require('./uint256').UInt256,
-    KeyPair = require('./keypair').KeyPair;
+var Base = require('./base').Base;
+var UInt = require('./uint').UInt;
+var UInt160 = require('./uint160').UInt160;
+var KeyPair = require('./keypair').KeyPair;
 
 var Seed = extend(function() {
-  // Internal form: NaN or BigInteger
-  this._curve = sjcl.ecc.curves['c256'];
+  this._curve = sjcl.ecc.curves.k256;
   this._value = NaN;
 }, UInt);
 
@@ -27,14 +25,14 @@ Seed.prototype.constructor = Seed;
 // value = NaN on error.
 // One day this will support rfc1751 too.
 Seed.prototype.parse_json = function(j) {
-  if ('string' === typeof j) {
+  if (typeof j === 'string') {
     if (!j.length) {
       this._value = NaN;
     // XXX Should actually always try and continue if it failed.
-    } else if (j[0] === "s") {
+    } else if (j[0] === 's') {
       this._value = Base.decode_check(Base.VER_FAMILY_SEED, j);
-    } else if (j.length === 32) {
-      this._value = this.parse_hex(j);
+    } else if (/^[0-9a-fA-f]{32}$/.test(j)) {
+      this.parse_hex(j);
     // XXX Should also try 1751
     } else {
       this.parse_passphrase(j);
@@ -47,8 +45,8 @@ Seed.prototype.parse_json = function (j) {
 };
 
 Seed.prototype.parse_passphrase = function(j) {
-  if ("string" !== typeof j) {
-    throw new Error("Passphrase must be a string");
+  if (typeof j !== 'string') {
+    throw new Error('Passphrase must be a string');
   }
 
   var hash = sjcl.hash.sha512.hash(sjcl.codec.utf8String.toBits(j));
@@ -60,8 +58,9 @@ Seed.prototype.parse_passphrase = function (j) {
 };
 
 Seed.prototype.to_json = function() {
-  if (!(this._value instanceof BigInteger))
+  if (!(this.is_valid())) {
     return NaN;
+  }
 
   var output = Base.encode_check(Base.VER_FAMILY_SEED, this.to_bytes());
 
@@ -79,38 +78,83 @@ function firstHalfOfSHA512(bytes) {
   );
 }
 
-function SHA256_RIPEMD160(bits) {
-  return sjcl.hash.ripemd160.hash(sjcl.hash.sha256.hash(bits));
-}
+// Removed a `*` so this JSDoc-ish syntax is ignored.
+// This will soon all change anyway.
+/*
+* @param account
+*        {undefined}                 take first, default, KeyPair
+*
+*        {Number}                    specifies the account number of the KeyPair
+*                                    desired.
+*
+*        {Uint160} (from_json able), specifies the address matching the KeyPair
+*                                    that is desired.
+*
+* @param maxLoops (optional)
+*        {Number}                    specifies the amount of attempts taken
+*                                    to generate a matching KeyPair
+*
+*/
+Seed.prototype.get_key = function(account, maxLoops) {
+  var account_number = 0, address;
+  var max_loops = maxLoops || 1;
 
-Seed.prototype.get_key = function (account_id) {
   if (!this.is_valid()) {
-    throw new Error("Cannot generate keys from invalid seed!");
+    throw new Error('Cannot generate keys from invalid seed!');
+  }
+  if (account) {
+    if (typeof account === 'number') {
+      account_number = account;
+      max_loops = account_number + 1;
+    } else {
+      address = UInt160.from_json(account);
+    }
   }
-  // XXX Should loop over keys until we find the right one
 
+  var private_gen, public_gen;
   var curve = this._curve;
+  var i = 0;
 
-  var seq = 0;
-
-  var private_gen, public_gen, i = 0;
   do {
-    private_gen = sjcl.bn.fromBits(firstHalfOfSHA512(append_int(this.to_bytes(), i)));
+    private_gen = sjcl.bn.fromBits(
+            firstHalfOfSHA512(append_int(this.to_bytes(), i)));
     i++;
   } while (!curve.r.greaterEquals(private_gen));
 
   public_gen = curve.G.mult(private_gen);
 
   var sec;
-  i = 0;
+  var key_pair;
+
   do {
-    sec = sjcl.bn.fromBits(firstHalfOfSHA512(append_int(append_int(public_gen.toBytesCompressed(), seq), i)));
+
+    i = 0;
+
+    do {
+      sec = sjcl.bn.fromBits(
+              firstHalfOfSHA512(
+                  append_int(
+                    append_int(public_gen.toBytesCompressed(), account_number)
+                    ,
+                    i
+                  )));
       i++;
     } while (!curve.r.greaterEquals(sec));
 
+    account_number++;
     sec = sec.add(private_gen).mod(curve.r);
+    key_pair = KeyPair.from_bn_secret(sec);
 
-  return KeyPair.from_bn_secret(sec);
+    if (max_loops-- <= 0) {
+      // We are almost certainly looking for an account that would take same
+      // value of $too_long {forever, ...}
+      throw new Error('Too many loops looking for KeyPair yielding ' +
+                      address.to_json() + ' from ' + this.to_json());
+    }
+
+  } while (address && !key_pair.get_address().equals(address));
+
+  return key_pair;
 };
 
 exports.Seed = Seed;

src/js/ripple/serializedobject.js

@@ -1,52 +1,184 @@
-var binformat = require('./binformat'),
-    sjcl = require('../../../build/sjcl'),
-    extend = require('extend'),
-    stypes = require('./serializedtypes');
+'use strict';
 
+var _ = require('lodash');
+var assert = require('assert');
+var extend = require('extend');
+var binformat = require('./binformat');
+var stypes = require('./serializedtypes');
+var utils = require('./utils');
 var UInt256 = require('./uint256').UInt256;
 
-var SerializedObject = function () {
+var sjcl = utils.sjcl;
+
+var TRANSACTION_TYPES = { };
+
+Object.keys(binformat.tx).forEach(function(key) {
+  TRANSACTION_TYPES[binformat.tx[key][0]] = key;
+});
+
+var LEDGER_ENTRY_TYPES = {};
+
+Object.keys(binformat.ledger).forEach(function(key) {
+  LEDGER_ENTRY_TYPES[binformat.ledger[key][0]] = key;
+});
+
+var TRANSACTION_RESULTS = {};
+
+Object.keys(binformat.ter).forEach(function(key) {
+  TRANSACTION_RESULTS[binformat.ter[key]] = key;
+});
+
+function normalize_sjcl_bn_hex(string) {
+  var hex = string.slice(2);    // remove '0x' prefix
+  // now strip leading zeros
+  var i = _.findIndex(hex, function(c) {
+    return c !== '0';
+  });
+  return i >= 0 ? hex.slice(i) : '0';
+}
+
+function SerializedObject(buf) {
+  if (Array.isArray(buf) || (Buffer && Buffer.isBuffer(buf))) {
+    this.buffer = buf;
+  } else if (typeof buf === 'string') {
+    this.buffer = sjcl.codec.bytes.fromBits(sjcl.codec.hex.toBits(buf));
+  } else if (!buf) {
     this.buffer = [];
+  } else {
+    throw new Error('Invalid buffer passed.');
+  }
   this.pointer = 0;
-};
+}
 
 SerializedObject.from_json = function(obj) {
-  var typedef;
-  var so = new SerializedObject();
-
   // Create a copy of the object so we don't modify it
-  obj = extend({}, obj);
+  obj = extend(true, {}, obj);
+  var so = new SerializedObject();
+  var typedef;
 
-  if ("number" === typeof obj.TransactionType) {
+  if (typeof obj.TransactionType === 'number') {
     obj.TransactionType = SerializedObject.lookup_type_tx(obj.TransactionType);
-
     if (!obj.TransactionType) {
-      throw new Error("Transaction type ID is invalid.");
+      throw new Error('Transaction type ID is invalid.');
     }
   }
 
-  if ("string" === typeof obj.TransactionType) {
-    typedef = binformat.tx[obj.TransactionType].slice();
+  if (typeof obj.LedgerEntryType === 'number') {
+    obj.LedgerEntryType = SerializedObject.lookup_type_le(obj.LedgerEntryType);
 
+    if (!obj.LedgerEntryType) {
+      throw new Error('LedgerEntryType ID is invalid.');
+    }
+  }
+
+  if (typeof obj.TransactionType === 'string') {
+    typedef = binformat.tx[obj.TransactionType];
+    if (!Array.isArray(typedef)) {
+      throw new Error('Transaction type is invalid');
+    }
+
+    typedef = typedef.slice();
     obj.TransactionType = typedef.shift();
-  } else if ("undefined" !== typeof obj.LedgerEntryType) {
-    // XXX: TODO
-    throw new Error("Ledger entry binary format not yet implemented.");
-  } else throw new Error("Object to be serialized must contain either " +
-                         "TransactionType or LedgerEntryType.");
+  } else if (typeof obj.LedgerEntryType === 'string') {
+    typedef = binformat.ledger[obj.LedgerEntryType];
 
+    if (!Array.isArray(typedef)) {
+      throw new Error('LedgerEntryType is invalid');
+    }
+
+    typedef = typedef.slice();
+    obj.LedgerEntryType = typedef.shift();
+
+  } else if (typeof obj.AffectedNodes === 'object') {
+    typedef = binformat.metadata;
+  } else {
+    throw new Error('Object to be serialized must contain either' +
+                    ' TransactionType, LedgerEntryType or AffectedNodes.');
+  }
+
+  // ND: This from_*json* seems a reasonable place to put validation of `json`
+  SerializedObject.check_no_missing_fields(typedef, obj);
   so.serialize(typedef, obj);
 
   return so;
 };
 
+SerializedObject.check_no_missing_fields = function(typedef, obj) {
+  var missing_fields = [];
+
+  for (var i = typedef.length - 1; i >= 0; i--) {
+    var spec = typedef[i];
+    var field = spec[0];
+    var requirement = spec[1];
+
+    if (binformat.REQUIRED === requirement && obj[field] === undefined) {
+      missing_fields.push(field);
+    }
+  }
+
+  if (missing_fields.length > 0) {
+    var object_name;
+
+    if (obj.TransactionType !== undefined) {
+      object_name = SerializedObject.lookup_type_tx(obj.TransactionType);
+    } else if (obj.LedgerEntryType !== undefined) {
+      object_name = SerializedObject.lookup_type_le(obj.LedgerEntryType);
+    } else {
+      object_name = 'TransactionMetaData';
+    }
+
+    throw new Error(object_name + ' is missing fields: ' +
+                    JSON.stringify(missing_fields));
+  }
+};
+
 SerializedObject.prototype.append = function(bytes) {
+  if (bytes instanceof SerializedObject) {
+    bytes = bytes.buffer;
+  }
+
+  // Make sure both buffer and bytes are Array. Either could potentially be a
+  // Buffer.
+  if (Array.isArray(this.buffer) && Array.isArray(bytes)) {
+    // Array::concat is horribly slow where buffer length is 100 kbytes + One
+    // transaction with 1100 affected nodes took around 23 seconds to convert
+    // from json to bytes.
+    Array.prototype.push.apply(this.buffer, bytes);
+  } else {
     this.buffer = this.buffer.concat(bytes);
+  }
+
   this.pointer += bytes.length;
 };
 
-SerializedObject.prototype.to_bits = function ()
-{
+SerializedObject.prototype.resetPointer = function() {
+  this.pointer = 0;
+};
+
+function readOrPeek(advance) {
+  return function(bytes) {
+    var start = this.pointer;
+    var end = start + bytes;
+
+    if (end > this.buffer.length) {
+      throw new Error('Buffer length exceeded');
+    }
+
+    var result = this.buffer.slice(start, end);
+
+    if (advance) {
+      this.pointer = end;
+    }
+
+    return result;
+  };
+}
+
+SerializedObject.prototype.read = readOrPeek(true);
+
+SerializedObject.prototype.peek = readOrPeek(false);
+
+SerializedObject.prototype.to_bits = function() {
   return sjcl.codec.bytes.toBits(this.buffer);
 };
 
@@ -54,52 +186,118 @@ SerializedObject.prototype.to_hex = function () {
   return sjcl.codec.hex.fromBits(this.to_bits()).toUpperCase();
 };
 
-SerializedObject.prototype.serialize = function (typedef, obj)
-{
+SerializedObject.prototype.to_json = function() {
+  var old_pointer = this.pointer;
+  this.resetPointer();
+  var output = { };
+
+  while (this.pointer < this.buffer.length) {
+    var key_and_value = stypes.parse(this);
+    var key = key_and_value[0];
+    var value = key_and_value[1];
+    output[key] = SerializedObject.jsonify_structure(value, key);
+  }
+
+  this.pointer = old_pointer;
+
+  return output;
+};
+
+SerializedObject.jsonify_structure = function(structure, field_name) {
+  var output;
+
+  switch (typeof structure) {
+    case 'number':
+      switch (field_name) {
+        case 'LedgerEntryType':
+          output = LEDGER_ENTRY_TYPES[structure];
+          break;
+        case 'TransactionResult':
+          output = TRANSACTION_RESULTS[structure];
+          break;
+        case 'TransactionType':
+          output = TRANSACTION_TYPES[structure];
+          break;
+        default:
+          output = structure;
+      }
+      break;
+    case 'object':
+      if (structure === null) {
+        break;
+      }
+
+      if (typeof structure.to_json === 'function') {
+        output = structure.to_json();
+      } else if (structure instanceof sjcl.bn) {
+        output = ('0000000000000000' +
+                   normalize_sjcl_bn_hex(structure.toString())
+                  .toUpperCase()
+                  ).slice(-16);
+      } else {
+        // new Array or Object
+        output = new structure.constructor();
+
+        var keys = Object.keys(structure);
+
+        for (var i = 0, l = keys.length; i < l; i++) {
+          var key = keys[i];
+          output[key] = SerializedObject.jsonify_structure(structure[key], key);
+        }
+      }
+      break;
+    default:
+      output = structure;
+  }
+
+  return output;
+};
+
+SerializedObject.prototype.serialize = function(typedef, obj) {
+  // Serialize object without end marker
+  stypes.Object.serialize(this, obj, true);
+
+  // ST: Old serialization
+  /*
   // Ensure canonical order
-  typedef = SerializedObject._sort_typedef(typedef.slice());
+  typedef = SerializedObject.sort_typedef(typedef);
 
   // Serialize fields
   for (var i=0, l=typedef.length; i<l; i++) {
-    var spec = typedef[i];
-    this.serialize_field(spec, obj);
+    this.serialize_field(typedef[i], obj);
   }
+  */
 };
 
-SerializedObject.prototype.signing_hash = function (prefix)
-{
+SerializedObject.prototype.hash = function(prefix) {
   var sign_buffer = new SerializedObject();
+
+  // Add hashing prefix
+  if (typeof prefix !== 'undefined') {
     stypes.Int32.serialize(sign_buffer, prefix);
+  }
+
+  // Copy buffer to temporary buffer
   sign_buffer.append(this.buffer);
-  return sign_buffer.hash_sha512_half();
+
+  var bits = sjcl.codec.bytes.toBits(sign_buffer.buffer);
+  var sha512hex = sjcl.codec.hex.fromBits(sjcl.hash.sha512.hash(bits));
+  return UInt256.from_hex(sha512hex.substr(0, 64));
 };
 
-SerializedObject.prototype.hash_sha512_half = function ()
-{
-  var bits = sjcl.codec.bytes.toBits(this.buffer),
-      hash = sjcl.bitArray.bitSlice(sjcl.hash.sha512.hash(bits), 0, 256);
+// DEPRECATED
+SerializedObject.prototype.signing_hash = SerializedObject.prototype.hash;
 
-  return UInt256.from_hex(sjcl.codec.hex.fromBits(hash));
-};
-
-SerializedObject.prototype.serialize_field = function (spec, obj)
-{
-  spec = spec.slice();
-
-  var name = spec.shift(),
-      presence = spec.shift(),
-      field_id = spec.shift(),
-      Type = spec.shift();
-
-  if ("undefined" !== typeof obj[name]) {
-    //console.log(name, Type.id, field_id);
-    this.append(SerializedObject.get_field_header(Type.id, field_id));
+SerializedObject.prototype.serialize_field = function(spec, obj) {
+  var name = spec[0];
+  var presence = spec[1];
 
+  if (typeof obj[name] !== 'undefined') {
     try {
-      Type.serialize(this, obj[name]);
+      stypes.serialize(this, name, obj[name]);
     } catch (e) {
       // Add field name to message and rethrow
-      e.message = "Error serializing '"+name+"': "+e.message;
+      e.message = 'Error serializing "' + name + '": ' + e.message;
       throw e;
     }
   } else if (presence === binformat.REQUIRED) {
@@ -107,38 +305,43 @@ SerializedObject.prototype.serialize_field = function (spec, obj)
   }
 };
 
-SerializedObject.get_field_header = function (type_id, field_id)
-{
+SerializedObject.get_field_header = function(type_id, field_id) {
   var buffer = [0];
-  if (type_id > 0xf) buffer.push(type_id & 0xff);
-  else buffer[0] += (type_id & 0xf) << 4;
 
-  if (field_id > 0xf) buffer.push(field_id & 0xff);
-  else buffer[0] += field_id & 0xf;
+  if (type_id > 0xF) {
+    buffer.push(type_id & 0xFF);
+  } else {
+    buffer[0] += (type_id & 0xF) << 4;
+  }
+
+  if (field_id > 0xF) {
+    buffer.push(field_id & 0xFF);
+  } else {
+    buffer[0] += field_id & 0xF;
+  }
 
   return buffer;
 };
 
+SerializedObject.sort_typedef = function(typedef) {
+  assert(Array.isArray(typedef));
+
   function sort_field_compare(a, b) {
     // Sort by type id first, then by field id
-  return a[3].id !== b[3].id ?
-    a[3].id - b[3].id :
-    a[2] - b[2];
-};
-SerializedObject._sort_typedef = function (typedef) {
+    return a[3] !== b[3] ? stypes[a[3]].id - stypes[b[3]].id : a[2] - b[2];
+  }
+
   return typedef.sort(sort_field_compare);
 };
 
 SerializedObject.lookup_type_tx = function(id) {
-  for (var i in binformat.tx) {
-    if (!binformat.tx.hasOwnProperty(i)) continue;
+  assert.strictEqual(typeof id, 'number');
+  return TRANSACTION_TYPES[id];
+};
 
-    if (binformat.tx[i][0] === id) {
-      return i;
-    }
-  }
-
-  return null;
+SerializedObject.lookup_type_le = function(id) {
+  assert(typeof id === 'number');
+  return LEDGER_ENTRY_TYPES[id];
 };
 
 exports.SerializedObject = SerializedObject;

src/js/ripple/serializedtypes.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Type definitions for binary format.
  *
@@ -6,183 +8,436 @@
  * SerializedObject.parse() or SerializedObject.serialize().
  */
 
-var extend  = require('extend'),
-    utils   = require('./utils'),
-    sjcl    = require('../../../build/sjcl');
+var assert = require('assert');
+var extend = require('extend');
+var GlobalBigNumber = require('bignumber.js');
+var Amount = require('./amount').Amount;
+var Currency = require('./currency').Currency;
+var binformat = require('./binformat');
+var utils = require('./utils');
+var sjcl = utils.sjcl;
+var SJCL_BN = sjcl.bn;
 
-var amount  = require('./amount'),
-    UInt160 = amount.UInt160,
-    UInt256 = require('./uint256').UInt256,
-    Amount  = amount.Amount,
-    Currency= amount.Currency;
+var UInt128 = require('./uint128').UInt128;
+var UInt160 = require('./uint160').UInt160;
+var UInt256 = require('./uint256').UInt256;
+var Base = require('./base').Base;
 
-// Shortcuts
-var hex    = sjcl.codec.hex,
-    bytes  = sjcl.codec.bytes;
+var BigNumber = GlobalBigNumber.another({
+  ROUNDING_MODE: GlobalBigNumber.ROUND_HALF_UP,
+  DECIMAL_PLACES: 40
+});
 
-var SerializedType = function (methods) {
+function SerializedType(methods) {
   extend(this, methods);
-};
-
-SerializedType.prototype.serialize_hex = function (so, hexData) {
-  var byteData = bytes.fromBits(hex.toBits(hexData));
-  this.serialize_varint(so, byteData.length);
-  so.append(byteData);
-};
-
-SerializedType.prototype.serialize_varint = function (so, val) {
-  if (val < 0) {
-    throw new Error("Variable integers are unsigned.");
 }
+
+function isNumber(val) {
+  return typeof val === 'number' && isFinite(val);
+}
+
+function isString(val) {
+  return typeof val === 'string';
+}
+
+function isHexInt64String(val) {
+  return isString(val) && /^[0-9A-F]{0,16}$/i.test(val);
+}
+
+function serializeBits(so, bits, noLength) {
+  var byteData = sjcl.codec.bytes.fromBits(bits);
+  if (!noLength) {
+    SerializedType.serialize_varint(so, byteData.length);
+  }
+  so.append(byteData);
+}
+
+function serializeHex(so, hexData, noLength) {
+  serializeBits(so, sjcl.codec.hex.toBits(hexData), noLength);
+}
+
+/**
+ * parses bytes as hex
+ *
+ * @param {Array} byte_array bytes
+ * @return {String} hex string
+ */
+function convertByteArrayToHex(byte_array) {
+  return sjcl.codec.hex.fromBits(sjcl.codec.bytes.toBits(byte_array))
+  .toUpperCase();
+}
+
+function convertHexToString(hexString) {
+  var bits = sjcl.codec.hex.toBits(hexString);
+  return sjcl.codec.utf8String.fromBits(bits);
+}
+
+function sort_fields(keys) {
+  function sort_field_compare(a, b) {
+    var a_field_coordinates = binformat.fieldsInverseMap[a];
+    var a_type_bits = a_field_coordinates[0];
+    var a_field_bits = a_field_coordinates[1];
+    var b_field_coordinates = binformat.fieldsInverseMap[b];
+    var b_type_bits = b_field_coordinates[0];
+    var b_field_bits = b_field_coordinates[1];
+
+    // Sort by type id first, then by field id
+    return a_type_bits !== b_type_bits
+    ? a_type_bits - b_type_bits
+    : a_field_bits - b_field_bits;
+  }
+
+  return keys.sort(sort_field_compare);
+}
+
+SerializedType.serialize_varint = function (so, val) {
+  if (val < 0) {
+    throw new Error('Variable integers are unsigned.');
+  }
+
   if (val <= 192) {
     so.append([val]);
-  } else if (val <= 12,480) {
+  } else if (val <= 12480) {
     val -= 193;
     so.append([193 + (val >>> 8), val & 0xff]);
   } else if (val <= 918744) {
     val -= 12481;
-    so.append([
-      241 + (val >>> 16),
-      val >>> 8 & 0xff,
-      val & 0xff
-    ]);
-  } else throw new Error("Variable integer overflow.");
+    so.append([241 + (val >>> 16), val >>> 8 & 0xff, val & 0xff]);
+  } else {
+    throw new Error('Variable integer overflow.');
+  }
 };
 
+SerializedType.prototype.parse_varint = function (so) {
+  var b1 = so.read(1)[0], b2, b3;
+  var result;
+
+  if (b1 > 254) {
+    throw new Error('Invalid varint length indicator');
+  }
+
+  if (b1 <= 192) {
+    result = b1;
+  } else if (b1 <= 240) {
+    b2 = so.read(1)[0];
+    result = 193 + (b1 - 193) * 256 + b2;
+  } else if (b1 <= 254) {
+    b2 = so.read(1)[0];
+    b3 = so.read(1)[0];
+    result = 12481 + (b1 - 241) * 65536 + b2 * 256 + b3;
+  }
+
+  return result;
+};
+
+// In the following, we assume that the inputs are in the proper range. Is this
+// correct?
+// Helper functions for 1-, 2-, and 4-byte integers.
+
+/**
+ * Convert an integer value into an array of bytes.
+ *
+ * The result is appended to the serialized object ('so').
+ *
+ * @param {Number} val value
+ * @param {Number} bytes byte size
+ * @return {Array} byte array
+ */
+function convertIntegerToByteArray(val, bytes) {
+  if (!isNumber(val)) {
+    throw new Error('Value is not a number', bytes);
+  }
+
+  if (val < 0 || val >= Math.pow(256, bytes)) {
+    throw new Error('Value out of bounds ');
+  }
+
+  var newBytes = [ ];
+
+  for (var i = 0; i < bytes; i++) {
+    newBytes.unshift(val >>> (i * 8) & 0xff);
+  }
+
+  return newBytes;
+}
+
+// Convert a certain number of bytes from the serialized object ('so') into an
+// integer.
+function readAndSum(so, bytes) {
+  var sum = 0;
+
+  if (bytes > 4) {
+    throw new Error('This function only supports up to four bytes.');
+  }
+
+  for (var i = 0; i < bytes; i++) {
+    var byte = so.read(1)[0];
+    sum += (byte << (8 * (bytes - i - 1)));
+  }
+
+  // Convert to unsigned integer
+  return sum >>> 0;
+}
+
 var STInt8 = exports.Int8 = new SerializedType({
   serialize: function (so, val) {
-    so.append([val & 0xff]);
+    so.append(convertIntegerToByteArray(val, 1));
   },
   parse: function (so) {
-    return so.read(1)[0];
+    return readAndSum(so, 1);
   }
 });
 
+STInt8.id = 16;
+
+function serialize(so, field_name, value) {
+  // so: a byte-stream to serialize into.
+  // field_name: a string for the field name ('LedgerEntryType' etc.)
+  // value: the value of that field.
+  var field_coordinates = binformat.fieldsInverseMap[field_name];
+  var type_bits = field_coordinates[0];
+  var field_bits = field_coordinates[1];
+  var tag_byte = (type_bits < 16
+    ? type_bits << 4
+    : 0) | (field_bits < 16
+      ? field_bits
+      : 0);
+
+  if (field_name === 'LedgerEntryType' && typeof value === 'string') {
+    value = binformat.ledger[value][0];
+  }
+
+  if (field_name === 'TransactionResult' && typeof value === 'string') {
+    value = binformat.ter[value];
+  }
+
+  STInt8.serialize(so, tag_byte);
+
+  if (type_bits >= 16) {
+    STInt8.serialize(so, type_bits);
+  }
+
+  if (field_bits >= 16) {
+    STInt8.serialize(so, field_bits);
+  }
+
+  // Get the serializer class (ST...)
+  var serialized_object_type;
+
+  if (field_name === 'Memo' && typeof value === 'object') {
+    // for Memo we override the default behavior with our STMemo serializer
+    serialized_object_type = exports.STMemo;
+  } else {
+    // for a field based on the type bits.
+    serialized_object_type = exports[binformat.types[type_bits]];
+  }
+
+  try {
+    serialized_object_type.serialize(so, value);
+  } catch (e) {
+    e.message += ' (' + field_name + ')';
+    throw e;
+  }
+}
+
+exports.serialize = exports.serialize_whatever = serialize;
+
+// Take the serialized object, figure out what type/field it is, and return the
+// parsing of that.
+
+function parse(so) {
+  var tag_byte = so.read(1)[0];
+  var type_bits = tag_byte >> 4;
+
+  if (type_bits === 0) {
+    type_bits = so.read(1)[0];
+  }
+
+  var field_bits = tag_byte & 0x0f;
+  var field_name = (field_bits === 0)
+    ? field_name = binformat.fields[type_bits][so.read(1)[0]]
+    : field_name = binformat.fields[type_bits][field_bits];
+
+  assert(field_name, 'Unknown field - header byte is 0x'
+    + tag_byte.toString(16));
+
+  // Get the parser class (ST...) for a field based on the type bits.
+  var type = (field_name === 'Memo')
+    ? exports.STMemo
+    : exports[binformat.types[type_bits]];
+
+  assert(type, 'Unknown type - header byte is 0x' + tag_byte.toString(16));
+
+  return [field_name, type.parse(so)]; // key, value
+}
+
+exports.parse = exports.parse_whatever = parse;
+
 var STInt16 = exports.Int16 = new SerializedType({
   serialize: function (so, val) {
-    so.append([
-      val >>> 8 & 0xff,
-      val       & 0xff
-    ]);
+    so.append(convertIntegerToByteArray(val, 2));
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Int16 not implemented");
+    return readAndSum(so, 2);
   }
 });
 
+STInt16.id = 1;
+
 var STInt32 = exports.Int32 = new SerializedType({
   serialize: function (so, val) {
-    so.append([
-      val >>> 24 & 0xff,
-      val >>> 16 & 0xff,
-      val >>>  8 & 0xff,
-      val        & 0xff
-    ]);
+    so.append(convertIntegerToByteArray(val, 4));
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Int32 not implemented");
+    return readAndSum(so, 4);
   }
 });
 
+STInt32.id = 2;
+
 var STInt64 = exports.Int64 = new SerializedType({
   serialize: function (so, val) {
-    // XXX
-    throw new Error("Serializing Int64 not implemented");
+    var bigNumObject;
+
+    if (isNumber(val)) {
+      val = Math.floor(val);
+      if (val < 0) {
+        throw new Error('Negative value for unsigned Int64 is invalid.');
+      }
+      bigNumObject = new SJCL_BN(val, 10);
+    } else if (isString(val)) {
+      if (!isHexInt64String(val)) {
+        throw new Error('Not a valid hex Int64.');
+      }
+      bigNumObject = new SJCL_BN(val, 16);
+    } else if (val instanceof SJCL_BN) {
+      if (!val.greaterEquals(0)) {
+        throw new Error('Negative value for unsigned Int64 is invalid.');
+      }
+      bigNumObject = val;
+    } else {
+      throw new Error('Invalid type for Int64');
+    }
+    serializeBits(so, bigNumObject.toBits(64), true); // noLength = true
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Int64 not implemented");
+    var bytes = so.read(8);
+    return SJCL_BN.fromBits(sjcl.codec.bytes.toBits(bytes));
   }
 });
 
+STInt64.id = 3;
+
 var STHash128 = exports.Hash128 = new SerializedType({
   serialize: function (so, val) {
-    // XXX
-    throw new Error("Serializing Hash128 not implemented");
+    var hash = UInt128.from_json(val);
+    if (!hash.is_valid()) {
+      throw new Error('Invalid Hash128');
+    }
+    serializeBits(so, hash.to_bits(), true); // noLength = true
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Hash128 not implemented");
+    return UInt128.from_bytes(so.read(16));
   }
 });
 
+STHash128.id = 4;
+
 var STHash256 = exports.Hash256 = new SerializedType({
   serialize: function (so, val) {
     var hash = UInt256.from_json(val);
-    this.serialize_hex(so, hash.to_hex());
+    if (!hash.is_valid()) {
+      throw new Error('Invalid Hash256');
+    }
+    serializeBits(so, hash.to_bits(), true); // noLength = true
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Hash256 not implemented");
+    return UInt256.from_bytes(so.read(32));
   }
 });
 
+STHash256.id = 5;
+
 var STHash160 = exports.Hash160 = new SerializedType({
   serialize: function (so, val) {
-    // XXX
-    throw new Error("Serializing Hash160 not implemented");
+    var hash = UInt160.from_json(val);
+    if (!hash.is_valid()) {
+      throw new Error('Invalid Hash160');
+    }
+    serializeBits(so, hash.to_bits(), true); // noLength = true
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Hash160 not implemented");
+    return UInt160.from_bytes(so.read(20));
   }
 });
 
+STHash160.id = 17;
+
 // Internal
 var STCurrency = new SerializedType({
   serialize: function (so, val) {
-    var currency = val.to_json();
-    if ("string" === typeof currency && currency.length === 3) {
-      var currencyCode = currency.toUpperCase(),
-          currencyData = utils.arraySet(20, 0);
+    var currencyData = val.to_bytes();
 
-      if (!/^[A-Z]{3}$/.test(currencyCode)) {
-        throw new Error('Invalid currency code');
+    if (!currencyData) {
+      throw new Error(
+        'Tried to serialize invalid/unimplemented currency type.');
     }
 
-      currencyData[12] = currencyCode.charCodeAt(0) & 0xff;
-      currencyData[13] = currencyCode.charCodeAt(1) & 0xff;
-      currencyData[14] = currencyCode.charCodeAt(2) & 0xff;
-
     so.append(currencyData);
-    } else {
-      throw new Error('Tried to serialize invalid/unimplemented currency type.');
-    }
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Currency not implemented");
+    var bytes = so.read(20);
+    var currency = Currency.from_bytes(bytes);
+    // XXX Disabled check. Theoretically, the Currency class should support any
+    //     UInt160 value and consider it valid. But it doesn't, so for the
+    //     deserialization to be usable, we need to allow invalid results for
+    //     now.
+    // if (!currency.is_valid()) {
+    //   throw new Error('Invalid currency: '+convertByteArrayToHex(bytes));
+    // }
+    return currency;
   }
 });
 
 var STAmount = exports.Amount = new SerializedType({
   serialize: function (so, val) {
     var amount = Amount.from_json(val);
+
     if (!amount.is_valid()) {
-      throw new Error("Not a valid Amount object.");
+      throw new Error('Not a valid Amount object.');
     }
 
+    var value = new BigNumber(amount.to_text());
+    var offset = value.e - 15;
+
     // Amount (64-bit integer)
     var valueBytes = utils.arraySet(8, 0);
-    if (amount.is_native()) {
-      var valueHex = amount._value.toString(16);
 
-      // Enforce correct length (64 bits)
-      if (valueHex.length > 16) {
+    if (amount.is_native()) {
+      var valueHex = value.abs().toString(16);
+
+      if (Amount.strict_mode && value.abs().greaterThan(Amount.bi_xns_max)) {
         throw new Error('Value out of bounds');
       }
-      while (valueHex.length < 16) {
-        valueHex = "0" + valueHex;
+
+      // Enforce correct length (64 bits)
+      if (Amount.strict_mode && valueHex.length > 16) {
+        throw new Error('Value out of bounds');
       }
 
-      valueBytes = bytes.fromBits(hex.toBits(valueHex));
+      while (valueHex.length < 16) {
+        valueHex = '0' + valueHex;
+      }
+
+      valueBytes = sjcl.codec.bytes.fromBits(sjcl.codec.hex.toBits(valueHex));
       // Clear most significant two bits - these bits should already be 0 if
       // Amount enforces the range correctly, but we'll clear them anyway just
       // so this code can make certain guarantees about the encoded value.
       valueBytes[0] &= 0x3f;
-      if (!amount.is_negative()) valueBytes[0] |= 0x40;
+
+      if (!amount.is_negative()) {
+        valueBytes[0] |= 0x40;
+      }
     } else {
       var hi = 0, lo = 0;
 
@@ -191,14 +446,21 @@ var STAmount = exports.Amount = new SerializedType({
 
       if (!amount.is_zero()) {
         // Second bit: non-negative?
-        if (!amount.is_negative()) hi |= 1 << 30;
+        if (!amount.is_negative()) {
+          hi |= 1 << 30;
+        }
 
         // Next eight bits: offset/exponent
-        hi |= ((97 + amount._offset) & 0xff) << 22;
+        hi |= ((97 + offset) & 0xff) << 22;
 
-        // Remaining 52 bits: mantissa
-        hi |= amount._value.shiftRight(32).intValue() & 0x3fffff;
-        lo = amount._value.intValue() & 0xffffffff;
+        // Remaining 54 bits: mantissa
+        var mantissaDecimal = utils.getMantissaDecimalString(value.abs());
+        var mantissaHex = (new BigNumber(mantissaDecimal)).toString(16);
+        assert(mantissaHex.length <= 16,
+          'Mantissa hex representation ' + mantissaHex +
+          ' exceeds the maximum length of 16');
+        hi |= parseInt(mantissaHex.slice(0, -8), 16) & 0x3fffff;
+        lo = parseInt(mantissaHex.slice(-8), 16);
       }
 
       valueBytes = sjcl.codec.bytes.fromBits([hi, lo]);
@@ -209,40 +471,97 @@ var STAmount = exports.Amount = new SerializedType({
     if (!amount.is_native()) {
       // Currency (160-bit hash)
       var currency = amount.currency();
-      STCurrency.serialize(so, currency);
+      STCurrency.serialize(so, currency, true);
 
       // Issuer (160-bit hash)
       so.append(amount.issuer().to_bytes());
     }
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Amount not implemented");
+    var value_bytes = so.read(8);
+    var is_zero = !(value_bytes[0] & 0x7f);
+
+    for (var i = 1; i < 8; i++) {
+      is_zero = is_zero && !value_bytes[i];
+    }
+
+    var is_negative = !is_zero && !(value_bytes[0] & 0x40);
+
+    if (value_bytes[0] & 0x80) {
+      // non-native
+      var currency = STCurrency.parse(so);
+      var issuer_bytes = so.read(20);
+      var issuer = UInt160.from_bytes(issuer_bytes);
+      issuer.set_version(Base.VER_ACCOUNT_ID);
+      var offset = ((value_bytes[0] & 0x3f) << 2) + (value_bytes[1] >>> 6) - 97;
+      var mantissa_bytes = value_bytes.slice(1);
+      mantissa_bytes[0] &= 0x3f;
+      var mantissa = new BigNumber(utils.arrayToHex(mantissa_bytes), 16);
+      var sign = is_negative ? '-' : '';
+      var valueString = sign + mantissa.toString() + 'e' + offset.toString();
+
+      return Amount.from_json({
+        currency: currency,
+        issuer: issuer.to_json(),
+        value: valueString
+      });
+    }
+
+    // native
+    var integer_bytes = value_bytes.slice();
+    integer_bytes[0] &= 0x3f;
+    var integer_hex = utils.arrayToHex(integer_bytes);
+    var value = new BigNumber(integer_hex, 16);
+    return Amount.from_json((is_negative ? '-' : '') + value.toString());
   }
 });
 
-var STVL = exports.VariableLength = new SerializedType({
+STAmount.id = 6;
+
+var STVL = exports.VariableLength = exports.VL = new SerializedType({
   serialize: function (so, val) {
-    if ("string" === typeof val) this.serialize_hex(so, val);
-    else throw new Error("Unknown datatype.");
+    if (typeof val === 'string') {
+      serializeHex(so, val);
+    } else {
+      throw new Error('Unknown datatype.');
+    }
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing VL not implemented");
+    var len = this.parse_varint(so);
+    return convertByteArrayToHex(so.read(len));
   }
 });
 
+STVL.id = 7;
+
 var STAccount = exports.Account = new SerializedType({
   serialize: function (so, val) {
     var account = UInt160.from_json(val);
-    this.serialize_hex(so, account.to_hex());
+    if (!account.is_valid()) {
+      throw new Error('Invalid account!');
+    }
+    serializeBits(so, account.to_bits());
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Account not implemented");
+    var len = this.parse_varint(so);
+
+    if (len !== 20) {
+      throw new Error('Non-standard-length account ID');
+    }
+
+    var result = UInt160.from_bytes(so.read(len));
+    result.set_version(Base.VER_ACCOUNT_ID);
+
+    if (false && !result.is_valid()) {
+      throw new Error('Invalid Account');
+    }
+
+    return result;
   }
 });
 
+STAccount.id = 8;
+
 var STPathSet = exports.PathSet = new SerializedType({
   typeBoundary: 0xff,
   typeEnd: 0x00,
@@ -250,71 +569,310 @@ var STPathSet = exports.PathSet = new SerializedType({
   typeCurrency: 0x10,
   typeIssuer: 0x20,
   serialize: function (so, val) {
-    // XXX
     for (var i = 0, l = val.length; i < l; i++) {
       // Boundary
-      if (i) STInt8.serialize(so, this.typeBoundary);
+      if (i) {
+        STInt8.serialize(so, this.typeBoundary);
+      }
 
       for (var j = 0, l2 = val[i].length; j < l2; j++) {
         var entry = val[i][j];
-
+        // if (entry.hasOwnProperty('_value')) {entry = entry._value;}
         var type = 0;
 
-        if (entry.account) type |= this.typeAccount;
-        if (entry.currency) type |= this.typeCurrency;
-        if (entry.issuer) type |= this.typeIssuer;
+        if (entry.account) {
+          type |= this.typeAccount;
+        }
+        if (entry.currency) {
+          type |= this.typeCurrency;
+        }
+        if (entry.issuer) {
+          type |= this.typeIssuer;
+        }
 
         STInt8.serialize(so, type);
 
         if (entry.account) {
-          so.append(UInt160.from_json(entry.account).to_bytes());
+          STHash160.serialize(so, entry.account);
         }
+
         if (entry.currency) {
-          var currency = Currency.from_json(entry.currency);
+          var currency = Currency.from_json(entry.currency, entry.non_native);
           STCurrency.serialize(so, currency);
         }
+
         if (entry.issuer) {
-          so.append(UInt160.from_json(entry.issuer).to_bytes());
+          STHash160.serialize(so, entry.issuer);
         }
       }
     }
+
     STInt8.serialize(so, this.typeEnd);
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing PathSet not implemented");
+    // should return a list of lists:
+    /*
+       [
+       [entry, entry],
+       [entry, entry, entry],
+       [entry],
+       []
+       ]
+
+       each entry has one or more of the following attributes:
+       amount, currency, issuer.
+       */
+
+    var path_list = [];
+    var current_path = [];
+    var tag_byte;
+
+    /* eslint-disable no-cond-assign */
+
+    while ((tag_byte = so.read(1)[0]) !== this.typeEnd) {
+      // TODO: try/catch this loop, and catch when we run out of data without
+      // reaching the end of the data structure.
+      // Now determine: is this an end, boundary, or entry-begin-tag?
+      // console.log('Tag byte:', tag_byte);
+      if (tag_byte === this.typeBoundary) {
+        if (current_path) { // close the current path, if there is one,
+          path_list.push(current_path);
+        }
+        current_path = [ ]; // and start a new one.
+        continue;
+      }
+
+      // It's an entry-begin tag.
+      var entry = {};
+      var type = 0;
+
+      if (tag_byte & this.typeAccount) {
+        entry.account = STHash160.parse(so);
+        entry.account.set_version(Base.VER_ACCOUNT_ID);
+        type = type | this.typeAccount;
+      }
+      if (tag_byte & this.typeCurrency) {
+        entry.currency = STCurrency.parse(so);
+        if (entry.currency.to_json() === 'XRP' && !entry.currency.is_native()) {
+          entry.non_native = true;
+        }
+        type = type | this.typeCurrency;
+      }
+      if (tag_byte & this.typeIssuer) {
+        entry.issuer = STHash160.parse(so);
+        // Enable and set correct type of base-58 encoding
+        entry.issuer.set_version(Base.VER_ACCOUNT_ID);
+        type = type | this.typeIssuer;
+      }
+
+      if (entry.account || entry.currency || entry.issuer) {
+        entry.type = type;
+        entry.type_hex = ('000000000000000' + type.toString(16)).slice(-16);
+        current_path.push(entry);
+      } else {
+        // It must have at least something in it.
+        throw new Error('Invalid path entry');
+      }
+    }
+
+    if (current_path) {
+      // close the current path, if there is one,
+      path_list.push(current_path);
+    }
+
+    return path_list;
   }
 });
 
+STPathSet.id = 18;
+
 var STVector256 = exports.Vector256 = new SerializedType({
   serialize: function(so, val) {
-    // XXX
-    throw new Error("Serializing Vector256 not implemented");
+    // Assume val is an array of STHash256 objects.
+    SerializedType.serialize_varint(so, val.length * 32);
+    for (var i = 0, l = val.length; i < l; i++) {
+      STHash256.serialize(so, val[i]);
+    }
   },
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Vector256 not implemented");
+    var length = this.parse_varint(so);
+    var output = [];
+    // length is number of bytes not number of Hash256
+    for (var i = 0; i < length / 32; i++) {
+      output.push(STHash256.parse(so));
     }
+    return output;
+  }
+});
+
+STVector256.id = 19;
+
+// Internal
+exports.STMemo = new SerializedType({
+  serialize: function(so, val, no_marker) {
+    var keys = [];
+
+    Object.keys(val).forEach(function (key) {
+      // Ignore lowercase field names - they're non-serializable fields by
+      // convention.
+      if (key[0] === key[0].toLowerCase()) {
+        return;
+      }
+
+      if (typeof binformat.fieldsInverseMap[key] === 'undefined') {
+        throw new Error('JSON contains unknown field: "' + key + '"');
+      }
+
+      keys.push(key);
+    });
+
+    // Sort fields
+    keys = sort_fields(keys);
+
+    keys.forEach(function(key) {
+      serialize(so, key, val[key]);
+    });
+
+    if (!no_marker) {
+      // Object ending marker
+      STInt8.serialize(so, 0xe1);
+    }
+  },
+  parse: function(so) {
+    var output = {};
+
+    while (so.peek(1)[0] !== 0xe1) {
+      var keyval = parse(so);
+      output[keyval[0]] = keyval[1];
+    }
+
+    if (output.MemoType !== undefined) {
+      try {
+        var parsedType = convertHexToString(output.MemoType);
+
+        if (parsedType !== 'unformatted_memo') {
+          output.parsed_memo_type = parsedType;
+        }
+      } catch (e) {
+        // we don't know what's in the binary, apparently it's not a UTF-8
+        // string
+        // this is fine, we won't add the parsed_memo_type field
+      }
+    }
+
+    if (output.MemoFormat !== undefined) {
+      try {
+        output.parsed_memo_format = convertHexToString(output.MemoFormat);
+      } catch (e) {
+        // we don't know what's in the binary, apparently it's not a UTF-8
+        // string
+        // this is fine, we won't add the parsed_memo_format field
+      }
+    }
+
+    if (output.MemoData !== undefined) {
+
+      try {
+        if (output.parsed_memo_format === 'json') {
+          // see if we can parse JSON
+          output.parsed_memo_data =
+          JSON.parse(convertHexToString(output.MemoData));
+
+        } else if (output.parsed_memo_format === 'text') {
+          // otherwise see if we can parse text
+          output.parsed_memo_data = convertHexToString(output.MemoData);
+        }
+      } catch(e) {
+        // we'll fail in case the content does not match what the MemoFormat
+        // described
+        // this is fine, we won't add the parsed_memo_data, the user has to
+        // parse themselves
+      }
+    }
+
+    so.read(1);
+    return output;
+  }
+
 });
 
 var STObject = exports.Object = new SerializedType({
-  serialize: function (so, val) {
-    // XXX
-    throw new Error("Serializing Object not implemented");
+  serialize: function (so, val, no_marker) {
+    var keys = [];
+
+    Object.keys(val).forEach(function (key) {
+      // Ignore lowercase field names - they're non-serializable fields by
+      // convention.
+      if (key[0] === key[0].toLowerCase()) {
+        return;
+      }
+
+      if (typeof binformat.fieldsInverseMap[key] === 'undefined') {
+        throw new Error('JSON contains unknown field: "' + key + '"');
+      }
+
+      keys.push(key);
+    });
+
+    // Sort fields
+    keys = sort_fields(keys);
+
+    for (var i = 0; i < keys.length; i++) {
+      serialize(so, keys[i], val[keys[i]]);
+    }
+
+    if (!no_marker) {
+      // Object ending marker
+      STInt8.serialize(so, 0xe1);
+    }
   },
+
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Object not implemented");
+    var output = {};
+    while (so.peek(1)[0] !== 0xe1) {
+      var keyval = parse(so);
+      output[keyval[0]] = keyval[1];
+    }
+    so.read(1);
+    return output;
   }
 });
 
+STObject.id = 14;
+
 var STArray = exports.Array = new SerializedType({
   serialize: function (so, val) {
-    // XXX
-    throw new Error("Serializing Array not implemented");
+    for (var i = 0, l = val.length; i < l; i++) {
+      var keys = Object.keys(val[i]);
+
+      if (keys.length !== 1) {
+        throw new Error(
+          'Cannot serialize an array containing non-single-key objects');
+      }
+
+      var field_name = keys[0];
+      var value = val[i][field_name];
+      serialize(so, field_name, value);
+    }
+
+    // Array ending marker
+    STInt8.serialize(so, 0xf1);
   },
+
   parse: function (so) {
-    // XXX
-    throw new Error("Parsing Array not implemented");
+    var output = [ ];
+
+    while (so.peek(1)[0] !== 0xf1) {
+      var keyval = parse(so);
+      var obj = { };
+      obj[keyval[0]] = keyval[1];
+      output.push(obj);
+    }
+
+    so.read(1);
+
+    return output;
   }
 });
+
+STArray.id = 15;

src/js/ripple/shamap.js

@@ -0,0 +1,187 @@
+'use strict';
+
+var util = require('util');
+var hashprefixes = require('./hashprefixes');
+
+var UInt256 = require('./uint256').UInt256;
+var SerializedObject = require('./serializedobject').SerializedObject;
+
+/**
+ * Abstract class representing a node in a SHAMap tree.
+ *
+ * Can be either SHAMapTreeNodeInner or SHAMapTreeNodeLeaf.
+ *
+ * @class
+ */
+function SHAMapTreeNode() { }
+
+SHAMapTreeNode.TYPE_INNER = 1;
+SHAMapTreeNode.TYPE_TRANSACTION_NM = 2;
+SHAMapTreeNode.TYPE_TRANSACTION_MD = 3;
+SHAMapTreeNode.TYPE_ACCOUNT_STATE = 4;
+
+/**
+* @param {String} tag (64 hexadecimal characters)
+* @param {SHAMapTreeNode} node
+* @return {void}
+* @virtual
+*/
+/*eslint-disable no-unused-vars*/
+SHAMapTreeNode.prototype.add_item = function(tag, node) {
+  throw new Error(
+    'Called unimplemented virtual method SHAMapTreeNode#add_item.');
+};
+/*eslint-enable no-unused-vars*/
+
+SHAMapTreeNode.prototype.hash = function() {
+  throw new Error('Called unimplemented virtual method SHAMapTreeNode#hash.');
+};
+
+/**
+ * Inner (non-leaf) node in a SHAMap tree.
+ * @param {Number} depth (i.e. how many parent inner nodes)
+ * @class
+ */
+function SHAMapTreeNodeInner(depth) {
+  SHAMapTreeNode.call(this);
+
+  this.leaves = {};
+
+  this.type = SHAMapTreeNode.INNER;
+  this.depth = depth === undefined ? 0 : depth;
+
+  this.empty = true;
+}
+
+util.inherits(SHAMapTreeNodeInner, SHAMapTreeNode);
+
+/**
+ * @param {String} tag (equates to a ledger entry `index`)
+ * @param {SHAMapTreeNode} node (to add)
+ * @return {void}
+ */
+SHAMapTreeNodeInner.prototype.add_item = function(tag, node) {
+  var depth = this.depth;
+  var existing_node = this.get_node(tag[depth]);
+
+  if (existing_node) {
+    // A node already exists in this slot
+    if (existing_node instanceof SHAMapTreeNodeInner) {
+      // There is an inner node, so we need to go deeper
+      existing_node.add_item(tag, node);
+    } else if (existing_node.tag === tag) {
+      // Collision
+      throw new Error(
+          'Tried to add a node to a SHAMap that was already in there.');
+    } else {
+      // Turn it into an inner node
+      var new_inner_node = new SHAMapTreeNodeInner(depth + 1);
+
+      // Parent new and existing node
+      new_inner_node.add_item(existing_node.tag, existing_node);
+      new_inner_node.add_item(tag, node);
+
+      // And place the newly created inner node in the slot
+      this.set_node(tag[depth], new_inner_node);
+    }
+  } else {
+    // Neat, we have a nice open spot for the new node
+    this.set_node(tag[depth], node);
+  }
+};
+
+/**
+ * Overwrite the node that is currently in a given slot.
+ * @param {String} slot (a character 0-F)
+ * @param {SHAMapTreeNode} node (to place)
+ * @return {void}
+ */
+SHAMapTreeNodeInner.prototype.set_node = function(slot, node) {
+  this.leaves[slot] = node;
+  this.empty = false;
+};
+
+SHAMapTreeNodeInner.prototype.get_node = function(slot) {
+  return this.leaves[slot];
+};
+
+SHAMapTreeNodeInner.prototype.hash = function() {
+  if (this.empty) {
+    return UInt256.from_hex(UInt256.HEX_ZERO);
+  }
+
+  var hash_buffer = new SerializedObject();
+
+  for (var i = 0; i < 16; i++) {
+    var leafHash = UInt256.from_hex(UInt256.HEX_ZERO);
+    var slot = i.toString(16).toUpperCase();
+
+    if (typeof this.leaves[slot] === 'object') {
+      leafHash = this.leaves[slot].hash();
+    }
+
+    hash_buffer.append(leafHash.to_bytes());
+  }
+
+  var hash = hash_buffer.hash(hashprefixes.HASH_INNER_NODE);
+
+  return UInt256.from_bits(hash);
+};
+
+/**
+ * Leaf node in a SHAMap tree.
+ * @param {String} tag (equates to a ledger entry `index`)
+ * @param {SerializedObject} node (bytes of account state, transaction etc)
+ * @param {Number} type (one of TYPE_ACCOUNT_STATE, TYPE_TRANSACTION_MD etc)
+ * @class
+ */
+function SHAMapTreeNodeLeaf(tag, node, type) {
+  SHAMapTreeNode.call(this);
+
+  if (typeof tag !== 'string') {
+    throw new Error('Tag is unexpected type.');
+  }
+
+  this.tag = tag;
+  this.tag_bytes = UInt256.from_hex(this.tag).to_bytes();
+  this.type = type;
+  this.node = node;
+}
+
+util.inherits(SHAMapTreeNodeLeaf, SHAMapTreeNode);
+
+SHAMapTreeNodeLeaf.prototype.hash = function() {
+  var buffer = new SerializedObject();
+  switch (this.type) {
+    case SHAMapTreeNode.TYPE_ACCOUNT_STATE:
+      buffer.append(this.node);
+      buffer.append(this.tag_bytes);
+      return buffer.hash(hashprefixes.HASH_LEAF_NODE);
+    case SHAMapTreeNode.TYPE_TRANSACTION_NM:
+      return this.tag_bytes;
+    case SHAMapTreeNode.TYPE_TRANSACTION_MD:
+      buffer.append(this.node);
+      buffer.append(this.tag_bytes);
+      return buffer.hash(hashprefixes.HASH_TX_NODE);
+    default:
+      throw new Error('Tried to hash a SHAMap node of unknown type.');
+  }
+};
+
+function SHAMap() {
+  this.root = new SHAMapTreeNodeInner(0);
+}
+
+SHAMap.prototype.add_item = function(tag, node, type) {
+  node = new SHAMapTreeNodeLeaf(tag, node, type);
+  this.root.add_item(tag, node);
+};
+
+SHAMap.prototype.hash = function() {
+  return this.root.hash();
+};
+
+exports.SHAMap = SHAMap;
+exports.SHAMapTreeNode = SHAMapTreeNode;
+exports.SHAMapTreeNodeInner = SHAMapTreeNodeInner;
+exports.SHAMapTreeNodeLeaf = SHAMapTreeNodeLeaf;

src/js/ripple/transactionmanager.js

@@ -0,0 +1,732 @@
+'use strict';
+
+var util = require('util');
+var assert = require('assert');
+var async = require('async');
+var EventEmitter = require('events').EventEmitter;
+var Transaction = require('./transaction').Transaction;
+var RippleError = require('./rippleerror').RippleError;
+var PendingQueue = require('./transactionqueue').TransactionQueue;
+var log = require('./log').internal.sub('transactionmanager');
+
+/**
+ * @constructor TransactionManager
+ * @param {Account} account
+ */
+
+function TransactionManager(account) {
+  EventEmitter.call(this);
+
+  var self = this;
+
+  this._account = account;
+  this._accountID = account._account_id;
+  this._remote = account._remote;
+  this._nextSequence = undefined;
+  this._maxFee = this._remote.max_fee;
+  this._maxAttempts = this._remote.max_attempts;
+  this._submissionTimeout = this._remote.submission_timeout;
+  this._lastLedgerOffset = this._remote.last_ledger_offset;
+  this._pending = new PendingQueue();
+
+  this._account.on('transaction-outbound', function(res) {
+    self._transactionReceived(res);
+  });
+
+  this._remote.on('load_changed', function(load) {
+    self._adjustFees(load);
+  });
+
+  function updatePendingStatus(ledger) {
+    self._updatePendingStatus(ledger);
+  }
+
+  this._remote.on('ledger_closed', updatePendingStatus);
+
+  function handleReconnect() {
+    self._handleReconnect(function() {
+      // Handle reconnect, account_tx procedure first, before
+      // hooking back into ledger_closed
+      self._remote.on('ledger_closed', updatePendingStatus);
+    });
+  }
+
+  this._remote.on('disconnect', function() {
+    self._remote.removeListener('ledger_closed', updatePendingStatus);
+    self._remote.once('connect', handleReconnect);
+  });
+
+  // Query server for next account transaction sequence
+  this._loadSequence();
+}
+
+util.inherits(TransactionManager, EventEmitter);
+
+TransactionManager._isNoOp = function(transaction) {
+  return (typeof transaction === 'object')
+      && (typeof transaction.tx_json === 'object')
+      && (transaction.tx_json.TransactionType === 'AccountSet')
+      && (transaction.tx_json.Flags === 0);
+};
+
+TransactionManager._isRemoteError = function(error) {
+  return (typeof error === 'object')
+      && (error.error === 'remoteError')
+      && (typeof error.remote === 'object');
+};
+
+TransactionManager._isNotFound = function(error) {
+  return TransactionManager._isRemoteError(error)
+      && /^(txnNotFound|transactionNotFound)$/.test(error.remote.error);
+};
+
+TransactionManager._isTooBusy = function(error) {
+  return TransactionManager._isRemoteError(error)
+      && (error.remote.error === 'tooBusy');
+};
+
+/**
+ * Normalize transactions received from account transaction stream and
+ * account_tx
+ *
+ * @param {Transaction}
+ * @return {Transaction} normalized
+ * @api private
+ */
+
+TransactionManager.normalizeTransaction = function(tx) {
+  var transaction = { };
+  var keys = Object.keys(tx);
+
+  for (var i = 0; i < keys.length; i++) {
+    var k = keys[i];
+    switch (k) {
+      case 'transaction':
+        // Account transaction stream
+        transaction.tx_json = tx[k];
+        break;
+      case 'tx':
+        // account_tx response
+        transaction.engine_result = tx.meta.TransactionResult;
+        transaction.result = transaction.engine_result;
+        transaction.tx_json = tx[k];
+        transaction.hash = tx[k].hash;
+        transaction.ledger_index = tx[k].ledger_index;
+        transaction.type = 'transaction';
+        transaction.validated = tx.validated;
+        break;
+      case 'meta':
+      case 'metadata':
+        transaction.metadata = tx[k];
+        break;
+      case 'mmeta':
+        // Don't copy mmeta
+        break;
+      default:
+        transaction[k] = tx[k];
+    }
+  }
+
+  return transaction;
+};
+
+/**
+ * Handle received transaction from two possible sources
+ *
+ * + Account transaction stream (normal operation)
+ * + account_tx (after reconnect)
+ *
+ * @param {Object} transaction
+ * @api private
+ */
+
+TransactionManager.prototype._transactionReceived = function(tx) {
+  var transaction = TransactionManager.normalizeTransaction(tx);
+
+  if (!transaction.validated) {
+    // Transaction has not been validated
+    return;
+  }
+
+  if (transaction.tx_json.Account !== this._accountID) {
+    // Received transaction's account does not match
+    return;
+  }
+
+  if (this._remote.trace) {
+    log.info('transaction received:', transaction.tx_json);
+  }
+
+  this._pending.addReceivedSequence(transaction.tx_json.Sequence);
+
+  var hash = transaction.tx_json.hash;
+  var submission = this._pending.getSubmission(hash);
+
+  if (!(submission instanceof Transaction)) {
+    // The received transaction does not correlate to one submitted
+    this._pending.addReceivedId(hash, transaction);
+    return;
+  }
+
+  // ND: A `success` handler will `finalize` this later
+  switch (transaction.engine_result) {
+    case 'tesSUCCESS':
+      submission.emit('success', transaction);
+      break;
+    default:
+      submission.emit('error', transaction);
+  }
+};
+
+/**
+ * Adjust pending transactions' fees in real-time. This does not resubmit
+ * pending transactions; they will be resubmitted periodically with an updated
+ * fee (and as a consequence, a new transaction ID) if not already validated
+ *
+ * ND: note, that `Fee` is a component of a transactionID
+ *
+ * @api private
+ */
+
+TransactionManager.prototype._adjustFees = function() {
+  var self = this;
+
+  if (!this._remote.local_fee) {
+    return;
+  }
+
+  function maxFeeExceeded(transaction) {
+    // Don't err until attempting to resubmit
+    transaction.once('presubmit', function() {
+      transaction.emit('error', 'tejMaxFeeExceeded');
+    });
+  }
+
+  this._pending.forEach(function(transaction) {
+    if (transaction._setFixedFee) {
+      return;
+    }
+
+    var oldFee = transaction.tx_json.Fee;
+    var newFee = transaction._computeFee();
+
+    if (Number(newFee) > self._maxFee) {
+      // Max transaction fee exceeded, abort submission
+      maxFeeExceeded(transaction);
+      return;
+    }
+
+    transaction.tx_json.Fee = newFee;
+    transaction.emit('fee_adjusted', oldFee, newFee);
+
+    if (self._remote.trace) {
+      log.info('fee adjusted:', transaction.tx_json, oldFee, newFee);
+    }
+  });
+};
+
+/**
+ * Get pending transactions
+ *
+ * @return {Array} pending transactions
+ */
+
+TransactionManager.prototype.getPending = function() {
+  return this._pending;
+};
+
+/**
+ * Legacy code. Update transaction status after excessive ledgers pass. One of
+ * either "missing" or "lost"
+ *
+ * @param {Object} ledger data
+ * @api private
+ */
+
+TransactionManager.prototype._updatePendingStatus = function(ledger) {
+  assert.strictEqual(typeof ledger, 'object');
+  assert.strictEqual(typeof ledger.ledger_index, 'number');
+
+  this._pending.forEach(function(transaction) {
+    if (transaction.finalized) {
+      return;
+    }
+
+    switch (ledger.ledger_index - transaction.submitIndex) {
+      case 4:
+        transaction.emit('missing', ledger);
+        break;
+      case 8:
+        transaction.emit('lost', ledger);
+        break;
+    }
+
+    if (ledger.ledger_index > transaction.tx_json.LastLedgerSequence) {
+      // Transaction must fail
+      transaction.emit('error', new RippleError(
+        'tejMaxLedger', 'Transaction LastLedgerSequence exceeded'));
+    }
+  });
+};
+
+// Fill an account transaction sequence
+TransactionManager.prototype._fillSequence = function(tx, callback) {
+  var self = this;
+
+  function submitFill(sequence, fCallback) {
+    var fillTransaction = self._remote.createTransaction('AccountSet', {
+      account: self._accountID
+    });
+    fillTransaction.tx_json.Sequence = sequence;
+
+    // Secrets may be set on a per-transaction basis
+    if (tx._secret) {
+      fillTransaction.secret(tx._secret);
+    }
+
+    fillTransaction.once('submitted', fCallback);
+    fillTransaction.submit();
+  }
+
+  function sequenceLoaded(err, sequence) {
+    if (typeof sequence !== 'number') {
+      log.info('fill sequence: failed to fetch account transaction sequence');
+      return callback();
+    }
+
+    var sequenceDiff = tx.tx_json.Sequence - sequence;
+    var submitted = 0;
+
+    async.whilst(
+      function() {
+        return submitted < sequenceDiff;
+      },
+      function(asyncCallback) {
+        submitFill(sequence, function(res) {
+          ++submitted;
+          if (res.engine_result === 'tesSUCCESS') {
+            self.emit('sequence_filled', err);
+          }
+          asyncCallback();
+        });
+      },
+      function() {
+        if (callback) {
+          callback();
+        }
+      }
+    );
+  }
+
+  this._loadSequence(sequenceLoaded);
+};
+
+/**
+ * Load account transaction sequence
+ *
+ * @param [Function] callback
+ * @api private
+ */
+
+TransactionManager.prototype._loadSequence = function(callback) {
+  var self = this;
+  callback = (typeof callback === 'function') ? callback : function() {};
+
+  function sequenceLoaded(err, sequence) {
+    if (err || typeof sequence !== 'number') {
+      if (self._remote.trace) {
+        log.info('error requesting account transaction sequence', err);
+        return;
+      }
+    }
+
+    self._nextSequence = sequence;
+    self.emit('sequence_loaded', sequence);
+    callback(err, sequence);
+  }
+
+  this._account.getNextSequence(sequenceLoaded);
+};
+
+/**
+ * On reconnect, load account_tx in case a pending transaction succeeded while
+ * disconnected
+ *
+ * @param [Function] callback
+ * @api private
+ */
+
+TransactionManager.prototype._handleReconnect = function(callback) {
+  var self = this;
+  callback = (typeof callback === 'function') ? callback : function() {};
+
+  if (!this._pending.length()) {
+    callback();
+    return;
+  }
+
+  function handleTransactions(err, transactions) {
+    if (err || typeof transactions !== 'object') {
+      if (self._remote.trace) {
+        log.info('error requesting account_tx', err);
+      }
+      callback();
+      return;
+    }
+
+    if (Array.isArray(transactions.transactions)) {
+      // Treat each transaction in account transaction history as received
+      transactions.transactions.forEach(self._transactionReceived, self);
+    }
+
+    callback();
+
+    self._loadSequence(function() {
+      // Resubmit pending transactions after sequence is loaded
+      self._resubmit();
+    });
+  }
+
+  var options = {
+    account: this._accountID,
+    ledger_index_min: this._pending.getMinLedger(),
+    ledger_index_max: -1,
+    binary: true,
+    parseBinary: true,
+    limit: 20
+  };
+
+  this._remote.requestAccountTx(options, handleTransactions);
+};
+
+/**
+ * Wait for specified number of ledgers to pass
+ *
+ * @param {Number} ledgers
+ * @param {Function} callback
+ * @api private
+ */
+
+TransactionManager.prototype._waitLedgers = function(ledgers, callback) {
+  assert.strictEqual(typeof ledgers, 'number');
+  assert.strictEqual(typeof callback, 'function');
+
+  if (ledgers < 1) {
+    return callback();
+  }
+
+  var self = this;
+  var closes = 0;
+
+  function ledgerClosed() {
+    if (++closes === ledgers) {
+      self._remote.removeListener('ledger_closed', ledgerClosed);
+      callback();
+    }
+  }
+
+  this._remote.on('ledger_closed', ledgerClosed);
+};
+
+/**
+ * Resubmit pending transactions. If a transaction is specified, it will be
+ * resubmitted. Otherwise, all pending transactions will be resubmitted
+ *
+ * @param [Number] ledgers to wait before resubmitting
+ * @param [Transaction] pending transactions to resubmit
+ * @api private
+ */
+
+TransactionManager.prototype._resubmit = function(ledgers, pending) {
+  var self = this;
+
+  if (ledgers && typeof ledgers !== 'number') {
+    pending = ledgers;
+    ledgers = 0;
+  }
+
+  ledgers = ledgers || 0;
+  pending = pending instanceof Transaction
+  ? [pending]
+  : this.getPending().getQueue();
+
+  function resubmitTransaction(transaction, next) {
+    if (!transaction || transaction.finalized) {
+      // Transaction has been finalized, nothing to do
+      return;
+    }
+
+    // Find ID within cache of received (validated) transaction IDs
+    var received = transaction.findId(self._pending._idCache);
+
+    if (received) {
+      switch (received.engine_result) {
+        case 'tesSUCCESS':
+          transaction.emit('success', received);
+          break;
+        default:
+          transaction.emit('error', received);
+      }
+    }
+
+    while (self._pending.hasSequence(transaction.tx_json.Sequence)) {
+      // Sequence number has been consumed by another transaction
+      transaction.tx_json.Sequence += 1;
+
+      if (self._remote.trace) {
+        log.info('incrementing sequence:', transaction.tx_json);
+      }
+    }
+
+    if (self._remote.trace) {
+      log.info('resubmit:', transaction.tx_json);
+    }
+
+    transaction.once('submitted', function(m) {
+      transaction.emit('resubmitted', m);
+      next();
+    });
+
+    self._request(transaction);
+  }
+
+  this._waitLedgers(ledgers, function() {
+    async.eachSeries(pending, resubmitTransaction);
+  });
+};
+
+/**
+ * Prepare submit request
+ *
+ * @param {Transaction} transaction to submit
+ * @return {Request} submit request
+ * @api private
+ */
+
+TransactionManager.prototype._prepareRequest = function(tx) {
+  var submitRequest = this._remote.requestSubmit();
+
+  if (this._remote.local_signing) {
+    tx.sign();
+
+    var serialized = tx.serialize();
+    submitRequest.tx_blob(serialized.to_hex());
+
+    var hash = tx.hash(null, null, serialized);
+    tx.addId(hash);
+  } else {
+    // ND: `build_path` is completely ignored when doing local signing as
+    // `Paths` is a component of the signed blob, the `tx_blob` is signed,
+    // sealed and delivered, and the txn unmodified.
+    // TODO: perhaps an exception should be raised if build_path is attempted
+    // while local signing
+    submitRequest.build_path(tx._build_path);
+    submitRequest.secret(tx._secret);
+    submitRequest.tx_json(tx.tx_json);
+  }
+
+  return submitRequest;
+};
+
+/**
+ * Send `submit` request, handle response
+ *
+ * @param {Transaction} transaction to submit
+ * @api private
+ */
+
+TransactionManager.prototype._request = function(tx) {
+  var self = this;
+  var remote = this._remote;
+
+  if (tx.finalized) {
+    return;
+  }
+
+  if (tx.attempts > this._maxAttempts) {
+    tx.emit('error', new RippleError('tejAttemptsExceeded'));
+    return;
+  }
+
+  if (tx.attempts > 0 && !remote.local_signing) {
+    var errMessage = 'Automatic resubmission requires local signing';
+    tx.emit('error', new RippleError('tejLocalSigningRequired', errMessage));
+    return;
+  }
+
+  if (remote.trace) {
+    log.info('submit transaction:', tx.tx_json);
+  }
+
+  function transactionFailed(message) {
+    if (message.engine_result === 'tefPAST_SEQ') {
+      // Transaction may succeed after Sequence is updated
+      self._resubmit(1, tx);
+    }
+  }
+
+  function transactionRetry() {
+    // XXX This may no longer be necessary. Instead, update sequence numbers
+    // after a transaction fails definitively
+    self._fillSequence(tx, function() {
+      self._resubmit(1, tx);
+    });
+  }
+
+  function transactionFailedLocal(message) {
+    if (message.engine_result === 'telINSUF_FEE_P') {
+      // Transaction may succeed after Fee is updated
+      self._resubmit(1, tx);
+    }
+  }
+
+  function submissionError(error) {
+    // Either a tem-class error or generic server error such as tooBusy. This
+    // should be a definitive failure
+    if (TransactionManager._isTooBusy(error)) {
+      self._resubmit(1, tx);
+    } else {
+      self._nextSequence--;
+      tx.emit('error', error);
+    }
+  }
+
+  function submitted(message) {
+    if (tx.finalized) {
+      return;
+    }
+
+    // ND: If for some unknown reason our hash wasn't computed correctly this
+    // is an extra measure.
+    if (message.tx_json && message.tx_json.hash) {
+      tx.addId(message.tx_json.hash);
+    }
+
+    message.result = message.engine_result || '';
+
+    tx.result = message;
+    tx.responses += 1;
+
+    if (remote.trace) {
+      log.info('submit response:', message);
+    }
+
+    tx.emit('submitted', message);
+
+    switch (message.result.slice(0, 3)) {
+      case 'tes':
+        tx.emit('proposed', message);
+        break;
+      case 'tec':
+        break;
+      case 'ter':
+        transactionRetry(message);
+        break;
+      case 'tef':
+        transactionFailed(message);
+        break;
+      case 'tel':
+        transactionFailedLocal(message);
+        break;
+      default:
+        // tem
+        submissionError(message);
+    }
+  }
+
+  function requestTimeout() {
+    // ND: What if the response is just slow and we get a response that
+    // `submitted` above will cause to have concurrent resubmit logic streams?
+    // It's simpler to just mute handlers and look out for finalized
+    // `transaction` messages.
+    if (tx.finalized) {
+      return;
+    }
+
+    tx.emit('timeout');
+
+    if (remote.isConnected()) {
+      if (remote.trace) {
+        log.info('timeout:', tx.tx_json);
+      }
+      self._resubmit(1, tx);
+    }
+  }
+
+  tx.submitIndex = this._remote._ledger_current_index;
+
+  if (tx.attempts === 0) {
+    tx.initialSubmitIndex = tx.submitIndex;
+  }
+
+  if (!tx._setLastLedger) {
+    // Honor LastLedgerSequence set with tx.lastLedger()
+    tx.tx_json.LastLedgerSequence = tx.initialSubmitIndex
+    + this._lastLedgerOffset;
+  }
+
+  tx.lastLedgerSequence = tx.tx_json.LastLedgerSequence;
+
+  if (remote.local_signing) {
+    tx.sign();
+  }
+
+  var submitRequest = this._prepareRequest(tx);
+  submitRequest.once('error', submitted);
+  submitRequest.once('success', submitted);
+
+  tx.emit('presubmit');
+
+  submitRequest.broadcast().request();
+  tx.attempts++;
+
+  tx.emit('postsubmit');
+
+  submitRequest.timeout(self._submissionTimeout, requestTimeout);
+};
+
+/**
+ * Entry point for TransactionManager submission
+ *
+ * @param {Transaction} tx
+ */
+
+TransactionManager.prototype.submit = function(tx) {
+  var self = this;
+
+  if (typeof this._nextSequence !== 'number') {
+    // If sequence number is not yet known, defer until it is.
+    this.once('sequence_loaded', function() {
+      self.submit(tx);
+    });
+    return;
+  }
+
+  if (tx.finalized) {
+    // Finalized transactions must stop all activity
+    return;
+  }
+
+  if (typeof tx.tx_json.Sequence !== 'number') {
+    // Honor manually-set sequences
+    tx.tx_json.Sequence = this._nextSequence++;
+  }
+
+  tx.once('cleanup', function() {
+    self.getPending().remove(tx);
+  });
+
+  if (!tx.complete()) {
+    this._nextSequence--;
+    return;
+  }
+
+  // ND: this is the ONLY place we put the tx into the queue. The
+  // TransactionQueue queue is merely a list, so any mutations to tx._hash
+  // will cause subsequent look ups (eg. inside 'transaction-outbound'
+  // validated transaction clearing) to fail.
+  this._pending.push(tx);
+  this._request(tx);
+};
+
+exports.TransactionManager = TransactionManager;

src/js/ripple/transactionqueue.js

@@ -0,0 +1,164 @@
+'use strict';
+
+var lodash = require('lodash');
+var LRU = require('lru-cache');
+var Transaction = require('./transaction').Transaction;
+
+/**
+ * Manager for pending transactions
+ */
+
+function TransactionQueue() {
+  this._queue = [ ];
+  this._idCache = new LRU({max: 200});
+  this._sequenceCache = new LRU({max: 200});
+}
+
+/**
+ * Store received (validated) sequence
+ *
+ * @param {Number} sequence
+ */
+
+TransactionQueue.prototype.addReceivedSequence = function(sequence) {
+  this._sequenceCache.set(String(sequence), true);
+};
+
+/**
+ * Check that sequence number has been consumed by a validated
+ * transaction
+ *
+ * @param {Number} sequence
+ * @return {Boolean}
+ */
+
+TransactionQueue.prototype.hasSequence = function(sequence) {
+  return this._sequenceCache.has(String(sequence));
+};
+
+/**
+ * Store received (validated) ID transaction
+ *
+ * @param {String} transaction id
+ * @param {Transaction} transaction
+ */
+
+TransactionQueue.prototype.addReceivedId = function(id, transaction) {
+  this._idCache.set(id, transaction);
+};
+
+/**
+ * Get received (validated) transaction by ID
+ *
+ * @param {String} transaction id
+ * @return {Object}
+ */
+
+TransactionQueue.prototype.getReceived = function(id) {
+  return this._idCache.get(id);
+};
+
+/**
+ * Get a submitted transaction by ID. Transactions
+ * may have multiple associated IDs.
+ *
+ * @param {String} transaction id
+ * @return {Transaction}
+ */
+
+TransactionQueue.prototype.getSubmission = function(id) {
+  return lodash.find(this._queue, function(tx) {
+    return lodash.contains(tx.submittedIDs, id);
+  });
+};
+
+/**
+ * Get earliest ledger in the pending queue
+ *
+ * @return {Number} ledger
+ */
+
+TransactionQueue.prototype.getMinLedger = function() {
+  if (this.length() < 1) {
+    return -1;
+  }
+
+  var result = Infinity;
+
+  for (var i = 0; i < this.length(); i++) {
+    if (this._queue[i].initialSubmitIndex < result) {
+      result = this._queue[i].initialSubmitIndex;
+    }
+  }
+
+  if (!isFinite(result)) {
+    result = -1;
+  }
+
+  return result;
+};
+
+/**
+ * Remove a transaction from the queue
+ *
+ * @param {String|Transaction} transaction or id
+ */
+
+TransactionQueue.prototype.remove = function(tx) {
+  // ND: We are just removing the Transaction by identity
+  var i = this._queue.length;
+
+  if (typeof tx === 'string') {
+    tx = this.getSubmission(tx);
+  }
+
+  if (!(tx instanceof Transaction)) {
+    return;
+  }
+
+  while (i--) {
+    if (this._queue[i] === tx) {
+      this._queue.splice(i, 1);
+      break;
+    }
+  }
+};
+
+/**
+ * Add a transaction to pending queue
+ *
+ * @param {Transaction} transaction
+ */
+
+TransactionQueue.prototype.push = function(tx) {
+  this._queue.push(tx);
+};
+
+/**
+ * Iterate over pending transactions
+ *
+ * @param {Function} iterator
+ */
+
+TransactionQueue.prototype.forEach = function(fn) {
+  this._queue.forEach(fn);
+};
+
+/**
+ * @return {Number} length of pending queue
+ */
+
+TransactionQueue.prototype.length =
+TransactionQueue.prototype.getLength = function() {
+  return this._queue.length;
+};
+
+/**
+ * @return {Array} pending queue
+ */
+
+TransactionQueue.prototype.getQueue = function() {
+  return this._queue;
+};
+
+exports.TransactionQueue = TransactionQueue;

src/js/ripple/uint.js

@@ -1,24 +1,22 @@
+'use strict';
+
+/*eslint new-cap: 1*/
 
-var sjcl    = require('../../../build/sjcl');
 var utils = require('./utils');
+var sjcl = utils.sjcl;
 var config = require('./config');
-var jsbn    = require('./jsbn');
-
-var BigInteger = jsbn.BigInteger;
-var nbi        = jsbn.nbi;
-
-var Base = require('./base').Base;
 
 //
 // Abstract UInt class
 //
-// Base class for UInt??? classes
+// Base class for UInt classes
 //
 
-var UInt = function () {
-  // Internal form: NaN or BigInteger
+function UInt() {
+  // Internal form: NaN or sjcl.bn
   this._value = NaN;
-};
+  this._update();
+}
 
 UInt.json_rewrite = function(j, opts) {
   return this.from_json(j).to_json(opts);
@@ -28,45 +26,56 @@ UInt.json_rewrite = function (j, opts) {
 UInt.from_generic = function(j) {
   if (j instanceof this) {
     return j.clone();
-  } else {
-    return (new this()).parse_generic(j);
   }
+  return (new this()).parse_generic(j);
 };
 
 // Return a new UInt from j.
 UInt.from_hex = function(j) {
   if (j instanceof this) {
     return j.clone();
-  } else {
-    return (new this()).parse_hex(j);
   }
+  return (new this()).parse_hex(j);
 };
 
 // Return a new UInt from j.
 UInt.from_json = function(j) {
   if (j instanceof this) {
     return j.clone();
-  } else {
-    return (new this()).parse_json(j);
   }
+  return (new this()).parse_json(j);
 };
 
 // Return a new UInt from j.
 UInt.from_bits = function(j) {
   if (j instanceof this) {
     return j.clone();
-  } else {
-    return (new this()).parse_bits(j);
   }
+  return (new this()).parse_bits(j);
+};
+
+// Return a new UInt from j.
+UInt.from_bytes = function(j) {
+  if (j instanceof this) {
+    return j.clone();
+  }
+  return (new this()).parse_bytes(j);
 };
 
 // Return a new UInt from j.
 UInt.from_bn = function(j) {
   if (j instanceof this) {
     return j.clone();
-  } else {
-    return (new this()).parse_bn(j);
   }
+  return (new this()).parse_bn(j);
+};
+
+// Return a new UInt from j.
+UInt.from_number = function(j) {
+  if (j instanceof this) {
+    return j.clone();
+  }
+  return (new this()).parse_number(j);
 };
 
 UInt.is_valid = function(j) {
@@ -81,74 +90,97 @@ UInt.prototype.clone = function () {
 UInt.prototype.copyTo = function(d) {
   d._value = this._value;
 
+  if (this._version_byte !== undefined) {
+    d._version_byte = this._version_byte;
+  }
+
+  if (typeof d._update === 'function') {
+    d._update();
+  }
+
   return d;
 };
 
 UInt.prototype.equals = function(d) {
-  return this._value instanceof BigInteger && d._value instanceof BigInteger && this._value.equals(d._value);
+  return this.is_valid() && d.is_valid() && this._value.equals(d._value);
 };
 
 UInt.prototype.is_valid = function() {
-  return this._value instanceof BigInteger;
+  return this._value instanceof sjcl.bn;
 };
 
 UInt.prototype.is_zero = function() {
-  return this._value.equals(BigInteger.ZERO);
+  return this.is_valid() && this._value.equals(new sjcl.bn(0));
+};
+
+/**
+ * Update any derivative values.
+ *
+ * This allows subclasses to maintain caches of any data that they derive from
+ * the main _value. For example, the Currency class keeps the currency type, the
+ * currency code and other information about the currency cached.
+ *
+ * The reason for keeping this mechanism in this class is so every subclass can
+ * call it whenever it modifies the internal state.
+ *
+ * @return {void}
+ */
+UInt.prototype._update = function() {
+  // Nothing to do by default. Subclasses will override this.
 };
 
 // value = NaN on error.
 UInt.prototype.parse_generic = function(j) {
   // Canonicalize and validate
-  if (config.accounts && j in config.accounts)
+  if (config.accounts && (j in config.accounts)) {
     j = config.accounts[j].account;
+  }
+
 
   switch (j) {
     case undefined:
-  case "0":
+    case '0':
     case this.constructor.STR_ZERO:
     case this.constructor.ACCOUNT_ZERO:
     case this.constructor.HEX_ZERO:
-    this._value  = nbi();
+      this._value = new sjcl.bn(0);
       break;
 
-  case "1":
+    case '1':
     case this.constructor.STR_ONE:
     case this.constructor.ACCOUNT_ONE:
     case this.constructor.HEX_ONE:
-    this._value  = new BigInteger([1]);
-
+      this._value = new sjcl.bn(1);
       break;
 
     default:
-    if ('string' !== typeof j) {
+        if (typeof j !== 'string') {
           this._value = NaN;
-    }
-    else if (j[0] === "r") {
-	    this._value  = Base.decode_check(Base.VER_ACCOUNT_ID, j);
-    }
-    else if (this.constructor.width === j.length) {
-	    this._value  = new BigInteger(utils.stringToArray(j), 256);
-    }
-    else if ((this.constructor.width*2) === j.length) {
+        } else if (this.constructor.width === j.length) {
+          var hex = utils.arrayToHex(utils.stringToArray(j));
+          this._value = new sjcl.bn(hex, 16);
+        } else if ((this.constructor.width * 2) === j.length) {
           // XXX Check char set!
-	    this._value  = new BigInteger(j, 16);
-    }
-    else {
+          this._value = new sjcl.bn(j, 16);
+        } else {
           this._value = NaN;
         }
   }
 
+  this._update();
+
   return this;
 };
 
 UInt.prototype.parse_hex = function(j) {
-  if ('string' === typeof j &&
-      j.length === (this.constructor.width * 2)) {
-    this._value  = new BigInteger(j, 16);
+  if (typeof j === 'string' && j.length === (this.constructor.width * 2)) {
+    this._value = new sjcl.bn(j, 16);
   } else {
     this._value = NaN;
   }
 
+  this._update();
+
   return this;
 };
 
@@ -156,66 +188,87 @@ UInt.prototype.parse_bits = function (j) {
   if (sjcl.bitArray.bitLength(j) !== this.constructor.width * 8) {
     this._value = NaN;
   } else {
-    var bytes = sjcl.codec.bytes.fromBits(j);
-	  this._value  = new BigInteger(bytes, 256);
+    this._value = sjcl.bn.fromBits(j);
+    // var bytes = sjcl.codec.bytes.fromBits(j);
+    // this.parse_bytes(bytes);
   }
 
+  this._update();
+
   return this;
 };
 
+
+UInt.prototype.parse_bytes = function(j) {
+  if (!Array.isArray(j) || j.length !== this.constructor.width) {
+    this._value = NaN;
+  } else {
+    var bits = sjcl.codec.bytes.toBits(j);
+    this._value = sjcl.bn.fromBits(bits);
+  }
+
+  this._update();
+
+  return this;
+};
+
+
 UInt.prototype.parse_json = UInt.prototype.parse_hex;
 
 UInt.prototype.parse_bn = function(j) {
-  if (j instanceof sjcl.bn &&
+  if ((j instanceof sjcl.bn) &&
       j.bitLength() <= this.constructor.width * 8) {
-    var bytes = sjcl.codec.bytes.fromBits(j.toBits());
-	  this._value  = new BigInteger(bytes, 256);
+    this._value = new sjcl.bn(j);
   } else {
     this._value = NaN;
   }
 
+  this._update();
+
+  return this;
+};
+
+UInt.prototype.parse_number = function(j) {
+  this._value = NaN;
+
+  if (typeof j === 'number' && isFinite(j) && j >= 0) {
+    this._value = new sjcl.bn(j);
+  }
+
+  this._update();
+
   return this;
 };
 
 // Convert from internal form.
 UInt.prototype.to_bytes = function() {
-  if (!(this._value instanceof BigInteger))
+  if (!this.is_valid()) {
     return null;
-
-  var bytes  = this._value.toByteArray();
-  bytes = bytes.map(function (b) { return (b+256) % 256; });
-  var target = this.constructor.width;
-
-  // XXX Make sure only trim off leading zeros.
-  bytes = bytes.slice(-target);
-  while (bytes.length < target) bytes.unshift(0);
-
-  return bytes;
+  }
+  return sjcl.codec.bytes.fromBits(this.to_bits());
 };
 
 UInt.prototype.to_hex = function() {
-  if (!(this._value instanceof BigInteger))
+  if (!this.is_valid()) {
     return null;
-
-  var bytes = this.to_bytes();
-
-  return sjcl.codec.hex.fromBits(sjcl.codec.bytes.toBits(bytes)).toUpperCase();
+  }
+  return sjcl.codec.hex.fromBits(this.to_bits()).toUpperCase();
 };
 
 UInt.prototype.to_json = UInt.prototype.to_hex;
 
 UInt.prototype.to_bits = function() {
-  if (!(this._value instanceof BigInteger))
+  if (!this.is_valid()) {
     return null;
+  }
 
-  var bytes = this.to_bytes();
-
-  return sjcl.codec.bytes.toBits(bytes);
+  return this._value.toBits(this.constructor.width * 8);
 };
 
 UInt.prototype.to_bn = function() {
-  if (!(this._value instanceof BigInteger))
+  if (!this.is_valid()) {
     return null;
+  }
 
   var bits = this.to_bits();
 

src/js/ripple/uint128.js

@@ -0,0 +1,25 @@
+'use strict';
+
+var utils = require('./utils');
+var extend = require('extend');
+var UInt = require('./uint').UInt;
+
+//
+// UInt128 support
+//
+
+var UInt128 = extend(function() {
+  this._value = NaN;
+}, UInt);
+
+UInt128.width = 16;
+UInt128.prototype = extend({}, UInt.prototype);
+UInt128.prototype.constructor = UInt128;
+
+var HEX_ZERO = UInt128.HEX_ZERO = '00000000000000000000000000000000';
+var HEX_ONE = UInt128.HEX_ONE = '00000000000000000000000000000000';
+
+UInt128.STR_ZERO = utils.hexToString(HEX_ZERO);
+UInt128.STR_ONE = utils.hexToString(HEX_ONE);
+
+exports.UInt128 = UInt128;

src/js/ripple/uint160.js

@@ -1,55 +1,81 @@
+'use strict';
 
-var sjcl    = require('../../../build/sjcl');
 var utils = require('./utils');
 var config = require('./config');
-var jsbn    = require('./jsbn');
 var extend = require('extend');
 
-var BigInteger = jsbn.BigInteger;
-var nbi        = jsbn.nbi;
-
-var UInt = require('./uint').UInt,
-    Base = require('./base').Base;
+var UInt = require('./uint').UInt;
+var Base = require('./base').Base;
 
 //
 // UInt160 support
 //
 
 var UInt160 = extend(function() {
-  // Internal form: NaN or BigInteger
   this._value = NaN;
+  this._version_byte = undefined;
+  this._update();
 }, UInt);
 
 UInt160.width = 20;
 UInt160.prototype = extend({}, UInt.prototype);
 UInt160.prototype.constructor = UInt160;
 
-var ACCOUNT_ZERO = UInt160.ACCOUNT_ZERO = "rrrrrrrrrrrrrrrrrrrrrhoLvTp";
-var ACCOUNT_ONE  = UInt160.ACCOUNT_ONE = "rrrrrrrrrrrrrrrrrrrrBZbvji";
-var HEX_ZERO     = UInt160.HEX_ZERO = "0000000000000000000000000000000000000000";
-var HEX_ONE      = UInt160.HEX_ONE = "0000000000000000000000000000000000000001";
-var STR_ZERO     = UInt160.STR_ZERO = utils.hexToString(HEX_ZERO);
-var STR_ONE      = UInt160.STR_ONE = utils.hexToString(HEX_ONE);
+var HEX_ZERO = UInt160.HEX_ZERO = '0000000000000000000000000000000000000000';
+var HEX_ONE = UInt160.HEX_ONE = '0000000000000000000000000000000000000001';
+
+UInt160.ACCOUNT_ZERO = 'rrrrrrrrrrrrrrrrrrrrrhoLvTp';
+UInt160.ACCOUNT_ONE = 'rrrrrrrrrrrrrrrrrrrrBZbvji';
+UInt160.STR_ZERO = utils.hexToString(HEX_ZERO);
+UInt160.STR_ONE = utils.hexToString(HEX_ONE);
+
+UInt160.prototype.set_version = function(j) {
+  this._version_byte = j;
+  return this;
+};
+
+UInt160.prototype.get_version = function() {
+  return this._version_byte;
+};
 
 // value = NaN on error.
 UInt160.prototype.parse_json = function(j) {
   // Canonicalize and validate
-  if (config.accounts && j in config.accounts)
+  if (config.accounts && (j in config.accounts)) {
     j = config.accounts[j].account;
+  }
 
-  if ('number' === typeof j) {
-    this._value  = new BigInteger(String(j));
-  }
-  else if ('string' !== typeof j) {
+  if (typeof j === 'number' && !isNaN(j)) {
+    // Allow raw numbers - DEPRECATED
+    // This is used mostly by the test suite and is supported
+    // as a legacy feature only. DO NOT RELY ON THIS BEHAVIOR.
+    this.parse_number(j);
+    this._version_byte = Base.VER_ACCOUNT_ID;
+  } else if (typeof j !== 'string') {
     this._value = NaN;
+  } else if (j[0] === 'r') {
+    this._value = Base.decode_check(Base.VER_ACCOUNT_ID, j);
+    this._version_byte = Base.VER_ACCOUNT_ID;
+  } else {
+    this.parse_hex(j);
   }
-  else if (j[0] === "r") {
+
+  this._update();
+
+  return this;
+};
+
+UInt160.prototype.parse_generic = function(j) {
+  UInt.prototype.parse_generic.call(this, j);
+
+  if (isNaN(this._value)) {
+    if ((typeof j === 'string') && j[0] === 'r') {
       this._value = Base.decode_check(Base.VER_ACCOUNT_ID, j);
     }
-  else {
-    this._value  = NaN;
   }
 
+  this._update();
+
   return this;
 };
 
@@ -57,15 +83,20 @@ UInt160.prototype.parse_json = function (j) {
 UInt160.prototype.to_json = function(opts) {
   opts = opts || {};
 
-  if (!(this._value instanceof BigInteger))
-    return NaN;
+  if (this.is_valid()) {
+    // If this value has a type, return a Base58 encoded string.
+    if (typeof this._version_byte === 'number') {
+      var output = Base.encode_check(this._version_byte, this.to_bytes());
 
-  var output = Base.encode_check(Base.VER_ACCOUNT_ID, this.to_bytes());
-
-  if (opts.gateways && output in opts.gateways)
+      if (opts.gateways && output in opts.gateways) {
         output = opts.gateways[output];
+      }
 
       return output;
+    }
+    return this.to_hex();
+  }
+  return NaN;
 };
 
 exports.UInt160 = UInt160;

src/js/ripple/uint256.js

@@ -1,22 +1,14 @@
+'use strict';
 
-var sjcl    = require('../../../build/sjcl');
 var utils = require('./utils');
-var config  = require('./config');
-var jsbn    = require('./jsbn');
 var extend = require('extend');
-
-var BigInteger = jsbn.BigInteger;
-var nbi        = jsbn.nbi;
-
-var UInt = require('./uint').UInt,
-    Base = require('./base').Base;
+var UInt = require('./uint').UInt;
 
 //
 // UInt256 support
 //
 
 var UInt256 = extend(function() {
-  // Internal form: NaN or BigInteger
   this._value = NaN;
 }, UInt);
 
@@ -24,11 +16,13 @@ UInt256.width = 32;
 UInt256.prototype = extend({}, UInt.prototype);
 UInt256.prototype.constructor = UInt256;
 
-var HEX_ZERO     = UInt256.HEX_ZERO = "00000000000000000000000000000000" +
-                                      "00000000000000000000000000000000";
-var HEX_ONE      = UInt256.HEX_ONE  = "00000000000000000000000000000000" +
-                                      "00000000000000000000000000000001";
-var STR_ZERO     = UInt256.STR_ZERO = utils.hexToString(HEX_ZERO);
-var STR_ONE      = UInt256.STR_ONE = utils.hexToString(HEX_ONE);
+var HEX_ZERO = UInt256.HEX_ZERO = '00000000000000000000000000000000' +
+                                  '00000000000000000000000000000000';
+
+var HEX_ONE = UInt256.HEX_ONE = '00000000000000000000000000000000' +
+                                '00000000000000000000000000000001';
+
+UInt256.STR_ZERO = utils.hexToString(HEX_ZERO);
+UInt256.STR_ONE = utils.hexToString(HEX_ONE);
 
 exports.UInt256 = UInt256;

src/js/ripple/utils.js

@@ -1,42 +1,34 @@
-Function.prototype.method = function(name,func) {
-  this.prototype[name] = func;
+'use strict';
 
-  return this;
-};
+function getMantissaDecimalString(bignum) {
+  var mantissa = bignum.toPrecision(16)
+    .replace(/\./, '')      // remove decimal point
+    .replace(/e.*/, '')     // remove scientific notation
+    .replace(/^0*/, '');    // remove leading zeroes
+  while (mantissa.length < 16) {
+    mantissa += '0';        // add trailing zeroes until length is 16
+  }
+  return mantissa;
+}
 
-var filterErr = function(code, done) {
-  return function(e) {
-      done(e.code !== code ? e : undefined);
-    };
-};
-
-var throwErr = function(done) {
-  return function(e) {
-      if (e)
-	throw e;
-      
-      done();
-    };
-};
- 
-var trace = function(comment, func) {
+function trace(comment, func) {
   return function() {
-      console.log("%s: %s", trace, arguments.toString);
+    console.log('%s: %s', trace, arguments.toString);
     func(arguments);
   };
-};
+}
 
-var arraySet = function (count, value) {
-  var i, a = new Array(count);
+function arraySet(count, value) {
+  var a = new Array(count);
 
-  for (i = 0; i < count; i++) {
+  for (var i = 0; i < count; i++) {
     a[i] = value;
   }
 
   return a;
-};
+}
 
-var hexToString = function (h) {
+function hexToString(h) {
   var a = [];
   var i = 0;
 
@@ -45,80 +37,110 @@ var hexToString = function (h) {
     i = 1;
   }
 
-  for (; i != h.length; i += 2) {
+  for (; i < h.length; i += 2) {
     a.push(String.fromCharCode(parseInt(h.substring(i, i + 2), 16)));
   }
 
-  return a.join("");
-};
+  return a.join('');
+}
 
-var stringToHex = function (s) {
-  return Array.prototype.map.call(s, function (c) {
-      var b = c.charCodeAt(0);
+function stringToHex(s) {
+  var result = '';
+  for (var i = 0; i < s.length; i++) {
+    var b = s.charCodeAt(i);
+    result += b < 16 ? '0' + b.toString(16) : b.toString(16);
+  }
+  return result;
+}
 
-      return b < 16 ? "0" + b.toString(16) : b.toString(16);
-    }).join("");
-};
-
-var stringToArray = function (s) {
+function stringToArray(s) {
   var a = new Array(s.length);
-  var i;
 
-  for (i = 0; i != a.length; i += 1)
+  for (var i = 0; i < a.length; i += 1) {
     a[i] = s.charCodeAt(i);
+  }
 
   return a;
-};
+}
 
-var hexToArray = function (h) {
+function hexToArray(h) {
   return stringToArray(hexToString(h));
 }
 
-var chunkString = function (str, n, leftAlign) {
+function arrayToHex(a) {
+  return a.map(function(byteValue) {
+    var hex = byteValue.toString(16);
+    return hex.length > 1 ? hex : '0' + hex;
+  }).join('');
+}
+
+function chunkString(str, n, leftAlign) {
   var ret = [];
   var i = 0, len = str.length;
+
   if (leftAlign) {
     i = str.length % n;
-    if (i) ret.push(str.slice(0, i));
+    if (i) {
+      ret.push(str.slice(0, i));
     }
+  }
+
   for (; i < len; i += n) {
     ret.push(str.slice(i, n + i));
   }
+
   return ret;
-};
-
-var logObject = function (msg, obj) {
-  console.log(msg, JSON.stringify(obj, undefined, 2));
-};
-
-var assert = function (assertion, msg) {
-  if (!assertion) {
-    throw new Error("Assertion failed" + (msg ? ": "+msg : "."));
 }
-};
+
+function assert(assertion, msg) {
+  if (!assertion) {
+    throw new Error('Assertion failed' + (msg ? ': ' + msg : '.'));
+  }
+}
 
 /**
- * Return unique values in array.
+ * @param {Array} arr (values)
+ * @return {Array} unique values (for string representation of value) in `arr`
  */
-var arrayUnique = function (arr) {
+function arrayUnique(arr) {
   var u = {}, a = [];
-  for (var i = 0, l = arr.length; i < l; ++i){
-    if (u.hasOwnProperty(arr[i])) {
+
+  for (var i = 0, l = arr.length; i < l; i++) {
+    var k = arr[i];
+    if (u[k]) {
       continue;
     }
-    a.push(arr[i]);
-    u[arr[i]] = 1;
+    a.push(k);
+    u[k] = true;
   }
+
   return a;
-};
+}
 
 /**
- * Convert a ripple epoch to a JavaScript timestamp.
+ * @param {Number} rpepoch (seconds since 1/1/2000 GMT)
+ * @return {Number} ms since unix epoch
  *
- * JavaScript timestamps are unix epoch in milliseconds.
  */
-var toTimestamp = function (rpepoch) {
+function toTimestamp(rpepoch) {
   return (rpepoch + 0x386D4380) * 1000;
+}
+
+/**
+ * @param {Number|Date} timestamp (ms since unix epoch)
+ * @return {Number} seconds since ripple epoch ( 1/1/2000 GMT)
+ */
+function fromTimestamp(timestamp) {
+  if (timestamp instanceof Date) {
+    timestamp = timestamp.getTime();
+  }
+
+  return Math.round(timestamp / 1000) - 0x386D4380;
+}
+
+exports.time = {
+  fromRipple: toTimestamp,
+  toRipple: fromTimestamp
 };
 
 exports.trace = trace;
@@ -127,10 +149,16 @@ exports.hexToString   = hexToString;
 exports.hexToArray = hexToArray;
 exports.stringToArray = stringToArray;
 exports.stringToHex = stringToHex;
+exports.arrayToHex = arrayToHex;
 exports.chunkString = chunkString;
-exports.logObject     = logObject;
 exports.assert = assert;
 exports.arrayUnique = arrayUnique;
 exports.toTimestamp = toTimestamp;
+exports.fromTimestamp = fromTimestamp;
+exports.getMantissaDecimalString = getMantissaDecimalString;
+
+// Going up three levels is needed to escape the src-cov folder used for the
+// test coverage stuff.
+exports.sjcl = require('../../../build/sjcl');
 
 // vim:sw=2:sts=2:ts=8:et

src/js/ripple/utils.web.js

@@ -1,11 +0,0 @@
-var exports = module.exports = require('./utils.js');
-
-// We override this function for browsers, because they print objects nicer
-// natively than JSON.stringify can.
-exports.logObject = function (msg, obj) {
-  if (/MSIE/.test(navigator.userAgent)) {
-    console.log(msg, JSON.stringify(obj));
-  } else {
-    console.log(msg, "", obj);
-  }
-};

src/js/ripple/wallet.js

@@ -0,0 +1,8 @@
+var sjcl = require('./utils').sjcl;
+
+var WalletGenerator = require('ripple-wallet-generator')({
+  sjcl: sjcl
+});
+
+module.exports = WalletGenerator;
+

src/js/sjcl-custom/sjcl-ecc-pointextras.js

@@ -0,0 +1,83 @@
+/**
+ *  Check that the point is valid based on the method described in
+ *  SEC 1: Elliptic Curve Cryptography, section 3.2.2.1: 
+ *  Elliptic Curve Public Key Validation Primitive
+ *  http://www.secg.org/download/aid-780/sec1-v2.pdf
+ *
+ *  @returns {Boolean}
+ */
+sjcl.ecc.point.prototype.isValidPoint = function() {
+
+  var self = this;
+
+  var field_modulus = self.curve.field.modulus;
+
+  if (self.isIdentity) {
+    return false;
+  }
+
+  // Check that coordinatres are in bounds
+  // Return false if x < 1 or x > (field_modulus - 1)
+  if (((new sjcl.bn(1).greaterEquals(self.x)) &&
+    !self.x.equals(1)) ||
+    (self.x.greaterEquals(field_modulus.sub(1))) &&
+    !self.x.equals(1)) {
+
+    return false;
+  }
+
+  // Return false if y < 1 or y > (field_modulus - 1)
+  if (((new sjcl.bn(1).greaterEquals(self.y)) &&
+    !self.y.equals(1)) ||
+    (self.y.greaterEquals(field_modulus.sub(1))) &&
+    !self.y.equals(1)) {
+
+    return false;
+  }
+
+  if (!self.isOnCurve()) {
+    return false;
+  }
+
+  // TODO check to make sure point is a scalar multiple of base_point
+
+  return true;
+
+};
+
+/**
+ *  Check that the point is on the curve
+ *
+ *  @returns {Boolean}
+ */
+sjcl.ecc.point.prototype.isOnCurve = function() {
+
+  var self = this;
+
+  var field_order = self.curve.r;
+  var component_a = self.curve.a;
+  var component_b = self.curve.b;
+  var field_modulus = self.curve.field.modulus;
+
+  var left_hand_side = self.y.mul(self.y).mod(field_modulus);
+  var right_hand_side = self.x.mul(self.x).mul(self.x).add(component_a.mul(self.x)).add(component_b).mod(field_modulus);
+
+  return left_hand_side.equals(right_hand_side);
+
+};
+
+
+sjcl.ecc.point.prototype.toString = function() {
+  return '(' + 
+    this.x.toString() + ', ' +
+    this.y.toString() +
+    ')';
+};
+
+sjcl.ecc.pointJac.prototype.toString = function() {
+  return '(' + 
+    this.x.toString() + ', ' +
+    this.y.toString() + ', ' +
+    this.z.toString() +
+    ')';
+};

src/js/sjcl-custom/sjcl-ecdsa-canonical.js

@@ -0,0 +1,17 @@
+sjcl.ecc.ecdsa.secretKey.prototype.canonicalizeSignature = function(rs) {
+  var w = sjcl.bitArray,
+      R = this._curve.r,
+      l = R.bitLength();
+
+  var r = sjcl.bn.fromBits(w.bitSlice(rs,0,l)),
+      s = sjcl.bn.fromBits(w.bitSlice(rs,l,2*l));
+
+  // For a canonical signature we want the lower of two possible values for s
+  // 0 < s <= n/2
+  if (!R.copy().halveM().greaterEquals(s)) {
+    s = R.sub(s);
+  }
+
+  return w.concat(r.toBits(l), s.toBits(l));
+};
+

src/js/sjcl-custom/sjcl-ecdsa-recoverablepublickey.js

@@ -0,0 +1,306 @@
+/**
+ *  This module uses the public key recovery method
+ *  described in SEC 1: Elliptic Curve Cryptography,
+ *  section 4.1.6, "Public Key Recovery Operation".
+ *  http://www.secg.org/download/aid-780/sec1-v2.pdf
+ *
+ *  Implementation based on:
+ *  https://github.com/bitcoinjs/bitcoinjs-lib/blob/89cf731ac7309b4f98994e3b4b67b7226020181f/src/ecdsa.js
+ */
+
+// Defined here so that this value only needs to be calculated once
+var FIELD_MODULUS_PLUS_ONE_DIVIDED_BY_FOUR;
+
+/**
+ *  Sign the given hash such that the public key, prepending an extra byte 
+ *  so that the public key will be recoverable from the signature
+ *
+ *  @param {bitArray} hash
+ *  @param {Number} paranoia
+ *  @returns {bitArray} Signature formatted as bitArray
+ */
+sjcl.ecc.ecdsa.secretKey.prototype.signWithRecoverablePublicKey = function(hash, paranoia, k_for_testing) {
+
+  var self = this;
+
+  // Convert hash to bits and determine encoding for output
+  var hash_bits;
+  if (typeof hash === 'object' && hash.length > 0 && typeof hash[0] === 'number') {
+    hash_bits = hash;
+  } else {
+    throw new sjcl.exception.invalid('hash. Must be a bitArray');
+  }
+
+  // Sign hash with standard, canonicalized method
+  var standard_signature = self.sign(hash_bits, paranoia, k_for_testing);
+  var canonical_signature = self.canonicalizeSignature(standard_signature);
+
+  // Extract r and s signature components from canonical signature
+  var r_and_s = getRandSFromSignature(self._curve, canonical_signature);
+
+  // Rederive public key
+  var public_key = self._curve.G.mult(sjcl.bn.fromBits(self.get()));
+
+  // Determine recovery factor based on which possible value
+  // returns the correct public key
+  var recovery_factor = calculateRecoveryFactor(self._curve, r_and_s.r, r_and_s.s, hash_bits, public_key);
+
+  // Prepend recovery_factor to signature and encode in DER
+  // The value_to_prepend should be 4 bytes total
+  var value_to_prepend = recovery_factor + 27;
+
+  var final_signature_bits = sjcl.bitArray.concat([value_to_prepend], canonical_signature);
+
+  // Return value in bits
+  return final_signature_bits;
+
+};
+
+
+/**
+ *  Recover the public key from a signature created with the
+ *  signWithRecoverablePublicKey method in this module
+ *
+ *  @static
+ *
+ *  @param {bitArray} hash
+ *  @param {bitArray} signature
+ *  @param {sjcl.ecc.curve} [sjcl.ecc.curves['k256']] curve
+ *  @returns {sjcl.ecc.ecdsa.publicKey} Public key
+ */
+sjcl.ecc.ecdsa.publicKey.recoverFromSignature = function(hash, signature, curve) {
+
+  if (!signature || signature instanceof sjcl.ecc.curve) {
+    throw new sjcl.exception.invalid('must supply hash and signature to recover public key');
+  }
+
+  if (!curve) {
+    curve = sjcl.ecc.curves['k256'];
+  }
+
+  // Convert hash to bits and determine encoding for output
+  var hash_bits;
+  if (typeof hash === 'object' && hash.length > 0 && typeof hash[0] === 'number') {
+    hash_bits = hash;
+  } else {
+    throw new sjcl.exception.invalid('hash. Must be a bitArray');
+  }
+
+  var signature_bits;
+  if (typeof signature === 'object' && signature.length > 0 && typeof signature[0] === 'number') {
+    signature_bits = signature;
+  } else {
+    throw new sjcl.exception.invalid('signature. Must be a bitArray');
+  }
+
+  // Extract recovery_factor from first 4 bytes
+  var recovery_factor = signature_bits[0] - 27;
+
+  if (recovery_factor < 0 || recovery_factor > 3) {
+    throw new sjcl.exception.invalid('signature. Signature must be generated with algorithm ' +
+      'that prepends the recovery factor in order to recover the public key');
+  }
+
+  // Separate r and s values
+  var r_and_s = getRandSFromSignature(curve, signature_bits.slice(1));
+  var signature_r = r_and_s.r;
+  var signature_s = r_and_s.s;
+
+  // Recover public key using recovery_factor
+  var recovered_public_key_point = recoverPublicKeyPointFromSignature(curve, signature_r, signature_s, hash_bits, recovery_factor);
+  var recovered_public_key = new sjcl.ecc.ecdsa.publicKey(curve, recovered_public_key_point);
+
+  return recovered_public_key;
+
+};
+
+
+/**
+ *  Retrieve the r and s components of a signature  
+ *
+ *  @param {sjcl.ecc.curve} curve
+ *  @param {bitArray} signature
+ *  @returns {Object} Object with 'r' and 's' fields each as an sjcl.bn
+ */
+function getRandSFromSignature(curve, signature) {
+
+  var r_length = curve.r.bitLength();
+
+  return {
+    r: sjcl.bn.fromBits(sjcl.bitArray.bitSlice(signature, 0, r_length)),
+    s: sjcl.bn.fromBits(sjcl.bitArray.bitSlice(signature, r_length, sjcl.bitArray.bitLength(signature)))
+  };
+};
+
+
+/**
+ *  Determine the recovery factor by trying all four
+ *  possibilities and figuring out which results in the
+ *  correct public key
+ *
+ *  @param {sjcl.ecc.curve} curve
+ *  @param {sjcl.bn} r
+ *  @param {sjcl.bn} s
+ *  @param {bitArray} hash_bits
+ *  @param {sjcl.ecc.point} original_public_key_point
+ *  @returns {Number, 0-3} Recovery factor
+ */
+function calculateRecoveryFactor(curve, r, s, hash_bits, original_public_key_point) {
+
+  var original_public_key_point_bits = original_public_key_point.toBits();
+
+  // TODO: verify that it is possible for the recovery_factor to be 2 or 3,
+  // we may only need 1 bit because the canonical signature might remove the
+  // possibility of us needing to "use the second candidate key"
+  for (var possible_factor = 0; possible_factor < 4; possible_factor++) {
+
+    var resulting_public_key_point;
+    try {
+      resulting_public_key_point = recoverPublicKeyPointFromSignature(curve, r, s, hash_bits, possible_factor);
+    } catch (err) {
+      // console.log(err, err.stack);
+      continue;
+    }
+
+    if (sjcl.bitArray.equal(resulting_public_key_point.toBits(), original_public_key_point_bits)) {
+      return possible_factor;
+    }
+
+  }
+
+  throw new sjcl.exception.bug('unable to calculate recovery factor from signature');
+
+};
+
+
+/**
+ *  Recover the public key from the signature.
+ *
+ *  @param {sjcl.ecc.curve} curve
+ *  @param {sjcl.bn} r
+ *  @param {sjcl.bn} s
+ *  @param {bitArray} hash_bits
+ *  @param {Number, 0-3} recovery_factor
+ *  @returns {sjcl.point} Public key corresponding to signature
+ */
+function recoverPublicKeyPointFromSignature(curve, signature_r, signature_s, hash_bits, recovery_factor) {
+
+  var field_order = curve.r;
+  var field_modulus = curve.field.modulus;
+
+  // Reduce the recovery_factor to the two bits used
+  recovery_factor = recovery_factor & 3;
+
+  // The less significant bit specifies whether the y coordinate
+  // of the compressed point is even or not.
+  var compressed_point_y_coord_is_even = recovery_factor & 1;
+
+  // The more significant bit specifies whether we should use the
+  // first or second candidate key.
+  var use_second_candidate_key = recovery_factor >> 1;
+
+  // Calculate (field_order + 1) / 4
+  if (!FIELD_MODULUS_PLUS_ONE_DIVIDED_BY_FOUR) {
+    FIELD_MODULUS_PLUS_ONE_DIVIDED_BY_FOUR = field_modulus.add(1).div(4);
+  }
+
+  // In the paper they write "1. For j from 0 to h do the following..."
+  // That is not necessary here because we are given the recovery_factor
+  // step 1.1 Let x = r + jn
+  // Here "j" is either 0 or 1
+  var x;
+  if (use_second_candidate_key) {
+    x = signature_r.add(field_order);
+  } else {
+    x = signature_r;
+  }
+
+  // step 1.2 and 1.3  convert x to an elliptic curve point
+  // Following formula in section 2.3.4 Octet-String-to-Elliptic-Curve-Point Conversion
+  var alpha = x.mul(x).mul(x).add(curve.a.mul(x)).add(curve.b).mod(field_modulus);
+  var beta = alpha.powermodMontgomery(FIELD_MODULUS_PLUS_ONE_DIVIDED_BY_FOUR, field_modulus);
+
+  // If beta is even but y isn't or
+  // if beta is odd and y is even
+  // then subtract beta from the field_modulus
+  var y;
+  var beta_is_even = beta.mod(2).equals(0);
+  if (beta_is_even && !compressed_point_y_coord_is_even ||
+    !beta_is_even && compressed_point_y_coord_is_even) {
+    y = beta;
+  } else {
+    y = field_modulus.sub(beta);
+  }
+
+  // generated_point_R is the point generated from x and y
+  var generated_point_R = new sjcl.ecc.point(curve, x, y);
+
+  // step 1.4  check that R is valid and R x field_order !== infinity
+  // TODO: add check for R x field_order === infinity
+  if (!generated_point_R.isValidPoint()) {
+    throw new sjcl.exception.corrupt('point R. Not a valid point on the curve. Cannot recover public key');
+  }
+
+  // step 1.5  Compute e from M
+  var message_e = sjcl.bn.fromBits(hash_bits);
+  var message_e_neg = new sjcl.bn(0).sub(message_e).mod(field_order);
+
+  // step 1.6  Compute Q = r^-1 (sR - eG)
+  // console.log('r: ', signature_r);
+  var signature_r_inv = signature_r.inverseMod(field_order);
+  var public_key_point = generated_point_R.mult2(signature_s, message_e_neg, curve.G).mult(signature_r_inv);
+
+  // Validate public key point
+  if (!public_key_point.isValidPoint()) {
+    throw new sjcl.exception.corrupt('public_key_point. Not a valid point on the curve. Cannot recover public key');
+  }
+
+  // Verify that this public key matches the signature
+  if (!verify_raw(curve, message_e, signature_r, signature_s, public_key_point)) {
+    throw new sjcl.exception.corrupt('cannot recover public key');
+  }
+
+  return public_key_point;
+
+};
+
+
+/**
+ *  Verify a signature given the raw components
+ *  using method defined in section 4.1.5:
+ *  "Alternative Verifying Operation"
+ *
+ *  @param {sjcl.ecc.curve} curve
+ *  @param {sjcl.bn} e
+ *  @param {sjcl.bn} r
+ *  @param {sjcl.bn} s
+ *  @param {sjcl.ecc.point} public_key_point
+ *  @returns {Boolean} 
+ */
+function verify_raw(curve, e, r, s, public_key_point) {
+
+  var field_order = curve.r;
+
+  // Return false if r is out of bounds
+  if ((new sjcl.bn(1)).greaterEquals(r) || r.greaterEquals(new sjcl.bn(field_order))) {
+    return false;
+  }
+
+  // Return false if s is out of bounds
+  if ((new sjcl.bn(1)).greaterEquals(s) || s.greaterEquals(new sjcl.bn(field_order))) {
+    return false;
+  }
+
+  // Check that r = (u1 + u2)G
+  // u1 = e x s^-1 (mod field_order)
+  // u2 = r x s^-1 (mod field_order)
+  var s_mod_inverse_field_order = s.inverseMod(field_order);
+  var u1 = e.mul(s_mod_inverse_field_order).mod(field_order);
+  var u2 = r.mul(s_mod_inverse_field_order).mod(field_order);
+
+  var point_computed = curve.G.mult2(u1, u2, public_key_point);
+
+  return r.equals(point_computed.x.mod(field_order));
+
+};
+

src/js/sjcl-custom/sjcl-extramath.js

@@ -6,11 +6,9 @@ sjcl.bn.prototype.divRem = function (that) {
   var thisa = this.abs(), thata = that.abs(), quot = new this._class(0),
       ci = 0;
   if (!thisa.greaterEquals(thata)) {
-    this.initWith(0);
-    return this;
+    return [new sjcl.bn(0), this.copy()];
   } else if (thisa.equals(thata)) {
-    this.initWith(1);
-    return this;
+    return [new sjcl.bn(1), new sjcl.bn(0)];
   }
 
   for (; thisa.greaterEquals(thata); ci++) {
@@ -59,3 +57,89 @@ sjcl.bn.prototype.abs = function () {
     return this.neg();
   } else return this;
 };
+
+/** this >> that */
+sjcl.bn.prototype.shiftRight = function (that) {
+  if ("number" !== typeof that) {
+    throw new Error("shiftRight expects a number");
+  }
+
+  that = +that;
+
+  if (that < 0) {
+    return this.shiftLeft(that);
+  }
+
+  var a = new sjcl.bn(this);
+
+  while (that >= this.radix) {
+    a.limbs.shift();
+    that -= this.radix;
+  }
+
+  while (that--) {
+    a.halveM();
+  }
+
+  return a;
+};
+
+/** this >> that */
+sjcl.bn.prototype.shiftLeft = function (that) {
+  if ("number" !== typeof that) {
+    throw new Error("shiftLeft expects a number");
+  }
+
+  that = +that;
+
+  if (that < 0) {
+    return this.shiftRight(that);
+  }
+
+  var a = new sjcl.bn(this);
+
+  while (that >= this.radix) {
+    a.limbs.unshift(0);
+    that -= this.radix;
+  }
+
+  while (that--) {
+    a.doubleM();
+  }
+
+  return a;
+};
+
+/** (int)this */
+// NOTE Truncates to 32-bit integer
+sjcl.bn.prototype.toNumber = function () {
+  return this.limbs[0] | 0;
+};
+
+/** find n-th bit, 0 = LSB */
+sjcl.bn.prototype.testBit = function (bitIndex) {
+  var limbIndex = Math.floor(bitIndex / this.radix);
+  var bitIndexInLimb = bitIndex % this.radix;
+
+  if (limbIndex >= this.limbs.length) return 0;
+
+  return (this.limbs[limbIndex] >>> bitIndexInLimb) & 1;
+};
+
+/** set n-th bit, 0 = LSB */
+sjcl.bn.prototype.setBitM = function (bitIndex) {
+  var limbIndex = Math.floor(bitIndex / this.radix);
+  var bitIndexInLimb = bitIndex % this.radix;
+
+  while (limbIndex >= this.limbs.length) this.limbs.push(0);
+
+  this.limbs[limbIndex] |= 1 << bitIndexInLimb;
+
+  this.cnormalize();
+
+  return this;
+};
+
+sjcl.bn.prototype.modInt = function (n) {
+  return this.toNumber() % n;
+};

src/js/sjcl-custom/sjcl-jacobi.js

@@ -0,0 +1,45 @@
+sjcl.bn.prototype.jacobi = function (that) {
+  var a = this;
+  that = new sjcl.bn(that);
+
+  if (that.sign() === -1) return;
+
+  // 1. If a = 0 then return(0).
+  if (a.equals(0)) { return 0; }
+
+  // 2. If a = 1 then return(1).
+  if (a.equals(1)) { return 1; }
+
+  var s = 0;
+
+  // 3. Write a = 2^e * a1, where a1 is odd.
+  var e = 0;
+  while (!a.testBit(e)) e++;
+  var a1 = a.shiftRight(e);
+
+  // 4. If e is even then set s ← 1.
+  if ((e & 1) === 0) {
+    s = 1;
+  } else {
+    var residue = that.modInt(8);
+
+    if (residue === 1 || residue === 7) {
+      // Otherwise set s ← 1 if n ≡ 1 or 7 (mod 8)
+      s = 1;
+    } else if (residue === 3 || residue === 5) {
+      // Or set s ← −1 if n ≡ 3 or 5 (mod 8).
+      s = -1;
+    }
+  }
+
+  // 5. If n ≡ 3 (mod 4) and a1 ≡ 3 (mod 4) then set s ← −s.
+  if (that.modInt(4) === 3 && a1.modInt(4) === 3) {
+    s = -s;
+  }
+
+  if (a1.equals(1)) {
+    return s;
+  } else {
+    return s * that.mod(a1).jacobi(a1);
+  }
+};

src/js/sjcl-custom/sjcl-montgomery.js

@@ -0,0 +1,156 @@
+sjcl.bn.prototype.invDigit = function ()
+{
+  var radixMod = 1 + this.radixMask;
+
+  if (this.limbs.length < 1) return 0;
+  var x = this.limbs[0];
+  if ((x&1) == 0) return 0;
+  var y = x&3;		// y == 1/x mod 2^2
+  y = (y*(2-(x&0xf)*y))&0xf;	// y == 1/x mod 2^4
+  y = (y*(2-(x&0xff)*y))&0xff;	// y == 1/x mod 2^8
+  y = (y*(2-(((x&0xffff)*y)&0xffff)))&0xffff;	// y == 1/x mod 2^16
+  // last step - calculate inverse mod DV directly;
+  // assumes 16 < radixMod <= 32 and assumes ability to handle 48-bit ints
+  y = (y*(2-x*y%radixMod))%radixMod;		// y == 1/x mod 2^dbits
+  // we really want the negative inverse, and -DV < y < DV
+  return (y>0)?radixMod-y:-y;
+};
+
+// returns bit length of the integer x
+function nbits(x) {
+  var r = 1, t;
+  if((t=x>>>16) != 0) { x = t; r += 16; }
+  if((t=x>>8) != 0) { x = t; r += 8; }
+  if((t=x>>4) != 0) { x = t; r += 4; }
+  if((t=x>>2) != 0) { x = t; r += 2; }
+  if((t=x>>1) != 0) { x = t; r += 1; }
+  return r;
+}
+
+// JSBN-style add and multiply for SJCL w/ 24 bit radix
+sjcl.bn.prototype.am = function (i,x,w,j,c,n) {
+  var xl = x&0xfff, xh = x>>12;
+  while (--n >= 0) {
+    var l = this.limbs[i]&0xfff;
+    var h = this.limbs[i++]>>12;
+    var m = xh*l+h*xl;
+    l = xl*l+((m&0xfff)<<12)+w.limbs[j]+c;
+    c = (l>>24)+(m>>12)+xh*h;
+    w.limbs[j++] = l&0xffffff;
+  }
+  return c;
+}
+
+var Montgomery = function (m)
+{
+  this.m = m;
+  this.mt = m.limbs.length;
+  this.mt2 = this.mt * 2;
+  this.mp = m.invDigit();
+  this.mpl = this.mp&0x7fff;
+  this.mph = this.mp>>15;
+  this.um = (1<<(m.radix-15))-1;
+};
+
+Montgomery.prototype.reduce = function (x)
+{
+  var radixMod = x.radixMask + 1;
+  while (x.limbs.length <= this.mt2)	// pad x so am has enough room later
+    x.limbs[x.limbs.length] = 0;
+  for (var i = 0; i < this.mt; ++i) {
+    // faster way of calculating u0 = x[i]*mp mod 2^radix
+    var j = x.limbs[i]&0x7fff;
+    var u0 = (j*this.mpl+(((j*this.mph+(x.limbs[i]>>15)*this.mpl)&this.um)<<15))&x.radixMask;
+    // use am to combine the multiply-shift-add into one call
+    j = i+this.mt;
+    x.limbs[j] += this.m.am(0,u0,x,i,0,this.mt);
+    // propagate carry
+    while (x.limbs[j] >= radixMod) { x.limbs[j] -= radixMod; x.limbs[++j]++; }
+  }
+  x.trim();
+  x = x.shiftRight(this.mt * this.m.radix);
+  if (x.greaterEquals(this.m)) x = x.sub(this.m);
+  return x.trim().normalize().reduce();
+};
+
+Montgomery.prototype.square = function (x)
+{
+  return this.reduce(x.square());
+};
+
+Montgomery.prototype.multiply = function (x, y)
+{
+  return this.reduce(x.mul(y));
+};
+
+Montgomery.prototype.convert = function (x)
+{
+  return x.abs().shiftLeft(this.mt * this.m.radix).mod(this.m);
+};
+
+Montgomery.prototype.revert = function (x)
+{
+  return this.reduce(x.copy());
+};
+
+sjcl.bn.prototype.powermodMontgomery = function (e, m)
+{
+  var i = e.bitLength(), k, r = new this._class(1);
+
+  if (i <= 0) return r;
+  else if (i < 18) k = 1;
+  else if (i < 48) k = 3;
+  else if (i < 144) k = 4;
+  else if (i < 768) k = 5;
+  else k = 6;
+
+  if (i < 8 || !m.testBit(0)) {
+    // For small exponents and even moduli, use a simple square-and-multiply
+    // algorithm.
+    return this.powermod(e, m);
+  }
+
+  var z = new Montgomery(m);
+
+  e.trim().normalize();
+
+  // precomputation
+  var g = new Array(), n = 3, k1 = k-1, km = (1<<k)-1;
+  g[1] = z.convert(this);
+  if (k > 1) {
+    var g2 = z.square(g[1]);
+
+    while (n <= km) {
+      g[n] = z.multiply(g2, g[n-2]);
+      n += 2;
+    }
+  }
+
+  var j = e.limbs.length-1, w, is1 = true, r2 = new this._class(), t;
+  i = nbits(e.limbs[j])-1;
+  while (j >= 0) {
+    if (i >= k1) w = (e.limbs[j]>>(i-k1))&km;
+    else {
+      w = (e.limbs[j]&((1<<(i+1))-1))<<(k1-i);
+      if (j > 0) w |= e.limbs[j-1]>>(this.radix+i-k1);
+    }
+
+    n = k;
+    while ((w&1) == 0) { w >>= 1; --n; }
+    if ((i -= n) < 0) { i += this.radix; --j; }
+    if (is1) {	// ret == 1, don't bother squaring or multiplying it
+      r = g[w].copy();
+      is1 = false;
+    } else {
+      while (n > 1) { r2 = z.square(r); r = z.square(r2); n -= 2; }
+      if (n > 0) r2 = z.square(r); else { t = r; r = r2; r2 = t; }
+      r = z.multiply(r2,g[w]);
+    }
+
+    while (j >= 0 && (e.limbs[j]&(1<<i)) == 0) {
+      r2 = z.square(r); t = r; r = r2; r2 = t;
+      if (--i < 0) { i = this.radix-1; --j; }
+    }
+  }
+  return z.revert(r);
+}

src/js/sjcl-custom/sjcl-secp256k1.js

@@ -1,17 +1,16 @@
 // ----- for secp256k1 ------
 
-// Overwrite NIST-P256 with secp256k1 so we're on even footing
-sjcl.ecc.curves.c256 = new sjcl.ecc.curve(
-    sjcl.bn.pseudoMersennePrime(256, [[0,-1],[4,-1],[6,-1],[7,-1],[8,-1],[9,-1],[32,-1]]),
-    "0x14551231950b75fc4402da1722fc9baee",
-    0,
-    7,
-    "0x79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
-    "0x483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8"
-);
+sjcl.ecc.point.prototype.toBytesCompressed = function () {
+  var header = this.y.mod(2).toString() == "0x0" ? 0x02 : 0x03;
+  return [header].concat(sjcl.codec.bytes.fromBits(this.x.toBits()))
+};
 
 // Replace point addition and doubling algorithms
 // NIST-P256 is a=-3, we need algorithms for a=0
+//
+// This is a custom point addition formula that
+// only works for a=-3 Jacobian curve. It's much
+// faster than the generic implementation
 sjcl.ecc.pointJac.prototype.add = function(T) {
   var S = this;
   if (S.curve !== T.curve) {
@@ -51,6 +50,9 @@ sjcl.ecc.pointJac.prototype.add = function(T) {
   return new sjcl.ecc.pointJac(this.curve,x,y,z);
 };
 
+// This is a custom doubling algorithm that
+// only works for a=-3 Jacobian curve. It's much
+// faster than the generic implementation
 sjcl.ecc.pointJac.prototype.doubl = function () {
   if (this.isIdentity) { return this; }
 
@@ -62,11 +64,13 @@ sjcl.ecc.pointJac.prototype.doubl = function () {
   var f = e.square();
   var x = f.sub(d.copy().doubleM());
   var y = e.mul(d.sub(x)).subM(c.doubleM().doubleM().doubleM());
-  var z = this.y.mul(this.z).doubleM();
+  var z = this.z.mul(this.y).doubleM();
   return new sjcl.ecc.pointJac(this.curve, x, y, z);
 };
 
-sjcl.ecc.point.prototype.toBytesCompressed = function () {
-  var header = this.y.mod(2).toString() == "0x0" ? 0x02 : 0x03;
-  return [header].concat(sjcl.codec.bytes.fromBits(this.x.toBits()))
-};
+// DEPRECATED:
+// previously the c256 curve was overridden with the secp256k1 curve
+// since then, sjcl has been updated to support k256
+// this override exist to keep supporting the old c256 with k256 behavior
+// this will be removed in future release
+sjcl.ecc.curves.c256 = sjcl.ecc.curves.k256;

src/js/sjcl-custom/sjcl-validecc.js

@@ -1,23 +1,32 @@
-sjcl.ecc.ecdsa.secretKey.prototype = {
-  sign: function(hash, paranoia) {
+sjcl.ecc.ecdsa.secretKey.prototype.sign = function(hash, paranoia, k_for_testing) {
   var R = this._curve.r,
-        l = R.bitLength(),
-        k = sjcl.bn.random(R.sub(1), paranoia).add(1),
-        r = this._curve.G.mult(k).x.mod(R),
-        s = sjcl.bn.fromBits(hash).add(r.mul(this._exponent)).mul(k.inverseMod(R)).mod(R);
+      l = R.bitLength();
+
+  // k_for_testing should ONLY BE SPECIFIED FOR TESTING
+  // specifying it will make the signature INSECURE
+  var k;
+  if (typeof k_for_testing === 'object' && k_for_testing.length > 0 && typeof k_for_testing[0] === 'number') {
+    k = k_for_testing;
+  } else if (typeof k_for_testing === 'string' && /^[0-9a-fA-F]+$/.test(k_for_testing)) {
+    k = sjcl.bn.fromBits(sjcl.codec.hex.toBits(k_for_testing));        
+  } else {
+    // This is the only option that should be used in production
+    k = sjcl.bn.random(R.sub(1), paranoia).add(1);
+  }
+
+  var r = this._curve.G.mult(k).x.mod(R);
+  var s = sjcl.bn.fromBits(hash).add(r.mul(this._exponent)).mul(k.inverseMod(R)).mod(R);
 
   return sjcl.bitArray.concat(r.toBits(l), s.toBits(l));
-  }
 };
 
-sjcl.ecc.ecdsa.publicKey.prototype = {
-  verify: function(hash, rs) {
+sjcl.ecc.ecdsa.publicKey.prototype.verify = function(hash, rs) {
   var w = sjcl.bitArray,
       R = this._curve.r,
       l = R.bitLength(),
       r = sjcl.bn.fromBits(w.bitSlice(rs,0,l)),
       s = sjcl.bn.fromBits(w.bitSlice(rs,l,2*l)),
-        sInv = s.modInverse(R),
+      sInv = s.inverseMod(R),
       hG = sjcl.bn.fromBits(hash).mul(sInv).mod(R),
       hA = r.mul(sInv).mod(R),
       r2 = this._curve.G.mult2(hG, hA, this._point).x;
@@ -26,5 +35,4 @@ sjcl.ecc.ecdsa.publicKey.prototype = {
     throw (new sjcl.exception.corrupt("signature didn't check out"));
   }
   return true;
-  }
 };

src/js/sjcl/.gitignore

@@ -0,0 +1,2 @@
+core.js
+core_closure.js

src/js/sjcl/.travis.yml

@@ -0,0 +1,9 @@
+before_script: ./configure --with-all
+
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"
+  - "0.8"
+# 0.6 appears to be unreliable on Travis at the moment.
+#  - "0.6"

src/js/sjcl/Makefile

@@ -54,10 +54,11 @@ lint: core.js core/*.js test/*.js browserTest/*.js lint/coding_guidelines.pl
 	lint/coding_guidelines.pl core/*.js test/*.js browserTest/*.js
 
 
-TEST_COMMON=  browserTest/rhinoUtil.js test/test.js
+TEST_COMMON=  browserTest/nodeUtil.js test/test.js
 
 TEST_SCRIPTS= $(TEST_COMMON) \
               test/aes_vectors.js test/aes_test.js \
+              test/bitArray_vectors.js test/bitArray_test.js \
               test/ocb2_vectors.js test/ocb2_test.js  \
               test/ccm_vectors.js test/ccm_test.js  \
               test/cbc_vectors.js test/cbc_test.js  \
@@ -70,18 +71,14 @@ TEST_SCRIPTS= $(TEST_COMMON) \
               test/hmac_vectors.js test/hmac_test.js \
               test/pbkdf2_test.js \
               test/bn_vectors.js test/bn_test.js \
-              test/ecdsa_test.js test/ecdsa_vectors.js test/ecdh_test.js
+              test/ecdsa_test.js test/ecdsa_vectors.js test/ecdh_test.js \
+              test/srp_vectors.js test/srp_test.js \
+              test/json_test.js
 
-TEST_SCRIPTS_OPT= $(TEST_COMMON) \
-              test/srp_vectors.js test/srp_test.js
+# Run all tests in node.js.
 
-# Rhino fails at -O 0.  Probably because the big files full of test vectors blow the
-# bytecode limit. So, run most tests with -O -1. But modular exponentiation is
-# currently very slow (on Rhino), so run the SRP test with optimizations on.
-
-test: sjcl.js $(TEST_SCRIPTS) test/run_tests_rhino.js
-	@rhino -O -1 -w test/run_tests_rhino.js $< $(TEST_SCRIPTS)
-	@rhino -O 9 -w test/run_tests_rhino.js $< $(TEST_SCRIPTS_OPT)
+test: sjcl.js $(TEST_SCRIPTS) test/run_tests_node.js
+	node test/run_tests_node.js $< $(TEST_SCRIPTS)
 
 tidy:
 	find . -name '*~' -delete

src/js/sjcl/README.md

@@ -0,0 +1,21 @@
+sjcl
+====
+
+[![Build Status](https://travis-ci.org/bitwiseshiftleft/sjcl.png)](https://travis-ci.org/bitwiseshiftleft/sjcl)
+
+Stanford Javascript Crypto Library
+
+Security Advisories
+===
+* 12.02.2014: the current development version has a paranoia bug in the ecc module. The bug was introduced in commit [ac0b3fe0](https://github.com/bitwiseshiftleft/sjcl/commit/ac0b3fe0) and might affect ecc key generation on platforms without a platform random number generator.
+* 
+
+Security Contact
+====
+Security Mail: sjcl@ovt.me  
+OpenPGP-Key Fingerprint: 0D54 3E52 87B4 EC06 3FA9 0115 72ED A6C7 7AAF 48ED  
+Keyserver: pool.sks-keyservers.net  
+
+Documentation
+====
+The documentation is available [here](http://bitwiseshiftleft.github.io/sjcl/doc/)

src/js/sjcl/bower.json

@@ -0,0 +1,12 @@
+{
+	"name": "sjcl",
+	"version": "1.0.0",
+	"main": ["./sjcl.js"],
+	"ignore": [
+		"**/*",
+		"!README.md",
+		"!README/*",
+		"!bower.json",
+		"!sjcl.js"
+	]
+}

src/js/sjcl/browserTest/browserUtil.js

@@ -1,6 +1,6 @@
 browserUtil = {};
 
-browserUtil.isRhino = (typeof(window) === 'undefined');
+browserUtil.isNodeJS = (typeof(window) === 'undefined');
 
 /**
  * Pause (for the graphics to update and the script timer to clear), then run the

src/js/sjcl/browserTest/entropy.html

@@ -0,0 +1,88 @@
+<html>
+<head>
+
+<title>Entropy Generator Progress</title>
+<!-- ProgressBar source: http://stackoverflow.com/questions/7190898/progress-bar-with-html-and-css -->
+
+<style>
+#progressbar {
+  background-color: black;
+  border-radius: 13px; /* (height of inner div) / 2 + padding */
+  padding: 3px;
+}
+#progressbar > div {
+   background-color: orange;
+   width: 0%; /* Adjust with JavaScript */
+   height: 20px;
+   border-radius: 10px;
+}
+</style>
+
+<script type="text/javascript" src="../sjcl.js">
+</script>
+
+<script type="text/javascript">
+
+var busy = 0;
+var collecting = 0;
+
+function showprogress () {
+	var barwidth = document.getElementById ("progresswidth");
+	var paranoia = parseInt (document.getElementById ("paranoialevel").value);
+	var progress = 100 * sjcl.random.getProgress (paranoia);
+	barwidth.style.width = progress+"%";
+	if (!sjcl.random.isReady (paranoia)) {
+		setTimeout ("showprogress()", 10, "JavaScript");
+	} else {
+		busy = 0;
+		document.getElementById ("startbutton").style.disabled = 1;
+	}
+}
+
+function startup () {
+	if (collecting == 0) {
+		sjcl.random.startCollectors ();
+		collecting = 1;
+	}
+	if (busy == 0) {
+		busy = 1;
+		document.getElementById ("startbutton").style.disabled = 1;
+		showprogress ();
+	}
+}
+
+function consume (numbits) {
+	var collector = document.getElementById ("collector");
+	collector.value = "retrieving random data";
+	var paranoia = document.getElementById ("paranoialevel").value;
+	var numwords = Math.ceil (numbits / 32);
+	var bits = sjcl.random.randomWords (numwords, paranoia);
+	collector.value = '';
+	for (var i=0; i<numwords; i++) {
+		var hi = (bits [i] >> 16) & 0x0000ffff;
+		var lo =  bits [i]        & 0x0000ffff;
+		collector.value = collector.value + hi.toString (16) + lo.toString (16);
+	}
+	startup ();
+}
+
+</script>
+
+</head>
+<body>
+<h1>Entropy Generator Progress</h1>
+
+<p>Target: 192 bits, available at paranoia level 5.</p>
+
+<p>Corresponding paranoia level from [0,1..10]: <input type="text" value="5" id="paranoialevel"/> <input type=button onclick="startup ()" id="startbutton" value=" Start &gt;&gt; "> (the idea being that you can see the progress bar advance gently from empty/black to full/yellow after you press this)</p>
+
+<p><input type=button onclick="consume (192)" value=" Consume 192 bits &gt;&gt; "><input type=text id=collector size=50 value="" onkeypress="consume (192)"> (also consumes 192 bits with every keypress in the text field; use key repeat to consume swiftly)</p>
+
+<div id="progressbar">
+  <div id="progresswidth"></div>
+</div>
+
+<p>Please move your mouse, play around and generally introduce entropy into your environment.</p>
+
+</body>
+</html>

src/js/sjcl/browserTest/nodeUtil.js

@@ -0,0 +1,44 @@
+browserUtil = {
+  isNodeJS: true,
+  
+  pauseAndThen: function (cb) { cb(); },
+  
+  cpsIterate: function (f, start, end, pause, callback) {
+    function go() {
+      var called = false;
+      if (start >= end) {
+        callback && callback();
+      } else {
+        f(start, function () {
+          if (!called) { called = true; start++; go(); }
+        });
+      }
+    }
+    go (start);
+  },
+  
+  cpsMap: function (map, list, pause, callback) {
+    browserUtil.cpsIterate(function (i, cb) { map(list[i], i, list.length, cb); },
+                           0, list.length, pause, callback);
+  },
+
+  loadScripts: function(scriptNames, callback) {
+    for (i=0; i<scriptNames.length; i++) {
+      load(scriptNames[i]);
+      callback && callback();
+    }
+  },
+  
+  write: function(type, message) {
+    console.log(message);
+    return { update: function (type2, message2) {
+      if (type2 === 'pass') { console.log("  + " + message2); }
+      else if (type2 === 'unimplemented') { console.log("  ? " + message2); }
+      else { console.log("  - " + message2); }
+    }};
+  },
+  
+  writeNewline: function () { console.log(""); },
+  
+  status: function(message) {}
+};

src/js/sjcl/compress/digitize.pl

@@ -16,7 +16,7 @@ sub digitize {
 }
 
 while (<>) {
-    s/([^a-zA-Z0-9_])(\d+)/$1 . digitize $2/eg;
+    s/([^a-zA-Z0-9_"])(\d+)/$1 . digitize $2/eg;
     print;
 }
 

src/js/sjcl/configure

@@ -4,12 +4,13 @@ use strict;
 
 my ($arg, $i, $j, $targ);
 
-my @targets = qw/sjcl aes bitArray codecString codecHex codecBase64 codecBytes sha256 sha512 sha1 ccm cbc ocb2 gcm hmac pbkdf2 random convenience bn ecc srp/;
+my @targets = qw/sjcl aes bitArray codecString codecHex codecBase32 codecBase64 codecBytes sha256 sha512 sha1 ccm cbc ocb2 gcm hmac pbkdf2 random convenience bn ecc srp/;
 my %deps = ('aes'=>'sjcl',
             'bitArray'=>'sjcl',
             'codecString'=>'bitArray',
             'codecHex'=>'bitArray',
             'codecBase64'=>'bitArray',
+            'codecBase32'=>'bitArray',
             'codecBytes'=>'bitArray',
             'sha256'=>'codecString',
             'sha512'=>'codecString',
@@ -32,10 +33,10 @@ my %enabled = ();
 $enabled{$_} = 0 foreach (@targets);
 
 # by default, all but codecBytes, srp, bn
-$enabled{$_} = 1 foreach (qw/aes bitArray codecString codecHex codecBase64 sha256 ccm ocb2 gcm hmac pbkdf2 random convenience/);
+$enabled{$_} = 1 foreach (qw/aes bitArray codecString codecHex codecBase32 codecBase64 sha256 ccm ocb2 gcm hmac pbkdf2 random convenience/);
 
 # argument parsing
-while ($arg = shift @ARGV) {
+while (my $arg = shift @ARGV) {
   if ($arg =~ /^--?with-all$/) {
     foreach (@targets) {
       if ($enabled{$_} == 0) {
@@ -97,7 +98,7 @@ my $config = '';
 my $pconfig;
 
 # dependency analysis: forbidden
-foreach $i (@targets) {
+foreach my $i (@targets) {
   if ($enabled{$i} > 0) {
     foreach $j (split /,/, $deps{$i}) {
       if ($enabled{$j} == -1) {
@@ -114,7 +115,7 @@ foreach $i (@targets) {
 }
 
 # reverse
-foreach $i (reverse @targets) {
+foreach my $i (reverse @targets) {
   if ($enabled{$i} > 0) {
     foreach $j (split /,/, $deps{$i}) {
       if ($enabled{$j} < $enabled{$i}) {

src/js/sjcl/core/bitArray.js

@@ -74,7 +74,7 @@ sjcl.bitArray = {
       return a1.concat(a2);
     }
     
-    var out, i, last = a1[a1.length-1], shift = sjcl.bitArray.getPartial(last);
+    var last = a1[a1.length-1], shift = sjcl.bitArray.getPartial(last);
     if (shift === 32) {
       return a1.concat(a2);
     } else {
@@ -183,5 +183,19 @@ sjcl.bitArray = {
    */
   _xor4: function(x,y) {
     return [x[0]^y[0],x[1]^y[1],x[2]^y[2],x[3]^y[3]];
+  },
+
+  /** byteswap a word array inplace.
+   * (does not handle partial words)
+   * @param {sjcl.bitArray} a word array
+   * @return {sjcl.bitArray} byteswapped array
+   */
+  byteswapM: function(a) {
+    var i, v, m = 0xff00;
+    for (i = 0; i < a.length; ++i) {
+      v = a[i];
+      a[i] = (v >>> 24) | ((v >>> 8) & m) | ((v & m) << 8) | (v << 24);
+    }
+    return a;
   }
 };

src/js/sjcl/core/bn.js

@@ -19,7 +19,7 @@ sjcl.bn.prototype = {
    * Initializes this with it, either as a bn, a number, or a hex string.
    */
   initWith: function(it) {
-    var i=0, k, n, l;
+    var i=0, k;
     switch(typeof it) {
     case "object":
       this.limbs = it.limbs.slice(0);
@@ -328,7 +328,7 @@ sjcl.bn.prototype = {
       carry = (l-m)*ipv;
     }
     if (carry === -1) {
-      limbs[i-1] -= this.placeVal;
+      limbs[i-1] -= pv;
     }
     return this;
   },
@@ -370,7 +370,9 @@ sjcl.bn.prototype = {
   }
 };
 
-/** @this { sjcl.bn } */
+/** @memberOf sjcl.bn
+* @this { sjcl.bn }
+*/
 sjcl.bn.fromBits = function(bits) {
   var Class = this, out = new Class(), words=[], w=sjcl.bitArray, t = this.prototype,
       l = Math.min(this.bitLength || 0x100000000, w.bitLength(bits)), e = l % t.radix || t.radix;
@@ -394,7 +396,9 @@ sjcl.bn.prototype.radixMask = (1 << sjcl.bn.prototype.radix) - 1;
  * i.e. a prime of the form 2^e + sum(a * 2^b),where the sum is negative and sparse.
  */
 sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
-  /** @constructor */
+  /** @constructor 
+  * @private
+  */
   function p(it) {
     this.initWith(it);
     /*if (this.limbs[this.modOffset]) {
@@ -427,10 +431,11 @@ sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
   ppr.modulus.cnormalize();
 
   /** Approximate reduction mod p.  May leave a number which is negative or slightly larger than p.
+   * @memberof sjcl.bn
    * @this { sjcl.bn }
    */
   ppr.reduce = function() {
-    var i, k, l, mo = this.modOffset, limbs = this.limbs, aff, off = this.offset, ol = this.offset.length, fac = this.factor, ll;
+    var i, k, l, mo = this.modOffset, limbs = this.limbs, off = this.offset, ol = this.offset.length, fac = this.factor, ll;
 
     i = this.minOffset;
     while (limbs.length > mo) {
@@ -452,7 +457,9 @@ sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
     return this;
   };
   
-  /** @this {sjcl.bn} */
+  /** @memberof sjcl.bn
+  * @this { sjcl.bn }
+  */
   ppr._strongReduce = (ppr.fullMask === -1) ? ppr.reduce : function() {
     var limbs = this.limbs, i = limbs.length - 1, k, l;
     this.reduce();
@@ -467,6 +474,7 @@ sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
   };
 
   /** mostly constant-time, very expensive full reduction.
+   * @memberof sjcl.bn
    * @this { sjcl.bn }
    */
   ppr.fullReduce = function() {
@@ -501,7 +509,9 @@ sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
   };
 
 
-  /** @this {sjcl.bn} */
+  /** @memberof sjcl.bn
+  * @this { sjcl.bn }
+  */
   ppr.inverse = function() {
     return (this.power(this.modulus.sub(2)));
   };
@@ -512,18 +522,24 @@ sjcl.bn.pseudoMersennePrime = function(exponent, coeff) {
 };
 
 // a small Mersenne prime
+var sbp = sjcl.bn.pseudoMersennePrime;
 sjcl.bn.prime = {
-  p127: sjcl.bn.pseudoMersennePrime(127, [[0,-1]]),
+  p127: sbp(127, [[0,-1]]),
 
   // Bernstein's prime for Curve25519
-  p25519: sjcl.bn.pseudoMersennePrime(255, [[0,-19]]),
+  p25519: sbp(255, [[0,-19]]),
+
+  // Koblitz primes
+  p192k: sbp(192, [[32,-1],[12,-1],[8,-1],[7,-1],[6,-1],[3,-1],[0,-1]]),
+  p224k: sbp(224, [[32,-1],[12,-1],[11,-1],[9,-1],[7,-1],[4,-1],[1,-1],[0,-1]]),
+  p256k: sbp(256, [[32,-1],[9,-1],[8,-1],[7,-1],[6,-1],[4,-1],[0,-1]]),
 
   // NIST primes
-  p192: sjcl.bn.pseudoMersennePrime(192, [[0,-1],[64,-1]]),
-  p224: sjcl.bn.pseudoMersennePrime(224, [[0,1],[96,-1]]),
-  p256: sjcl.bn.pseudoMersennePrime(256, [[0,-1],[96,1],[192,1],[224,-1]]),
-  p384: sjcl.bn.pseudoMersennePrime(384, [[0,-1],[32,1],[96,-1],[128,-1]]),
-  p521: sjcl.bn.pseudoMersennePrime(521, [[0,-1]])
+  p192: sbp(192, [[0,-1],[64,-1]]),
+  p224: sbp(224, [[0,1],[96,-1]]),
+  p256: sbp(256, [[0,-1],[96,1],[192,1],[224,-1]]),
+  p384: sbp(384, [[0,-1],[32,1],[96,-1],[128,-1]]),
+  p521: sbp(521, [[0,-1]])
 };
 
 sjcl.bn.random = function(modulus, paranoia) {

src/js/sjcl/core/cbc.js

@@ -5,6 +5,11 @@
  * @author Dan Boneh
  */
 
+if (sjcl.beware === undefined) {
+  sjcl.beware = {};
+}
+sjcl.beware["CBC mode is dangerous because it doesn't protect message integrity."
+] = function() {
   /** @namespace
    * Dangerous: CBC mode with PKCS#5 padding.
    *
@@ -12,11 +17,6 @@
    * @author Mike Hamburg
    * @author Dan Boneh
    */
-if (sjcl.beware === undefined) {
-  sjcl.beware = {};
-}
-sjcl.beware["CBC mode is dangerous because it doesn't protect message integrity."
-] = function() {
   sjcl.mode.cbc = {
     /** The name of the mode.
      * @constant
@@ -100,7 +100,7 @@ sjcl.beware["CBC mode is dangerous because it doesn't protect message integrity.
 
       /* check and remove the pad */
       bi = output[i-1] & 255;
-      if (bi == 0 || bi > 16) {
+      if (bi === 0 || bi > 16) {
         throw new sjcl.exception.corrupt("pkcs#5 padding corrupt");
       }
       bo = bi * 0x1010101;

src/js/sjcl/core/ccm.js

@@ -25,7 +25,7 @@ sjcl.mode.ccm = {
    * @return {bitArray} The encrypted data, an array of bytes.
    */
   encrypt: function(prf, plaintext, iv, adata, tlen) {
-    var L, i, out = plaintext.slice(0), tag, w=sjcl.bitArray, ivl = w.bitLength(iv) / 8, ol = w.bitLength(out) / 8;
+    var L, out = plaintext.slice(0), tag, w=sjcl.bitArray, ivl = w.bitLength(iv) / 8, ol = w.bitLength(out) / 8;
     tlen = tlen || 64;
     adata = adata || [];
     
@@ -59,7 +59,7 @@ sjcl.mode.ccm = {
   decrypt: function(prf, ciphertext, iv, adata, tlen) {
     tlen = tlen || 64;
     adata = adata || [];
-    var L, i, 
+    var L,
         w=sjcl.bitArray,
         ivl = w.bitLength(iv) / 8,
         ol = w.bitLength(ciphertext), 
@@ -101,7 +101,7 @@ sjcl.mode.ccm = {
    */
   _computeTag: function(prf, plaintext, iv, adata, tlen, L) {
     // compute B[0]
-    var q, mac, field = 0, offset = 24, tmp, i, macData = [], w=sjcl.bitArray, xor = w._xor4;
+    var mac, tmp, i, macData = [], w=sjcl.bitArray, xor = w._xor4;
 
     tlen /= 8;
   
@@ -161,7 +161,7 @@ sjcl.mode.ccm = {
    * @private
    */
   _ctrMode: function(prf, data, iv, tag, tlen, L) {
-    var enc, i, w=sjcl.bitArray, xor = w._xor4, ctr, b, l = data.length, bl=w.bitLength(data);
+    var enc, i, w=sjcl.bitArray, xor = w._xor4, ctr, l = data.length, bl=w.bitLength(data);
 
     // start the ctr
     ctr = w.concat([w.partial(8,L-1)],iv).concat([0,0,0]).slice(0,4);

src/js/sjcl/core/codecBase32.js

@@ -0,0 +1,64 @@
+/** @fileOverview Bit array codec implementations.
+ *
+ * @author Nils Kenneweg
+ */
+
+/** @namespace Base32 encoding/decoding */
+sjcl.codec.base32 = {
+  /** The base32 alphabet.
+   * @private
+   */
+  _chars: "0123456789abcdefghjkmnpqrstvwxyz",
+
+  /* bits in an array */
+  BITS: 32,
+  /* base to encode at (2^x) */
+  BASE: 5,
+  /* bits - base */
+  REMAINING: 27,
+  
+  /** Convert from a bitArray to a base32 string. */
+  fromBits: function (arr, _noEquals) {
+    var BITS = sjcl.codec.base32.BITS, BASE = sjcl.codec.base32.BASE, REMAINING = sjcl.codec.base32.REMAINING;
+    var out = "", i, bits=0, c = sjcl.codec.base32._chars, ta=0, bl = sjcl.bitArray.bitLength(arr);
+
+    for (i=0; out.length * BASE <= bl; ) {
+      out += c.charAt((ta ^ arr[i]>>>bits) >>> REMAINING);
+      if (bits < BASE) {
+        ta = arr[i] << (BASE-bits);
+        bits += REMAINING;
+        i++;
+      } else {
+        ta <<= BASE;
+        bits -= BASE;
+      }
+    }
+
+    return out;
+  },
+  
+  /** Convert from a base32 string to a bitArray */
+  toBits: function(str) {
+    var BITS = sjcl.codec.base32.BITS, BASE = sjcl.codec.base32.BASE, REMAINING = sjcl.codec.base32.REMAINING;
+    var out = [], i, bits=0, c = sjcl.codec.base32._chars, ta=0, x;
+
+    for (i=0; i<str.length; i++) {
+      x = c.indexOf(str.charAt(i));
+      if (x < 0) {
+        throw new sjcl.exception.invalid("this isn't base32!");
+      }
+      if (bits > REMAINING) {
+        bits -= REMAINING;
+        out.push(ta ^ x>>>bits);
+        ta  = x << (BITS-bits);
+      } else {
+        bits += BASE;
+        ta ^= x << (BITS-bits);
+      }
+    }
+    if (bits&56) {
+      out.push(sjcl.bitArray.partial(bits&56, ta, 1));
+    }
+    return out;
+  }
+};

src/js/sjcl/core/codecBase64.js

@@ -15,7 +15,9 @@ sjcl.codec.base64 = {
   /** Convert from a bitArray to a base64 string. */
   fromBits: function (arr, _noEquals, _url) {
     var out = "", i, bits=0, c = sjcl.codec.base64._chars, ta=0, bl = sjcl.bitArray.bitLength(arr);
-    if (_url) c = c.substr(0,62) + '-_';
+    if (_url) {
+      c = c.substr(0,62) + '-_';
+    }
     for (i=0; out.length * 6 < bl; ) {
       out += c.charAt((ta ^ arr[i]>>>bits) >>> 26);
       if (bits < 6) {
@@ -35,7 +37,9 @@ sjcl.codec.base64 = {
   toBits: function(str, _url) {
     str = str.replace(/\s|=/g,'');
     var out = [], i, bits=0, c = sjcl.codec.base64._chars, ta=0, x;
-    if (_url) c = c.substr(0,62) + '-_';
+    if (_url) {
+      c = c.substr(0,62) + '-_';
+    }
     for (i=0; i<str.length; i++) {
       x = c.indexOf(str.charAt(i));
       if (x < 0) {

src/js/sjcl/core/codecHex.js

@@ -9,7 +9,7 @@
 sjcl.codec.hex = {
   /** Convert from a bitArray to a hex string. */
   fromBits: function (arr) {
-    var out = "", i, x;
+    var out = "", i;
     for (i=0; i<arr.length; i++) {
       out += ((arr[i]|0)+0xF00000000000).toString(16).substr(4);
     }

src/js/sjcl/core/convenience.js

@@ -15,10 +15,10 @@
    * @param {String} plaintext The data to encrypt.
    * @param {Object} [params] The parameters including tag, iv and salt.
    * @param {Object} [rp] A returned version with filled-in parameters.
-   * @return {String} The ciphertext.
+   * @return {Object} The cipher raw data.
    * @throws {sjcl.exception.invalid} if a parameter is invalid.
    */
-  encrypt: function (password, plaintext, params, rp) {
+  _encrypt: function (password, plaintext, params, rp) {
     params = params || {};
     rp = rp || {};
 
@@ -67,23 +67,36 @@
     p.ct = sjcl.mode[p.mode].encrypt(prp, plaintext, p.iv, adata, p.ts);
 
     //return j.encode(j._subtract(p, j.defaults));
+    return p;
+  },
+
+  /** Simple encryption function.
+   * @param {String|bitArray} password The password or key.
+   * @param {String} plaintext The data to encrypt.
+   * @param {Object} [params] The parameters including tag, iv and salt.
+   * @param {Object} [rp] A returned version with filled-in parameters.
+   * @return {String} The ciphertext serialized data.
+   * @throws {sjcl.exception.invalid} if a parameter is invalid.
+   */
+  encrypt: function (password, plaintext, params, rp) {
+    var j = sjcl.json, p = j._encrypt.apply(j, arguments);
     return j.encode(p);
   },
 
   /** Simple decryption function.
    * @param {String|bitArray} password The password or key.
-   * @param {String} ciphertext The ciphertext to decrypt.
+   * @param {Object} ciphertext The cipher raw data to decrypt.
    * @param {Object} [params] Additional non-default parameters.
    * @param {Object} [rp] A returned object with filled parameters.
    * @return {String} The plaintext.
    * @throws {sjcl.exception.invalid} if a parameter is invalid.
    * @throws {sjcl.exception.corrupt} if the ciphertext is corrupt.
    */
-  decrypt: function (password, ciphertext, params, rp) {
+  _decrypt: function (password, ciphertext, params, rp) {
     params = params || {};
     rp = rp || {};
 
-    var j = sjcl.json, p = j._add(j._add(j._add({},j.defaults),j.decode(ciphertext)), params, true), ct, tmp, prp, adata=p.adata;
+    var j = sjcl.json, p = j._add(j._add(j._add({},j.defaults),ciphertext), params, true), ct, tmp, prp, adata=p.adata;
     if (typeof p.salt === "string") {
       p.salt = sjcl.codec.base64.toBits(p.salt);
     }
@@ -120,7 +133,25 @@
     j._add(rp, p);
     rp.key = password;
 
+    if (params.raw === 1) {
+      return ct;
+    } else {
       return sjcl.codec.utf8String.fromBits(ct);
+    }
+  },
+
+  /** Simple decryption function.
+   * @param {String|bitArray} password The password or key.
+   * @param {String} ciphertext The ciphertext to decrypt.
+   * @param {Object} [params] Additional non-default parameters.
+   * @param {Object} [rp] A returned object with filled parameters.
+   * @return {String} The plaintext.
+   * @throws {sjcl.exception.invalid} if a parameter is invalid.
+   * @throws {sjcl.exception.corrupt} if the ciphertext is corrupt.
+   */
+  decrypt: function (password, ciphertext, params, rp) {
+    var j = sjcl.json;
+    return j._decrypt(password, j.decode(ciphertext), params, rp);
   },
   
   /** Encode a flat structure into a JSON string.
@@ -174,13 +205,15 @@
     }
     var a = str.replace(/^\{|\}$/g, '').split(/,/), out={}, i, m;
     for (i=0; i<a.length; i++) {
-      if (!(m=a[i].match(/^(?:(["']?)([a-z][a-z0-9]*)\1):(?:(\d+)|"([a-z0-9+\/%*_.@=\-]*)")$/i))) {
+      if (!(m=a[i].match(/^\s*(?:(["']?)([a-z][a-z0-9]*)\1)\s*:\s*(?:(-?\d+)|"([a-z0-9+\/%*_.@=\-]*)"|(true|false))$/i))) {
         throw new sjcl.exception.invalid("json decode: this isn't json!");
       }
       if (m[3]) {
         out[m[2]] = parseInt(m[3],10);
-      } else {
+      } else if (m[4]) {
         out[m[2]] = m[2].match(/^(ct|salt|iv)$/) ? sjcl.codec.base64.toBits(m[4]) : unescape(m[4]);
+      } else if (m[5]) {
+        out[m[2]] = m[5] === 'true';
       }
     }
     return out;
@@ -262,7 +295,7 @@ sjcl.misc._pbkdf2Cache = {};
 
 /** Cached PBKDF2 key derivation.
  * @param {String} password The password.
- * @param {Object} [params] The derivation params (iteration count and optional salt).
+ * @param {Object} [obj] The derivation params (iteration count and optional salt).
  * @return {Object} The derived data in key, the salt in salt.
  */
 sjcl.misc.cachedPbkdf2 = function (password, obj) {

src/js/sjcl/core/ecc.js

@@ -1,3 +1,6 @@
+/**
+ * base class for all ecc operations.
+ */
 sjcl.ecc = {};
 
 /**
@@ -11,8 +14,16 @@ sjcl.ecc.point = function(curve,x,y) {
   if (x === undefined) {
     this.isIdentity = true;
   } else {
+    if (x instanceof sjcl.bn) {
+      x = new curve.field(x);
+    }
+    if (y instanceof sjcl.bn) {
+      y = new curve.field(y);
+    }
+
     this.x = x;
     this.y = y;
+
     this.isIdentity = false;
   }
   this.curve = curve;
@@ -144,7 +155,9 @@ sjcl.ecc.pointJac.prototype = {
       a  = y2.mul(this.x.mul(4)),
       b  = y2.square().mul(8),
       z2 = this.z.square(),
-      c  = this.x.sub(z2).mul(3).mul(this.x.add(z2)),
+      c  = this.curve.a.toString() == (new sjcl.bn(-3)).toString() ?
+                this.x.sub(z2).mul(3).mul(this.x.add(z2)) :
+                this.x.square().mul(3).add(z2.square().mul(this.curve.a)),
       x  = c.square().subM(a).subM(a),
       y  = a.sub(x).mul(c).subM(b),
       z  = this.y.add(this.y).mul(this.z);
@@ -242,7 +255,7 @@ sjcl.ecc.pointJac.prototype = {
  */
 sjcl.ecc.curve = function(Field, r, a, b, x, y) {
   this.field = Field;
-  this.r = Field.prototype.modulus.sub(r);
+  this.r = new sjcl.bn(r);
   this.a = new Field(a);
   this.b = new Field(b);
   this.G = new sjcl.ecc.point(this, new Field(x), new Field(y));
@@ -261,7 +274,7 @@ sjcl.ecc.curve.prototype.fromBits = function (bits) {
 sjcl.ecc.curves = {
   c192: new sjcl.ecc.curve(
     sjcl.bn.prime.p192,
-    "0x662107c8eb94364e4b2dd7ce",
+    "0xffffffffffffffffffffffff99def836146bc9b1b4d22831",
     -3,
     "0x64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1",
     "0x188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012",
@@ -269,7 +282,7 @@ sjcl.ecc.curves = {
 
   c224: new sjcl.ecc.curve(
     sjcl.bn.prime.p224,
-    "0xe95c1f470fc1ec22d6baa3a3d5c4",
+    "0xffffffffffffffffffffffffffff16a2e0b8f03e13dd29455c5c2a3d",
     -3,
     "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4",
     "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
@@ -277,7 +290,7 @@ sjcl.ecc.curves = {
 
   c256: new sjcl.ecc.curve(
     sjcl.bn.prime.p256,
-    "0x4319055358e8617b0c46353d039cdaae",
+    "0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
     -3,
     "0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
     "0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
@@ -285,18 +298,46 @@ sjcl.ecc.curves = {
 
   c384: new sjcl.ecc.curve(
     sjcl.bn.prime.p384,
-    "0x389cb27e0bc8d21fa7e5f24cb74f58851313e696333ad68c",
+    "0xffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf581a0db248b0a77aecec196accc52973",
     -3,
     "0xb3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875ac656398d8a2ed19d2a85c8edd3ec2aef",
     "0xaa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a385502f25dbf55296c3a545e3872760ab7",
-    "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b1ce1d7e819d7a431d7c90ea0e5f")
+    "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b1ce1d7e819d7a431d7c90ea0e5f"),
+
+  k192: new sjcl.ecc.curve(
+    sjcl.bn.prime.p192k,
+    "0xfffffffffffffffffffffffe26f2fc170f69466a74defd8d",
+    0,
+    3,
+    "0xdb4ff10ec057e9ae26b07d0280b7f4341da5d1b1eae06c7d",
+    "0x9b2f2f6d9c5628a7844163d015be86344082aa88d95e2f9d"),
+
+  k224: new sjcl.ecc.curve(
+    sjcl.bn.prime.p224k,
+    "0x010000000000000000000000000001dce8d2ec6184caf0a971769fb1f7",
+    0,
+    5,
+    "0xa1455b334df099df30fc28a169a467e9e47075a90f7e650eb6b7a45c",
+    "0x7e089fed7fba344282cafbd6f7e319f7c0b0bd59e2ca4bdb556d61a5"),
+
+  k256: new sjcl.ecc.curve(
+    sjcl.bn.prime.p256k,
+    "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
+    0,
+    7,
+    "0x79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+    "0x483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8")
+
 };
 
-
-/* Diffie-Hellman-like public-key system */
-sjcl.ecc._dh = function(cn) {
-  sjcl.ecc[cn] = {
-    /** @constructor */
+/** our basicKey classes
+*/
+sjcl.ecc.basicKey = {
+  /** ecc publicKey. 
+  * @constructor
+  * @param {curve} curve the elliptic curve
+  * @param {point} point the point on the curve
+  */
   publicKey: function(curve, point) {
     this._curve = curve;
     this._curveBitLength = curve.r.bitLength();
@@ -306,50 +347,86 @@ sjcl.ecc._dh = function(cn) {
       this._point = point;
     }
 
+    /** get this keys point data
+    * @return x and y as bitArrays
+    */
     this.get = function() {
       var pointbits = this._point.toBits();
       var len = sjcl.bitArray.bitLength(pointbits);
       var x = sjcl.bitArray.bitSlice(pointbits, 0, len/2);
       var y = sjcl.bitArray.bitSlice(pointbits, len/2);
       return { x: x, y: y };
-      }
+    };
   },
 
-    /** @constructor */
+  /** ecc secretKey
+  * @constructor
+  * @param {curve} curve the elliptic curve
+  * @param exponent
+  */
   secretKey: function(curve, exponent) {
     this._curve = curve;
     this._curveBitLength = curve.r.bitLength();
     this._exponent = exponent;
 
+    /** get this keys exponent data
+    * @return {bitArray} exponent
+    */
     this.get = function () {
       return this._exponent.toBits();
+    };
   }
-    },
+};
+
+/** @private */
+sjcl.ecc.basicKey.generateKeys = function(cn) {
+  return function generateKeys(curve, paranoia, sec) {
+    curve = curve || 256;
 
-    /** @constructor */
-    generateKeys: function(curve, paranoia, sec) {
-      if (curve === undefined) {
-        curve = 256;
-      }
     if (typeof curve === "number") {
       curve = sjcl.ecc.curves['c'+curve];
       if (curve === undefined) {
         throw new sjcl.exception.invalid("no such curve");
       }
     }
-      if (sec === undefined) {
-        var sec = sjcl.bn.random(curve.r, paranoia);
-      }
+    sec = sec || sjcl.bn.random(curve.r, paranoia);
+
     var pub = curve.G.mult(sec);
     return { pub: new sjcl.ecc[cn].publicKey(curve, pub),
              sec: new sjcl.ecc[cn].secretKey(curve, sec) };
+  };
+};
+
+/** elGamal keys */
+sjcl.ecc.elGamal = {
+  /** generate keys
+  * @function
+  * @param curve
+  * @param {int} paranoia Paranoia for generation (default 6)
+  * @param {secretKey} sec secret Key to use. used to get the publicKey for ones secretKey
+  */
+  generateKeys: sjcl.ecc.basicKey.generateKeys("elGamal"),
+  /** elGamal publicKey. 
+  * @constructor
+  * @augments sjcl.ecc.basicKey.publicKey
+  */
+  publicKey: function (curve, point) {
+    sjcl.ecc.basicKey.publicKey.apply(this, arguments);
+  },
+  /** elGamal secretKey
+  * @constructor
+  * @augments sjcl.ecc.basicKey.secretKey
+  */
+  secretKey: function (curve, exponent) {
+    sjcl.ecc.basicKey.secretKey.apply(this, arguments);
   }
 };
-};
-
-sjcl.ecc._dh("elGamal");
 
 sjcl.ecc.elGamal.publicKey.prototype = {
+  /** Kem function of elGamal Public Key
+  * @param paranoia paranoia to use for randomization.
+  * @return {object} key and tag. unkem(tag) with the corresponding secret key results in the key returned.
+  */
   kem: function(paranoia) {
     var sec = sjcl.bn.random(this._curve.r, paranoia),
         tag = this._curve.G.mult(sec).toBits(),
@@ -359,34 +436,58 @@ sjcl.ecc.elGamal.publicKey.prototype = {
 };
 
 sjcl.ecc.elGamal.secretKey.prototype = {
+  /** UnKem function of elGamal Secret Key
+  * @param {bitArray} tag The Tag to decrypt.
+  * @return {bitArray} decrypted key.
+  */
   unkem: function(tag) {
     return sjcl.hash.sha256.hash(this._curve.fromBits(tag).mult(this._exponent).toBits());
   },
 
+  /** Diffie-Hellmann function
+  * @param {elGamal.publicKey} pk The Public Key to do Diffie-Hellmann with
+  * @return {bitArray} diffie-hellmann result for this key combination.
+  */
   dh: function(pk) {
     return sjcl.hash.sha256.hash(pk._point.mult(this._exponent).toBits());
+  },
+  
+  /** Diffie-Hellmann function, compatible with Java generateSecret
+   * @param {elGamal.publicKey} pk The Public Key to do Diffie-Hellmann with
+   * @return {bitArray} undigested X value, diffie-hellmann result for this key combination,
+   * compatible with Java generateSecret().
+   */
+   dhJavaEc: function(pk) {
+     return pk._point.mult(this._exponent).x.toBits();
    }
 };
 
-sjcl.ecc._dh("ecdsa");
-
-sjcl.ecc.ecdsa.secretKey.prototype = {
-  sign: function(hash, paranoia, fakeLegacyVersion, fixedKForTesting) {
-    if (sjcl.bitArray.bitLength(hash) > this._curveBitLength) {
-      hash = sjcl.bitArray.clamp(hash, this._curveBitLength);
-    }
-    var R  = this._curve.r,
-        l  = R.bitLength(),
-        k  = fixedKForTesting || sjcl.bn.random(R.sub(1), paranoia).add(1),
-        r  = this._curve.G.mult(k).x.mod(R),
-        ss = sjcl.bn.fromBits(hash).add(r.mul(this._exponent)),
-        s  = fakeLegacyVersion ? ss.inverseMod(R).mul(k).mod(R)
-             : ss.mul(k.inverseMod(R)).mod(R);
-    return sjcl.bitArray.concat(r.toBits(l), s.toBits(l));
-  }
+/** ecdsa keys */
+sjcl.ecc.ecdsa = {
+  /** generate keys
+  * @function
+  * @param curve
+  * @param {int} paranoia Paranoia for generation (default 6)
+  * @param {secretKey} sec secret Key to use. used to get the publicKey for ones secretKey
+  */
+  generateKeys: sjcl.ecc.basicKey.generateKeys("ecdsa")
 };
 
+/** ecdsa publicKey. 
+* @constructor
+* @augments sjcl.ecc.basicKey.publicKey
+*/
+sjcl.ecc.ecdsa.publicKey = function (curve, point) {
+  sjcl.ecc.basicKey.publicKey.apply(this, arguments);
+};
+
+/** specific functions for ecdsa publicKey. */
 sjcl.ecc.ecdsa.publicKey.prototype = {
+  /** Diffie-Hellmann function
+  * @param {bitArray} hash hash to verify. 
+  * @param {bitArray} rs signature bitArray.
+  * @param {boolean}  fakeLegacyVersion use old legacy version
+  */
   verify: function(hash, rs, fakeLegacyVersion) {
     if (sjcl.bitArray.bitLength(hash) > this._curveBitLength) {
       hash = sjcl.bitArray.clamp(hash, this._curveBitLength);
@@ -410,3 +511,33 @@ sjcl.ecc.ecdsa.publicKey.prototype = {
     return true;
   }
 };
+
+/** ecdsa secretKey
+* @constructor
+* @augments sjcl.ecc.basicKey.publicKey
+*/
+sjcl.ecc.ecdsa.secretKey = function (curve, exponent) {
+  sjcl.ecc.basicKey.secretKey.apply(this, arguments);
+};
+
+/** specific functions for ecdsa secretKey. */
+sjcl.ecc.ecdsa.secretKey.prototype = {
+  /** Diffie-Hellmann function
+  * @param {bitArray} hash hash to sign. 
+  * @param {int} paranoia paranoia for random number generation
+  * @param {boolean} fakeLegacyVersion use old legacy version
+  */
+  sign: function(hash, paranoia, fakeLegacyVersion, fixedKForTesting) {
+    if (sjcl.bitArray.bitLength(hash) > this._curveBitLength) {
+      hash = sjcl.bitArray.clamp(hash, this._curveBitLength);
+    }
+    var R  = this._curve.r,
+        l  = R.bitLength(),
+        k  = fixedKForTesting || sjcl.bn.random(R.sub(1), paranoia).add(1),
+        r  = this._curve.G.mult(k).x.mod(R),
+        ss = sjcl.bn.fromBits(hash).add(r.mul(this._exponent)),
+        s  = fakeLegacyVersion ? ss.inverseMod(R).mul(k).mod(R)
+             : ss.mul(k.inverseMod(R)).mod(R);
+    return sjcl.bitArray.concat(r.toBits(l), s.toBits(l));
+  }
+};

src/js/sjcl/core/gcm.js

@@ -120,7 +120,7 @@ sjcl.mode.gcm = {
    * @param {Number} tlen The length of the tag, in bits.
    */
   _ctrMode: function(encrypt, prf, data, adata, iv, tlen) {
-    var H, J0, S0, enc, i, ctr, tag, last, l, bl, abl, ivbl, w=sjcl.bitArray, xor=w._xor4;
+    var H, J0, S0, enc, i, ctr, tag, last, l, bl, abl, ivbl, w=sjcl.bitArray;
 
     // Calculate data lengths
     l = data.length;

src/js/sjcl/core/hmac.js

@@ -27,13 +27,35 @@ sjcl.misc.hmac = function (key, Hash) {
   
   this._baseHash[0].update(exKey[0]);
   this._baseHash[1].update(exKey[1]);
+  this._resultHash = new Hash(this._baseHash[0]);
 };
 
 /** HMAC with the specified hash function.  Also called encrypt since it's a prf.
  * @param {bitArray|String} data The data to mac.
  */
 sjcl.misc.hmac.prototype.encrypt = sjcl.misc.hmac.prototype.mac = function (data) {
-  var w = new (this._hash)(this._baseHash[0]).update(data).finalize();
-  return new (this._hash)(this._baseHash[1]).update(w).finalize();
+  if (!this._updated) {
+    this.update(data);
+    return this.digest(data);
+  } else {
+    throw new sjcl.exception.invalid("encrypt on already updated hmac called!");
+  }
 };
 
+sjcl.misc.hmac.prototype.reset = function () {
+  this._resultHash = new this._hash(this._baseHash[0]);
+  this._updated = false;
+};
+
+sjcl.misc.hmac.prototype.update = function (data) {
+  this._updated = true;
+  this._resultHash.update(data);
+};
+
+sjcl.misc.hmac.prototype.digest = function () {
+  var w = this._resultHash.finalize(), result = new (this._hash)(this._baseHash[1]).update(w).finalize();
+
+  this.reset();
+
+  return result;
+};

src/js/sjcl/core/pbkdf2.js

@@ -12,7 +12,7 @@
  * This is the method specified by RSA's PKCS #5 standard.
  *
  * @param {bitArray|String} password  The password.
- * @param {bitArray} salt The salt.  Should have lots of entropy.
+ * @param {bitArray|String} salt The salt.  Should have lots of entropy.
  * @param {Number} [count=1000] The number of iterations.  Higher numbers make the function slower but more secure.
  * @param {Number} [length] The length of the derived key.  Defaults to the
                             output size of the hash function.
@@ -30,6 +30,10 @@ sjcl.misc.pbkdf2 = function (password, salt, count, length, Prff) {
     password = sjcl.codec.utf8String.toBits(password);
   }
   
+  if (typeof salt === "string") {
+    salt = sjcl.codec.utf8String.toBits(salt);
+  }
+  
   Prff = Prff || sjcl.misc.hmac;
   
   var prf = new Prff(password),

src/js/sjcl/core/random.js

@@ -3,12 +3,13 @@
  * @author Emily Stark
  * @author Mike Hamburg
  * @author Dan Boneh
+ * @author Michael Brooks
  */
 
 /** @constructor
  * @class Random number generator
- *
  * @description
+ * <b>Use sjcl.random as a singleton for this class!</b>
  * <p>
  * This random number generator is a derivative of Ferguson and Schneier's
  * generator Fortuna.  It collects entropy from various events into several
@@ -74,10 +75,11 @@ sjcl.prng = function(defaultParanoia) {
   this._PARANOIA_LEVELS         = [0,48,64,96,128,192,256,384,512,768,1024];
   this._MILLISECONDS_PER_RESEED = 30000;
   this._BITS_PER_RESEED         = 80;
-}
+};
  
 sjcl.prng.prototype = {
-  /** Generate several random words, and return them in an array
+  /** Generate several random words, and return them in an array.
+   * A word consists of 32 bits (4 bytes)
    * @param {Number} nwords The number of words to generate.
    */
   randomWords: function (nwords, paranoia) {
@@ -102,7 +104,11 @@ sjcl.prng.prototype = {
     return out.slice(0,nwords);
   },
   
-  setDefaultParanoia: function (paranoia) {
+  setDefaultParanoia: function (paranoia, allowZeroParanoia) {
+    if (paranoia === 0 && allowZeroParanoia !== "Setting paranoia=0 will ruin your security; use it only for testing") {
+      throw "Setting paranoia=0 will ruin your security; use it only for testing";
+    }
+
     this._defaultParanoia = paranoia;
   },
   
@@ -119,7 +125,7 @@ sjcl.prng.prototype = {
       i, tmp,
       t = (new Date()).valueOf(),
       robin = this._robins[source],
-      oldReady = this.isReady(), err = 0;
+      oldReady = this.isReady(), err = 0, objName;
       
     id = this._collectorIds[source];
     if (id === undefined) { id = this._collectorIds[source] = this._collectorIdNext ++; }
@@ -137,7 +143,7 @@ sjcl.prng.prototype = {
       break;
       
     case "object":
-      var objName = Object.prototype.toString.call(data);
+      objName = Object.prototype.toString.call(data);
       if (objName === "[object Uint32Array]") {
         tmp = [];
         for (i = 0; i < data.length; i++) {
@@ -149,7 +155,7 @@ sjcl.prng.prototype = {
           err = 1;
         }
         for (i=0; i<data.length && !err; i++) {
-          if (typeof(data[i]) != "number") {
+          if (typeof(data[i]) !== "number") {
             err = 1;
           }
         }
@@ -234,14 +240,25 @@ sjcl.prng.prototype = {
   startCollectors: function () {
     if (this._collectorsStarted) { return; }
   
+    this._eventListener = {
+      loadTimeCollector: this._bind(this._loadTimeCollector),
+      mouseCollector: this._bind(this._mouseCollector),
+      keyboardCollector: this._bind(this._keyboardCollector),
+      accelerometerCollector: this._bind(this._accelerometerCollector),
+      touchCollector: this._bind(this._touchCollector)
+    };
+
     if (window.addEventListener) {
-      window.addEventListener("load", this._loadTimeCollector, false);
-      window.addEventListener("mousemove", this._mouseCollector, false);
+      window.addEventListener("load", this._eventListener.loadTimeCollector, false);
+      window.addEventListener("mousemove", this._eventListener.mouseCollector, false);
+      window.addEventListener("keypress", this._eventListener.keyboardCollector, false);
+      window.addEventListener("devicemotion", this._eventListener.accelerometerCollector, false);
+      window.addEventListener("touchmove", this._eventListener.touchCollector, false);
     } else if (document.attachEvent) {
-      document.attachEvent("onload", this._loadTimeCollector);
-      document.attachEvent("onmousemove", this._mouseCollector);
-    }
-    else {
+      document.attachEvent("onload", this._eventListener.loadTimeCollector);
+      document.attachEvent("onmousemove", this._eventListener.mouseCollector);
+      document.attachEvent("keypress", this._eventListener.keyboardCollector);
+    } else {
       throw new sjcl.exception.bug("can't attach event");
     }
   
@@ -253,12 +270,17 @@ sjcl.prng.prototype = {
     if (!this._collectorsStarted) { return; }
   
     if (window.removeEventListener) {
-      window.removeEventListener("load", this._loadTimeCollector, false);
-      window.removeEventListener("mousemove", this._mouseCollector, false);
-    } else if (window.detachEvent) {
-      window.detachEvent("onload", this._loadTimeCollector);
-      window.detachEvent("onmousemove", this._mouseCollector);
+      window.removeEventListener("load", this._eventListener.loadTimeCollector, false);
+      window.removeEventListener("mousemove", this._eventListener.mouseCollector, false);
+      window.removeEventListener("keypress", this._eventListener.keyboardCollector, false);
+      window.removeEventListener("devicemotion", this._eventListener.accelerometerCollector, false);
+      window.removeEventListener("touchmove", this._eventListener.touchCollector, false);
+    } else if (document.detachEvent) {
+      document.detachEvent("onload", this._eventListener.loadTimeCollector);
+      document.detachEvent("onmousemove", this._eventListener.mouseCollector);
+      document.detachEvent("keypress", this._eventListener.keyboardCollector);
     }
+
     this._collectorsStarted = false;
   },
   
@@ -292,6 +314,13 @@ sjcl.prng.prototype = {
     }
   },
   
+  _bind: function (func) {
+    var that = this;
+    return function () {
+      func.apply(that, arguments);
+    };
+  },
+
   /** Generate 4 random words, no reseed, no gate.
    * @private
    */
@@ -363,13 +392,63 @@ sjcl.prng.prototype = {
     this._reseed(reseedData);
   },
   
-  _mouseCollector: function (ev) {
-    var x = ev.x || ev.clientX || ev.offsetX || 0, y = ev.y || ev.clientY || ev.offsetY || 0;
-    sjcl.random.addEntropy([x,y], 2, "mouse");
+  _keyboardCollector: function () {
+    this._addCurrentTimeToEntropy(1);
   },
   
-  _loadTimeCollector: function (ev) {
-    sjcl.random.addEntropy((new Date()).valueOf(), 2, "loadtime");
+  _mouseCollector: function (ev) {
+    var x, y;
+
+    try {
+      x = ev.x || ev.clientX || ev.offsetX || 0;
+      y = ev.y || ev.clientY || ev.offsetY || 0;
+    } catch (err) {
+      // Event originated from a secure element. No mouse position available.
+      x = 0;
+      y = 0;
+    }
+
+    if (x != 0 && y!= 0) {
+      sjcl.random.addEntropy([x,y], 2, "mouse");
+    }
+
+    this._addCurrentTimeToEntropy(0);
+  },
+
+  _touchCollector: function(ev) {
+    var touch = ev.touches[0] || ev.changedTouches[0];
+    var x = touch.pageX || touch.clientX,
+        y = touch.pageY || touch.clientY;
+
+    sjcl.random.addEntropy([x,y],1,"touch");
+
+    this._addCurrentTimeToEntropy(0);
+  },
+  
+  _loadTimeCollector: function () {
+    this._addCurrentTimeToEntropy(2);
+  },
+
+  _addCurrentTimeToEntropy: function (estimatedEntropy) {
+    if (typeof window !== 'undefined' && window.performance && typeof window.performance.now === "function") {
+      //how much entropy do we want to add here?
+      sjcl.random.addEntropy(window.performance.now(), estimatedEntropy, "loadtime");
+    } else {
+      sjcl.random.addEntropy((new Date()).valueOf(), estimatedEntropy, "loadtime");
+    }
+  },
+  _accelerometerCollector: function (ev) {
+    var ac = ev.accelerationIncludingGravity.x||ev.accelerationIncludingGravity.y||ev.accelerationIncludingGravity.z;
+    if(window.orientation){
+      var or = window.orientation;
+      if (typeof or === "number") {
+        sjcl.random.addEntropy(or, 1, "accelerometer");
+      }
+    }
+    if (ac) {
+      sjcl.random.addEntropy(ac, 2, "accelerometer");
+    }
+    this._addCurrentTimeToEntropy(0);
   },
 
   _fireEvent: function (name, arg) {
@@ -392,15 +471,52 @@ sjcl.prng.prototype = {
   }
 };
 
+/** an instance for the prng.
+* @see sjcl.prng
+*/
 sjcl.random = new sjcl.prng(6);
 
 (function(){
+  // function for getting nodejs crypto module. catches and ignores errors.
+  function getCryptoModule() {
     try {
+      return require('crypto');
+    }
+    catch (e) {
+      return null;
+    }
+  }
+
+  try {
+    var buf, crypt, ab;
+
+    // get cryptographically strong entropy depending on runtime environment
+    if (typeof module !== 'undefined' && module.exports && (crypt = getCryptoModule()) && crypt.randomBytes) {
+      buf = crypt.randomBytes(1024/8);
+      buf = new Uint32Array(new Uint8Array(buf).buffer);
+      sjcl.random.addEntropy(buf, 1024, "crypto.randomBytes");
+
+    } else if (typeof window !== 'undefined' && typeof Uint32Array !== 'undefined') {
+      ab = new Uint32Array(32);
+      if (window.crypto && window.crypto.getRandomValues) {
+        window.crypto.getRandomValues(ab);
+      } else if (window.msCrypto && window.msCrypto.getRandomValues) {
+        window.msCrypto.getRandomValues(ab);
+      } else {
+        return;
+      }
+
       // get cryptographically strong entropy in Webkit
-    var ab = new Uint32Array(32);
-    crypto.getRandomValues(ab);
       sjcl.random.addEntropy(ab, 1024, "crypto.getRandomValues");
-  } catch (e) {
+
+    } else {
       // no getRandomValues :-(
     }
-})();
+  } catch (e) {
+    if (typeof window !== 'undefined' && window.console) {
+      console.log("There was an error collecting entropy from the browser:");
+      console.log(e);
+      //we do not want the library to fail due to randomness not being maintained.
+    }
+  }
+}());

src/js/sjcl/core/sha1.js

@@ -138,8 +138,7 @@ sjcl.hash.sha1.prototype = {
   _block:function (words) {  
     var t, tmp, a, b, c, d, e,
     w = words.slice(0),
-    h = this._h,
-    k = this._key;
+    h = this._h;
    
     a = h[0]; b = h[1]; c = h[2]; d = h[3]; e = h[4]; 
 

src/js/sjcl/core/sha512.js

@@ -299,7 +299,7 @@ sjcl.hash.sha512.prototype = {
       t1h += chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
       t1l += krl;
       t1h += krh + ((t1l >>> 0) < (krl >>> 0) ? 1 : 0);
-      t1l += wrl;
+      t1l = t1l + wrl|0;   // FF32..FF34 perf issue https://bugzilla.mozilla.org/show_bug.cgi?id=1054972
       t1h += wrh + ((t1l >>> 0) < (wrl >>> 0) ? 1 : 0);
 
       // t2 = sigma0 + maj

src/js/sjcl/core/sjcl.js

@@ -10,7 +10,7 @@
 
 "use strict";
 /*jslint indent: 2, bitwise: false, nomen: false, plusplus: false, white: false, regexp: false */
-/*global document, window, escape, unescape */
+/*global document, window, escape, unescape, module, require, Uint32Array */
 
 /** @namespace The Stanford Javascript Crypto Library, top-level namespace. */
 var sjcl = {
@@ -68,6 +68,11 @@ var sjcl = {
   }
 };
 
-if(typeof module != 'undefined' && module.exports){
+if(typeof module !== 'undefined' && module.exports){
   module.exports = sjcl;
 }
+if (typeof define === "function") {
+    define([], function () {
+        return sjcl;
+    });
+}

src/js/sjcl/demo/index.html

@@ -36,7 +36,7 @@
       <h2>Key Derivation</h2>
       <div class="section">
         <div>
-          <label for="salt"">Salt:</label>
+          <label for="salt">Salt:</label>
           <a class="random floatright" href="javascript:randomize('salt',2,0)">random</a>
         </div>
         <input type="text" id="salt" class="wide hex" autocomplete="off" size="17" maxlength="35"/>

src/js/sjcl/package.json

@@ -0,0 +1,16 @@
+{
+    "name": "sjcl",
+    "version": "1.0.1",
+    "description": "Stanford Javascript Crypto Library",
+    "main": "sjcl.js",
+    "author": "bitwiseshiftleft",
+    "keywords": ["encryption", "high-level", "crypto"],
+    "repository" : {
+        "type": "git",
+        "url": "https://github.com/bitwiseshiftleft/sjcl.git"
+    },
+    "scripts": {
+      "test": "make test"
+    },
+    "engines": { "node": "*" }
+}