Version 0.17.2

[DOC] fix transferRate description

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015", "stage-1"],
+  "plugins": ["syntax-flow", "transform-flow-strip-types"]
+}

.flowconfig

@@ -4,6 +4,11 @@
 .*/ripple-lib/test/fixtures/.*
 .*/node_modules/flow-bin/.*
 .*/node_modules/webpack/.*
+.*/node_modules/babel-core/.*
+.*/node_modules/babel-eslint/.*
+.*/node_modules/babel-preset-es2015/.*
+.*/node_modules/babel-preset-stage-1/.*
+.*/node_modules/babel-register/.*
 
 [include]
 ./node_modules/

Gulpfile.js

@@ -8,24 +8,49 @@ var rename = require('gulp-rename');
 var webpack = require('webpack');
 var bump = require('gulp-bump');
 var argv = require('yargs').argv;
+var assert = require('assert');
+var fs = require('fs');
 
 var pkg = require('./package.json');
 
+var uglifyOptions = {
+  mangle: {
+    except: ['_', 'RippleError', 'RippledError', 'UnexpectedError',
+    'LedgerVersionError', 'ConnectionError', 'NotConnectedError',
+    'DisconnectedError', 'TimeoutError', 'ResponseFormatError',
+    'ValidationError', 'NotFoundError', 'MissingLedgerHistoryError',
+    'PendingLedgerVersionError'
+    ]
+  }
+};
+
 function webpackConfig(extension, overrides) {
   overrides = overrides || {};
   var defaults = {
     cache: true,
+    externals: [{
+      'lodash': '_'
+    }],
     entry: './src/index.js',
     output: {
       library: 'ripple',
       path: './build/',
       filename: ['ripple-', extension].join(pkg.version)
     },
+    plugins: [
+      new webpack.NormalModuleReplacementPlugin(/^ws$/, './wswrapper'),
+      new webpack.NormalModuleReplacementPlugin(/^\.\/wallet$/, './wallet-web'),
+      new webpack.NormalModuleReplacementPlugin(/^.*setup-api$/,
+        './setup-api-web')
+    ],
     module: {
       loaders: [{
+        test: /jayson/,
+        loader: 'null'
+      }, {
         test: /\.js$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader?optional=runtime'
+        exclude: [/node_modules/],
+        loader: 'babel-loader'
       }, {
         test: /\.json/,
         loader: 'json-loader'
@@ -35,15 +60,70 @@ function webpackConfig(extension, overrides) {
   return _.assign({}, defaults, overrides);
 }
 
+function webpackConfigForWebTest(testFileName, path) {
+  var match = testFileName.match(/\/?([^\/]*)-test.js$/);
+  if (!match) {
+    assert(false, 'wrong filename:' + testFileName);
+  }
+  var configOverrides = {
+    externals: [{
+      'lodash': '_',
+      'ripple-api': 'ripple',
+      'net': 'null'
+    }],
+    entry: testFileName,
+    output: {
+      library: match[1].replace(/-/g, '_'),
+      path: './test-compiled-for-web/' + (path ? path : ''),
+      filename: match[1] + '-test.js'
+    }
+  };
+  return webpackConfig('.js', configOverrides);
+}
+
+gulp.task('build-tests', function(callback) {
+  var times = 0;
+  function done() {
+    if (++times >= 5) {
+      callback();
+    }
+  }
+  webpack(webpackConfigForWebTest('./test/rangeset-test.js'), done);
+  webpack(webpackConfigForWebTest('./test/connection-test.js'), done);
+  webpack(webpackConfigForWebTest('./test/api-test.js'), done);
+  webpack(webpackConfigForWebTest('./test/broadcast-api-test.js'), done);
+  webpack(webpackConfigForWebTest('./test/integration/integration-test.js',
+    'integration/'), done);
+});
+
+function createLink(from, to) {
+  if (fs.existsSync(to)) {
+    fs.unlinkSync(to);
+  }
+  fs.linkSync(from, to);
+}
+
+function createBuildLink(callback) {
+  return function(err, res) {
+    createLink('./build/ripple-' + pkg.version + '.js',
+      './build/ripple-latest.js');
+    callback(err, res);
+  };
+}
+
 gulp.task('build', function(callback) {
-  webpack(webpackConfig('.js'), callback);
+  webpack(webpackConfig('.js'), createBuildLink(callback));
 });
 
 gulp.task('build-min', ['build'], function() {
   return gulp.src(['./build/ripple-', '.js'].join(pkg.version))
-  .pipe(uglify())
+  .pipe(uglify(uglifyOptions))
   .pipe(rename(['ripple-', '-min.js'].join(pkg.version)))
-  .pipe(gulp.dest('./build/'));
+  .pipe(gulp.dest('./build/'))
+  .on('end', function() {
+    createLink('./build/ripple-' + pkg.version + '-min.js',
+      './build/ripple-latest-min.js');
+  });
 });
 
 gulp.task('build-debug', function(callback) {

HISTORY.md

@@ -1,4 +1,8 @@
-##0.16.3
+##0.16.5
+**Changes**
++ [Filter insufficient source funds paths from pathfind results](https://github.com/ripple/ripple-lib/pull/688)
+
+##0.16.4
 **Changes**
 + [Update ws to 1.0.1](https://github.com/ripple/ripple-lib/pull/682)
 

README.md

@@ -1,6 +1,6 @@
 #ripple-lib
 
-A JavaScript API for interacting with Ripple in Node.js and the browser
+A JavaScript API for interacting with Ripple in Node.js
 
 [![Circle CI](https://circleci.com/gh/ripple/ripple-lib/tree/develop.svg?style=svg)](https://circleci.com/gh/ripple/ripple-lib/tree/develop) [![Coverage Status](https://coveralls.io/repos/ripple/ripple-lib/badge.png?branch=develop)](https://coveralls.io/r/ripple/ripple-lib?branch=develop)
 
@@ -8,7 +8,7 @@ A JavaScript API for interacting with Ripple in Node.js and the browser
 
 ###Features
 
-+ Connect to a rippled server in JavaScript (Node.js or browser)
++ Connect to a rippled server in Node.js
 + 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

circle.yml

@@ -1,7 +1,19 @@
 machine:
   node:
     version: 0.12.0
+  hosts:
+    testripple.circleci.com: 127.0.0.1
+dependencies:
+  pre:
+    - npm -g install npm@latest-2
+    - wget https://s3-us-west-2.amazonaws.com/ripple-debs/rippled_0.30.1-b11-1.deb
+    - sudo dpkg -i rippled_0.30.1-b11-1.deb
 test:
+  pre:
+    - rippled -a --start --conf "$HOME/$CIRCLE_PROJECT_REPONAME/test/integration/rippled.cfg":
+        background: true
   override:
     - scripts/ci.sh "$CIRCLE_NODE_INDEX" "$CIRCLE_NODE_TOTAL":
         parallel: true
+  post:
+    - killall /usr/bin/rippled

docs/index.md

@@ -54,12 +54,15 @@
   - [prepareSuspendedPaymentCancellation](#preparesuspendedpaymentcancellation)
   - [prepareSuspendedPaymentExecution](#preparesuspendedpaymentexecution)
   - [sign](#sign)
+  - [combine](#combine)
   - [submit](#submit)
   - [generateAddress](#generateaddress)
   - [computeLedgerHash](#computeledgerhash)
 - [API Events](#api-events)
   - [ledger](#ledger)
   - [error](#error)
+  - [connected](#connected)
+  - [disconnected](#disconnected)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -89,6 +92,14 @@ const api = new RippleAPI({
 api.on('error', (errorCode, errorMessage) => {
   console.log(errorCode + ': ' + errorMessage);
 });
+api.on('connected', () => {
+  console.log('connected');
+});
+api.on('disconnected', (code) => {
+  // code - [close code](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent) sent by the server
+  // will be 1000 if this was normal closure
+  console.log('disconnected, code:', code);
+});
 api.connect().then(() => {
   /* insert code here */
 }).then(() => {
@@ -137,7 +148,7 @@ If you omit the `server` parameter, RippleAPI operates [offline](#offline-functi
 
 1. Install [NodeJS](https://nodejs.org) and the Node Package Manager (npm). Most Linux distros have a package for NodeJS, but make sure you have version `0.12.0` or higher.
 2. Use npm to install [Babel](https://babeljs.io/) globally:
-      `npm install -g babel`
+      `npm install -g babel-cli`
 3. Use npm to install RippleAPI:
       `npm install ripple-lib`
 
@@ -200,7 +211,7 @@ A *value* is a quantity of a currency represented as a decimal string. Be carefu
 
 **XRP** has 6 significant digits past the decimal point. In other words, XRP cannot be divided into positive values smaller than `0.000001` (1e-6). XRP has a maximum value of `100000000000` (1e11).
 
-**Non-XRP values** have 15 decimal digits of precision, with a maximum value of `9999999999999999e80`. The smallest positive non-XRP value is `1e-81`.
+**Non-XRP values** have 16 decimal digits of precision, with a maximum value of `9999999999999999e80`. The smallest positive non-XRP value is `1e-81`.
 
 
 ## Amount
@@ -269,7 +280,7 @@ Executing a transaction with `RippleAPI` requires the following four steps:
     * [prepareSuspendedPaymentCreation](#preparesuspendedpaymentcreation)
     * [prepareSuspendedPaymentCancellation](#preparesuspendedpaymentcancellation)
     * [prepareSuspendedPaymentExecution](#preparesuspendedpaymentexecution)
-2. [Sign](#sign) - Cryptographically sign the transaction locally and save the [transaction ID](#transaction-id). Signing is how the owner of an account authorizes a transaction to take place.
+2. [Sign](#sign) - Cryptographically sign the transaction locally and save the [transaction ID](#transaction-id). Signing is how the owner of an account authorizes a transaction to take place. For multisignature transactions, the `signedTransaction` fields returned by `sign` must be collected and passed to the [combine](#combine) method.
 3. [Submit](#submit) - Submit the transaction to the connected server.
 4. Verify - Verify that the transaction got validated by querying with [getTransaction](#gettransaction). This is necessary because transactions may fail even if they were successfully submitted.
 
@@ -290,6 +301,7 @@ maxFee | [value](#value) | *Optional* The maximum fee to pay for the transaction
 maxLedgerVersion | integer,null | *Optional* The highest ledger version that the transaction can be included in. If this option and `maxLedgerVersionOffset` are both omitted, the `maxLedgerVersion` option will default to 3 greater than the current validated ledger version (equivalent to `maxLedgerVersionOffset=3`). Use `null` to not set a maximum ledger version.
 maxLedgerVersionOffset | integer | *Optional* Offset from current validated legder version to highest ledger version that the transaction can be included in.
 sequence | [sequence](#account-sequence-number) | *Optional* The initiating account's sequence number for this transaction.
+signersCount | integer | *Optional* Number of signers that will be signing this transaction.
 
 We recommended that you specify a `maxLedgerVersion` so that you can quickly determine that a failed transaction will never succeeed in the future. It is impossible for a transaction to succeed after the network ledger version exceeds the transaction's `maxLedgerVersion`. If you omit `maxLedgerVersion`, the "prepare*" method automatically supplies a `maxLedgerVersion` equal to the current ledger plus 3, which it includes in the return value from the "prepare*" method.
 
@@ -480,7 +492,13 @@ passwordSpent | boolean | *Optional* Indicates that the account has used its fre
 regularKey | [address](#ripple-address),null | *Optional* The public key of a new keypair, to use as the regular key to this account, as a base-58-encoded string in the same format as an account address. Use `null` to remove the regular key.
 requireAuthorization | boolean | *Optional* If set, this account must individually approve other users in order for those users to hold this account’s issuances.
 requireDestinationTag | boolean | *Optional* Requires incoming payments to specify a destination tag.
-transferRate | number,null | *Optional*  The fee to charge when users transfer this account’s issuances, represented as billionths of a unit. Use `null` to set no fee.
+signers | object | *Optional* Settings that determine what sets of accounts can be used to sign a transaction on behalf of this account using multisigning.
+*signers.* threshold | integer | *Optional* A target number for the signer weights. A multi-signature from this list is valid only if the sum weights of the signatures provided is equal or greater than this value. To delete the signers setting, use the value `0`.
+*signers.* weights | array | *Optional* Weights of signatures for each signer.
+*signers.* weights[] | object | An association of an address and a weight.
+*signers.weights[].* address | [address](#ripple-address) | A Ripple account address
+*signers.weights[].* weight | integer | The weight that the signature of this account counts as towards the threshold.
+transferRate | number,null | *Optional*  The fee to charge when users transfer this account’s issuances, as the decimal amount that must be sent to deliver 1 unit. Has precision up to 9 digits beyond the decimal point. Use `null` to set no fee.
 
 ### Example
 
@@ -803,7 +821,7 @@ Name | Type | Description
 id | [id](#transaction-id) | A hash of the transaction that can be used to identify it.
 address | [address](#ripple-address) | The address of the account that initiated the transaction.
 sequence | [sequence](#account-sequence-number) | The account sequence number of the transaction for the account that initiated it.
-type | [transactionType](#transaction-types) | The type of the tranasction.
+type | [transactionType](#transaction-types) | The type of the transaction.
 specification | object | A specification that would produce the same outcome as this transaction. The structure of the specification depends on the value of the `type` field (see [Transaction Types](#transaction-types) for details). *Note:* This is **not** necessarily the same as the original specification.
 outcome | object | The outcome of the transaction (what effects it had).
 *outcome.* result | string | Result code returned by rippled. See [Transaction Results](https://ripple.com/build/transactions/#full-transaction-response-list) for a complete list.
@@ -820,6 +838,7 @@ outcome | object | The outcome of the transaction (what effects it had).
 *outcome.orderbookChanges.\*[].* makerExchangeRate | [value](#value) | *Optional* The exchange rate between the `quantity` currency and the `totalPrice` currency from the point of view of the maker.
 *outcome.* ledgerVersion | integer | The ledger version that the transaction was validated in.
 *outcome.* indexInLedger | integer | The ordering index of the transaction in the ledger.
+*outcome.* deliveredAmount | [amount](#amount) | *Optional* For payment transactions, it is impossible to reliably compute the actual delivered amount from the balanceChanges due to fixed precision. If the payment is not a partial payment and the transaction succeeded, the deliveredAmount should always be considered to be the amount specified in the transaction.
 *outcome.* timestamp | date-time string | *Optional* The timestamp when the transaction was validated. (May be missing when requesting transactions in binary mode.)
 
 ### Example
@@ -859,6 +878,11 @@ return api.getTransaction(id).then(transaction => {
     "result": "tesSUCCESS",
     "timestamp": "2013-03-12T23:56:50.000Z",
     "fee": "0.00001",
+    "deliveredAmount": {
+      "currency": "USD",
+      "value": "0.001",
+      "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+    },
     "balanceChanges": {
       "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
         {
@@ -993,6 +1017,11 @@ return api.getTransactions(address).then(transaction => {
     "outcome": {
       "result": "tesSUCCESS",
       "fee": "0.00001",
+      "deliveredAmount": {
+        "currency": "USD",
+        "value": "0.001",
+        "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+      },
       "balanceChanges": {
         "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
           {
@@ -1085,6 +1114,11 @@ return api.getTransactions(address).then(transaction => {
     "outcome": {
       "result": "tesSUCCESS",
       "fee": "0.00001",
+      "deliveredAmount": {
+        "currency": "USD",
+        "value": "0.001",
+        "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+      },
       "balanceChanges": {
         "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
           {
@@ -2644,7 +2678,13 @@ passwordSpent | boolean | *Optional* Indicates that the account has used its fre
 regularKey | [address](#ripple-address),null | *Optional* The public key of a new keypair, to use as the regular key to this account, as a base-58-encoded string in the same format as an account address. Use `null` to remove the regular key.
 requireAuthorization | boolean | *Optional* If set, this account must individually approve other users in order for those users to hold this account’s issuances.
 requireDestinationTag | boolean | *Optional* Requires incoming payments to specify a destination tag.
-transferRate | number,null | *Optional*  The fee to charge when users transfer this account’s issuances, represented as billionths of a unit. Use `null` to set no fee.
+signers | object | *Optional* Settings that determine what sets of accounts can be used to sign a transaction on behalf of this account using multisigning.
+*signers.* threshold | integer | *Optional* A target number for the signer weights. A multi-signature from this list is valid only if the sum weights of the signatures provided is equal or greater than this value. To delete the signers setting, use the value `0`.
+*signers.* weights | array | *Optional* Weights of signatures for each signer.
+*signers.* weights[] | object | An association of an address and a weight.
+*signers.weights[].* address | [address](#ripple-address) | A Ripple account address
+*signers.weights[].* weight | integer | The weight that the signature of this account counts as towards the threshold.
+transferRate | number,null | *Optional*  The fee to charge when users transfer this account’s issuances, as the decimal amount that must be sent to deliver 1 unit. Has precision up to 9 digits beyond the decimal point. Use `null` to set no fee.
 
 ### Example
 
@@ -2894,7 +2934,7 @@ const trustline = {
     }
   ]
 };
-return api.preparePayment(address, trustline).then(prepared =>
+return api.prepareTrustline(address, trustline).then(prepared =>
   {/* ... */});
 ```
 
@@ -3282,7 +3322,7 @@ return api.prepareSuspendedPaymentExecution(address, suspendedPaymentExecution).
 
 ## sign
 
-`sign(txJSON: string, secret: string): {signedTransaction: string, id: string}`
+`sign(txJSON: string, secret: string, options: Object): {signedTransaction: string, id: string}`
 
 Sign a prepared transaction. The signed transaction must subsequently be [submitted](#submit).
 
@@ -3292,6 +3332,8 @@ Name | Type | Description
 ---- | ---- | -----------
 txJSON | string | Transaction represented as a JSON string in rippled format.
 secret | secret string | The secret of the account that is initiating the transaction.
+options | object | *Optional* Options that control the type of signature that will be generated.
+*options.* signAs | [address](#ripple-address) | *Optional* The account that the signature should count for in multisigning.
 
 ### Return Value
 
@@ -3319,6 +3361,44 @@ return api.sign(txJSON, secret);
 ```
 
 
+## combine
+
+`combine(signedTransactions: Array<string>): {signedTransaction: string, id: string}`
+
+Combines signed transactions from multiple accounts for a multisignature transaction. The signed transaction must subsequently be [submitted](#submit).
+
+### Parameters
+
+Name | Type | Description
+---- | ---- | -----------
+signedTransactions | array\<string\> | An array of signed transactions (from the output of [sign](#sign)) to combine.
+
+### Return Value
+
+This method returns an object with the following structure:
+
+Name | Type | Description
+---- | ---- | -----------
+signedTransaction | string | The signed transaction represented as an uppercase hexadecimal string.
+id | [id](#transaction-id) | The [Transaction ID](#transaction-id) of the signed transaction.
+
+### Example
+
+```javascript
+const signedTransactions = [ "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1F1" ];
+return api.combine(signedTransactions);
+```
+
+
+```json
+{
+  "signedTransaction": "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "id": "8A3BFD2214B4C8271ED62648FCE9ADE4EE82EF01827CF7D1F7ED497549A368CC"
+}
+```
+
+
 ## submit
 
 `submit(signedTransaction: string): Promise<Object>`
@@ -3337,7 +3417,7 @@ This method returns an object with the following structure:
 
 Name | Type | Description
 ---- | ---- | -----------
-resultCode | string | The result code returned by rippled. [List of tranasction responses](http://pages.lightthenight.org/gba/SanFran15/ripple)
+resultCode | string | The result code returned by rippled. [List of transaction responses](https://ripple.com/build/transactions/#full-transaction-response-list)
 resultMessage | string | Human-readable explanation of the status of the transaction.
 
 ### Example
@@ -3523,3 +3603,35 @@ api.on('error', (errorCode, errorMessage, data) => {
 tooBusy: The server is too busy to help you now.
 ```
 
+## connected
+
+This event is emitted after connection successfully opened.
+
+### Example
+
+```javascript
+api.on('connected', () => {
+  console.log('Connection is open now.');
+});
+```
+
+## disconnected
+
+This event is emitted when connection is closed.
+
+### Return Value
+
+The only parameter is a number containing the [close code](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent) send by the server.
+
+### Example
+
+```javascript
+api.on('disconnected', (code) => {
+  if (code !== 1000) {
+    console.log('Connection is closed due to error.');
+  } else {
+    console.log('Connection is closed normally.');
+  }
+});
+```
+

docs/samples/cancelall.js

@@ -0,0 +1,38 @@
+'use strict';
+const RippleAPI = require('../../dist/npm').RippleAPI; // require('ripple-lib')
+
+const address = 'rLDYrujdKUfVx28T9vRDAbyJ7G2WVXKo4K';
+const secret = '';
+
+const api = new RippleAPI({server: 'wss://s1.ripple.com:443'});
+const instructions = {maxLedgerVersionOffset: 5};
+
+function fail(message) {
+  console.error(message);
+  process.exit(1);
+}
+
+function cancelOrder(orderSequence) {
+  console.log('Cancelling order: ' + orderSequence.toString());
+  return api.prepareOrderCancellation(address, {orderSequence}, instructions)
+  .then(prepared => {
+    const signing = api.sign(prepared.txJSON, secret);
+    return api.submit(signing.signedTransaction);
+  });
+}
+
+function cancelAllOrders(orderSequences) {
+  if (orderSequences.length === 0) {
+    return Promise.resolve();
+  }
+  const orderSequence = orderSequences.pop();
+  return cancelOrder(orderSequence).then(() => cancelAllOrders(orderSequences));
+}
+
+api.connect().then(() => {
+  console.log('Connected...');
+  return api.getOrders(address).then(orders => {
+    const orderSequences = orders.map(order => order.properties.sequence);
+    return cancelAllOrders(orderSequences);
+  }).then(() => process.exit(0));
+}).catch(fail);

docs/src/basictypes.md.ejs

@@ -21,7 +21,7 @@ A *value* is a quantity of a currency represented as a decimal string. Be carefu
 
 **XRP** has 6 significant digits past the decimal point. In other words, XRP cannot be divided into positive values smaller than `0.000001` (1e-6). XRP has a maximum value of `100000000000` (1e11).
 
-**Non-XRP values** have 15 decimal digits of precision, with a maximum value of `9999999999999999e80`. The smallest positive non-XRP value is `1e-81`.
+**Non-XRP values** have 16 decimal digits of precision, with a maximum value of `9999999999999999e80`. The smallest positive non-XRP value is `1e-81`.
 
 
 ## Amount

docs/src/boilerplate.md.ejs

@@ -11,6 +11,14 @@ const api = new RippleAPI({
 api.on('error', (errorCode, errorMessage) => {
   console.log(errorCode + ': ' + errorMessage);
 });
+api.on('connected', () => {
+  console.log('connected');
+});
+api.on('disconnected', (code) => {
+  // code - [close code](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent) sent by the server
+  // will be 1000 if this was normal closure
+  console.log('disconnected, code:', code);
+});
 api.connect().then(() => {
   /* insert code here */
 }).then(() => {
@@ -47,7 +55,7 @@ If you omit the `server` parameter, RippleAPI operates [offline](#offline-functi
 
 1. Install [NodeJS](https://nodejs.org) and the Node Package Manager (npm). Most Linux distros have a package for NodeJS, but make sure you have version `0.12.0` or higher.
 2. Use npm to install [Babel](https://babeljs.io/) globally:
-      `npm install -g babel`
+      `npm install -g babel-cli`
 3. Use npm to install RippleAPI:
       `npm install ripple-lib`
 

docs/src/combine.md.ejs

@@ -0,0 +1,24 @@
+## combine
+
+`combine(signedTransactions: Array<string>): {signedTransaction: string, id: string}`
+
+Combines signed transactions from multiple accounts for a multisignature transaction. The signed transaction must subsequently be [submitted](#submit).
+
+### Parameters
+
+<%- renderSchema("input/combine.json") %>
+
+### Return Value
+
+This method returns an object with the following structure:
+
+<%- renderSchema("output/sign.json") %>
+
+### Example
+
+```javascript
+const signedTransactions = <%- importFile('test/fixtures/requests/combine.json') %>;
+return api.combine(signedTransactions);
+```
+
+<%- renderFixture("responses/combine.json") %>

docs/src/events.md.ejs

@@ -47,3 +47,35 @@ api.on('error', (errorCode, errorMessage, data) => {
 ```
 tooBusy: The server is too busy to help you now.
 ```
+
+## connected
+
+This event is emitted after connection successfully opened.
+
+### Example
+
+```javascript
+api.on('connected', () => {
+  console.log('Connection is open now.');
+});
+```
+
+## disconnected
+
+This event is emitted when connection is closed.
+
+### Return Value
+
+The only parameter is a number containing the [close code](https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent) send by the server.
+
+### Example
+
+```javascript
+api.on('disconnected', (code) => {
+  if (code !== 1000) {
+    console.log('Connection is closed due to error.');
+  } else {
+    console.log('Connection is closed normally.');
+  }
+});
+```

docs/src/index.md.ejs

@@ -31,6 +31,7 @@
 <% include prepareSuspendedPaymentCancellation.md.ejs %>
 <% include prepareSuspendedPaymentExecution.md.ejs %>
 <% include sign.md.ejs %>
+<% include combine.md.ejs %>
 <% include submit.md.ejs %>
 <% include generateAddress.md.ejs %>
 <% include computeLedgerHash.md.ejs %>

docs/src/prepareTrustline.md.ejs

@@ -23,7 +23,7 @@ All "prepare*" methods have the same return type.
 ```javascript
 const address = 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59';
 const trustline = <%- importFile('test/fixtures/requests/prepare-trustline.json') %>;
-return api.preparePayment(address, trustline).then(prepared =>
+return api.prepareTrustline(address, trustline).then(prepared =>
   {/* ... */});
 ```
 

docs/src/sign.md.ejs

@@ -1,6 +1,6 @@
 ## sign
 
-`sign(txJSON: string, secret: string): {signedTransaction: string, id: string}`
+`sign(txJSON: string, secret: string, options: Object): {signedTransaction: string, id: string}`
 
 Sign a prepared transaction. The signed transaction must subsequently be [submitted](#submit).
 

docs/src/transactions.md.ejs

@@ -30,7 +30,7 @@ Executing a transaction with `RippleAPI` requires the following four steps:
     * [prepareSuspendedPaymentCreation](#preparesuspendedpaymentcreation)
     * [prepareSuspendedPaymentCancellation](#preparesuspendedpaymentcancellation)
     * [prepareSuspendedPaymentExecution](#preparesuspendedpaymentexecution)
-2. [Sign](#sign) - Cryptographically sign the transaction locally and save the [transaction ID](#transaction-id). Signing is how the owner of an account authorizes a transaction to take place.
+2. [Sign](#sign) - Cryptographically sign the transaction locally and save the [transaction ID](#transaction-id). Signing is how the owner of an account authorizes a transaction to take place. For multisignature transactions, the `signedTransaction` fields returned by `sign` must be collected and passed to the [combine](#combine) method.
 3. [Submit](#submit) - Submit the transaction to the connected server.
 4. Verify - Verify that the transaction got validated by querying with [getTransaction](#gettransaction). This is necessary because transactions may fail even if they were successfully submitted.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ripple-lib",
-  "version": "0.16.3",
+  "version": "0.17.2",
   "license": "ISC",
   "description": "A JavaScript API for interacting with Ripple in Node.js and the browser",
   "files": [
@@ -15,41 +15,50 @@
     "test": "test"
   },
   "dependencies": {
-    "ajv": "^1.4.8",
-    "babel-polyfill": "^6.2.0",
-    "babel-runtime": "^5.5.4",
+    "ajv": "^4.0.5",
+    "ajv-i18n": "^1.2.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-runtime": "^6.3.19",
     "bignumber.js": "^2.0.3",
     "https-proxy-agent": "^1.0.0",
     "jayson": "^1.2.2",
     "lodash": "^3.1.0",
     "ripple-address-codec": "^2.0.1",
-    "ripple-binary-codec": "^0.1.1",
+    "ripple-binary-codec": "^0.1.3",
     "ripple-hashes": "^0.1.0",
     "ripple-keypairs": "^0.10.0",
     "ripple-lib-transactionparser": "^0.6.0",
-    "ws": "^0.7.1"
+    "ws": "^1.0.1"
   },
   "devDependencies": {
     "assert-diff": "^1.0.1",
-    "babel": "^5.8.21",
-    "babel-core": "^5.8.22",
-    "babel-eslint": "^4.1.3",
-    "babel-loader": "^5.3.2",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.1",
+    "babel-plugin-syntax-flow": "^6.3.13",
+    "babel-plugin-transform-flow-strip-types": "^6.4.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-stage-1": "^6.3.13",
+    "babel-register": "^6.3.13",
     "coveralls": "^2.10.0",
     "doctoc": "^0.15.0",
     "ejs": "^2.3.4",
-    "eslint": "^1.3.0",
-    "eslint-plugin-flowtype": "^1.0.0",
+    "eslint": "^2.9.0",
     "eventemitter2": "^0.4.14",
-    "flow-bin": "^0.14",
+    "flow-bin": "^0.24.2",
     "gulp": "^3.8.10",
     "gulp-bump": "^0.1.13",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^1.1.0",
-    "istanbul": "^0.3.5",
+    "http-server": "^0.8.5",
+    "isparta": "^4.0.0",
     "json-loader": "^0.5.2",
     "json-schema-to-markdown-table": "^0.4.0",
     "mocha": "^2.1.0",
+    "mocha-junit-reporter": "^1.9.1",
+    "mocha-in-sauce": "^0.0.1",
+    "null-loader": "^0.1.1",
     "webpack": "^1.5.3",
     "yargs": "^1.3.1"
   },
@@ -63,11 +72,12 @@
     "watch": "babel -w -D --optional runtime -d dist/npm/ src/",
     "compile-with-source-maps": "babel -D --optional runtime -s -t -d dist/npm/ src/",
     "prepublish": "npm run clean && npm run compile",
-    "test": "istanbul test _mocha",
+    "test": "babel-node node_modules/isparta/lib/cli cover ./node_modules/mocha/bin/_mocha",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/es6/eslintrc'; echo 'parser: babel-eslint' >> eslintrc; fi; eslint -c eslintrc src/",
     "perf": "./scripts/perf_test.sh",
-    "start": "babel-node scripts/http.js"
+    "start": "babel-node scripts/http.js",
+    "sauce": "babel-node scripts/sauce-runner.js"
   },
   "repository": {
     "type": "git",

scripts/checkeol.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function checkEOL {
+  local changedFiles=$(git --no-pager diff --name-only -M100% --diff-filter=AM --relative $(git merge-base FETCH_HEAD origin/HEAD) FETCH_HEAD)
+  local result=0
+  for name in $changedFiles; do
+    grep  -c -U -q $'\r' $name
+      if [ $? -eq 0 ]; then
+        echo "windows eol found in $name" >&2
+        result=1
+      fi
+  done
+  if [ $result -eq 1 ]; then
+    false
+  fi
+}
+
+checkEOL

scripts/ci.sh

@@ -3,6 +3,10 @@
 NODE_INDEX="$1"
 TOTAL_NODES="$2"
 
+function checkEOL {
+  ./scripts/checkeol.sh
+}
+
 typecheck() {
   npm install -g flow-bin
   flow --version
@@ -11,7 +15,7 @@ typecheck() {
 
 lint() {
   echo "eslint $(node_modules/.bin/eslint --version)"
-  npm list babel-eslint | grep babel-eslint
+  npm list babel-eslint
   REPO_URL="https://raw.githubusercontent.com/ripple/javascript-style-guide"
   curl "$REPO_URL/es6/eslintrc" > ./eslintrc
   echo "parser: babel-eslint" >> ./eslintrc
@@ -20,6 +24,7 @@ lint() {
 
 unittest() {
   # test "src"
+  mocha test --reporter mocha-junit-reporter --reporter-options mochaFile=$CIRCLE_TEST_REPORTS/test-results.xml
   npm test --coverage
   npm run coveralls
 
@@ -29,12 +34,33 @@ unittest() {
   mkdir -p test-compiled/node_modules
   ln -nfs ../../dist/npm test-compiled/node_modules/ripple-api
   mocha --opts test-compiled/mocha.opts test-compiled
+
+  # compile tests for browser testing
+  gulp build-min build-tests
+  node --harmony test-compiled/mocked-server.js > /dev/null &
+
+  #echo "Running tests in PhantomJS"
+  #mocha-phantomjs test/localrunner.html
+  #echo "Running tests using minified version in PhantomJS"
+  #mocha-phantomjs test/localrunnermin.html
+
+  echo "Running tests in SauceLabs"
+  http-server &
+  npm run sauce
+
+  pkill -f mocked-server.js
+  pkill -f http-server
   rm -rf test-compiled
 }
 
 integrationtest() {
   mocha test/integration/integration-test.js
   mocha test/integration/http-integration-test.js
+
+  # run integration tests in PhantomJS
+  #gulp build-tests build-min
+  #echo "Running integragtion tests in PhantomJS"
+  #mocha-phantomjs test/localintegrationrunner.html
 }
 
 doctest() {
@@ -47,6 +73,7 @@ doctest() {
 }
 
 oneNode() {
+  checkEOL
   doctest
   lint
   typecheck
@@ -57,7 +84,7 @@ oneNode() {
 twoNodes() {
   case "$NODE_INDEX" in
     0) doctest; lint; integrationtest;;
-    1) typecheck; unittest;;
+    1) checkEOL; typecheck; unittest;;
     *) echo "ERROR: invalid usage"; exit 2;;
   esac
 }
@@ -65,7 +92,7 @@ twoNodes() {
 threeNodes() {
   case "$NODE_INDEX" in
     0) doctest; lint; integrationtest;;
-    1) typecheck;;
+    1) checkEOL; typecheck;;
     2) unittest;;
     *) echo "ERROR: invalid usage"; exit 2;;
   esac

scripts/publish

@@ -16,28 +16,3 @@ echo ""
 echo "publish to npm"
 npm publish
 exit_on_error
-
-rm -rf dist/bower
-echo ""
-echo "publish to bower"
-
-git clone git@github.com:ripple/bower-ripple.git dist/bower
-gulp bower
-exit_on_error
-
-cd dist/bower
-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

@@ -16,28 +16,3 @@ echo ""
 echo "publish rc to npm"
 npm publish --tag beta
 exit_on_error
-
-rm -rf dist/bower
-echo ""
-echo "publish to bower"
-
-git clone git@github.com:ripple/bower-ripple.git dist/bower
-gulp bower
-exit_on_error
-
-cd dist/bower
-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

@@ -1,12 +0,0 @@
-rm -rf dist/bower
-git clone git@github.com:ripple/bower-ripple.git dist/bower
-gulp bower
-cd dist/bower
-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/sauce-runner.js

@@ -0,0 +1,100 @@
+
+const _ = require('lodash');
+const MochaSauce = require('mocha-in-sauce');
+
+const testUrl = 'http://testripple.circleci.com:8080/test/saucerunner.html';
+
+
+function main() {
+  // uncomment for more debug info
+  // process.env.DEBUG = '*';
+
+  // configure
+  const config = {
+    name: 'RippleAPI',
+    host: 'localhost',
+    port: 4445,
+    maxDuration: 180000,
+    // the current build name (optional)
+    build: Date.now(),
+    url: testUrl,
+    runSauceConnect: true
+  };
+
+  if (process.env.CIRCLE_BUILD_NUM) {
+    config.build = process.env.CIRCLE_BUILD_NUM;
+    config.tags = [process.env.CIRCLE_BRANCH, process.env.CIRCLE_SHA1];
+    config.tunnelIdentifier = process.env.CIRCLE_BUILD_NUM;
+  }
+
+  const sauce = new MochaSauce(config);
+
+  sauce.concurrency(5);
+
+  // setup what browsers to test with
+  sauce.browser({browserName: 'firefox', platform: 'Linux',
+   version: '43'});
+  sauce.browser({browserName: 'firefox', platform: 'Windows 8.1',
+    version: '43'});
+  sauce.browser({browserName: 'firefox', platform: 'OS X 10.11',
+   version: '43'});
+  sauce.browser({browserName: 'safari', platform: 'OS X 10.11',
+    version: '9'});
+  sauce.browser({browserName: 'safari', platform: 'OS X 10.10',
+    version: '8'});
+  sauce.browser({browserName: 'safari', platform: 'OS X 10.9',
+    version: '7'});
+  sauce.browser({browserName: 'chrome', platform: 'OS X 10.11',
+    version: '47'});
+  sauce.browser({browserName: 'chrome', platform: 'Linux',
+    version: '47'});
+  sauce.browser({browserName: 'chrome', platform: 'Windows 8.1',
+    version: '47'});
+  sauce.browser({browserName: 'internet explorer', platform: 'Windows 10',
+    version: '11'});
+  sauce.browser({browserName: 'MicrosoftEdge', platform: 'Windows 10',
+    version: '20'});
+
+  sauce.on('init', function(browser) {
+    console.log('  init : %s %s', browser.browserName, browser.platform);
+  });
+
+  sauce.on('start', function(browser) {
+    console.log('  start : %s %s', browser.browserName, browser.platform);
+  });
+
+  sauce.on('end', function(browser, res) {
+    console.log('  end : %s %s : %d failures', browser.browserName,
+      browser.platform, res && res.failures);
+  });
+
+  sauce.on('connected', sauceConnectProcess => {
+    sauceConnectProcess.on('exit', function(code, /* signal */) {
+      if (code > 0) {
+        console.log('something wrong - exiting');
+        process.exit();
+      } else {
+        console.log('normal tunnel exit');
+      }
+    });
+  });
+
+
+  sauce.start(function(err, res) {
+    let failure = false;
+    if (err) {
+      console.log('Error starting Sauce');
+      console.error(err);
+      process.exitCode = 2;
+    } else {
+      console.log('-------------- done --------------');
+      failure = _.some(res, 'failures');
+      console.log('Tests are failed:', failure);
+      if (failure) {
+        process.exitCode = 1;
+      }
+    }
+  });
+}
+
+main();

src/api.js

@@ -1,5 +1,5 @@
 /* @flow */
-'use strict';
+'use strict'; // eslint-disable-line 
 
 /* eslint-disable max-len */
 // Enable core-js polyfills. This allows use of ES6/7 extensions listed here:
@@ -44,6 +44,7 @@ const prepareSuspendedPaymentCancellation =
   require('./transaction/suspended-payment-cancellation');
 const prepareSettings = require('./transaction/settings');
 const sign = require('./transaction/sign');
+const combine = require('./transaction/combine');
 const submit = require('./transaction/submit');
 const errors = require('./common').errors;
 const generateAddress =
@@ -88,6 +89,12 @@ class RippleAPI extends EventEmitter {
       this.connection.on('error', (errorCode, errorMessage, data) => {
         this.emit('error', errorCode, errorMessage, data);
       });
+      this.connection.on('connected', () => {
+        this.emit('connected');
+      });
+      this.connection.on('disconnected', code => {
+        this.emit('disconnected', code);
+      });
     } else {
       // use null object pattern to provide better error message if user
       // tries to call a method that requires a connection
@@ -125,6 +132,7 @@ _.assign(RippleAPI.prototype, {
   prepareSuspendedPaymentCancellation,
   prepareSettings,
   sign,
+  combine,
   submit,
 
   generateAddress,

src/broadcast.js

@@ -11,6 +11,9 @@ class RippleAPIBroadcast extends RippleAPI {
       _.assign({}, options, {server})
     ));
 
+    // exposed for testing
+    this._apis = apis;
+
     this.getMethodNames().forEach(name => {
       this[name] = function() { // eslint-disable-line no-loop-func
         return Promise.race(apis.map(api => api[name].apply(api, arguments)));

src/common/browser-hacks.js

@@ -0,0 +1,21 @@
+'use strict';
+
+function setPrototypeOf(object, prototype) {
+  // Object.setPrototypeOf not supported on Internet Explorer 9
+  /* eslint-disable */
+  Object.setPrototypeOf ? Object.setPrototypeOf(object, prototype) :
+    object.__proto__ = prototype;
+  /* eslint-enable */
+}
+
+function getConstructorName(object) {
+  // hack for internet explorer
+  return process.browser ?
+    object.constructor.toString().match(/^function\s+([^(]*)/)[1] :
+    object.constructor.name;
+}
+
+module.exports = {
+  getConstructorName,
+  setPrototypeOf
+};

src/common/connection.js

@@ -1,11 +1,13 @@
-'use strict';
+'use strict'; // eslint-disable-line 
+
 const _ = require('lodash');
 const {EventEmitter} = require('events');
 const WebSocket = require('ws');
 const parseURL = require('url').parse;
 const RangeSet = require('./rangeset').RangeSet;
 const {RippledError, DisconnectedError, NotConnectedError,
-  TimeoutError, ResponseFormatError, ConnectionError} = require('./errors');
+  TimeoutError, ResponseFormatError, ConnectionError,
+  RippledNotInitializedError} = require('./errors');
 
 function isStreamMessageType(type) {
   return type === 'ledgerClosed' ||
@@ -36,6 +38,21 @@ class Connection extends EventEmitter {
     this._ledgerVersion = null;
     this._availableLedgerVersions = new RangeSet();
     this._nextRequestID = 1;
+    this._retry = 0;
+    this._retryTimer = null;
+    this._onOpenErrorBound = null;
+    this._onUnexpectedCloseBound = null;
+  }
+
+  _updateLedgerVersions(data) {
+    this._ledgerVersion = Number(data.ledger_index);
+    if (data.validated_ledgers) {
+      this._availableLedgerVersions.reset();
+      this._availableLedgerVersions.parseAndAddRanges(
+        data.validated_ledgers);
+    } else {
+      this._availableLedgerVersions.addValue(this._ledgerVersion);
+    }
   }
 
   // return value is array of arguments to Connection.emit
@@ -48,10 +65,7 @@ class Connection extends EventEmitter {
       return [data.id.toString(), data];
     } else if (isStreamMessageType(data.type)) {
       if (data.type === 'ledgerClosed') {
-        this._ledgerVersion = Number(data.ledger_index);
-        this._availableLedgerVersions.reset();
-        this._availableLedgerVersions.parseAndAddRanges(
-          data.validated_ledgers);
+        this._updateLedgerVersions(data);
       }
       return [data.type, data];
     } else if (data.type === undefined && data.error) {
@@ -73,7 +87,7 @@ class Connection extends EventEmitter {
     }
     // we don't want this inside the try/catch or exceptions in listener
     // will be caught
-    this.emit.apply(this, parameters);
+    this.emit(...parameters);
   }
 
   get _state() {
@@ -88,26 +102,118 @@ class Connection extends EventEmitter {
     return this._state === WebSocket.OPEN && this._isReady;
   }
 
-  _onUnexpectedClose() {
+  _onUnexpectedClose(beforeOpen, resolve, reject, code) {
+    if (this._onOpenErrorBound) {
+      this._ws.removeListener('error', this._onOpenErrorBound);
+      this._onOpenErrorBound = null;
+    }
+    // just in case
+    this._ws.removeAllListeners('open');
     this._ws = null;
     this._isReady = false;
-    this.connect().then();
+    if (beforeOpen) {
+      // connection was closed before it was properly opened, so we must return
+      // error to connect's caller
+      this.connect().then(resolve, reject);
+    } else {
+      // if first parameter ws lib sends close code,
+      // but sometimes it forgots about it, so default to 1006 - CLOSE_ABNORMAL
+      this.emit('disconnected', code || 1006);
+      this._retryConnect();
+    }
+  }
+
+  _calculateTimeout(retriesCount) {
+    return (retriesCount < 40)
+      // First, for 2 seconds: 20 times per second
+      ? (1000 / 20)
+      : (retriesCount < 40 + 60)
+        // Then, for 1 minute: once per second
+        ? (1000)
+        : (retriesCount < 40 + 60 + 60)
+          // Then, for 10 minutes: once every 10 seconds
+          ? (10 * 1000)
+          // Then: once every 30 seconds
+          : (30 * 1000);
+  }
+
+  _retryConnect() {
+    this._retry += 1;
+    const retryTimeout = this._calculateTimeout(this._retry);
+    this._retryTimer = setTimeout(() => {
+      this.emit('reconnecting', this._retry);
+      this.connect().catch(this._retryConnect.bind(this));
+    }, retryTimeout);
+  }
+
+  _clearReconnectTimer() {
+    clearTimeout(this._retryTimer);
+    this._retryTimer = null;
   }
 
   _onOpen() {
+    if (!this._ws) {
+      return Promise.reject(new DisconnectedError());
+    }
+    if (this._onOpenErrorBound) {
+      this._ws.removeListener('error', this._onOpenErrorBound);
+      this._onOpenErrorBound = null;
+    }
+
     const request = {
       command: 'subscribe',
       streams: ['ledger']
     };
-    return this.request(request).then(response => {
-      this._ledgerVersion = Number(response.ledger_index);
-      this._availableLedgerVersions.parseAndAddRanges(
-        response.validated_ledgers);
+    return this.request(request).then(data => {
+      if (_.isEmpty(data) || !data.ledger_index) {
+        // rippled instance doesn't have validated ledgers
+        return this._disconnect(false).then(() => {
+          throw new RippledNotInitializedError('Rippled not initialized');
+        });
+      }
+
+      this._updateLedgerVersions(data);
+      this._rebindOnUnxpectedClose();
+
+      this._retry = 0;
+      this._ws.on('error', error => {
+        if (process.browser && error && error.type === 'error') {
+          // we are in browser, ignore error - `close` event will be fired
+          // after error
+          return;
+        }
+        this.emit('error', 'websocket', error.message, error);
+      });
+
       this._isReady = true;
       this.emit('connected');
+
+      return undefined;
     });
   }
 
+  _rebindOnUnxpectedClose() {
+    if (this._onUnexpectedCloseBound) {
+      this._ws.removeListener('close', this._onUnexpectedCloseBound);
+    }
+    this._onUnexpectedCloseBound =
+      this._onUnexpectedClose.bind(this, false, null, null);
+    this._ws.once('close', this._onUnexpectedCloseBound);
+  }
+
+  _unbindOnUnxpectedClose() {
+    if (this._onUnexpectedCloseBound) {
+      this._ws.removeListener('close', this._onUnexpectedCloseBound);
+    }
+    this._onUnexpectedCloseBound = null;
+  }
+
+  _onOpenError(reject, error) {
+    this._onOpenErrorBound = null;
+    this._unbindOnUnxpectedClose();
+    reject(new NotConnectedError(error && error.message));
+  }
+
   _createWebSocket() {
     const options = {};
     if (this._proxyURL !== undefined) {
@@ -142,14 +248,17 @@ class Connection extends EventEmitter {
       cert: this._certificate
     }, _.isUndefined);
     const websocketOptions = _.assign({}, options, optionsOverrides);
-    const websocket = new WebSocket(this._url, websocketOptions);
+    const websocket = new WebSocket(this._url, null, websocketOptions);
     // we will have a listener for each outstanding request,
     // so we have to raise the limit (the default is 10)
+    if (typeof websocket.setMaxListeners === 'function') {
       websocket.setMaxListeners(Infinity);
+    }
     return websocket;
   }
 
   connect() {
+    this._clearReconnectTimer();
     return new Promise((resolve, reject) => {
       if (!this._url) {
         reject(new ConnectionError(
@@ -165,10 +274,18 @@ class Connection extends EventEmitter {
         // should still be emitted; the "ws" documentation says: "The close
         // event is also emitted when then underlying net.Socket closes the
         // connection (end or close)."
-        this._ws.on('error', error =>
-          this.emit('error', 'websocket', error.messsage, error));
+        // In case if there is connection error (say, server is not responding)
+        // we must return this error to connection's caller. After successful
+        // opening, we will forward all errors to main api object.
+        this._onOpenErrorBound = this._onOpenError.bind(this, reject);
+        this._ws.once('error', this._onOpenErrorBound);
         this._ws.on('message', this._onMessage.bind(this));
-        this._onUnexpectedCloseBound = this._onUnexpectedClose.bind(this);
+        // in browser close event can came before open event, so we must
+        // resolve connect's promise after reconnect in that case.
+        // after open event we will rebound _onUnexpectedCloseBound
+        // without resolve and reject functions
+        this._onUnexpectedCloseBound = this._onUnexpectedClose.bind(this, true,
+          resolve, reject);
         this._ws.once('close', this._onUnexpectedCloseBound);
         this._ws.once('open', () => this._onOpen().then(resolve, reject));
       }
@@ -176,16 +293,30 @@ class Connection extends EventEmitter {
   }
 
   disconnect() {
+    return this._disconnect(true);
+  }
+
+  _disconnect(calledByUser) {
+    if (calledByUser) {
+      this._clearReconnectTimer();
+      this._retry = 0;
+    }
     return new Promise(resolve => {
       if (this._state === WebSocket.CLOSED) {
         resolve();
       } else if (this._state === WebSocket.CLOSING) {
         this._ws.once('close', resolve);
       } else {
+        if (this._onUnexpectedCloseBound) {
           this._ws.removeListener('close', this._onUnexpectedCloseBound);
-        this._ws.once('close', () => {
+          this._onUnexpectedCloseBound = null;
+        }
+        this._ws.once('close', code => {
           this._ws = null;
           this._isReady = false;
+          if (calledByUser) {
+            this.emit('disconnected', code || 1000); // 1000 - CLOSE_NORMAL
+          }
           resolve();
         });
         this._ws.close();

src/common/errors.js

@@ -1,14 +1,28 @@
-'use strict';
+'use strict'; // eslint-disable-line 
 const util = require('util');
+const browserHacks = require('./browser-hacks');
 
-class RippleError extends Error {
+// this is needed because extending builtins doesn't work in babel 6.x
+function extendableBuiltin(cls) {
+  function ExtendableBuiltin() {
+    cls.apply(this, arguments);
+  }
+  ExtendableBuiltin.prototype = Object.create(cls.prototype);
+  browserHacks.setPrototypeOf(ExtendableBuiltin, cls);
+  return ExtendableBuiltin;
+}
+
+class RippleError extends extendableBuiltin(Error) {
   constructor(message, data) {
     super(message);
-    this.name = this.constructor.name;
+
+    this.name = browserHacks.getConstructorName(this);
     this.message = message;
     this.data = data;
+    if (Error.captureStackTrace) {
       Error.captureStackTrace(this, this.constructor.name);
     }
+  }
 
   toString() {
     let result = '[' + this.name + '(' + this.message;
@@ -39,6 +53,8 @@ class NotConnectedError extends ConnectionError {}
 
 class DisconnectedError extends ConnectionError {}
 
+class RippledNotInitializedError extends ConnectionError {}
+
 class TimeoutError extends ConnectionError {}
 
 class ResponseFormatError extends ConnectionError {}
@@ -71,6 +87,7 @@ module.exports = {
   RippledError,
   NotConnectedError,
   DisconnectedError,
+  RippledNotInitializedError,
   TimeoutError,
   ResponseFormatError,
   ValidationError,

src/common/schema-validator.js

@@ -94,7 +94,8 @@ function loadSchemas() {
     require('./schemas/input/compute-ledger-hash'),
     require('./schemas/input/sign.json'),
     require('./schemas/input/submit.json'),
-    require('./schemas/input/generate-address.json')
+    require('./schemas/input/generate-address.json'),
+    require('./schemas/input/combine.json')
   ];
   const titles = _.map(schemas, schema => schema.title);
   const duplicates = _.keys(_.pick(_.countBy(titles), count => count > 1));

src/common/schemas/input/combine.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "combineParameters",
+  "type": "object",
+  "properties": {
+    "signedTransactions": {
+      "type": "array",
+      "description": "An array of signed transactions (from the output of [sign](#sign)) to combine.",
+      "items": {
+        "type": "string",
+        "pattern": "^[A-F0-9]+$",
+        "description": "A single-signed transaction represented as an uppercase hexadecimal string (from the output of [sign](#sign))"
+      },
+      "minLength": 1
+    }
+  },
+  "additionalProperties": false,
+  "required": ["signedTransactions"]
+}

src/common/schemas/input/sign.json

@@ -11,6 +11,17 @@
       "type": "string",
       "format": "secret",
       "description": "The secret of the account that is initiating the transaction."
+    },
+    "options": {
+      "type": "object",
+      "description": "Options that control the type of signature that will be generated.",
+      "properties": {
+        "signAs": {
+          "$ref": "address",
+          "description": "The account that the signature should count for in multisigning."
+        }
+      },
+      "additionalProperties": false
     }
   },
   "additionalProperties": false,

src/common/schemas/objects/amount.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "amount",
   "link": "amount",
-  "description": "An Amount on the Ripple Protocol, used also for XRP in the ripple-rest API",
+  "description": "An Amount on the Ripple Protocol",
   "allOf": [
     {"$ref": "amountbase"},
     {"required": ["value"]}

src/common/schemas/objects/instructions.json

@@ -28,6 +28,11 @@
       "description": "Offset from current validated legder version to highest ledger version that the transaction can be included in.",
       "type": "integer",
       "minimum": 0
+    },
+    "signersCount": {
+      "description": "Number of signers that will be signing this transaction.",
+      "type": "integer",
+      "minimum": 1
     }
   },
   "additionalProperties": false,

src/common/schemas/objects/settings.json

@@ -55,7 +55,7 @@
       "description": " The domain that owns this account, as a hexadecimal string representing the ASCII for the domain in lowercase."
     },
     "transferRate": {
-      "description": " The fee to charge when users transfer this account’s issuances, represented as billionths of a unit. Use `null` to set no fee.",
+      "description": " The fee to charge when users transfer this account’s issuances, as the decimal amount that must be sent to deliver 1 unit. Has precision up to 9 digits beyond the decimal point. Use `null` to set no fee.",
       "oneOf": [
         {"type": "null"},
         {"type": "number", "minimum": 1, "maximum": 4.294967295}
@@ -68,6 +68,35 @@
       ],
       "description": "The public key of a new keypair, to use as the regular key to this account, as a base-58-encoded string in the same format as an account address. Use `null` to remove the regular key."
     },
+    "signers": {
+      "type": "object",
+      "description": "Settings that determine what sets of accounts can be used to sign a transaction on behalf of this account using multisigning.",
+      "properties": {
+        "threshold": {
+          "$ref": "uint32",
+          "description": "A target number for the signer weights. A multi-signature from this list is valid only if the sum weights of the signatures provided is equal or greater than this value. To delete the signers setting, use the value `0`."
+        },
+        "weights": {
+          "type": "array",
+          "description": "Weights of signatures for each signer.",
+          "items": {
+            "type": "object",
+            "description": "An association of an address and a weight.",
+            "properties": {
+              "address": {"$ref": "address"},
+              "weight": {
+                "$ref": "uint32",
+                "description": "The weight that the signature of this account counts as towards the threshold."
+              }
+            },
+            "required": ["address", "weight"],
+            "additionalProperties": false
+          },
+          "minItems": 1,
+          "maxItems": 8
+        }
+      }
+    },
     "memos": {"$ref": "memos"}
   },
   "additionalProperties": false

src/common/schemas/objects/tx-type.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "transactionType",
   "link": "transaction-types",
-  "description": "The type of the tranasction.",
+  "description": "The type of the transaction.",
   "type": "string",
   "enum": ["payment", "order", "orderCancellation", "trustline", "settings",
            "suspendedPaymentCreation", "suspendedPaymentCancellation",

src/common/schemas/output/outcome.json

@@ -17,6 +17,10 @@
       "$ref": "value",
       "description": "The XRP fee that was charged for the transaction."
     },
+    "deliveredAmount": {
+      "$ref": "amount",
+      "description": "For payment transactions, it is impossible to reliably compute the actual delivered amount from the balanceChanges due to fixed precision. If the payment is not a partial payment and the transaction succeeded, the deliveredAmount should always be considered to be the amount specified in the transaction."
+    },
     "balanceChanges": {
       "type": "object",
       "additionalProperties": {

src/common/schemas/output/submit.json

@@ -5,7 +5,7 @@
   "properties": {
     "resultCode": {
       "type": "string",
-      "description": "The result code returned by rippled. [List of tranasction responses](http://pages.lightthenight.org/gba/SanFran15/ripple)"
+      "description": "The result code returned by rippled. [List of transaction responses](https://ripple.com/build/transactions/#full-transaction-response-list)"
     },
     "resultMessage": {
       "type": "string",

src/common/serverinfo.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'; // eslint-disable-line 
 const _ = require('lodash');
 const {convertKeysFromSnakeCaseToCamelCase} = require('./utils');
 import type {Connection} from './connection';
@@ -43,6 +43,7 @@ function getServerInfo(connection: Connection): Promise<GetServerInfoResponse> {
   return connection.request({command: 'server_info'}).then(response => {
     const info = convertKeysFromSnakeCaseToCamelCase(response.info);
     renameKeys(info, {hostid: 'hostID'});
+    if (info.validatedLedger) {
       renameKeys(info.validatedLedger, {
         baseFeeXrp: 'baseFeeXRP',
         reserveBaseXrp: 'reserveBaseXRP',
@@ -55,6 +56,7 @@ function getServerInfo(connection: Connection): Promise<GetServerInfoResponse> {
         info.validatedLedger.reserveBaseXRP.toString();
       info.validatedLedger.reserveIncrementXRP =
         info.validatedLedger.reserveIncrementXRP.toString();
+    }
     return info;
   });
 }

src/common/utils.js

@@ -35,12 +35,13 @@ function toRippledAmount(amount: Amount): RippledAmount {
   };
 }
 
-const FINDSNAKE = /([a-zA-Z]_[a-zA-Z])/g;
 function convertKeysFromSnakeCaseToCamelCase(obj: any): any {
   if (typeof obj === 'object') {
     let newKey;
     return _.reduce(obj, (result, value, key) => {
       newKey = key;
+      // taking this out of function leads to error in PhantomJS
+      const FINDSNAKE = /([a-zA-Z]_[a-zA-Z])/g;
       if (FINDSNAKE.test(key)) {
         newKey = key.replace(FINDSNAKE, r => r[0] + r[2].toUpperCase());
       }

src/common/validate.js

@@ -47,6 +47,7 @@ module.exports = {
   prepareSuspendedPaymentExecution: _.partial(schemaValidate,
     'prepareSuspendedPaymentExecutionParameters'),
   sign: _.partial(schemaValidate, 'signParameters'),
+  combine: _.partial(schemaValidate, 'combineParameters'),
   submit: _.partial(schemaValidate, 'submitParameters'),
   computeLedgerHash: _.partial(schemaValidate, 'computeLedgerHashParameters'),
   generateAddress: _.partial(schemaValidate, 'generateAddressParameters'),

src/common/wswrapper.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const {EventEmitter} = require('events');
+
+function unsused() {}
+
+/**
+ * Provides `EventEmitter` interface for native browser `WebSocket`,
+ * same, as `ws` package provides.
+ */
+class WSWrapper extends EventEmitter {
+  constructor(url, protocols = null, websocketOptions = {}) {
+    super();
+    unsused(protocols);
+    unsused(websocketOptions);
+    this.setMaxListeners(Infinity);
+
+    this._ws = new WebSocket(url);
+
+    this._ws.onclose = () => {
+      this.emit('close');
+    };
+
+    this._ws.onopen = () => {
+      this.emit('open');
+    };
+
+    this._ws.onerror = error => {
+      this.emit('error', error);
+    };
+
+    this._ws.onmessage = message => {
+      this.emit('message', message.data);
+    };
+  }
+
+  close() {
+    if (this.readyState === 1) {
+      this._ws.close();
+    }
+  }
+
+  send(message) {
+    this._ws.send(message);
+  }
+
+  get readyState() {
+    return this._ws.readyState;
+  }
+
+}
+
+WSWrapper.CONNECTING = 0;
+WSWrapper.OPEN = 1;
+WSWrapper.CLOSING = 2;
+WSWrapper.CLOSED = 3;
+
+module.exports = WSWrapper;
+

src/http.js

@@ -8,6 +8,7 @@ const jayson = require('jayson');
 const RippleAPI = require('./api').RippleAPI;
 
 
+/* istanbul ignore next */
 function createHTTPServer(options, httpPort) {
   const rippleAPI = new RippleAPI(options);
 

src/ledger/parse/account-order.js

@@ -1,5 +1,5 @@
 /* @flow */
-'use strict';
+'use strict'; // eslint-disable-line strict
 const utils = require('./utils');
 const flags = require('./flags').orderFlags;
 const parseAmount = require('./amount');
@@ -31,11 +31,14 @@ function parseAccountOrder(address: string, order: Object): Object {
     expirationTime: utils.parseTimestamp(order.expiration)
   });
 
+  const makerExchangeRate = order.quality ?
+      utils.adjustQualityForXRP(order.quality.toString(),
+        takerGetsAmount.currency, takerPaysAmount.currency) :
+      computeQuality(takerGetsAmount, takerPaysAmount);
   const properties = {
     maker: address,
     sequence: order.seq,
-    makerExchangeRate: order.quality ? order.quality.toString()
-      : computeQuality(takerGetsAmount, takerPaysAmount)
+    makerExchangeRate: makerExchangeRate
   };
 
   return {specification, properties};

src/ledger/parse/amendment.js

@@ -0,0 +1,9 @@
+'use strict'; // eslint-disable-line strict
+
+function parseAmendment(tx: Object) {
+  return {
+    amendment: tx.Amendment
+  };
+}
+
+module.exports = parseAmendment;

src/ledger/parse/amount.js

@@ -1,6 +1,6 @@
 /* @flow */
 'use strict';
-const utils = require('./utils');
+const utils = require('../utils');
 import type {Amount, RippledAmount} from '../../common/types.js';
 
 
@@ -8,7 +8,7 @@ function parseAmount(amount: RippledAmount): Amount {
   if (typeof amount === 'string') {
     return {
       currency: 'XRP',
-      value: utils.dropsToXrp(amount)
+      value: utils.common.dropsToXrp(amount)
     };
   }
   return {

src/ledger/parse/fee-update.js

@@ -0,0 +1,15 @@
+'use strict'; // eslint-disable-line strict
+const BigNumber = require('bignumber.js');
+const {dropsToXrp} = require('./utils');
+
+function parseFeeUpdate(tx: Object) {
+  const baseFeeDrops = (new BigNumber(tx.BaseFee, 16)).toString();
+  return {
+    baseFeeXRP: dropsToXrp(baseFeeDrops),
+    referenceFeeUnits: tx.ReferenceFeeUnits,
+    reserveBaseXRP: dropsToXrp(tx.ReserveBase),
+    reserveIncrementXRP: dropsToXrp(tx.ReserveIncrement)
+  };
+}
+
+module.exports = parseFeeUpdate;

src/ledger/parse/fields.js

@@ -1,5 +1,6 @@
 /* @flow */
 'use strict';
+const _ = require('lodash');
 const BigNumber = require('bignumber.js');
 const AccountFields = require('./utils').constants.AccountFields;
 
@@ -22,6 +23,26 @@ function parseFields(data: Object): Object {
       settings[info.name] = parseField(info, fieldValue);
     }
   }
+
+  if (data.RegularKey) {
+    settings.regularKey = data.RegularKey;
+  }
+
+  // TODO: this isn't implemented in rippled yet, may have to change this later
+  if (data.SignerQuorum || data.SignerEntries) {
+    settings.signers = {};
+    if (data.SignerQuorum) {
+      settings.signers.threshold = data.SignerQuorum;
+    }
+    if (data.SignerEntries) {
+      settings.signers.weights = _.map(data.SignerEntries, entry => {
+        return {
+          address: entry.SignerEntry.Account,
+          weight: entry.SignerEntry.SignerWeight
+        };
+      });
+    }
+  }
   return settings;
 }
 

src/ledger/parse/payment.js

@@ -6,10 +6,6 @@ const utils = require('./utils');
 const parseAmount = require('./amount');
 const txFlags = utils.txFlags;
 
-function isPartialPayment(tx) {
-  return (tx.Flags & txFlags.Payment.PartialPayment) !== 0;
-}
-
 function isNoDirectRipple(tx) {
   return (tx.Flags & txFlags.Payment.NoRippleDirect) !== 0;
 }
@@ -45,7 +41,7 @@ function parsePayment(tx: Object): Object {
     memos: utils.parseMemos(tx),
     invoiceID: tx.InvoiceID,
     paths: tx.Paths ? JSON.stringify(tx.Paths) : undefined,
-    allowPartialPayment: isPartialPayment(tx) || undefined,
+    allowPartialPayment: utils.isPartialPayment(tx) || undefined,
     noDirectRipple: isNoDirectRipple(tx) || undefined,
     limitQuality: isQualityLimited(tx) || undefined
   });

src/ledger/parse/settings.js

@@ -52,10 +52,10 @@ function parseFlags(tx: Object) {
 
 function parseSettings(tx: Object) {
   const txType = tx.TransactionType;
-  assert(txType === 'AccountSet' || txType === 'SetRegularKey');
+  assert(txType === 'AccountSet' || txType === 'SetRegularKey' ||
+         txType === 'SignerListSet');
 
-  const regularKey = tx.RegularKey ? {regularKey: tx.RegularKey} : {};
-  return _.assign(regularKey, parseFlags(tx), parseFields(tx));
+  return _.assign({}, parseFlags(tx), parseFields(tx));
 }
 
 module.exports = parseSettings;

src/ledger/parse/transaction.js

@@ -1,5 +1,5 @@
 /* @flow */
-'use strict';
+'use strict'; // eslint-disable-line strict
 const assert = require('assert');
 const utils = require('./utils');
 const parsePayment = require('./payment');
@@ -11,6 +11,8 @@ const parseSuspendedPaymentCreation = require('./suspended-payment-creation');
 const parseSuspendedPaymentExecution = require('./suspended-payment-execution');
 const parseSuspendedPaymentCancellation =
   require('./suspended-payment-cancellation');
+const parseFeeUpdate = require('./fee-update');
+const parseAmendment = require('./amendment');
 
 function parseTransactionType(type) {
   const mapping = {
@@ -22,7 +24,10 @@ function parseTransactionType(type) {
     SetRegularKey: 'settings',
     SuspendedPaymentCreate: 'suspendedPaymentCreation',
     SuspendedPaymentFinish: 'suspendedPaymentExecution',
-    SuspendedPaymentCancel: 'suspendedPaymentCancellation'
+    SuspendedPaymentCancel: 'suspendedPaymentCancellation',
+    SignerListSet: 'settings',
+    SetFee: 'feeUpdate',          // pseudo-transaction
+    EnableAmendment: 'amendment'  // pseudo-transaction
   };
   return mapping[type] || null;
 }
@@ -37,7 +42,9 @@ function parseTransaction(tx: Object): Object {
     'settings': parseSettings,
     'suspendedPaymentCreation': parseSuspendedPaymentCreation,
     'suspendedPaymentExecution': parseSuspendedPaymentExecution,
-    'suspendedPaymentCancellation': parseSuspendedPaymentCancellation
+    'suspendedPaymentCancellation': parseSuspendedPaymentCancellation,
+    'feeUpdate': parseFeeUpdate,
+    'amendment': parseAmendment
   };
   const parser = mapping[type];
   assert(parser !== undefined, 'Unrecognized transaction type');

src/ledger/parse/utils.js

@@ -4,6 +4,9 @@ const _ = require('lodash');
 const transactionParser = require('ripple-lib-transactionparser');
 const utils = require('../utils');
 const BigNumber = require('bignumber.js');
+const parseAmount = require('./amount');
+
+import type {Amount} from '../common/types.js';
 
 function adjustQualityForXRP(
   quality: string, takerGetsCurrency: string, takerPaysCurrency: string
@@ -35,19 +38,39 @@ function removeEmptyCounterparty(amount) {
 }
 
 function removeEmptyCounterpartyInBalanceChanges(balanceChanges) {
-  _.forEach(balanceChanges, (changes) => {
+  _.forEach(balanceChanges, changes => {
     _.forEach(changes, removeEmptyCounterparty);
   });
 }
 
 function removeEmptyCounterpartyInOrderbookChanges(orderbookChanges) {
-  _.forEach(orderbookChanges, (changes) => {
-    _.forEach(changes, (change) => {
+  _.forEach(orderbookChanges, changes => {
+    _.forEach(changes, change => {
       _.forEach(change, removeEmptyCounterparty);
     });
   });
 }
 
+function isPartialPayment(tx) {
+  return (tx.Flags & utils.common.txFlags.Payment.PartialPayment) !== 0;
+}
+
+function parseDeliveredAmount(tx: Object): Amount | void {
+  let deliveredAmount;
+
+  // TODO: Workaround for existing rippled bug where delivered_amount may not be
+  // provided for account_tx
+  if (tx.TransactionType === 'Payment') {
+    if (tx.meta.delivered_amount) {
+      deliveredAmount = parseAmount(tx.meta.delivered_amount);
+    } else if (tx.Amount && !isPartialPayment(tx)) {
+      deliveredAmount = parseAmount(tx.Amount);
+    }
+  }
+
+  return deliveredAmount;
+}
+
 function parseOutcome(tx: Object): ?Object {
   const metadata = tx.meta || tx.metaData;
   if (!metadata) {
@@ -58,15 +81,16 @@ function parseOutcome(tx: Object): ?Object {
   removeEmptyCounterpartyInBalanceChanges(balanceChanges);
   removeEmptyCounterpartyInOrderbookChanges(orderbookChanges);
 
-  return {
+  return utils.common.removeUndefined({
     result: tx.meta.TransactionResult,
     timestamp: parseTimestamp(tx.date),
     fee: utils.common.dropsToXrp(tx.Fee),
     balanceChanges: balanceChanges,
     orderbookChanges: orderbookChanges,
     ledgerVersion: tx.ledger_index,
-    indexInLedger: tx.meta.TransactionIndex
-  };
+    indexInLedger: tx.meta.TransactionIndex,
+    deliveredAmount: parseDeliveredAmount(tx)
+  });
 }
 
 function hexToString(hex: string): ?string {
@@ -77,7 +101,7 @@ function parseMemos(tx: Object): ?Array<Object> {
   if (!Array.isArray(tx.Memos) || tx.Memos.length === 0) {
     return undefined;
   }
-  return tx.Memos.map((m) => {
+  return tx.Memos.map(m => {
     return utils.common.removeUndefined({
       type: m.Memo.parsed_memo_type || hexToString(m.Memo.MemoType),
       format: m.Memo.parsed_memo_format || hexToString(m.Memo.MemoFormat),
@@ -93,6 +117,7 @@ module.exports = {
   hexToString,
   parseTimestamp,
   adjustQualityForXRP,
+  isPartialPayment,
   dropsToXrp: utils.common.dropsToXrp,
   constants: utils.common.constants,
   txFlags: utils.common.txFlags,

src/ledger/pathfind.js

@@ -85,6 +85,20 @@ function conditionallyAddDirectXRPPath(connection: Connection, address: string,
     xrpBalance => addDirectXrpPath(paths, xrpBalance));
 }
 
+function filterSourceFundsLowPaths(pathfind: PathFind,
+                                   paths: RippledPathsResponse
+): RippledPathsResponse {
+  if (pathfind.source.amount &&
+      pathfind.destination.amount.value === undefined && paths.alternatives) {
+    paths.alternatives = _.filter(paths.alternatives, alt => {
+      return alt.source_amount &&
+        pathfind.source.amount &&
+        new BigNumber(alt.source_amount.value).eq(pathfind.source.amount.value);
+    });
+  }
+  return paths;
+}
+
 function formatResponse(pathfind: PathFind, paths: RippledPathsResponse) {
   if (paths.alternatives && paths.alternatives.length > 0) {
     return parsePathfind(paths);
@@ -116,7 +130,9 @@ function getPaths(pathfind: PathFind): Promise<GetPaths> {
   const address = pathfind.source.address;
   return requestPathFind(this.connection, pathfind).then(paths =>
     conditionallyAddDirectXRPPath(this.connection, address, paths)
-  ).then(paths => formatResponse(pathfind, paths));
+  )
+  .then(paths => filterSourceFundsLowPaths(pathfind, paths))
+  .then(paths => formatResponse(pathfind, paths));
 }
 
 module.exports = getPaths;

src/ledger/transaction.js

@@ -1,5 +1,5 @@
 /* @flow */
-'use strict';
+'use strict'; // eslint-disable-line strict
 const _ = require('lodash');
 const utils = require('./utils');
 const parseTransaction = require('./parse/transaction');
@@ -13,15 +13,18 @@ function attachTransactionDate(connection: Connection, tx: Object
     return Promise.resolve(tx);
   }
 
-  if (!tx.ledger_index) {
+  const ledgerVersion = tx.ledger_index || tx.LedgerSequence;
+
+  if (!ledgerVersion) {
     return new Promise(() => {
-      throw new errors.NotFoundError('ledger_index not found in tx');
+      throw new errors.NotFoundError(
+        'ledger_index and LedgerSequence not found in tx');
     });
   }
 
   const request = {
     command: 'ledger',
-    ledger_index: tx.ledger_index
+    ledger_index: ledgerVersion
   };
 
   return connection.request(request).then(data => {

src/transaction/combine.js

@@ -0,0 +1,39 @@
+/* @flow */
+'use strict';
+const _ = require('lodash');
+const binary = require('ripple-binary-codec');
+const utils = require('./utils');
+const BigNumber = require('bignumber.js');
+const {decodeAddress} = require('ripple-address-codec');
+const {validate} = utils.common;
+const {computeBinaryTransactionHash} = require('ripple-hashes');
+
+function addressToBigNumber(address) {
+  const hex = (new Buffer(decodeAddress(address))).toString('hex');
+  return new BigNumber(hex, 16);
+}
+
+function compareSigners(a, b) {
+  return addressToBigNumber(a.Signer.Account)
+    .comparedTo(addressToBigNumber(b.Signer.Account));
+}
+
+function combine(signedTransactions: Array<string>): Object {
+  validate.combine({signedTransactions});
+
+  const txs = _.map(signedTransactions, binary.decode);
+  const tx = _.omit(txs[0], 'Signers');
+  if (!_.every(txs, _tx => _.isEqual(tx, _.omit(_tx, 'Signers')))) {
+    throw new utils.common.errors.ValidationError(
+      'txJSON is not the same for all signedTransactions');
+  }
+  const unsortedSigners = _.reduce(txs, (accumulator, _tx) =>
+    accumulator.concat(_tx.Signers || []), []);
+  const signers = unsortedSigners.sort(compareSigners);
+  const signedTx = _.assign({}, tx, {Signers: signers});
+  const signedTransaction = binary.encode(signedTx);
+  const id = computeBinaryTransactionHash(signedTransaction);
+  return {signedTransaction, id};
+}
+
+module.exports = combine;

src/transaction/settings.js

@@ -70,7 +70,17 @@ function convertTransferRate(transferRate: number | string): number | string {
   return (new BigNumber(transferRate)).shift(9).toNumber();
 }
 
-function createSettingsTransaction(account: string, settings: Settings
+function formatSignerEntry(signer: Object): Object {
+  return {
+    SignerEntry: {
+      Account: signer.address,
+      SignerWeight: signer.weight
+    }
+  };
+}
+
+function createSettingsTransactionWithoutMemos(
+  account: string, settings: Settings
 ): Object {
   if (settings.regularKey !== undefined) {
     const removeRegularKey = {
@@ -83,15 +93,20 @@ function createSettingsTransaction(account: string, settings: Settings
     return _.assign({}, removeRegularKey, {RegularKey: settings.regularKey});
   }
 
+  if (settings.signers !== undefined) {
+    return {
+      TransactionType: 'SignerListSet',
+      Account: account,
+      SignerQuorum: settings.signers.threshold,
+      SignerEntries: _.map(settings.signers.weights, formatSignerEntry)
+    };
+  }
+
   const txJSON: Object = {
     TransactionType: 'AccountSet',
     Account: account
   };
 
-  if (settings.memos !== undefined) {
-    txJSON.Memos = _.map(settings.memos, utils.convertMemo);
-  }
-
   setTransactionFlags(txJSON, _.omit(settings, 'memos'));
   setTransactionFields(txJSON, settings);
 
@@ -101,6 +116,15 @@ function createSettingsTransaction(account: string, settings: Settings
   return txJSON;
 }
 
+function createSettingsTransaction(account: string, settings: Settings
+): Object {
+  const txJSON = createSettingsTransactionWithoutMemos(account, settings);
+  if (settings.memos !== undefined) {
+    txJSON.Memos = _.map(settings.memos, utils.convertMemo);
+  }
+  return txJSON;
+}
+
 function prepareSettings(address: string, settings: Settings,
     instructions: Instructions = {}
 ): Promise<Prepare> {

src/transaction/sign.js

@@ -6,23 +6,38 @@ const binary = require('ripple-binary-codec');
 const {computeBinaryTransactionHash} = require('ripple-hashes');
 const validate = utils.common.validate;
 
-function computeSignature(txJSON, privateKey) {
-  const signingData = binary.encodeForSigning(txJSON);
+function computeSignature(tx: Object, privateKey: string, signAs: ?string) {
+  const signingData = signAs ?
+    binary.encodeForMultisigning(tx, signAs) : binary.encodeForSigning(tx);
   return keypairs.sign(signingData, privateKey);
 }
 
-function sign(txJSON: string, secret: string
+function sign(txJSON: string, secret: string, options: Object = {}
 ): {signedTransaction: string; id: string} {
   validate.sign({txJSON, secret});
   // we can't validate that the secret matches the account because
   // the secret could correspond to the regular key
 
   const tx = JSON.parse(txJSON);
-  const keypair = keypairs.deriveKeypair(secret);
-  if (tx.SigningPubKey === undefined) {
-    tx.SigningPubKey = keypair.publicKey;
+  if (tx.TxnSignature || tx.Signers) {
+    throw new utils.common.errors.ValidationError(
+      'txJSON must not contain "TxnSignature" or "Signers" properties');
   }
+
+  const keypair = keypairs.deriveKeypair(secret);
+  tx.SigningPubKey = options.signAs ? '' : keypair.publicKey;
+
+  if (options.signAs) {
+    const signer = {
+      Account: options.signAs,
+      SigningPubKey: keypair.publicKey,
+      TxnSignature: computeSignature(tx, keypair.privateKey, options.signAs)
+    };
+    tx.Signers = [{Signer: signer}];
+  } else {
     tx.TxnSignature = computeSignature(tx, keypair.privateKey);
+  }
+
   const serialized = binary.encode(tx);
   return {
     signedTransaction: serialized,

src/transaction/submit.js

@@ -1,17 +1,9 @@
 /* @flow */
-'use strict';
+'use strict'; // eslint-disable-line 
 const _ = require('lodash');
 const utils = require('./utils');
 const {validate} = utils.common;
-
-type Submit = {
-  success: boolean,
-  engineResult: string,
-  engineResultCode: number,
-  engineResultMessage?: string,
-  txBlob?: string,
-  txJson?: Object
-}
+import type {Submit} from './types.js';
 
 function isImmediateRejection(engineResult: string): boolean {
   // note: "tel" errors mean the local server refused to process the
@@ -20,10 +12,10 @@ function isImmediateRejection(engineResult: string): boolean {
   // if the required fee changes (this does not occur at the time of
   // this writing, but it could change in the future)
   // all other error classes can potentially result in transcation validation
-  return _.startsWith(engineResult, 'tem') || _.startsWith(engineResult, 'tej');
+  return _.startsWith(engineResult, 'tem');
 }
 
-function formatResponse(response) {
+function formatSubmitResponse(response) {
   const data = {
     resultCode: response.engine_result,
     resultMessage: response.engine_result_message
@@ -36,11 +28,12 @@ function formatResponse(response) {
 
 function submit(signedTransaction: string): Promise<Submit> {
   validate.submit({signedTransaction});
+
   const request = {
     command: 'submit',
     tx_blob: signedTransaction
   };
-  return this.connection.request(request).then(formatResponse);
+  return this.connection.request(request).then(formatSubmitResponse);
 }
 
 module.exports = submit;

src/transaction/types.js

@@ -6,7 +6,8 @@ export type Instructions = {
   fee?: string,
   maxFee?: string,
   maxLedgerVersion?: number,
-  maxLedgerVersionOffset?: number
+  maxLedgerVersionOffset?: number,
+  signersCount?: number
 }
 
 export type Prepare = {
@@ -17,3 +18,12 @@ export type Prepare = {
    maxLedgerVersion?: number
  }
 }
+
+export type Submit = {
+  success: boolean,
+  engineResult: string,
+  engineResultCode: number,
+  engineResultMessage?: string,
+  txBlob?: string,
+  txJson?: Object
+}

src/transaction/utils.js

@@ -27,6 +27,10 @@ function setCanonicalFlag(txJSON) {
   txJSON.Flags = txJSON.Flags >>> 0;
 }
 
+function scaleValue(value, multiplier) {
+  return (new BigNumber(value)).times(multiplier).toString();
+}
+
 function prepareTransaction(txJSON: Object, api: Object,
     instructions: Instructions
 ): Promise<Prepare> {
@@ -51,8 +55,10 @@ function prepareTransaction(txJSON: Object, api: Object,
   }
 
   function prepareFee(): Promise<Object> {
+    const multiplier = instructions.signersCount === undefined ? 1 :
+      instructions.signersCount + 1;
     if (instructions.fee !== undefined) {
-      txJSON.Fee = common.xrpToDrops(instructions.fee);
+      txJSON.Fee = scaleValue(common.xrpToDrops(instructions.fee), multiplier);
       return Promise.resolve(txJSON);
     }
     const cushion = api._feeCushion;
@@ -60,9 +66,10 @@ function prepareTransaction(txJSON: Object, api: Object,
       const feeDrops = common.xrpToDrops(fee);
       if (instructions.maxFee !== undefined) {
         const maxFeeDrops = common.xrpToDrops(instructions.maxFee);
-        txJSON.Fee = BigNumber.min(feeDrops, maxFeeDrops).toString();
+        const normalFee = BigNumber.min(feeDrops, maxFeeDrops).toString();
+        txJSON.Fee = scaleValue(normalFee, multiplier);
       } else {
-        txJSON.Fee = feeDrops;
+        txJSON.Fee = scaleValue(feeDrops, multiplier);
       }
       return txJSON;
     });

test/api-test.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-nested-callbacks */
-'use strict';
+'use strict'; // eslint-disable-line
 const _ = require('lodash');
 const assert = require('assert-diff');
 const setupAPI = require('./setup-api');
@@ -14,8 +14,12 @@ const address = addresses.ACCOUNT;
 const utils = RippleAPI._PRIVATE.ledgerUtils;
 const ledgerClosed = require('./fixtures/rippled/ledger-close-newer');
 const schemaValidator = RippleAPI._PRIVATE.schemaValidator;
+const binary = require('ripple-binary-codec');
 assert.options.strict = true;
 
+// how long before each test case times out
+const TIMEOUT = process.browser ? 25000 : 10000;
+
 function unused() {
 }
 
@@ -37,6 +41,7 @@ function checkResult(expected, schemaName, response) {
 
 
 describe('RippleAPI', function() {
+  this.timeout(TIMEOUT);
   const instructions = {maxLedgerVersionOffset: 100};
   beforeEach(setupAPI.setup);
   afterEach(setupAPI.teardown);
@@ -94,7 +99,7 @@ describe('RippleAPI', function() {
     });
 
     it('preparePayment with all options specified', function() {
-      return this.api.getLedgerVersion().then((ver) => {
+      return this.api.getLedgerVersion().then(ver => {
         const localInstructions = {
           maxLedgerVersion: ver + 100,
           fee: '0.000012'
@@ -183,20 +188,20 @@ describe('RippleAPI', function() {
 
   it('prepareSettings', function() {
     return this.api.prepareSettings(
-      address, requests.prepareSettings, instructions).then(
+      address, requests.prepareSettings.domain, instructions).then(
       _.partial(checkResult, responses.prepareSettings.flags, 'prepare'));
   });
 
   it('prepareSettings - no maxLedgerVersion', function() {
     return this.api.prepareSettings(
-      address, requests.prepareSettings, {maxLedgerVersion: null}).then(
+      address, requests.prepareSettings.domain, {maxLedgerVersion: null}).then(
       _.partial(checkResult, responses.prepareSettings.noMaxLedgerVersion,
         'prepare'));
   });
 
   it('prepareSettings - no instructions', function() {
     return this.api.prepareSettings(
-      address, requests.prepareSettings).then(
+      address, requests.prepareSettings.domain).then(
       _.partial(
         checkResult,
         responses.prepareSettings.noInstructions,
@@ -244,6 +249,23 @@ describe('RippleAPI', function() {
         'prepare'));
   });
 
+  it('prepareSettings - set signers', function() {
+    const settings = requests.prepareSettings.signers;
+    return this.api.prepareSettings(address, settings, instructions).then(
+      _.partial(checkResult, responses.prepareSettings.signers,
+        'prepare'));
+  });
+
+  it('prepareSettings - fee for multisign', function() {
+    const localInstructions = _.defaults({
+      signersCount: 4
+    }, instructions);
+    return this.api.prepareSettings(
+      address, requests.prepareSettings.domain, localInstructions).then(
+      _.partial(checkResult, responses.prepareSettings.flagsMultisign,
+        'prepare'));
+  });
+
   it('prepareSuspendedPaymentCreation', function() {
     const localInstructions = _.defaults({
       maxFee: '0.000012'
@@ -305,6 +327,15 @@ describe('RippleAPI', function() {
     schemaValidator.schemaValidate('sign', result);
   });
 
+  it('sign - already signed', function() {
+    const secret = 'shsWGZcmZz6YsWWmcnpfr6fLTdtFV';
+    const result = this.api.sign(requests.sign.normal.txJSON, secret);
+    assert.throws(() => {
+      const tx = JSON.stringify(binary.decode(result.signedTransaction));
+      this.api.sign(tx, secret);
+    }, /txJSON must not contain "TxnSignature" or "Signers" properties/);
+  });
+
   it('sign - SuspendedPaymentExecution', function() {
     const secret = 'snoPBrXtMeMyMHUVTgbuqAfg1SUTb';
     const result = this.api.sign(requests.sign.suspended.txJSON, secret);
@@ -312,6 +343,14 @@ describe('RippleAPI', function() {
     schemaValidator.schemaValidate('sign', result);
   });
 
+  it('sign - signAs', function() {
+    const txJSON = requests.sign.signAs;
+    const secret = 'snoPBrXtMeMyMHUVTgbuqAfg1SUTb';
+    const signature = this.api.sign(JSON.stringify(txJSON), secret,
+      {signAs: 'rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh'});
+    assert.deepEqual(signature, responses.sign.signAs);
+  });
+
   it('submit', function() {
     return this.api.submit(responses.sign.normal.signedTransaction).then(
       _.partial(checkResult, responses.submit, 'submit'));
@@ -326,6 +365,21 @@ describe('RippleAPI', function() {
     });
   });
 
+  it('combine', function() {
+    const combined = this.api.combine(requests.combine.setDomain);
+    checkResult(responses.combine.single, 'sign', combined);
+  });
+
+  it('combine - different transactions', function() {
+    const request = [requests.combine.setDomain[0]];
+    const tx = binary.decode(requests.combine.setDomain[0]);
+    tx.Flags = 0;
+    request.push(binary.encode(tx));
+    assert.throws(() => {
+      this.api.combine(request);
+    }, /txJSON is not the same for all signedTransactions/);
+  });
+
   describe('RippleAPI', function() {
 
     it('getBalances', function() {
@@ -654,6 +708,21 @@ describe('RippleAPI', function() {
       });
     });
 
+    it('getTransaction - amendment', function() {
+      const hash =
+        'A971B83ABED51D83749B73F3C1AAA627CD965AFF74BE8CD98299512D6FB0658F';
+      return this.api.getTransaction(hash).then(result => {
+        assert.deepEqual(result, responses.getTransaction.amendment);
+      });
+    });
+
+    it('getTransaction - feeUpdate', function() {
+      const hash =
+        'C6A40F56127436DCD830B1B35FF939FD05B5747D30D6542572B7A835239817AF';
+      return this.api.getTransaction(hash).then(result => {
+        assert.deepEqual(result, responses.getTransaction.feeUpdate);
+      });
+    });
   });
 
   it('getTransactions', function() {
@@ -914,7 +983,11 @@ describe('RippleAPI', function() {
   });
 
   it('getServerInfo - error', function() {
-    this.mockRippled.returnErrorOnServerInfo = true;
+    this.api.connection._send(JSON.stringify({
+      command: 'config',
+      data: {returnErrorOnServerInfo: true}
+    }));
+
     return this.api.getServerInfo().then(() => {
       assert(false, 'Should throw NetworkError');
     }).catch(error => {
@@ -923,6 +996,19 @@ describe('RippleAPI', function() {
     });
   });
 
+  it('getServerInfo - no validated ledger', function() {
+    this.api.connection._send(JSON.stringify({
+      command: 'config',
+      data: {serverInfoWithoutValidated: true}
+    }));
+
+    return this.api.getServerInfo().then(info => {
+      assert.strictEqual(info.networkLedger, 'waiting');
+    }).catch(error => {
+      assert(false, 'Should not throw Error, got ' + String(error));
+    });
+  });
+
   it('getFee', function() {
     return this.api.getFee().then(fee => {
       assert.strictEqual(fee, '0.000012');
@@ -1012,6 +1098,15 @@ describe('RippleAPI', function() {
     });
   });
 
+  it('getPaths - no paths source amount', function() {
+    return this.api.getPaths(requests.getPaths.NoPathsSource).then(() => {
+      assert(false, 'Should throw NotFoundError');
+    }).catch(error => {
+      assert(error instanceof this.api.errors.NotFoundError);
+    });
+  });
+
+
   it('getPaths - no paths with source currencies', function() {
     const pathfind = requests.getPaths.NoPathsWithCurrencies;
     return this.api.getPaths(pathfind).then(() => {
@@ -1035,7 +1130,7 @@ describe('RippleAPI', function() {
   });
 
   it('getLedgerVersion', function(done) {
-    this.api.getLedgerVersion().then((ver) => {
+    this.api.getLedgerVersion().then(ver => {
       assert.strictEqual(ver, 8819951);
       done();
     }, done);
@@ -1255,7 +1350,7 @@ describe('RippleAPI - offline', function() {
   it('prepareSettings and sign', function() {
     const api = new RippleAPI();
     const secret = 'shsWGZcmZz6YsWWmcnpfr6fLTdtFV';
-    const settings = requests.prepareSettings;
+    const settings = requests.prepareSettings.domain;
     const instructions = {
       sequence: 23,
       maxLedgerVersion: 8820051,

test/broadcast-api-test.js

@@ -8,6 +8,8 @@ const ledgerClosed = require('./fixtures/rippled/ledger-close');
 const RippleAPI = require('ripple-api').RippleAPI;
 const schemaValidator = RippleAPI._PRIVATE.schemaValidator;
 
+const TIMEOUT = process.browser ? 25000 : 10000;
+
 function checkResult(expected, schemaName, response) {
   if (expected.txJSON) {
     assert(response.txJSON);
@@ -21,12 +23,15 @@ function checkResult(expected, schemaName, response) {
 }
 
 describe('RippleAPIBroadcast', function() {
+  this.timeout(TIMEOUT);
   beforeEach(setupAPI.setupBroadcast);
   afterEach(setupAPI.teardown);
 
   it('base', function() {
     const expected = {request_server_info: 1};
+    if (!process.browser) {
       this.mocks.forEach(mock => mock.expect(_.assign({}, expected)));
+    }
     assert(this.api.isConnected());
     return this.api.getServerInfo().then(
       _.partial(checkResult, responses.getServerInfo, 'getServerInfo'));
@@ -39,14 +44,16 @@ describe('RippleAPIBroadcast', function() {
     });
     const ledgerNext = _.assign({}, ledgerClosed);
     ledgerNext.ledger_index++;
-    this.mocks.forEach(mock => mock.socket.send(JSON.stringify(ledgerNext)));
+
+    this.api._apis.forEach(api => api.connection._send(JSON.stringify({
+      command: 'echo',
+      data: ledgerNext
+    })));
 
     setTimeout(() => {
-      console.log('-- ledgerVersion', this.api.ledgerVersion);
       assert.strictEqual(gotLedger, 1);
       done();
-    }, 50);
-
+    }, 1250);
   });
 
   it('error propagation', function(done) {
@@ -55,8 +62,10 @@ describe('RippleAPIBroadcast', function() {
       assert.strictEqual(info, 'info');
       done();
     });
-    this.mocks[1].socket.send(
-      JSON.stringify({error: 'type', error_message: 'info'}));
+    this.api._apis[1].connection._send(JSON.stringify({
+      command: 'echo',
+      data: {error: 'type', error_message: 'info'}
+    }));
   });
 
 });

test/connection-test.js

@@ -1,5 +1,5 @@
+'use strict'; // eslint-disable-line 
 /* eslint-disable max-nested-callbacks */
-'use strict';
 
 const _ = require('lodash');
 const net = require('net');
@@ -7,8 +7,11 @@ const assert = require('assert-diff');
 const setupAPI = require('./setup-api');
 const RippleAPI = require('ripple-api').RippleAPI;
 const utils = RippleAPI._PRIVATE.ledgerUtils;
+const ledgerClose = require('./fixtures/rippled/ledger-close.json');
 
 
+const TIMEOUT = 200000;   // how long before each test case times out
+
 function unused() {
 }
 
@@ -26,6 +29,7 @@ function createServer() {
 }
 
 describe('Connection', function() {
+  this.timeout(TIMEOUT);
   beforeEach(setupAPI.setup);
   afterEach(setupAPI.teardown);
 
@@ -46,6 +50,9 @@ describe('Connection', function() {
         messages.push(message);
       }
     };
+    connection._ws = {
+      send: function() {}
+    };
     connection._onMessage(message1);
     connection._send(message2);
 
@@ -53,11 +60,15 @@ describe('Connection', function() {
   });
 
   it('with proxy', function(done) {
-    createServer().then((server) => {
+    if (process.browser) {
+      done();
+      return;
+    }
+    createServer().then(server => {
       const port = server.address().port;
       const expect = 'CONNECT localhost';
-      server.on('connection', (socket) => {
-        socket.on('data', (data) => {
+      server.on('connection', socket => {
+        socket.on('data', data => {
           const got = data.toString('ascii', 0, expect.length);
           assert.strictEqual(got, expect);
           server.close();
@@ -95,10 +106,33 @@ describe('Connection', function() {
     });
   });
 
+  it('should throw NotConnectedError if server not responding ', function(
+    done
+  ) {
+    if (process.browser) {
+      const phantomTest = /PhantomJS/;
+      if (phantomTest.test(navigator.userAgent)) {
+        // inside PhantomJS this one just hangs, so skip as not very relevant
+        done();
+        return;
+      }
+    }
+
+    // Address where no one listens
+    const connection =
+      new utils.common.Connection('ws://testripple.circleci.com:129');
+    connection.on('error', done);
+    connection.connect().catch(error => {
+      assert(error instanceof this.api.errors.NotConnectedError);
+      done();
+    });
+  });
+
   it('DisconnectedError', function() {
-    this.api.connection._send = function() {
-      this._ws.close();
-    };
+    this.api.connection._send(JSON.stringify({
+      command: 'config',
+      data: {disconnectOnServerInfo: true}
+    }));
     return this.api.getServerInfo().then(() => {
       assert(false, 'Should throw DisconnectedError');
     }).catch(error => {
@@ -160,6 +194,114 @@ describe('Connection', function() {
     }, 1);
   });
 
+  describe('reconnection test', function() {
+    beforeEach(function() {
+      this.api.connection.__workingUrl = this.api.connection._url;
+      this.api.connection.__doReturnBad = function() {
+        this._url = this.__badUrl;
+        const self = this;
+        function onReconnect(num) {
+          if (num >= 2) {
+            self._url = self.__workingUrl;
+            self.removeListener('reconnecting', onReconnect);
+          }
+        }
+        this.on('reconnecting', onReconnect);
+      };
+    });
+
+    afterEach(function() {
+
+    });
+
+    it('reconnect on several unexpected close', function(done) {
+      if (process.browser) {
+        const phantomTest = /PhantomJS/;
+        if (phantomTest.test(navigator.userAgent)) {
+          // inside PhantomJS this one just hangs, so skip as not very relevant
+          done();
+          return;
+        }
+      }
+      this.timeout(70001);
+      const self = this;
+      self.api.connection.__badUrl = 'ws://testripple.circleci.com:129';
+      function breakConnection() {
+        self.api.connection.__doReturnBad();
+        self.api.connection._send(JSON.stringify({
+          command: 'test_command',
+          data: {disconnectIn: 10}
+        }));
+      }
+
+      let connectsCount = 0;
+      let disconnectsCount = 0;
+      let reconnectsCount = 0;
+      let code = 0;
+      this.api.connection.on('reconnecting', () => {
+        reconnectsCount += 1;
+      });
+      this.api.connection.on('disconnected', _code => {
+        code = _code;
+        disconnectsCount += 1;
+      });
+      const num = 3;
+      this.api.connection.on('connected', () => {
+        connectsCount += 1;
+        if (connectsCount < num) {
+          breakConnection();
+        }
+        if (connectsCount === num) {
+          if (disconnectsCount !== num) {
+            done(new Error('disconnectsCount must be equal to ' + num +
+              '(got ' + disconnectsCount + ' instead)'));
+          } else if (reconnectsCount !== num * 2) {
+            done(new Error('reconnectsCount must be equal to ' + num * 2 +
+              ' (got ' + reconnectsCount + ' instead)'));
+          } else if (code !== 1006) {
+            done(new Error('disconnect must send code 1006 (got ' + code +
+              ' instead)'));
+          } else {
+            done();
+          }
+        }
+      });
+
+      breakConnection();
+    });
+  });
+
+  it('should emit disconnected event with code 1000 (CLOSE_NORMAL)',
+  function(done
+  ) {
+    this.api.once('disconnected', code => {
+      assert.strictEqual(code, 1000);
+      done();
+    });
+    this.api.disconnect();
+  });
+
+  it('should emit disconnected event with code 1006 (CLOSE_ABNORMAL)',
+  function(done
+  ) {
+    this.api.once('error', error => {
+      done(new Error('should not throw error, got ' + String(error)));
+    });
+    this.api.once('disconnected', code => {
+      assert.strictEqual(code, 1006);
+      done();
+    });
+    this.api.connection._send(JSON.stringify({
+      command: 'test_command',
+      data: {disconnectIn: 10}
+    }));
+  });
+
+  it('should emit connected event on after reconnect', function(done) {
+    this.api.once('connected', done);
+    this.api.connection._ws.close();
+  });
+
   it('Multiply connect calls', function() {
     return this.api.connect().then(() => {
       return this.api.connect();
@@ -167,7 +309,7 @@ describe('Connection', function() {
   });
 
   it('hasLedgerVersion', function() {
-    return this.api.connection.hasLedgerVersion(8819951).then((result) => {
+    return this.api.connection.hasLedgerVersion(8819951).then(result => {
       assert(result);
     });
   });
@@ -261,4 +403,59 @@ describe('Connection', function() {
 
     this.api.connection._onMessage(JSON.stringify({type: 'unknown'}));
   });
+
+  it('ledger close without validated_ledgers', function(done) {
+    const message = _.omit(ledgerClose, 'validated_ledgers');
+    this.api.on('ledger', function(ledger) {
+      assert.strictEqual(ledger.ledgerVersion, 8819951);
+      done();
+    });
+    this.api.connection._ws.emit('message', JSON.stringify(message));
+  });
+
+  it('should throw RippledNotInitializedError if server does not have ' +
+  'validated ledgers',
+  function() {
+    this.timeout(3000);
+
+    this.api.connection._send(JSON.stringify({
+      command: 'global_config',
+      data: {returnEmptySubscribeRequest: 1}
+    }));
+
+    const api = new RippleAPI({server: this.api.connection._url});
+    return api.connect().then(() => {
+      assert(false, 'Must have thrown!');
+    }, error => {
+      assert(error instanceof this.api.errors.RippledNotInitializedError,
+        'Must throw RippledNotInitializedError, got instead ' + String(error));
+    });
+  });
+
+  it('should try to reconnect on empty subscribe response on reconnect',
+  function(done) {
+    this.timeout(23000);
+
+    this.api.on('error', error => {
+      done(error || new Error('Should not emit error.'));
+    });
+    let disconncedCount = 0;
+    this.api.on('connected', () => {
+      done(disconncedCount !== 1 ?
+        new Error('Wrong number of disconnects') : undefined);
+    });
+    this.api.on('disconnected', () => {
+      disconncedCount++;
+    });
+
+    this.api.connection._send(JSON.stringify({
+      command: 'global_config',
+      data: {returnEmptySubscribeRequest: 3}
+    }));
+
+    this.api.connection._send(JSON.stringify({
+      command: 'test_command',
+      data: {disconnectIn: 10}
+    }));
+  });
 });

test/fixtures/addresses.js

@@ -6,5 +6,6 @@ module.exports = {
   FOURTH_ACCOUNT: 'rJnZ4YHCUsHvQu7R6mZohevKJDHFzVD6Zr',
   ISSUER: 'rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM',
   NOTFOUND: 'rajTAg3hon5Lcu1RxQQPxTgHvqfhc1EaUS',
-  SECRET: 'shsWGZcmZz6YsWWmcnpfr6fLTdtFV'
+  SECRET: 'shsWGZcmZz6YsWWmcnpfr6fLTdtFV',
+  SOURCE_LOW_FUNDS: 'rhVgDEfS1r1fLyRUZCpab4TdowZcAJwHy2'
 };

test/fixtures/requests/combine.json

@@ -0,0 +1,2 @@
+[ "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1F1" ]

test/fixtures/requests/getpaths/no-paths-source-amount.json

@@ -0,0 +1,13 @@
+{
+  "source": {
+    "address": "rhVgDEfS1r1fLyRUZCpab4TdowZcAJwHy2",
+    "amount": {
+      "value": "1000002",
+      "currency": "USD"
+    }
+  },
+  "destination": {
+    "address": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59",
+    "amount": {"currency": "USD"}
+  }
+}

test/fixtures/requests/getpaths/send-all.json

@@ -3,7 +3,7 @@
     "address": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59",
     "amount": {
       "currency": "USD",
-      "value": "5"
+      "value": "5.00"
     }
   },
   "destination": {

test/fixtures/requests/index.js

@@ -20,7 +20,10 @@ module.exports = {
     allOptions: require('./prepare-payment-all-options'),
     noCounterparty: require('./prepare-payment-no-counterparty')
   },
-  prepareSettings: require('./prepare-settings'),
+  prepareSettings: {
+    domain: require('./prepare-settings'),
+    signers: require('./prepare-settings-signers')
+  },
   prepareSuspendedPaymentCreation: {
     normal: require('./prepare-suspended-payment-creation'),
     full: require('./prepare-suspended-payment-creation-full')
@@ -40,7 +43,8 @@ module.exports = {
   },
   sign: {
     normal: require('./sign'),
-    suspended: require('./sign-suspended.json')
+    suspended: require('./sign-suspended.json'),
+    signAs: require('./sign-as')
   },
   getPaths: {
     normal: require('./getpaths/normal'),
@@ -49,6 +53,7 @@ module.exports = {
     XrpToXrpNotEnough: require('./getpaths/xrp2xrp-not-enough'),
     NotAcceptCurrency: require('./getpaths/not-accept-currency'),
     NoPaths: require('./getpaths/no-paths'),
+    NoPathsSource: require('./getpaths/no-paths-source-amount'),
     NoPathsWithCurrencies: require('./getpaths/no-paths-with-currencies'),
     sendAll: require('./getpaths/send-all'),
     invalid: require('./getpaths/invalid'),
@@ -61,5 +66,8 @@ module.exports = {
   computeLedgerHash: {
     header: require('./compute-ledger-hash'),
     transactions: require('./compute-ledger-hash-transactions')
+  },
+  combine: {
+    setDomain: require('./combine.json')
   }
 };

test/fixtures/requests/prepare-settings-signers.json

@@ -0,0 +1,19 @@
+{
+  "signers": {
+    "threshold": 2,
+    "weights": [
+      {
+        "address": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59",
+        "weight": 1
+      },
+      {
+        "address": "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo",
+        "weight": 1
+      },
+      {
+        "address": "rwBYyfufTzk77zUSKEu4MvixfarC35av1J",
+        "weight": 1
+      }
+    ]
+  }
+}

test/fixtures/requests/sign-as.json

@@ -0,0 +1,8 @@
+{
+  "Account": "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
+  "Amount": "1000000000",
+  "Destination": "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
+  "Fee": "50",
+  "Sequence": 2,
+  "TransactionType": "Payment"
+}

test/fixtures/responses/combine.json

@@ -0,0 +1,4 @@
+{
+  "signedTransaction": "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "id": "8A3BFD2214B4C8271ED62648FCE9ADE4EE82EF01827CF7D1F7ED497549A368CC"
+}

test/fixtures/responses/get-ledger-full.json

@@ -34,6 +34,10 @@
       "outcome": {
         "result": "tesSUCCESS",
         "fee": "0.00001",
+        "deliveredAmount": {
+          "currency": "XRP",
+          "value": "10000"
+        },
         "balanceChanges": {
           "rLQBHVhFnaC5gLEkgr6HgBJJ3bgeZHg9cj": [
             {

test/fixtures/responses/get-transaction-amendment.json

@@ -0,0 +1,17 @@
+{
+  "type": "amendment",
+  "address": "rrrrrrrrrrrrrrrrrrrrrhoLvTp",
+  "sequence": 0,
+  "id": "A971B83ABED51D83749B73F3C1AAA627CD965AFF74BE8CD98299512D6FB0658F",
+  "specification": {
+    "amendment": "42426C4D4F1009EE67080A9B7965B44656D7714D104A72F9B4369F97ABF044EE"
+  },
+  "outcome": {
+    "result": "tesSUCCESS",
+    "timestamp": "2016-05-05T16:33:30.000Z",
+    "fee": "0",
+    "balanceChanges": {},
+    "orderbookChanges": {},
+    "indexInLedger": 0
+  }
+}

test/fixtures/responses/get-transaction-fee-update.json

@@ -0,0 +1,21 @@
+{
+  "type": "feeUpdate",
+  "address": "rrrrrrrrrrrrrrrrrrrrrhoLvTp",
+  "sequence": 0,
+  "id": "C6A40F56127436DCD830B1B35FF939FD05B5747D30D6542572B7A835239817AF",
+  "specification": {
+    "baseFeeXRP": "0.00001",
+    "referenceFeeUnits": 10,
+    "reserveBaseXRP": "50",
+    "reserveIncrementXRP": "12.5"
+  },
+  "outcome": {
+    "result": "tesSUCCESS",
+    "timestamp": "2014-08-08T16:57:50.000Z",
+    "fee": "0",
+    "balanceChanges": {},
+    "orderbookChanges": {},
+    "ledgerVersion": 3717633,
+    "indexInLedger": 3
+  }
+}

test/fixtures/responses/get-transaction-payment.json

@@ -24,6 +24,11 @@
     "result": "tesSUCCESS",
     "timestamp": "2013-03-12T23:56:50.000Z",
     "fee": "0.00001",
+    "deliveredAmount": {
+      "currency": "USD",
+      "value": "0.001",
+      "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+    },
     "balanceChanges": {
       "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
         {

test/fixtures/responses/get-transactions.json

@@ -30,6 +30,11 @@
     "outcome": {
       "result": "tesSUCCESS",
       "fee": "0.00001",
+      "deliveredAmount": {
+        "currency": "USD",
+        "value": "0.001",
+        "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+      },
       "balanceChanges": {
         "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
           {
@@ -122,6 +127,11 @@
     "outcome": {
       "result": "tesSUCCESS",
       "fee": "0.00001",
+      "deliveredAmount": {
+        "currency": "USD",
+        "value": "0.001",
+        "counterparty": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
+      },
       "balanceChanges": {
         "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo": [
           {

test/fixtures/responses/index.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'; // eslint-disable-line strict
 
 module.exports = {
   generateAddress: require('./generate-address.json'),
@@ -43,7 +43,9 @@ module.exports = {
     suspendedPaymentExecution:
       require('./get-transaction-suspended-payment-execution.json'),
     suspendedPaymentExecutionSimple:
-      require('./get-transaction-suspended-payment-execution-simple.json')
+      require('./get-transaction-suspended-payment-execution-simple.json'),
+    amendment: require('./get-transaction-amendment.json'),
+    feeUpdate: require('./get-transaction-fee-update.json')
   },
   getTransactions: {
     normal: require('./get-transactions.json'),
@@ -81,13 +83,15 @@ module.exports = {
     regularKey: require('./prepare-settings-regular-key.json'),
     removeRegularKey: require('./prepare-settings-remove-regular-key.json'),
     flags: require('./prepare-settings.json'),
+    flagsMultisign: require('./prepare-settings-multisign.json'),
     flagSet: require('./prepare-settings-flag-set.json'),
     flagClear: require('./prepare-settings-flag-clear.json'),
     setTransferRate: require('./prepare-settings-set-transfer-rate.json'),
     fieldClear: require('./prepare-settings-field-clear.json'),
     noInstructions: require('./prepare-settings-no-instructions.json'),
     signed: require('./prepare-settings-signed.json'),
-    noMaxLedgerVersion: require('./prepare-settings-no-maxledgerversion.json')
+    noMaxLedgerVersion: require('./prepare-settings-no-maxledgerversion.json'),
+    signers: require('./prepare-settings-signers.json')
   },
   prepareSuspendedPaymentCreation: {
     normal: require('./prepare-suspended-payment-creation'),
@@ -108,7 +112,11 @@ module.exports = {
   },
   sign: {
     normal: require('./sign.json'),
-    suspended: require('./sign-suspended.json')
+    suspended: require('./sign-suspended.json'),
+    signAs: require('./sign-as')
+  },
+  combine: {
+    single: require('./combine.json')
   },
   submit: require('./submit.json'),
   ledgerEvent: require('./ledger-event.json')

test/fixtures/responses/prepare-settings-multisign.json

@@ -0,0 +1,8 @@
+{
+  "txJSON": "{\"TransactionType\":\"AccountSet\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Memos\":[{\"Memo\":{\"MemoData\":\"7465787465642064617461\",\"MemoType\":\"74657374\",\"MemoFormat\":\"706C61696E2F74657874\"}}],\"Domain\":\"726970706C652E636F6D\",\"Flags\":2147483648,\"LastLedgerSequence\":8820051,\"Fee\":\"60\",\"Sequence\":23}",
+  "instructions": {
+    "fee": "0.00006",
+    "sequence": 23,
+    "maxLedgerVersion": 8820051
+  }
+}

test/fixtures/responses/prepare-settings-signers.json

@@ -0,0 +1,8 @@
+{
+  "txJSON": "{\"TransactionType\":\"SignerListSet\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"SignerQuorum\":2,\"SignerEntries\":[{\"SignerEntry\":{\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"SignerWeight\":1}},{\"SignerEntry\":{\"Account\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"SignerWeight\":1}},{\"SignerEntry\":{\"Account\":\"rwBYyfufTzk77zUSKEu4MvixfarC35av1J\",\"SignerWeight\":1}}],\"Flags\":2147483648,\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
+  "instructions": {
+    "fee": "0.000012",
+    "sequence": 23,
+    "maxLedgerVersion": 8820051
+  }
+}

test/fixtures/responses/sign-as.json

@@ -0,0 +1,4 @@
+{
+  "signedTransaction": "120000240000000261400000003B9ACA00684000000000000032730081142E244E6F20104E57C0C60BD823CB312BF10928C78314B5F762798A53D543A014CAF8B297CFF8F2F937E8F3E01073210330E7FC9D56BB25D6893BA3F317AE5BCF33B3291BD63DB32654A313222F7FD02074473045022100BB6FC77F26BC88587204CAA79B2230C420D7EC937B8AC3A0CF9B0BE988BAB0D002203BF86893BA3B764375FFFAD9D54A4AAEDABD07C4D72ADB9C1B20C10B4DD712898114B5F762798A53D543A014CAF8B297CFF8F2F937E8E1F1",
+  "id": "AB7632D7C07E591658635CED6A5DDE832B22CA066907CB131DEFAAA925B98185"
+}

test/fixtures/rippled/account-offers.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'; // eslint-disable-line strict
 const _ = require('lodash');
 const addresses = require('../addresses');
 
@@ -160,6 +160,7 @@ module.exports = function(request, options = {}) {
         {
           'flags': 0,
           'seq': 814018,
+          'quality': '16922629533.64839',
           'taker_gets': {
             'currency': 'NZD',
             'issuer': 'rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc',

test/fixtures/rippled/empty.json

@@ -0,0 +1,7 @@
+{
+  "id": 0,
+  "status": "success",
+  "type": "response",
+  "result": {
+  }
+}

test/fixtures/rippled/index.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'; // eslint-disable-line 
 
 module.exports = {
   submit: {
@@ -12,6 +12,7 @@ module.exports = {
     withSettingsTx: require('./ledger-with-settings-tx'),
     withStateAsHashes: require('./ledger-with-state-as-hashes')
   },
+  empty: require('./empty'),
   subscribe: require('./subscribe'),
   unsubscribe: require('./unsubscribe'),
   account_info: {
@@ -31,6 +32,8 @@ module.exports = {
   },
   server_info: {
     normal: require('./server-info'),
+    noValidated: require('./server-info-no-validated'),
+    syncing: require('./server-info-syncing'),
     error: require('./server-info-error')
   },
   path_find: {
@@ -38,7 +41,8 @@ module.exports = {
     sendUSD: require('./path-find-send-usd'),
     sendAll: require('./path-find-send-all'),
     XrpToXrp: require('./path-find-xrp-to-xrp'),
-    srcActNotFound: require('./path-find-srcActNotFound')
+    srcActNotFound: require('./path-find-srcActNotFound'),
+    sourceAmountLow: require('./path-find-srcAmtLow')
   },
   tx: {
     Payment: require('./tx/payment.json'),
@@ -68,6 +72,8 @@ module.exports = {
       require('./tx/suspended-payment-execution-simple.json'),
     Unrecognized: require('./tx/unrecognized.json'),
     NoMeta: require('./tx/no-meta.json'),
-    LedgerZero: require('./tx/ledger-zero.json')
+    LedgerZero: require('./tx/ledger-zero.json'),
+    Amendment: require('./tx/amendment.json'),
+    SetFee: require('./tx/set-fee.json')
   }
 };

test/fixtures/rippled/path-find-srcAmtLow.json

@@ -0,0 +1,97 @@
+{
+  "id": 0,
+  "result": {
+    "full_reply": true,
+    "alternatives": [
+      {
+        "paths_canonical": [],
+        "paths_computed": [
+          [
+            {
+              "account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            }
+          ],
+          [
+            {
+              "account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            },
+            {
+              "account": "rLMJ4db4uwHcd6NHg6jvTaYb8sH5Gy4tg5",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            },
+            {
+              "account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            }
+          ],
+          [
+            {
+              "account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            },
+            {
+              "currency": "USD",
+              "issuer": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
+              "type": 48,
+              "type_hex": "0000000000000030"
+            },
+            {
+              "account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            }
+          ],
+          [
+            {
+              "account": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            },
+            {
+              "account": "rLMJ4db4uwHcd6NHg6jvTaYb8sH5Gy4tg5",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            },
+            {
+              "account": "r9vbV3EHvXWjSkeQ6CAcYVPGeq7TuiXY2X",
+              "type": 1,
+              "type_hex": "0000000000000001"
+            }
+          ]
+        ],
+        "source_amount": {
+          "currency": "USD",
+          "issuer": "rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo",
+          "value": "0.000001002"
+        }
+      }
+    ],
+    "source_account": "rhVgDEfS1r1fLyRUZCpab4TdowZcAJwHy2",
+    "destination_amount": {
+      "currency": "USD",
+      "value": "-1",
+      "issuer": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59"
+    },
+    "destination_account": "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59",
+    "destination_currencies": [
+      "JOE",
+      "BTC",
+      "DYM",
+      "CNY",
+      "EUR",
+      "015841551A748AD2C1F76FF6ECB0CCCD00000000",
+      "MXN",
+      "USD",
+      "XRP"
+    ]
+  },
+  "status": "success",
+  "type": "response"
+}

test/fixtures/rippled/server-info-no-validated.json

@@ -0,0 +1,31 @@
+{
+  "id": 0,
+  "status": "success",
+  "type": "response",
+  "result": {
+    "info": {
+      "build_version": "0.30.1-hf2",
+      "complete_ledgers": "empty",
+      "hostid": "ARTS",
+      "io_latency_ms": 1,
+      "last_close": {
+        "converge_time_s": 2.007,
+        "proposers": 4
+      },
+      "load_factor": 1,
+      "peers": 53,
+      "pubkey_node": "n94wWvFUmaKGYrKUGgpv1DyYgDeXRGdACkNQaSe7zJiy5Znio7UC",
+      "server_state": "connected",
+      "network_ledger" : "waiting",
+      "closed_ledger": {
+        "age": 5,
+        "base_fee_xrp": 0.00001,
+        "hash": "4482DEE5362332F54A4036ED57EE1767C9F33CF7CE5A6670355C16CECE381D46",
+        "reserve_base_xrp": 20,
+        "reserve_inc_xrp": 5,
+        "seq": 6595042
+      },
+      "validation_quorum": 3
+    }
+  }
+}

test/fixtures/rippled/server-info-syncing.json

@@ -0,0 +1,30 @@
+{
+  "id": 0,
+  "status": "success",
+  "type": "response",
+  "result": {
+    "info": {
+      "build_version": "0.24.0-rc1",
+      "complete_ledgers": "32570-6595042",
+      "hostid": "ARTS",
+      "io_latency_ms": 1,
+      "last_close": {
+        "converge_time_s": 2.007,
+        "proposers": 4
+      },
+      "load_factor": 1,
+      "peers": 53,
+      "pubkey_node": "n94wWvFUmaKGYrKUGgpv1DyYgDeXRGdACkNQaSe7zJiy5Znio7UC",
+      "server_state": "syncing",
+      "validated_ledger": {
+        "age": 5,
+        "base_fee_xrp": 0.00001,
+        "hash": "4482DEE5362332F54A4036ED57EE1767C9F33CF7CE5A6670355C16CECE381D46",
+        "reserve_base_xrp": 20,
+        "reserve_inc_xrp": 5,
+        "seq": 6595042
+      },
+      "validation_quorum": 3
+    }
+  }
+}

test/fixtures/rippled/tx/amendment.json

@@ -0,0 +1,40 @@
+{
+  "id": 0,
+  "status": "success",
+  "type": "response",
+  "result": {
+    "Account": "rrrrrrrrrrrrrrrrrrrrrhoLvTp",
+    "Amendment": "42426C4D4F1009EE67080A9B7965B44656D7714D104A72F9B4369F97ABF044EE",
+    "Fee": "0",
+    "Flags": 65536,
+    "date": 515781210,
+    "LedgerSequence": 20889601,
+    "Sequence": 0,
+    "SigningPubKey": "",
+    "TransactionType": "EnableAmendment",
+    "hash": "A971B83ABED51D83749B73F3C1AAA627CD965AFF74BE8CD98299512D6FB0658F",
+    "meta": {
+      "AffectedNodes": [
+        {
+          "CreatedNode": {
+            "LedgerEntryType": "Amendments",
+            "LedgerIndex": "7DB0788C020F02780A673DC74757F23823FA3014C1866E72CC4CD8B226CD6EF4",
+            "NewFields": {
+              "Majorities": [
+                {
+                  "Majority": {
+                    "Amendment": "42426C4D4F1009EE67080A9B7965B44656D7714D104A72F9B4369F97ABF044EE",
+                    "CloseTime": 515781202
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "TransactionIndex": 0,
+      "TransactionResult": "tesSUCCESS"
+    },
+    "validated": true
+  }
+}

test/fixtures/rippled/tx/set-fee.json

@@ -0,0 +1,43 @@
+{
+  "id": 0,
+  "status": "success",
+  "type": "response",
+  "result": {
+    "hash": "C6A40F56127436DCD830B1B35FF939FD05B5747D30D6542572B7A835239817AF",
+    "ledger_index": 3717633,
+    "date": 460832270,
+    "TransactionType": "SetFee",
+    "Sequence": 0,
+    "ReferenceFeeUnits": 10,
+    "ReserveBase": 50000000,
+    "ReserveIncrement": 12500000,
+    "BaseFee": "000000000000000A",
+    "Fee": "0",
+    "SigningPubKey": "",
+    "Account": "rrrrrrrrrrrrrrrrrrrrrhoLvTp",
+    "meta": {
+      "TransactionIndex": 3,
+      "AffectedNodes": [
+        {
+          "ModifiedNode": {
+            "LedgerEntryType": "FeeSettings",
+            "LedgerIndex": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A651",
+            "PreviousFields": {
+              "ReserveBase": 20000000,
+              "ReserveIncrement": 5000000
+            },
+            "FinalFields": {
+              "Flags": 0,
+              "ReferenceFeeUnits": 10,
+              "ReserveBase": 50000000,
+              "ReserveIncrement": 12500000,
+              "BaseFee": "000000000000000A"
+            }
+          }
+        }
+      ],
+      "TransactionResult": "tesSUCCESS"
+    },
+    "validated": true
+  }
+}

test/hacks/phantomhacks.js

@@ -0,0 +1,37 @@
+'use strict';
+// this one will be directly run in browser, so disable eslint
+/* eslint-disable no-var, no-extend-native, consistent-this, func-style */
+
+(function() {
+  var phantomTest = /PhantomJS/;
+  if (phantomTest.test(navigator.userAgent)) {
+    // mocha-phantomjs-core has wrong shim for Function.bind, so we
+    // will replace it with correct one
+    // this bind polyfill copied from MDN documentation
+    Function.prototype.bind = function(oThis) {
+      if (typeof this !== 'function') {
+        // closest thing possible to the ECMAScript 5
+        // internal IsCallable function
+        throw new TypeError(
+          'Function.prototype.bind - what is trying to be bound is not callable'
+        );
+      }
+
+      var aArgs = Array.prototype.slice.call(arguments, 1);
+      var fToBind = this;
+      var FNOP = function() {};
+      var fBound = function() {
+        return fToBind.apply(this instanceof FNOP ? this : oThis,
+          aArgs.concat(Array.prototype.slice.call(arguments)));
+      };
+
+      if (this.prototype) {
+        // native functions don't have a prototype
+        FNOP.prototype = this.prototype;
+      }
+      fBound.prototype = new FNOP();
+
+      return fBound;
+    };
+  }
+})();

test/integration/fixtures/get-transaction.json

@@ -1,74 +0,0 @@
-{
-  "jsonrpc": "2.0",
-  "id": "2",
-  "result": {
-    "type": "order",
-    "address": "rK5j9n8baXfL4gzUoZsfxBvvsv97P5swaV",
-    "sequence": 7973823,
-    "id": "4EB6B76237DEEE99F1EA16FAACED2D1E69C5F9CB54F727A4ECA51A08AD3AF466",
-    "specification": {
-      "direction": "buy",
-      "quantity": {
-        "currency": "USD",
-        "value": "0.000709756467",
-        "counterparty": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"
-      },
-      "totalPrice": {
-        "currency": "JPY",
-        "value": "0.086630181788",
-        "counterparty": "r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN"
-      }
-    },
-    "outcome": {
-      "result": "tesSUCCESS",
-      "timestamp": "2015-12-03T00:53:21.000Z",
-      "fee": "0.010001",
-      "balanceChanges": {
-        "rK5j9n8baXfL4gzUoZsfxBvvsv97P5swaV": [
-          {
-            "currency": "XRP",
-            "value": "-0.010001"
-          }
-        ]
-      },
-      "orderbookChanges": {
-        "rK5j9n8baXfL4gzUoZsfxBvvsv97P5swaV": [
-          {
-            "direction": "buy",
-            "quantity": {
-              "currency": "USD",
-              "counterparty": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
-              "value": "0.000709260645"
-            },
-            "totalPrice": {
-              "currency": "JPY",
-              "counterparty": "r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN",
-              "value": "0.086665436143"
-            },
-            "sequence": 7973725,
-            "status": "cancelled",
-            "makerExchangeRate": "0.008183892870852266"
-          },
-          {
-            "direction": "buy",
-            "quantity": {
-              "currency": "USD",
-              "counterparty": "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B",
-              "value": "0.000709756467"
-            },
-            "totalPrice": {
-              "currency": "JPY",
-              "counterparty": "r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN",
-              "value": "0.086630181788"
-            },
-            "sequence": 7973823,
-            "status": "created",
-            "makerExchangeRate": "0.008192946757712049"
-          }
-        ]
-      },
-      "ledgerVersion": 17445469,
-      "indexInLedger": 2
-    }
-  }
-}

test/integration/fixtures/get-transactions.json

@@ -1,72 +0,0 @@
-{
-  "jsonrpc": "2.0",
-  "id": "3",
-  "result": [
-    {
-      "type": "order",
-      "address": "rpP2JgiMyTF5jR5hLG3xHCPi1knBb1v9cM",
-      "sequence": 3372206,
-      "id": "848397FA686BD4A59F91EC1F4DE717360470EE8BD67CAA01D5FD333EDA8D97B3",
-      "specification": {
-        "direction": "buy",
-        "quantity": {
-          "currency": "JPY",
-          "value": "27865.90216965619",
-          "counterparty": "rJRi8WW24gt9X85PHAxfWNPCizMMhqUQwg"
-        },
-        "totalPrice": {
-          "currency": "XRP",
-          "value": "40000"
-        }
-      },
-      "outcome": {
-        "result": "tesSUCCESS",
-        "fee": "0.011",
-        "balanceChanges": {
-          "rpP2JgiMyTF5jR5hLG3xHCPi1knBb1v9cM": [
-            {
-              "currency": "XRP",
-              "value": "-0.011"
-            }
-          ]
-        },
-        "orderbookChanges": {
-          "rpP2JgiMyTF5jR5hLG3xHCPi1knBb1v9cM": [
-            {
-              "direction": "buy",
-              "quantity": {
-                "currency": "JPY",
-                "counterparty": "rJRi8WW24gt9X85PHAxfWNPCizMMhqUQwg",
-                "value": "27880.6855384734"
-              },
-              "totalPrice": {
-                "currency": "XRP",
-                "value": "40000"
-              },
-              "sequence": 3372204,
-              "status": "cancelled",
-              "makerExchangeRate": "0.697017138461835"
-            },
-            {
-              "direction": "buy",
-              "quantity": {
-                "currency": "JPY",
-                "counterparty": "rJRi8WW24gt9X85PHAxfWNPCizMMhqUQwg",
-                "value": "27865.90216965619"
-              },
-              "totalPrice": {
-                "currency": "XRP",
-                "value": "40000"
-              },
-              "sequence": 3372206,
-              "status": "created",
-              "makerExchangeRate": "0.6966475542414048"
-            }
-          ]
-        },
-        "ledgerVersion": 17533547,
-        "indexInLedger": 12
-      }
-    }
-  ]
-}

test/integration/fixtures/index.js

@@ -1,6 +0,0 @@
-'use strict';
-
-module.exports = {
-  getTransaction: require('./get-transaction'),
-  getTransactions: require('./get-transactions')
-};

test/integration/http-integration-test.js

@@ -4,18 +4,19 @@ const assert = require('assert-diff');
 const _ = require('lodash');
 const jayson = require('jayson');
 
+const RippleAPI = require('../../src').RippleAPI;
 const createHTTPServer = require('../../src/index').createHTTPServer;
+const {payTo, ledgerAccept} = require('./utils');
 
 const apiFixtures = require('../fixtures');
 const apiRequests = apiFixtures.requests;
 const apiResponses = apiFixtures.responses;
 
-const fixtures = require('./fixtures');
-
 const TIMEOUT = 20000;   // how long before each test case times out
 
+const serverUri = 'ws://127.0.0.1:6006';
 const apiOptions = {
-  server: 'wss://s1.ripple.com'
+  server: serverUri
 };
 
 const httpPort = 3000;
@@ -38,11 +39,14 @@ function random() {
   return _.fill(Array(16), 0);
 }
 
+
 describe('http server integration tests', function() {
   this.timeout(TIMEOUT);
 
   let server = null;
   let client = null;
+  let paymentId = null;
+  let newWallet = null;
 
   function createTestInternal(testName, methodName, params, testFunc, id) {
     it(testName, function() {
@@ -60,6 +64,21 @@ describe('http server integration tests', function() {
       makeNamedParams(params), testFunc, id);
   }
 
+  before(() => {
+    this.api = new RippleAPI({server: serverUri});
+    console.log('CONNECTING...');
+    return this.api.connect().then(() => {
+      console.log('CONNECTED...');
+    })
+    .then(() => ledgerAccept(this.api))
+    .then(() => newWallet = this.api.generateAddress())
+    .then(() => ledgerAccept(this.api))
+    .then(() => payTo(this.api, newWallet.address))
+    .then(paymentId_ => {
+      paymentId = paymentId_;
+    });
+  });
+
   beforeEach(function() {
     server = createHTTPServer(apiOptions, httpPort);
     return server.start().then(() => {
@@ -85,32 +104,49 @@ describe('http server integration tests', function() {
     result => assert(_.isNumber(result.result.validatedLedger.ledgerVersion))
   );
 
-  createTest(
-    'getTransaction',
-    [{id: '4EB6B76237DEEE99F1EA16FAACED2D1E69C5F9CB54F727A4ECA51A08AD3AF466'}],
-    result => assert.deepEqual(result, fixtures.getTransaction),
-    '2'
-  );
+  it('getTransaction', function() {
+    const params = [{id: paymentId}];
+    return new Promise((resolve, reject) => {
+      client.request('getTransaction', makePositionalParams(params),
+        (err, result) => {
+          if (err) {
+            reject(err);
+          }
+          assert.strictEqual(result.result.id, paymentId);
+          const outcome = result.result.outcome;
+          assert.strictEqual(outcome.result, 'tesSUCCESS');
+          assert.strictEqual(outcome.balanceChanges
+            .rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh[0].value, '-4003218.000012');
+          resolve(result);
+        });
+    });
+  });
 
-  createTest(
-    'getTransactions',
-    [{address: 'rpP2JgiMyTF5jR5hLG3xHCPi1knBb1v9cM'}, {
+  it('getTransactions', function() {
+    const params = [{address: newWallet.address}, {
       options: {
         binary: true,
-        limit: 1,
-        start:
-          'FBAAC31D6BAEEFA9E501266FD62DA7A7982662BC19BC42F49BB41405C2F820DB'
+        limit: 1
       }
-    }],
-    result => assert.deepEqual(result, fixtures.getTransactions),
-    '3'
-  );
+    }];
+    return new Promise((resolve, reject) => {
+      client.request('getTransactions', makeNamedParams(params),
+        (err, result) => {
+          if (err) {
+            reject(err);
+          }
+          assert.strictEqual(result.result.length, 1);
+          assert.strictEqual(result.result[0].id, paymentId);
+          resolve(result);
+        });
+    });
+  });
 
   createTest(
     'prepareSettings',
     [
       {address},
-      {settings: apiRequests.prepareSettings},
+      {settings: apiRequests.prepareSettings.domain},
       {instructions: {
         maxFee: '0.000012',
         sequence: 23,

test/integration/integration-test.js

@@ -6,76 +6,186 @@ const assert = require('assert');
 const errors = require('../../src/common/errors');
 const wallet = require('./wallet');
 const requests = require('../fixtures/requests');
-const RippleAPI = require('../../src').RippleAPI;
+const RippleAPI = require('ripple-api').RippleAPI;
 const {isValidAddress} = require('ripple-address-codec');
 const {isValidSecret} = require('../../src/common');
+const {payTo, ledgerAccept} = require('./utils');
 
 
-const TIMEOUT = 30000;   // how long before each test case times out
+// how long before each test case times out
+const TIMEOUT = process.browser ? 25000 : 10000;
 const INTERVAL = 1000;   // how long to wait between checks for validated ledger
 
+const serverUrl = 'ws://127.0.0.1:6006';
 
-function verifyTransaction(testcase, hash, type, options, txData) {
+function acceptLedger(api) {
+  return api.connection.request({command: 'ledger_accept'});
+}
+
+function verifyTransaction(testcase, hash, type, options, txData, address) {
   console.log('VERIFY...');
   return testcase.api.getTransaction(hash, options).then(data => {
     assert(data && data.outcome);
     assert.strictEqual(data.type, type);
-    assert.strictEqual(data.address, wallet.getAddress());
+    assert.strictEqual(data.address, address);
     assert.strictEqual(data.outcome.result, 'tesSUCCESS');
+    if (testcase.transactions !== undefined) {
       testcase.transactions.push(hash);
+    }
     return {txJSON: JSON.stringify(txData), id: hash, tx: data};
   }).catch(error => {
     if (error instanceof errors.PendingLedgerVersionError) {
       console.log('NOT VALIDATED YET...');
       return new Promise((resolve, reject) => {
         setTimeout(() => verifyTransaction(testcase, hash, type,
-          options, txData).then(resolve, reject), INTERVAL);
+          options, txData, address).then(resolve, reject), INTERVAL);
       });
     }
+    console.log(error.stack);
     assert(false, 'Transaction not successful: ' + error.message);
   });
 }
 
-function testTransaction(testcase, type, lastClosedLedgerVersion, prepared) {
+function testTransaction(testcase, type, lastClosedLedgerVersion, prepared,
+    address = wallet.getAddress(), secret = wallet.getSecret()) {
   const txJSON = prepared.txJSON;
   assert(txJSON, 'missing txJSON');
   const txData = JSON.parse(txJSON);
-  assert.strictEqual(txData.Account, wallet.getAddress());
-  const signedData = testcase.api.sign(txJSON, wallet.getSecret());
+  assert.strictEqual(txData.Account, address);
+  const signedData = testcase.api.sign(txJSON, secret);
   console.log('PREPARED...');
-  return testcase.api.submit(signedData.signedTransaction).then(data => {
+  return testcase.api.submit(signedData.signedTransaction)
+  .then(data => testcase.test.title.indexOf('multisign') !== -1 ?
+  acceptLedger(testcase.api).then(() => data) : data).then(data => {
     console.log('SUBMITTED...');
     assert.strictEqual(data.resultCode, 'tesSUCCESS');
     const options = {
       minLedgerVersion: lastClosedLedgerVersion,
       maxLedgerVersion: txData.LastLedgerSequence
     };
+    ledgerAccept(testcase.api);
     return new Promise((resolve, reject) => {
       setTimeout(() => verifyTransaction(testcase, signedData.id, type,
-        options, txData).then(resolve, reject), INTERVAL);
+        options, txData, address).then(resolve, reject), INTERVAL);
     });
   });
 }
 
-function setup() {
-  this.api = new RippleAPI({server: 'wss://s1.ripple.com'});
+function setup(server = 'wss://s1.ripple.com') {
+  this.api = new RippleAPI({server});
   console.log('CONNECTING...');
   return this.api.connect().then(() => {
     console.log('CONNECTED...');
+  }, error => {
+    console.log('ERROR:', error);
+    throw error;
   });
 }
 
+const masterAccount = 'rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh';
+const masterSecret = 'snoPBrXtMeMyMHUVTgbuqAfg1SUTb';
+
+function makeTrustLine(testcase, address, secret) {
+  const api = testcase.api;
+  const specification = {
+    currency: 'USD',
+    counterparty: masterAccount,
+    limit: '1341.1',
+    ripplingDisabled: true
+  };
+  const trust = api.prepareTrustline(address, specification, {})
+    .then(data => {
+      const signed = api.sign(data.txJSON, secret);
+      if (address === wallet.getAddress()) {
+        testcase.transactions.push(signed.id);
+      }
+      return api.submit(signed.signedTransaction);
+    })
+    .then(() => ledgerAccept(api));
+  return trust;
+}
+
+function makeOrder(api, address, specification, secret) {
+  return api.prepareOrder(address, specification)
+    .then(data => api.sign(data.txJSON, secret))
+    .then(signed => api.submit(signed.signedTransaction))
+    .then(() => ledgerAccept(api));
+}
+
+function setupAccounts(testcase) {
+  const api = testcase.api;
+
+  const promise = payTo(api, 'rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM')
+    .then(() => payTo(api, wallet.getAddress()))
+    .then(() => payTo(api, testcase.newWallet.address))
+    .then(() => payTo(api, 'rKmBGxocj9Abgy25J51Mk1iqFzW9aVF9Tc'))
+    .then(() => payTo(api, 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q'))
+    .then(() => {
+      return api.prepareSettings(masterAccount, {defaultRipple: true})
+      .then(data => api.sign(data.txJSON, masterSecret))
+      .then(signed => api.submit(signed.signedTransaction))
+      .then(() => ledgerAccept(api));
+    })
+    .then(() => makeTrustLine(testcase, wallet.getAddress(),
+      wallet.getSecret()))
+    .then(() => makeTrustLine(testcase, testcase.newWallet.address,
+      testcase.newWallet.secret))
+    .then(() => payTo(api, wallet.getAddress(), '123', 'USD', masterAccount))
+    .then(() => payTo(api, 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q'))
+    .then(() => {
+      const orderSpecification = {
+        direction: 'buy',
+        quantity: {
+          currency: 'USD',
+          value: '432',
+          counterparty: masterAccount
+        },
+        totalPrice: {
+          currency: 'XRP',
+          value: '432'
+        }
+      };
+      return makeOrder(testcase.api, testcase.newWallet.address,
+        orderSpecification, testcase.newWallet.secret);
+    })
+    .then(() => {
+      const orderSpecification = {
+        direction: 'buy',
+        quantity: {
+          currency: 'XRP',
+          value: '1741'
+        },
+        totalPrice: {
+          currency: 'USD',
+          value: '171',
+          counterparty: masterAccount
+        }
+      };
+      return makeOrder(testcase.api, masterAccount, orderSpecification,
+        masterSecret);
+    });
+  return promise;
+}
+
 function teardown() {
   return this.api.disconnect();
 }
 
 function suiteSetup() {
   this.transactions = [];
-  return setup.bind(this)().then(() => {
-    return this.api.getLedgerVersion().then(ledgerVersion => {
+
+  return setup.bind(this)(serverUrl)
+    .then(() => ledgerAccept(this.api))
+    .then(() => this.newWallet = this.api.generateAddress())
+    // two times to give time to server to send `ledgerClosed` event
+    // so getLedgerVersion will return right value
+    .then(() => ledgerAccept(this.api))
+    .then(() => this.api.getLedgerVersion())
+    .then(ledgerVersion => {
       this.startLedgerVersion = ledgerVersion;
-    });
-  }).then(teardown.bind(this));
+    })
+    .then(() => setupAccounts(this))
+    .then(() => teardown.bind(this)());
 }
 
 describe('integration tests', function() {
@@ -84,14 +194,14 @@ describe('integration tests', function() {
   this.timeout(TIMEOUT);
 
   before(suiteSetup);
-  beforeEach(setup);
+  beforeEach(_.partial(setup, serverUrl));
   afterEach(teardown);
 
 
   it('settings', function() {
     return this.api.getLedgerVersion().then(ledgerVersion => {
       return this.api.prepareSettings(address,
-        requests.prepareSettings, instructions).then(prepared =>
+        requests.prepareSettings.domain, instructions).then(prepared =>
           testTransaction(this, 'settings', ledgerVersion, prepared));
     });
   });
@@ -140,10 +250,10 @@ describe('integration tests', function() {
       }
     };
     return this.api.getLedgerVersion().then(ledgerVersion => {
-      return this.api.prepareOrder(address,
-        orderSpecification, instructions).then(prepared =>
-          testTransaction(this, 'order', ledgerVersion, prepared)
-        ).then(result => {
+      return this.api.prepareOrder(address, orderSpecification, instructions)
+        .then(prepared =>
+          testTransaction(this, 'order', ledgerVersion, prepared))
+        .then(result => {
           const txData = JSON.parse(result.txJSON);
           return this.api.getOrders(address).then(orders => {
             assert(orders && orders.length > 0);
@@ -155,7 +265,8 @@ describe('integration tests', function() {
             assert.deepEqual(createdOrder.specification, orderSpecification);
             return txData;
           });
-        }).then(txData => this.api.prepareOrderCancellation(
+        })
+        .then(txData => this.api.prepareOrderCancellation(
           address, {orderSequence: txData.Sequence}, instructions)
             .then(prepared => testTransaction(this, 'orderCancellation',
               ledgerVersion, prepared))
@@ -232,7 +343,7 @@ describe('integration tests', function() {
   it('getSettings', function() {
     return this.api.getSettings(address).then(data => {
       assert(data);
-      assert.strictEqual(data.domain, requests.prepareSettings.domain);
+      assert.strictEqual(data.domain, requests.prepareSettings.domain.domain);
     });
   });
 
@@ -244,7 +355,7 @@ describe('integration tests', function() {
       },
       counter: {
         currency: 'USD',
-        counterparty: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q'
+        counterparty: masterAccount
       }
     };
     return this.api.getOrderbook(address, orderbook).then(book => {
@@ -272,11 +383,11 @@ describe('integration tests', function() {
         address: address
       },
       destination: {
-        address: 'rKmBGxocj9Abgy25J51Mk1iqFzW9aVF9Tc',
+        address: this.newWallet.address,
         amount: {
-          value: '0.000001',
+          value: '1',
           currency: 'USD',
-          counterparty: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q'
+          counterparty: masterAccount
         }
       }
     };
@@ -289,8 +400,24 @@ describe('integration tests', function() {
     });
   });
 
+
   it('getPaths - send all', function() {
-    const pathfind = requests.getPaths.sendAll;
+    const pathfind = {
+      source: {
+        address: address,
+        amount: {
+          currency: 'USD',
+          value: '0.005'
+        }
+      },
+      destination: {
+        address: this.newWallet.address,
+        amount: {
+          currency: 'USD'
+        }
+      }
+    };
+
     return this.api.getPaths(pathfind).then(data => {
       assert(data && data.length > 0);
       assert(_.every(data, path => {
@@ -313,3 +440,63 @@ describe('integration tests', function() {
   });
 
 });
+
+describe('integration tests - standalone rippled', function() {
+  const instructions = {maxLedgerVersionOffset: 10};
+  this.timeout(TIMEOUT);
+
+  beforeEach(_.partial(setup, serverUrl));
+  afterEach(teardown);
+  const address = 'r5nx8ZkwEbFztnc8Qyi22DE9JYjRzNmvs';
+  const secret = 'ss6F8381Br6wwpy9p582H8sBt19J3';
+  const signer1address = 'rQDhz2ZNXmhxzCYwxU6qAbdxsHA4HV45Y2';
+  const signer1secret = 'shK6YXzwYfnFVn3YZSaMh5zuAddKx';
+  const signer2address = 'r3RtUvGw9nMoJ5FuHxuoVJvcENhKtuF9ud';
+  const signer2secret = 'shUHQnL4EH27V4EiBrj6EfhWvZngF';
+
+  it('submit multisigned transaction', function() {
+    const signers = {
+      threshold: 2,
+      weights: [
+        {address: signer1address, weight: 1},
+        {address: signer2address, weight: 1}
+      ]
+    };
+    let minLedgerVersion = null;
+    return payTo(this.api, address).then(() => {
+      return this.api.getLedgerVersion().then(ledgerVersion => {
+        minLedgerVersion = ledgerVersion;
+        return this.api.prepareSettings(address, {signers}, instructions)
+        .then(prepared => {
+          return testTransaction(this, 'settings', ledgerVersion, prepared,
+            address, secret);
+        });
+      });
+    }).then(() => {
+      const multisignInstructions =
+        _.assign({}, instructions, {signersCount: 2});
+      return this.api.prepareSettings(
+        address, {domain: 'example.com'}, multisignInstructions)
+      .then(prepared => {
+        const signed1 = this.api.sign(
+          prepared.txJSON, signer1secret, {signAs: signer1address});
+        const signed2 = this.api.sign(
+          prepared.txJSON, signer2secret, {signAs: signer2address});
+        const combined = this.api.combine([
+          signed1.signedTransaction, signed2.signedTransaction
+        ]);
+        return this.api.submit(combined.signedTransaction)
+        .then(response => acceptLedger(this.api).then(() => response))
+        .then(response => {
+          assert.strictEqual(response.resultCode, 'tesSUCCESS');
+          const options = {minLedgerVersion};
+          return verifyTransaction(this, combined.id, 'settings',
+            options, {}, address);
+        }).catch(error => {
+          console.log(error.message);
+          throw error;
+        });
+      });
+    });
+  });
+});

test/integration/rippled.cfg

@@ -0,0 +1,961 @@
+#-------------------------------------------------------------------------------
+#
+# Rippled Server Instance Configuration Example
+#
+#-------------------------------------------------------------------------------
+#
+# Contents
+#
+#   1. Server
+#
+#   2. Peer Protocol
+#
+#   3. Ripple Protocol
+#
+#   4. HTTPS Client
+#
+#   5. Database
+#
+#   6. Diagnostics
+#
+#   7. Voting
+#
+#   8. Example Settings
+#
+#-------------------------------------------------------------------------------
+#
+# Purpose
+#
+#   This file documents and provides examples of all rippled server process
+#   configuration options. When the rippled server instance is launched, it
+#   looks for a file with the following name:
+#
+#     rippled.cfg
+#
+#   For more information on where the rippled server instance searches for
+#   the file please visit the Ripple wiki. Specifically, the section explaining
+#   the --conf command line option:
+#
+#     https://ripple.com/wiki/Rippled#--conf.3Dpath
+#
+#   This file should be named rippled.cfg.  This file is UTF-8 with Dos, UNIX,
+#   or Mac style end of lines.  Blank lines and lines beginning with '#' are
+#   ignored. Undefined sections are reserved. No escapes are currently defined.
+#
+# Notation
+#
+#   In this document a simple BNF notation is used. Angle brackets denote
+#   required elements, square brackets denote optional elements, and single
+#   quotes indicate string literals. A vertical bar separating 1 or more
+#   elements is a logical "or"; Any one of the elements may be chosen.
+#   Parenthesis are notational only, and used to group elements, they are not
+#   part of the syntax unless they appear in quotes. White space may always
+#   appear between elements, it has no effect on values.
+#
+#       <key>       A required identifier
+#       '='         The equals sign character
+#       |           Logical "or"
+#       ( )         Used for grouping
+#
+#
+#   An identifier is a string of upper or lower case letters, digits, or
+#   underscores subject to the requirement that the first character of an
+#   identifier must be a letter. Identifiers are not case sensitive (but
+#   values may be).
+#
+#   Some configuration sections contain key/value pairs. A line containing
+#   a key/value pair has this syntax:
+#
+#       <identifier> '=' <value>
+#
+#   Depending on the section and key, different value types are possible:
+#
+#       <integer>   A signed integer
+#       <unsigned>  An unsigned integer
+#       <flag>      A boolean. 1 = true/yes/on, 0 = false/no/off.
+#
+#   Consult the documentation on the key in question to determine the possible
+#   value types.
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 1. Server
+#
+#----------
+#
+#
+#
+#   rippled offers various server protocols to clients making inbound
+#   connections. The listening ports rippled uses are "universal" ports
+#   which may be configured to handshake in one or more of the available
+#   supported protocols. These universal ports simplify administration:
+#   A single open port can be used for multiple protocols.
+#
+#   NOTE    At least one server port must be defined in order
+#           to accept incoming network connections.
+#
+#
+# [server]
+#
+#   A list of port names and key/value pairs. A port name must start with a
+#   letter and contain only letters and numbers. The name is not case-sensitive.
+#   For each name in this list, rippled will look for a configuration file
+#   section with the same name and use it to create a listening port. The
+#   name is informational only; the choice of name does not affect the function
+#   of the listening port.
+#
+#   Key/value pairs specified in this section are optional, and apply to all
+#   listening ports unless the port overrides the value in its section. They
+#   may be considered default values.
+#
+#   Suggestion:
+#
+#       To avoid a conflict with port names and future configuration sections,
+#       we recommend prepending "port_" to the port name. This prefix is not
+#       required, but suggested.
+#
+#   This example defines two ports with different port numbers and settings:
+#
+#       [server]
+#       port_public
+#       port_private
+#       port = 80
+#
+#       [port_public]
+#       ip=0.0.0.0
+#       port = 443
+#       protocol=peer,https
+#
+#       [port_private]
+#       ip=127.0.0.1
+#       protocol=http
+#
+#   When rippled is used as a command line client (for example, issuing a
+#   server stop command), the first port advertising the http or https
+#   protocol will be used to make the connection.
+#
+#
+#
+# [<name>]
+#
+#   A series of key/value pairs that define the settings for the port with
+#   the corresponding name. These keys are possible:
+#
+#   ip = <IP-address>
+#
+#       Required. Determines the IP address of the network interface to bind
+#       to. To bind to all available interfaces, uses 0.0.0.0
+#
+#   port = <number>
+#
+#       Required. Sets the port number to use for this port.
+#
+#   protocol = [ http, https, peer ]
+#
+#       Required. A comma-separated list of protocols to support:
+#
+#       http        JSON-RPC over HTTP
+#       https       JSON-RPC over HTTPS
+#       ws          Websockets
+#       wss         Secure Websockets
+#       peer        Peer Protocol
+#
+#       Restrictions:
+#
+#       Only one port may be configured to support the peer protocol.
+#       A port cannot have websocket and non websocket protocols at the
+#       same time. It is possible have both Websockets and Secure Websockets
+#       together in one port.
+#
+#       NOTE    If no ports support the peer protocol, rippled cannot
+#               receive incoming peer connections or become a superpeer.
+#
+#   user = <text>
+#   password = <text>
+#
+#       When set, these credentials will be required on HTTP/S requests.
+#       The credentials must be provided using HTTP's Basic Authentication
+#       headers. If either or both fields are empty, then no credentials are
+#       required. IP address restrictions, if any, will be checked in addition
+#       to the credentials specified here.
+#
+#       When acting in the client role, rippled will supply these credentials
+#       using HTTP's Basic Authentication headers when making outbound HTTP/S
+#       requests.
+#
+#   admin = [ IP, IP, IP, ... ]
+#
+#       A comma-separated list of IP addresses.
+#
+#       When set, grants administrative command access to the specified IP
+#       addresses. These commands may be issued over http, https, ws, or wss
+#       if configured on the port. If unspecified, the default is to not allow
+#       administrative commands.
+#
+#       *SECURITY WARNING*
+#       0.0.0.0 may be specified to allow access from any IP address. It must
+#       be the only address specified and cannot be combined with other IPs.
+#       Use of this address can compromise server security, please consider its
+#       use carefully.
+#
+#   admin_user = <text>
+#   admin_password = <text>
+#
+#       When set, clients must provide these credentials in the submitted
+#       JSON for any administrative command requests submitted to the HTTP/S,
+#       WS, or WSS protocol interfaces. If administrative commands are
+#       disabled for a port, these credentials have no effect.
+#
+#       When acting in the client role, rippled will supply these credentials
+#       in the submitted JSON for any administrative command requests when
+#       invoking JSON-RPC commands on remote servers.
+#
+#   ssl_key = <filename>
+#   ssl_cert = <filename>
+#   ssl_chain = <filename>
+#
+#       Use the specified files when configuring SSL on the port.
+#
+#       NOTE    If no files are specified and secure protocols are selected,
+#               rippled will generate an internal self-signed certificate.
+#
+#       The files have these meanings:
+#
+#       ssl_key
+#
+#           Specifies the filename holding the SSL key in PEM format.
+#
+#       ssl_cert
+#
+#           Specifies the path to the SSL certificate file in PEM format.
+#           This is not needed if the chain includes it.
+#
+#       ssl_chain
+#
+#           If you need a certificate chain, specify the path to the
+#           certificate chain here. The chain may include the end certificate.
+#
+#
+#
+# [rpc_startup]
+#
+#   Specify a list of RPC commands to run at startup.
+#
+#   Examples:
+#     { "command" : "server_info" }
+#     { "command" : "log_level", "partition" : "ripplecalc", "severity" : "trace" }
+#
+#
+#
+# [websocket_ping_frequency]
+#
+#   <number>
+#
+#   The amount of time to wait in seconds, before sending a websocket 'ping'
+#   message. Ping messages are used to determine if the remote end of the
+#   connection is no longer available.
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 2. Peer Protocol
+#
+#-----------------
+#
+#   These settings control security and access attributes of the Peer to Peer
+#   server section of the rippled process. Peer Protocol implements the
+#   Ripple Payment protocol. It is over peer connections that transactions
+#   and validations are passed from to machine to machine, to determine the
+#   contents of validated ledgers.
+#
+#
+#
+# [ips]
+#
+#   List of hostnames or ips where the Ripple protocol is served.  For a starter
+#   list, you can either copy entries from: https://ripple.com/ripple.txt or if
+#   you prefer you can specify r.ripple.com 51235
+#
+#   One IPv4 address or domain names per line is allowed. A port may must be
+#   specified after adding a space to the address.  By convention, if known,
+#   IPs are listed in from most to least trusted.
+#
+#   Examples:
+#    192.168.0.1
+#    192.168.0.1 3939
+#    r.ripple.com 51235
+#
+#   This will give you a good, up-to-date list of addresses:
+#
+#   [ips]
+#   r.ripple.com 51235
+#
+#   The default is: [ips_fixed] addresses (if present) or r.ripple.com 51235
+#
+#
+# [ips_fixed]
+#
+#   List of IP addresses or hostnames to which rippled should always attempt to
+#   maintain peer connections with. This is useful for manually forming private
+#   networks, for example to configure a validation server that connects to the
+#   Ripple network through a public-facing server, or for building a set
+#   of cluster peers.
+#
+#   One IPv4 address or domain names per line is allowed. A port must be
+#   specified after adding a space to the address.
+#
+#
+#
+# [peer_private]
+#
+#   0 or 1.
+#
+#   0: Request peers to broadcast your address. Normal outbound peer connections [default]
+#   1: Request peers not broadcast your address. Only connect to configured peers.
+#
+#
+#
+# [peers_max]
+#
+#   The largest number of desired peer connections (incoming or outgoing).
+#   Cluster and fixed peers do not count towards this total. There are
+#   implementation-defined lower limits imposed on this value for security
+#   purposes.
+#
+#
+#
+# [node_seed]
+#
+#   This is used for clustering. To force a particular node seed or key, the
+#   key can be set here.  The format is the same as the validation_seed field.
+#   To obtain a validation seed, use the validation_create command.
+#
+#   Examples:  RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE
+#              shfArahZT9Q9ckTf3s1psJ7C7qzVN
+#
+#
+#
+# [cluster_nodes]
+#
+#   To extend full trust to other nodes, place their node public keys here.
+#   Generally, you should only do this for nodes under common administration.
+#   Node public keys start with an 'n'. To give a node a name for identification
+#   place a space after the public key and then the name.
+#
+#
+#
+# [sntp_servers]
+#
+#   IP address or domain of NTP servers to use for time synchronization.
+#
+#   These NTP servers are suitable for rippled servers located in the United
+#   States:
+#      time.windows.com
+#      time.apple.com
+#      time.nist.gov
+#      pool.ntp.org
+#
+#
+#
+# [overlay]
+#
+#   Controls settings related to the peer to peer overlay.
+#
+#   A set of key/value pair parameters to configure the overlay.
+#
+#   public_ip = <IP-address>
+#
+#       If the server has a known, fixed public IPv4 address,
+#       specify that IP address here in dotted decimal notation.
+#       Peers will use this information to reject attempt to proxy
+#       connections to or from this server.
+#
+#   ip_limit = <number>
+#
+#       The maximum number of incoming peer connections allowed by a single
+#       IP that isn't classified as "private" in RFC1918. The implementation
+#       imposes some hard and soft upper limits on this value to prevent a
+#       single host from consuming all inbound slots. If the value is not
+#       present the server will autoconfigure an appropriate limit.
+#
+#
+#
+# [transaction_queue] EXPERIMENTAL
+#
+#   This section is EXPERIMENTAL, and should not be
+#   present for production configuration settings.
+#
+#   A set of key/value pair parameters to tune the performance of the
+#   transaction queue.
+#
+#   ledgers_in_queue = <number>
+#
+#       The queue will be limited to this <number> of average ledgers'
+#       worth of transactions. If the queue fills up, the transactions
+#       with the lowest fees will be dropped from the queue any time a
+#       transaction with a higher fee level is added. Default: 20.
+#
+#   retry_sequence_percent = <number>
+#
+#       If a client resubmits a transaction, the new transaction's fee
+#       must be more than <number> percent higher than the original
+#       transaction's fee, or meet the current open ledger fee to be
+#       considered. Default: 125.
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 3. Ripple Protocol
+#
+#-------------------
+#
+#   These settings affect the behavior of the server instance with respect
+#   to Ripple payment protocol level activities such as validating and
+#   closing ledgers, establishing a quorum, or adjusting fees in response
+#   to server overloads.
+#
+#
+#
+# [node_size]
+#
+#   Tunes the servers based on the expected load and available memory. Legal
+#   sizes are "tiny", "small", "medium", "large", and "huge". We recommend
+#   you start at the default and raise the setting if you have extra memory.
+#   The default is "tiny".
+#
+#
+#
+# [validation_quorum]
+#
+#   Sets the minimum number of trusted validations a ledger must have before
+#   the server considers it fully validated. Note that if you are validating,
+#   your validation counts.
+#
+#
+#
+# [ledger_history]
+#
+#   The number of past ledgers to acquire on server startup and the minimum to
+#   maintain while running.
+#
+#   To serve clients, servers need historical ledger data. Servers that don't
+#   need to serve clients can set this to "none".  Servers that want complete
+#   history can set this to "full".
+#
+#   This must be less than or equal to online_delete (if online_delete is used)
+#
+#   The default is: 256
+#
+#
+#
+# [fetch_depth]
+#
+#   The number of past ledgers to serve to other peers that request historical
+#   ledger data (or "full" for no limit).
+#
+#   Servers that require low latency and high local performance may wish to
+#   restrict the historical ledgers they are willing to serve. Setting this
+#   below 32 can harm network stability as servers require easy access to
+#   recent history to stay in sync. Values below 128 are not recommended.
+#
+#   The default is: full
+#
+#
+#
+# [validation_seed]
+#
+#   To perform validation, this section should contain either a validation seed
+#   or key.  The validation seed is used to generate the validation
+#   public/private key pair.  To obtain a validation seed, use the
+#   validation_create command.
+#
+#   Examples:  RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE
+#              shfArahZT9Q9ckTf3s1psJ7C7qzVN
+#
+#
+#
+# [validators]
+#
+#   List of nodes to always accept as validators. Nodes are specified by domain
+#   or public key.
+#
+#   For domains, rippled will probe for https web servers at the specified
+#   domain in the following order: ripple.DOMAIN, www.DOMAIN, DOMAIN
+#
+#   For public key entries, a comment may optionally be specified after adding
+#   a space to the public key.
+#
+#   Examples:
+#    ripple.com
+#    n9KorY8QtTdRx7TVDpwnG9NvyxsDwHUKUEeDLY3AkiGncVaSXZi5
+#    n9MqiExBcoG19UXwoLjBJnhsxEhAZMuWwJDRdkyDz1EkEkwzQTNt John Doe
+#
+#
+#
+# [validators_file]
+#
+#   Path to file contain a list of nodes to always accept as validators. Use
+#   this to specify a file other than this file to manage your validators list.
+#
+#   If this entry is not present or empty and no nodes from previous runs were
+#   found in the database, rippled will look for a validators.txt in the config
+#   directory.  If not found there, it will attempt to retrieve the file from
+#   the [validators_site] web site.
+#
+#   After specifying a different [validators_file] or changing the contents of
+#   the validators file, issue a RPC unl_load command to have rippled load the
+#   file.
+#
+#   Specify the file by specifying its full path.
+#
+#   Examples:
+#    C:/home/johndoe/ripple/validators.txt
+#    /home/johndoe/ripple/validators.txt
+#
+#
+#
+# [validators_site]
+#
+#   Specifies where to find validators.txt for UNL boostrapping and RPC
+#   unl_network command.
+#
+#   Example: ripple.com
+#
+#
+#
+# [path_search]
+#   When searching for paths, the default search aggressiveness. This can take
+#   exponentially more resources as the size is increased.
+#
+#   The default is: 7
+#
+# [path_search_fast]
+# [path_search_max]
+#   When searching for paths, the minimum and maximum search aggressiveness.
+#
+#   If you do not need pathfinding, you can set path_search_max to zero to
+#   disable it and avoid some expensive bookkeeping.
+#
+#   The default for 'path_search_fast' is 2. The default for 'path_search_max' is 10.
+#
+# [path_search_old]
+#
+#   For clients that use the legacy path finding interfaces, the search
+#   aggressiveness to use. The default is 7.
+#
+#
+#
+# [fee_default]
+#
+#   Sets the base cost of a transaction in drops. Used when the server has
+#   no other source of fee information, such as signing transactions offline.
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 4. HTTPS Client
+#
+#----------------
+#
+#   The rippled server instance uses HTTPS GET requests in a variety of
+#   circumstances, including but not limited to contacting trusted domains to
+#   fetch information such as mapping an email address to a Ripple Payment
+#   Network address.
+#
+# [ssl_verify]
+#
+#   0 or 1.
+#
+#   0. HTTPS client connections will not verify certificates.
+#   1. Certificates will be checked for HTTPS client connections.
+#
+#   If not specified, this parameter defaults to 1.
+#
+#
+#
+# [ssl_verify_file]
+#
+#   <pathname>
+#
+#   A file system path leading to the certificate verification file for
+#   HTTPS client requests.
+#
+#
+#
+# [ssl_verify_dir]
+#
+#   <pathname>
+#
+#
+#   A file system path leading to a file or directory containing the root
+#   certificates that the server will accept for verifying HTTP servers.
+#   Used only for outbound HTTPS client connections.
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 5. Database
+#
+#------------
+#
+#   rippled creates 4 SQLite database to hold bookkeeping information
+#   about transactions, local credentials, and various other things.
+#   It also creates the NodeDB, which holds all the objects that
+#   make up the current and historical ledgers.
+#
+#   The size of the NodeDB grows in proportion to the amount of new data and the
+#   amount of historical data (a configurable setting) so the performance of the
+#   underlying storage media where the NodeDB is placed can significantly affect
+#   the performance of the server.
+#
+#   Partial pathnames will be considered relative to the location of
+#   the rippled.cfg file.
+#
+#   [node_db]               Settings for the Node Database (required)
+#
+#   Format (without spaces):
+#       One or more lines of case-insensitive key / value pairs:
+#       <key> '=' <value>
+#       ...
+#
+#   Example:
+#       type=nudb
+#       path=db/nudb
+#
+#   The "type" field must be present and controls the choice of backend:
+#
+#   type = NuDB
+#
+#       NuDB is a high-performance database written by Ripple Labs and optimized
+#       for rippled and solid-state drives.
+#
+#       NuDB maintains its high speed regardless of the amount of history
+#       stored. Online delete may be selected, but is not required. NuDB is
+#       available on all platforms that rippled runs on.
+#
+#   type = RocksDB
+#
+#       RocksDB is an open-source, general-purpose key/value store - see
+#       http://rocksdb.org/ for more details.
+#
+#       RocksDB is an alternative backend for systems that don't use solid-state
+#       drives.  Because RocksDB's performance degrades as it stores more data,
+#       keeping full history is not advised, and using online delete is
+#       recommended.  RocksDB is not available on Windows.
+#
+#       The RocksDB backend also provides these optional parameters:
+#
+#       compression         0 for none, 1 for Snappy compression
+#
+#
+#
+#   Required keys:
+#       path                Location to store the database (all types)
+#
+#   Optional keys:
+#
+#       These keys are possible for any type of backend:
+#
+#       online_delete       Minimum value of 256. Enable automatic purging
+#                           of older ledger information. Maintain at least this
+#                           number of ledger records online. Must be greater
+#                           than or equal to ledger_history.
+#
+#       advisory_delete     0 for disabled, 1 for enabled. If set, then
+#                           require administrative RPC call "can_delete"
+#                           to enable online deletion of ledger records.
+#
+#   Notes:
+#       The 'node_db' entry configures the primary, persistent storage.
+#
+#       The 'import_db' is used with the '--import' command line option to
+#           migrate the specified database into the current database given
+#           in the [node_db] section.
+#
+#   [import_db]     Settings for performing a one-time import (optional)
+#   [database_path]   Path to the book-keeping databases.
+#
+#   There are 4 bookkeeping SQLite database that the server creates and
+#   maintains. If you omit this configuration setting, it will default to
+#   creating a directory called "db" located in the same place as your
+#   rippled.cfg file. Partial pathnames will be considered relative to
+#   the location of the rippled executable.
+#
+#
+#
+#
+#-------------------------------------------------------------------------------
+#
+# 6. Diagnostics
+#
+#---------------
+#
+#   These settings are designed to help server administrators diagnose
+#   problems, and obtain detailed information about the activities being
+#   performed by the rippled process.
+#
+#
+#
+# [debug_logfile]
+#
+#   Specifies where a debug logfile is kept. By default, no debug log is kept.
+#   Unless absolute, the path is relative the directory containing this file.
+#
+#   Example: debug.log
+#
+#
+#
+# [insight]
+#
+#   Configuration parameters for the Beast. Insight stats collection module.
+#
+#   Insight is a module that collects information from the areas of rippled
+#   that have instrumentation. The configuration parameters control where the
+#   collection metrics are sent. The parameters are expressed as key = value
+#   pairs with no white space. The main parameter is the choice of server:
+#
+#     "server"
+#
+#       Choice of server to send metrics to. Currently the only choice is
+#       "statsd" which sends UDP packets to a StatsD daemon, which must be
+#       running while rippled is running. More information on StatsD is
+#       available here:
+#           https://github.com/b/statsd_spec
+#
+#       When server=statsd, these additional keys are used:
+#
+#       "address" The UDP address and port of the listening StatsD server,
+#                 in the format, n.n.n.n:port.
+#
+#       "prefix"  A string prepended to each collected metric. This is used
+#                 to distinguish between different running instances of rippled.
+#
+#     If this section is missing, or the server type is unspecified or unknown,
+#     statistics are not collected or reported.
+#
+#   Example:
+#
+#     [insight]
+#     server=statsd
+#     address=192.168.0.95:4201
+#     prefix=my_validator
+#
+#-------------------------------------------------------------------------------
+#
+# 7. Voting
+#
+#----------
+#
+#   The vote settings configure settings for the entire Ripple network.
+#   While a single instance of rippled cannot unilaterally enforce network-wide
+#   settings, these choices become part of the instance's vote during the
+#   consensus process for each voting ledger.
+#
+# [voting]
+#
+#   A set of key/value pair parameters used during voting ledgers.
+#
+#   reference_fee = <drops>
+#
+#       The cost of the reference transaction fee, specified in drops.
+#       The reference transaction is the simplest form of transaction.
+#       It represents an XRP payment between two parties.
+#
+#       If this parameter is unspecified, rippled will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           reference_fee = 10           # 10 drops
+#
+#   account_reserve = <drops>
+#
+#       The account reserve requirement is specified in drops. The portion of an
+#       account's XRP balance that is at or below the reserve may only be
+#       spent on transaction fees, and not transferred out of the account.
+#
+#       If this parameter is unspecified, rippled will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           account_reserve = 20000000   # 20 XRP
+#
+#   owner_reserve = <drops>
+#
+#       The owner reserve is the amount of XRP reserved in the account for
+#       each ledger item owned by the account. Ledger items an account may
+#       own include trust lines, open orders, and tickets.
+#
+#       If this parameter is unspecified, rippled will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           owner_reserve = 5000000      # 5 XRP
+#
+#-------------------------------------------------------------------------------
+#
+# 8. Example Settings
+#
+#--------------------
+#
+#   Administrators can use these values as a starting point for configuring
+#   their instance of rippled, but each value should be checked to make sure
+#   it meets the business requirements for the organization.
+#
+# Server
+#
+#   These example configuration settings create these ports:
+#
+#   "peer"
+#
+#       Peer protocol open to everyone. This is required to accept
+#       incoming rippled connections. This does not affect automatic
+#       or manual outgoing Peer protocol connections.
+#
+#   "rpc"
+#
+#       Administrative RPC commands over HTTPS, when originating from
+#       the same machine (via the loopback adapter at 127.0.0.1).
+#
+#   "wss_admin"
+#
+#       Admin level API commands over Secure Websockets, when originating
+#       from the same machine (via the loopback adapter at 127.0.0.1).
+#
+#   This port is commented out but can be enabled by removing
+#   the '#' from each corresponding line including the entry under [server]
+#
+#   "wss_public"
+#
+#       Guest level API commands over Secure Websockets, open to everyone.
+#
+#   For HTTPS and Secure Websockets ports, if no certificate and key file
+#   are specified then a self-signed certificate will be generated on startup.
+#   If you have a certificate and key file, uncomment the corresponding lines
+#   and ensure the paths to the files are correct.
+#
+#   NOTE
+#
+#       To accept connections on well known ports such as 80 (HTTP) or
+#       443 (HTTPS), most operating systems will require rippled to
+#       run with administrator privileges, or else rippled will not start.
+
+[server]
+port_rpc_admin_local
+#port_peer
+port_ws_admin_local
+#port_ws_public
+#port_ws_admin_public
+#ssl_key = /etc/ssl/private/server.key
+#ssl_cert = /etc/ssl/certs/server.crt
+
+[port_rpc_admin_local]
+port = 5005
+ip = 127.0.0.1
+admin = 127.0.0.1
+protocol = http
+
+[port_peer]
+port = 51235
+ip = 0.0.0.0
+protocol = peer
+
+[port_ws_admin_local]
+port = 6006
+ip = 127.0.0.1
+admin = 127.0.0.1
+protocol = ws
+
+[port_ws_admin_public]
+port = 5007
+ip = 0.0.0.0
+admin = 192.168.50.1
+protocol = ws
+
+[port_ws_public]
+port = 5006
+ip = 0.0.0.0
+protocol = ws
+
+#[port_ws_public]
+#port = 5005
+#ip = 127.0.0.1
+#protocol = wss
+
+#-------------------------------------------------------------------------------
+
+[node_size]
+medium
+
+# This is primary persistent datastore for rippled.  This includes transaction
+# metadata, account states, and ledger headers.  Helpful information can be
+# found here: https://ripple.com/wiki/NodeBackEnd
+# delete old ledgers while maintaining at least 2000. Do not require an
+# external administrative command to initiate deletion.
+[node_db]
+type=RocksDB
+path=/var/lib/rippled/db/rocksdb
+open_files=2000
+filter_bits=12
+cache_mb=256
+file_size_mb=8
+file_size_mult=2
+online_delete=2000
+advisory_delete=0
+
+[database_path]
+/var/lib/rippled/db
+
+# This needs to be an absolute directory reference, not a relative one.
+# Modify this value as required.
+[debug_logfile]
+/var/log/rippled.debug.log
+
+[sntp_servers]
+time.windows.com
+time.apple.com
+time.nist.gov
+pool.ntp.org
+
+# Where to find some other servers speaking the Ripple protocol.
+#
+#[ips]
+#r.ripple.com 51235
+
+# Public keys of the validators that this rippled instance trusts.  The latest
+# list of validators can be obtained from https://ripple.com/ripple.txt
+#
+# See also https://wiki.ripple.com/Ripple.txt
+#
+[validators]
+n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7    RL1
+n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj    RL2
+n9L81uNCaPgtUJfaHh89gmdvXKAmSt5Gdsw2g1iPWaPkAHW5Nm4C    RL3
+n9KiYM9CgngLvtRCQHZwgC2gjpdaZcCcbt3VboxiNFcKuwFVujzS    RL4
+n9LdgEtkmGB9E2h3K4Vp7iGUaKuq23Zr32ehxiU8FWY7xoxbWTSA    RL5
+
+# The number of validators rippled needs to accept a consensus.
+# Don't change this unless you know what you're doing.
+[validation_quorum]
+3
+
+# Turn down default logging to save disk space in the long run.
+# Valid values here are trace, debug, info, warning, error, and fatal
+[rpc_startup]
+{ "command": "log_level", "severity": "trace" }
+#{ "command": "log_level", "severity": "warning" }
+
+# If ssl_verify is 1, certificates will be validated.
+# To allow the use of self-signed certificates for development or internal use,
+# set to ssl_verify to 0.
+[ssl_verify]
+1
+
+[features]
+SusPay
+MultiSign

test/integration/utils.js

@@ -0,0 +1,56 @@
+'use strict';
+
+const masterAccount = 'rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh';
+const masterSecret = 'snoPBrXtMeMyMHUVTgbuqAfg1SUTb';
+
+function ledgerAccept(api) {
+  const request = {command: 'ledger_accept'};
+  return api.connection.request(request);
+}
+
+function pay(api, from, to, amount, secret, currency = 'XRP', counterparty) {
+  const paymentSpecification = {
+    source: {
+      address: from,
+      maxAmount: {
+        value: amount,
+        currency: currency
+      }
+    },
+    destination: {
+      address: to,
+      amount: {
+        value: amount,
+        currency: currency
+      }
+    }
+  };
+
+  if (counterparty !== undefined) {
+    paymentSpecification.source.maxAmount.counterparty = counterparty;
+    paymentSpecification.destination.amount.counterparty = counterparty;
+  }
+
+  let id = null;
+  return api.preparePayment(from, paymentSpecification, {})
+    .then(data => api.sign(data.txJSON, secret))
+    .then(signed => {
+      id = signed.id;
+      return api.submit(signed.signedTransaction);
+    })
+    .then(() => ledgerAccept(api))
+    .then(() => id);
+}
+
+
+function payTo(api, to, amount = '4003218', currency = 'XRP', counterparty) {
+  return pay(api, masterAccount, to, amount, masterSecret, currency,
+    counterparty);
+}
+
+
+module.exports = {
+  pay,
+  payTo,
+  ledgerAccept
+};

test/integration/wallet-web.js

@@ -0,0 +1,14 @@
+'use strict';
+
+function getAddress() {
+  return 'rQDhz2ZNXmhxzCYwxU6qAbdxsHA4HV45Y2';
+}
+
+function getSecret() {
+  return 'shK6YXzwYfnFVn3YZSaMh5zuAddKx';
+}
+
+module.exports = {
+  getAddress,
+  getSecret
+};

test/integration/wallet.js

@@ -1,4 +1,5 @@
 'use strict';
+
 const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');

test/localintegrationrunner.html

@@ -0,0 +1,27 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <!-- encoding must be set for mocha's special characters to render properly -->
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+    <script src="./vendor/lodash.min.js"></script>
+  </head>
+  <body>
+    <div id="deb"></div>
+    <div id="mocha"></div>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="hacks/phantomhacks.js"></script>
+    <script src="../build/ripple-latest.js"></script>
+    <script>
+      if (window.initMochaPhantomJS) {
+        window.initMochaPhantomJS();
+      }
+      mocha.ui('bdd')
+    </script>
+ 
+    <script src="../test-compiled-for-web/integration/integration-test.js"></script>
+
+    <script>
+      mocha.run()
+    </script>
+  </body>
+</html>

test/localrunner.html

@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <!-- encoding must be set for mocha's special characters to render properly -->
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+    <script src="./vendor/lodash.min.js"></script>
+  </head>
+  <body>
+    <div id="deb"></div>
+    <div id="mocha"></div>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="hacks/phantomhacks.js"></script>
+    <script src="../build/ripple-latest.js"></script>
+    <script>
+      if (window.initMochaPhantomJS) {
+        window.initMochaPhantomJS();
+      }
+      mocha.ui('bdd')
+    </script>
+ 
+    <script src="../test-compiled-for-web/api-test.js"></script>
+
+    <script src="../test-compiled-for-web/broadcast-api-test.js"></script>
+ 
+    <script src="../test-compiled-for-web/connection-test.js"></script>
+
+    <script src="../test-compiled-for-web/rangeset-test.js"></script>
+
+    <script>
+      mocha.run()
+    </script>
+  </body>
+</html>