Update version to 0.16.4

Merge branch 'develop' into release
* develop: Update ws to 1.0.1 run integration tests using standalone server Add multisignature support Add sample code to cancel all orders for a specified account Remove references to browser support add check for windows eol on commit removes windows eols from some files Fix error on ledger subscription message without validated_ledgers
2025-11-15 18:15:49 +00:00 · 2016-01-04 19:48:59 -08:00 · 2016-01-04 19:47:24 -08:00 · 2016-01-04 19:45:47 -08:00 · 2016-01-04 19:12:11 -08:00 · 2016-01-04 19:06:30 -08:00
104 changed files with 3148 additions and 1073 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,34 @@
+##0.16.4
+**Changes**
+ [Update ws to 1.0.1](https://github.com/ripple/ripple-lib/pull/682)
+
+##0.16.2
+**Changes**
+ [Bump ripple-binary-codec dependency version to 0.1.1 to fix issue with computeLedgerHash for transactions with DeliverMin]
+
+##0.16.1
+**Changes**
+ [FIX: Use assert not assert-diff](https://github.com/ripple/ripple-lib/commit/f6ebe325193e7208c5ee8d8e84a7504714f0009e)
+
+##0.16.0
+**Breaking Changes**
+ [Fix types of XRP values in getServerInfo response](https://github.com/ripple/ripple-lib/commit/99d08065e4bda3dda6ae1f183adbd11abc70a9b7)
+ [Change error event format and fix crash due to error event on webscocket](https://github.com/ripple/ripple-lib/commit/9cd72595f0efc062d77b9d625695d6030c524cc6)
+
+**Changes**
+ [Fix generateAddress docs and add error event listener to boilerplate](https://github.com/ripple/ripple-lib/commit/809d981987a2890fac3a73a40a05c598b9040334)
+ [Allow setting maxLedgerVersion to null to specify no maximum](https://github.com/ripple/ripple-lib/commit/82613e7e8b360d1ae1552eab4559ab4763c06d7e)
+ [Add support for client certificates](https://github.com/ripple/ripple-lib/commit/5f5e48e4140345d166b8c1a3ee0847b0d9e2d893)
+ [getFee returns a string not float](https://github.com/ripple/ripple-lib/commit/7bf2da6014c87e164542e69356efeaabb575a157)
+ [Fix parsing of quality for getTrustlines](https://github.com/ripple/ripple-lib/commit/86ff315ef2a39dfdc2ce97e0e1c4aa73f04e363b)
+ [Fix DeliverMin value when specifying minAmount](Fix DeliverMin value when specifying minAmount)
+ [http server example](https://github.com/ripple/ripple-lib/commit/76866ab901ea46a2dd73181605e0f7f4220043d4)
+
+
+##0.15.2
+**Changes**
+ [Fix support for proxy credentials in proxy URL and fix error when there are more than 10 outstanding requests](https://github.com/ripple/ripple-lib/commit/0990ad4a6f1d59ca9d2cb859b4e2d71693f3fc4b)
+
 ##0.15.1
 **Changes**
 + [Fix babel-polyfill require](https://github.com/ripple/ripple-lib/commit/062148674c3b1293ab82c28e25615ddd530339fa)
--- a/README.md
+++ b/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
--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,16 @@
 machine:
  node:
    version: 0.12.0
+dependencies:
+  pre:
+    - 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
--- a/docs/index.md
+++ b/docs/index.md
@@ -54,6 +54,7 @@
  - [prepareSuspendedPaymentCancellation](#preparesuspendedpaymentcancellation)
  - [prepareSuspendedPaymentExecution](#preparesuspendedpaymentexecution)
  - [sign](#sign)
+  - [combine](#combine)
  - [submit](#submit)
  - [generateAddress](#generateaddress)
  - [computeLedgerHash](#computeledgerhash)
@@ -86,6 +87,9 @@ const {RippleAPI} = require('ripple-lib');
 const api = new RippleAPI({
  server: 'wss://s1.ripple.com' // Public rippled server hosted by Ripple, Inc.
 });
+api.on('error', (errorCode, errorMessage) => {
+  console.log(errorCode + ': ' + errorMessage);
+});
 api.connect().then(() => {
  /* insert code here */
 }).then(() => {
@@ -105,6 +109,10 @@ All the code snippets in this documentation assume that you have surrounded them
 If you omit the "catch" section, errors may not be visible.
 </aside>

+<aside class="notice">
+The "error" event is emitted whenever an error occurs that cannot be associated with a specific request. If the listener is not registered, an exception will be thrown whenever the event is emitted.
+</aside>
+
 ### Parameters

 The RippleAPI constructor optionally takes one argument, an object with the following options:
@@ -112,7 +120,10 @@ The RippleAPI constructor optionally takes one argument, an object with the foll
 Name | Type | Description
 ---- | ---- | -----------
 authorization | string | *Optional* Username and password for HTTP basic authentication to the rippled server in the format **username:password**.
+certificate | string | *Optional* A string containing the certificate key of the client in PEM format. (Can be an array of certificates).
 feeCushion | number | *Optional* Factor to multiply estimated fee by to provide a cushion in case the required fee rises during submission of a transaction. Defaults to `1.2`.
+key | string | *Optional* A string containing the private key of the client in PEM format. (Can be an array of keys).
+passphrase | string | *Optional* The passphrase for the private key of the client.
 proxy | uri string | *Optional* URI for HTTP/HTTPS proxy to use to connect to the rippled server.
 proxyAuthorization | string | *Optional* Username and password for HTTP basic authentication to the proxy in the format **username:password**.
 server | uri string | *Optional* URI for rippled websocket port to connect to. Must start with `wss://` or `ws://`.
@@ -259,7 +270,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.

@@ -277,9 +288,10 @@ Name | Type | Description
 ---- | ---- | -----------
 fee | [value](#value) | *Optional* An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 maxFee | [value](#value) | *Optional* The maximum fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
-maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
-maxLedgerVersionOffset | integer | *Optional* Offset from current legder version to highest ledger version that the transaction can be included in.
+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.

@@ -470,6 +482,12 @@ 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.
+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, represented as billionths of a unit. Use `null` to set no fee.

 ### Example
@@ -673,10 +691,10 @@ pubkeyNode | string | Public key used to verify this node for internal communica
 serverState | string | A string indicating to what extent the server is participating in the network. See [Possible Server States](https://ripple.com/build/rippled-apis/#possible-server-states) for more details.
 validatedLedger | object | Information about the fully-validated ledger with the highest sequence number (the most recent).
 *validatedLedger.* age | integer | The time since the ledger was closed, in seconds.
-*validatedLedger.* baseFeeXRP | number | Base fee, in XRP. This may be represented in scientific notation such as 1e-05 for 0.00005.
+*validatedLedger.* baseFeeXRP | [value](#value) | Base fee, in XRP. This may be represented in scientific notation such as 1e-05 for 0.00005.
 *validatedLedger.* hash | string | Unique hash for the ledger, as an uppercase hexadecimal string.
-*validatedLedger.* reserveBaseXRP | integer | Minimum amount of XRP necessary for every account to keep in reserve.
-*validatedLedger.* reserveIncrementXRP | integer | Amount of XRP added to the account reserve for each object an account is responsible for in the ledger.
+*validatedLedger.* reserveBaseXRP | [value](#value) | Minimum amount of XRP necessary for every account to keep in reserve.
+*validatedLedger.* reserveIncrementXRP | [value](#value) | Amount of XRP added to the account reserve for each object an account is responsible for in the ledger.
 *validatedLedger.* ledgerVersion | integer | Identifying sequence number of this ledger version.
 validationQuorum | number | Minimum number of trusted validations required in order to validate a ledger version. Some circumstances may cause the server to require more validations.
 load | object | *Optional* *(Admin only)* Detailed information about the current load state of the server.
@@ -707,10 +725,10 @@ return api.getServerInfo().then(info => {/* ... */});
  "serverState": "full",
  "validatedLedger": {
    "age": 5,
-    "baseFeeXRP": 0.00001,
+    "baseFeeXRP": "0.00001",
    "hash": "4482DEE5362332F54A4036ED57EE1767C9F33CF7CE5A6670355C16CECE381D46",
-    "reserveBaseXRP": 20,
-    "reserveIncrementXRP": 5,
+    "reserveBaseXRP": "20",
+    "reserveIncrementXRP": "5",
    "ledgerVersion": 6595042
  },
  "validationQuorum": 3
@@ -730,7 +748,7 @@ This method has no parameters.

 ### Return Value

-This method returns a promise that resolves with a floating point value representing the estimated fee to submit a transaction, expressed in XRP.
+This method returns a promise that resolves with a string encoded floating point value representing the estimated fee to submit a transaction, expressed in XRP.

 ### Example

@@ -739,7 +757,7 @@ return api.getFee().then(fee => {/* ... */});
 ```

 ```json
-0.012
+"0.012"
 ```

 ## getLedgerVersion
@@ -2634,6 +2652,12 @@ 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.
+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, represented as billionths of a unit. Use `null` to set no fee.

 ### Example
@@ -2793,7 +2817,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -2862,7 +2886,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -2929,7 +2953,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -2994,7 +3018,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -3046,7 +3070,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -3111,7 +3135,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -3183,7 +3207,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -3240,7 +3264,7 @@ txJSON | string | The prepared transaction in rippled JSON format.
 instructions | object | The instructions for how to execute the transaction after adding automatic defaults.
 *instructions.* fee | [value](#value) | An exact fee to pay for the transaction. See [Transaction Fees](#transaction-fees) for more information.
 *instructions.* sequence | [sequence](#account-sequence-number) | The initiating account's sequence number for this transaction.
-*instructions.* maxLedgerVersion | integer | *Optional* The highest ledger version that the transaction can be included in.
+*instructions.* maxLedgerVersion | integer,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.

 ### Example

@@ -3272,7 +3296,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).

@@ -3282,6 +3306,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

@@ -3309,6 +3335,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>`
@@ -3355,7 +3419,11 @@ Generate a new Ripple address and corresponding secret.

 ### Parameters

-This method has no parameters.
+Name | Type | Description
+---- | ---- | -----------
+options | object | *Optional* Options to control how the address and secret are generated.
+*options.* algorithm | string | *Optional* The digital signature algorithm to generate an address for. Can be `ecdsa-secp256k1` (default) or `ed25519`.
+*options.* entropy | array\<integer\> | *Optional* The entropy to use to generate the seed.

 ### Return Value

@@ -3369,8 +3437,7 @@ secret | secret string | The secret corresponding to the `address`.
 ### Example

 ```javascript
-return api.generateAddress()
-  .then(result => {/* ... */});
+return api.generateAddress();
 ```


@@ -3451,7 +3518,7 @@ Name | Type | Description
 baseFeeXRP | [value](#value) | Base fee, in XRP.
 ledgerHash | string | Unique hash of the ledger that was closed, as hex.
 ledgerTimestamp | date-time string | The time at which this ledger closed.
-reserveBaseXRP | [value](#value) | The minimum reserve, in drops of XRP, that is required for an account.
+reserveBaseXRP | [value](#value) | The minimum reserve, in XRP, that is required for an account.
 reserveIncrementXRP | [value](#value) | The increase in account reserve that is added for each item the account owns, such as offers or trust lines.
 transactionCount | integer | Number of new transactions included in this ledger.
 ledgerVersion | integer | Ledger version of the ledger that closed.
@@ -3482,16 +3549,26 @@ api.on('ledger', ledger => {

 ## error

-This event is emitted when there is an error on the connection to the server.
+This event is emitted when there is an error on the connection to the server that cannot be associated to a specific request.

 ### Return Value

-The first parameter is a string indicating the error type, which may be `badMessage` (meaning that rippled returned a malformed message), or one of the [rippled Universal Errors](https://ripple.com/build/rippled-apis/#universal-errors). The second parameter is a message explaining the error, or the message that caused the error in the case of `badMessage`.
+The first parameter is a string indicating the error type:
+* `badMessage` - rippled returned a malformed message
+* `websocket` - the websocket library emitted an error
+* one of the error codes found in the [rippled Universal Errors](https://ripple.com/build/rippled-apis/#universal-errors).
+
+The second parameter is a message explaining the error.
+
+The third parameter is:
+* the message that caused the error for `badMessage`
+* the error object emitted for `websocket`
+* the parsed response for rippled errors

 ### Example

 ```javascript
-api.on('error', (errorCode, errorMessage) => {
+api.on('error', (errorCode, errorMessage, data) => {
  console.log(errorCode + ': ' + errorMessage);
 });
 ```
--- a/docs/samples/cancelall.js
+++ b/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);
--- a/docs/src/boilerplate.md.ejs
+++ b/docs/src/boilerplate.md.ejs
@@ -8,6 +8,9 @@ const {RippleAPI} = require('ripple-lib');
 const api = new RippleAPI({
  server: 'wss://s1.ripple.com' // Public rippled server hosted by Ripple, Inc.
 });
+api.on('error', (errorCode, errorMessage) => {
+  console.log(errorCode + ': ' + errorMessage);
+});
 api.connect().then(() => {
  /* insert code here */
 }).then(() => {
@@ -27,6 +30,10 @@ All the code snippets in this documentation assume that you have surrounded them
 If you omit the "catch" section, errors may not be visible.
 </aside>

+<aside class="notice">
+The "error" event is emitted whenever an error occurs that cannot be associated with a specific request. If the listener is not registered, an exception will be thrown whenever the event is emitted.
+</aside>
+
 ### Parameters

 The RippleAPI constructor optionally takes one argument, an object with the following options:
--- a/docs/src/combine.md.ejs
+++ b/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") %>
--- a/docs/src/events.md.ejs
+++ b/docs/src/events.md.ejs
@@ -20,16 +20,26 @@ api.on('ledger', ledger => {

 ## error

-This event is emitted when there is an error on the connection to the server.
+This event is emitted when there is an error on the connection to the server that cannot be associated to a specific request.

 ### Return Value

-The first parameter is a string indicating the error type, which may be `badMessage` (meaning that rippled returned a malformed message), or one of the [rippled Universal Errors](https://ripple.com/build/rippled-apis/#universal-errors). The second parameter is a message explaining the error, or the message that caused the error in the case of `badMessage`.
+The first parameter is a string indicating the error type:
+* `badMessage` - rippled returned a malformed message
+* `websocket` - the websocket library emitted an error
+* one of the error codes found in the [rippled Universal Errors](https://ripple.com/build/rippled-apis/#universal-errors).
+
+The second parameter is a message explaining the error.
+
+The third parameter is:
+* the message that caused the error for `badMessage`
+* the error object emitted for `websocket`
+* the parsed response for rippled errors

 ### Example

 ```javascript
-api.on('error', (errorCode, errorMessage) => {
+api.on('error', (errorCode, errorMessage, data) => {
  console.log(errorCode + ': ' + errorMessage);
 });
 ```
--- a/docs/src/generateAddress.md.ejs
+++ b/docs/src/generateAddress.md.ejs
@@ -6,7 +6,7 @@ Generate a new Ripple address and corresponding secret.

 ### Parameters

-This method has no parameters.
+<%- renderSchema('input/generate-address.json') %>

 ### Return Value

@@ -17,8 +17,7 @@ This method returns an object with the following structure:
 ### Example

 ```javascript
-return api.generateAddress()
-  .then(result => {/* ... */});
+return api.generateAddress();
 ```

 <%- renderFixture('responses/generate-address.json') %>
--- a/docs/src/getFee.md.ejs
+++ b/docs/src/getFee.md.ejs
@@ -10,7 +10,7 @@ This method has no parameters.

 ### Return Value

-This method returns a promise that resolves with a floating point value representing the estimated fee to submit a transaction, expressed in XRP.
+This method returns a promise that resolves with a string encoded floating point value representing the estimated fee to submit a transaction, expressed in XRP.

 ### Example

@@ -19,5 +19,5 @@ return api.getFee().then(fee => {/* ... */});
 ```

 ```json
-0.012
+"0.012"
 ```
--- a/docs/src/index.md.ejs
+++ b/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 %>
--- a/docs/src/sign.md.ejs
+++ b/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).

--- a/docs/src/transactions.md.ejs
+++ b/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.

--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,11 +1,11 @@
 {
  "name": "ripple-lib",
-  "version": "0.15.1",
+  "version": "0.16.4",
  "dependencies": {
    "ajv": {
-      "version": "1.4.8",
-      "from": "https://registry.npmjs.org/ajv/-/ajv-1.4.8.tgz",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-1.4.8.tgz",
+      "version": "1.4.10",
+      "from": "https://registry.npmjs.org/ajv/-/ajv-1.4.10.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-1.4.10.tgz",
      "dependencies": {
        "json-stable-stringify": {
          "version": "1.0.0",
@@ -21,106 +21,157 @@
        }
      }
    },
+    "ajv-i18n": {
+      "version": "0.1.1",
+      "from": "https://registry.npmjs.org/ajv-i18n/-/ajv-i18n-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ajv-i18n/-/ajv-i18n-0.1.1.tgz"
+    },
    "babel-polyfill": {
-      "version": "6.2.0",
-      "from": "babel-polyfill@*",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.2.0.tgz",
+      "version": "6.3.14",
+      "from": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.3.14.tgz",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.3.14.tgz",
      "dependencies": {
        "core-js": {
          "version": "1.2.6",
-          "from": "core-js@>=1.0.1 <2.0.0",
+          "from": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz",
          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz"
        },
        "babel-regenerator-runtime": {
-          "version": "6.2.0",
-          "from": "babel-regenerator-runtime@>=6.2.0 <7.0.0",
-          "resolved": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.2.0.tgz"
+          "version": "6.3.13",
+          "from": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.3.13.tgz",
+          "resolved": "https://registry.npmjs.org/babel-regenerator-runtime/-/babel-regenerator-runtime-6.3.13.tgz"
        }
      }
    },
    "babel-runtime": {
-      "version": "5.8.29",
-      "from": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.29.tgz",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.29.tgz",
+      "version": "5.8.34",
+      "from": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.34.tgz",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.34.tgz",
      "dependencies": {
        "core-js": {
-          "version": "1.2.3",
-          "from": "https://registry.npmjs.org/core-js/-/core-js-1.2.3.tgz",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.3.tgz"
+          "version": "1.2.6",
+          "from": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz"
        }
      }
    },
    "bignumber.js": {
-      "version": "2.1.0",
-      "from": "bignumber.js@>=2.0.3 <3.0.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.1.0.tgz"
+      "version": "2.1.2",
+      "from": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.1.2.tgz"
    },
    "https-proxy-agent": {
      "version": "1.0.0",
-      "from": "https-proxy-agent@>=1.0.0 <2.0.0",
+      "from": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
      "dependencies": {
        "agent-base": {
          "version": "2.0.1",
-          "from": "agent-base@>=2.0.0 <3.0.0",
+          "from": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
          "dependencies": {
            "semver": {
              "version": "5.0.3",
-              "from": "semver@>=5.0.1 <5.1.0",
+              "from": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
              "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
            }
          }
        },
        "debug": {
          "version": "2.2.0",
-          "from": "debug@>=2.0.0 <3.0.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
          "dependencies": {
            "ms": {
              "version": "0.7.1",
-              "from": "ms@0.7.1",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
            }
          }
        },
        "extend": {
          "version": "3.0.0",
-          "from": "extend@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
        }
      }
    },
+    "jayson": {
+      "version": "1.2.2",
+      "from": "https://registry.npmjs.org/jayson/-/jayson-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/jayson/-/jayson-1.2.2.tgz",
+      "dependencies": {
+        "JSONStream": {
+          "version": "1.0.3",
+          "from": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+          "dependencies": {
+            "jsonparse": {
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
+            },
+            "through": {
+              "version": "2.3.8",
+              "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+              "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+            }
+          }
+        },
+        "commander": {
+          "version": "1.3.2",
+          "from": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz",
+          "dependencies": {
+            "keypress": {
+              "version": "0.1.0",
+              "from": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"
+            }
+          }
+        },
+        "eyes": {
+          "version": "0.1.8",
+          "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+          "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+        },
+        "lodash": {
+          "version": "3.6.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz"
+        }
+      }
+    },
    "lodash": {
      "version": "3.10.1",
-      "from": "lodash@>=3.1.0 <4.0.0",
+      "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
    },
    "ripple-address-codec": {
      "version": "2.0.1",
-      "from": "ripple-address-codec@>=2.0.1 <3.0.0",
+      "from": "https://registry.npmjs.org/ripple-address-codec/-/ripple-address-codec-2.0.1.tgz",
      "resolved": "https://registry.npmjs.org/ripple-address-codec/-/ripple-address-codec-2.0.1.tgz",
      "dependencies": {
        "hash.js": {
          "version": "1.0.3",
-          "from": "hash.js@>=1.0.3 <2.0.0",
+          "from": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
          "dependencies": {
            "inherits": {
              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <3.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
            }
          }
        },
        "x-address-codec": {
          "version": "0.7.2",
-          "from": "x-address-codec@>=0.7.0 <0.8.0",
+          "from": "https://registry.npmjs.org/x-address-codec/-/x-address-codec-0.7.2.tgz",
          "resolved": "https://registry.npmjs.org/x-address-codec/-/x-address-codec-0.7.2.tgz",
          "dependencies": {
            "base-x": {
              "version": "1.0.1",
-              "from": "base-x@>=1.0.1 <2.0.0",
+              "from": "https://registry.npmjs.org/base-x/-/base-x-1.0.1.tgz",
              "resolved": "https://registry.npmjs.org/base-x/-/base-x-1.0.1.tgz"
            }
          }
@@ -128,77 +179,77 @@
      }
    },
    "ripple-binary-codec": {
-      "version": "0.1.0",
-      "from": "ripple-binary-codec@0.1.0",
-      "resolved": "https://registry.npmjs.org/ripple-binary-codec/-/ripple-binary-codec-0.1.0.tgz",
+      "version": "0.1.1",
+      "from": "https://registry.npmjs.org/ripple-binary-codec/-/ripple-binary-codec-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ripple-binary-codec/-/ripple-binary-codec-0.1.1.tgz",
      "dependencies": {
        "bn.js": {
          "version": "3.3.0",
-          "from": "bn.js@>=3.2.0 <4.0.0",
+          "from": "https://registry.npmjs.org/bn.js/-/bn.js-3.3.0.tgz",
          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-3.3.0.tgz"
        },
        "create-hash": {
          "version": "1.1.2",
-          "from": "create-hash@>=1.1.2 <2.0.0",
+          "from": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
          "dependencies": {
            "cipher-base": {
              "version": "1.0.2",
-              "from": "cipher-base@>=1.0.1 <2.0.0",
+              "from": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz",
              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
            },
            "ripemd160": {
              "version": "1.0.1",
-              "from": "ripemd160@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz",
              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
            },
            "sha.js": {
              "version": "2.4.4",
-              "from": "sha.js@>=2.3.6 <3.0.0",
+              "from": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz",
              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
            }
          }
        },
        "decimal.js": {
          "version": "4.0.3",
-          "from": "decimal.js@>=4.0.2 <5.0.0",
+          "from": "https://registry.npmjs.org/decimal.js/-/decimal.js-4.0.3.tgz",
          "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-4.0.3.tgz"
        },
        "inherits": {
          "version": "2.0.1",
-          "from": "inherits@>=2.0.1 <3.0.0",
+          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
        }
      }
    },
    "ripple-hashes": {
      "version": "0.1.0",
-      "from": "ripple-hashes@0.1.0",
+      "from": "https://registry.npmjs.org/ripple-hashes/-/ripple-hashes-0.1.0.tgz",
      "resolved": "https://registry.npmjs.org/ripple-hashes/-/ripple-hashes-0.1.0.tgz",
      "dependencies": {
        "create-hash": {
          "version": "1.1.2",
-          "from": "create-hash@>=1.1.2 <2.0.0",
+          "from": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
          "dependencies": {
            "cipher-base": {
              "version": "1.0.2",
-              "from": "cipher-base@>=1.0.1 <2.0.0",
+              "from": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz",
              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
            },
            "inherits": {
              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <3.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
            },
            "ripemd160": {
              "version": "1.0.1",
-              "from": "ripemd160@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz",
              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
            },
            "sha.js": {
              "version": "2.4.4",
-              "from": "sha.js@>=2.3.6 <3.0.0",
+              "from": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz",
              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
            }
          }
@@ -207,39 +258,39 @@
    },
    "ripple-keypairs": {
      "version": "0.10.0",
-      "from": "ripple-keypairs@>=0.10.0 <0.11.0",
+      "from": "https://registry.npmjs.org/ripple-keypairs/-/ripple-keypairs-0.10.0.tgz",
      "resolved": "https://registry.npmjs.org/ripple-keypairs/-/ripple-keypairs-0.10.0.tgz",
      "dependencies": {
        "bn.js": {
          "version": "3.3.0",
-          "from": "bn.js@>=3.1.1 <4.0.0",
+          "from": "https://registry.npmjs.org/bn.js/-/bn.js-3.3.0.tgz",
          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-3.3.0.tgz"
        },
        "brorand": {
          "version": "1.0.5",
-          "from": "brorand@>=1.0.5 <2.0.0",
+          "from": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz",
          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
        },
        "elliptic": {
          "version": "5.2.1",
-          "from": "elliptic@>=5.1.0 <6.0.0",
+          "from": "https://registry.npmjs.org/elliptic/-/elliptic-5.2.1.tgz",
          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-5.2.1.tgz",
          "dependencies": {
            "inherits": {
              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <3.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
            }
          }
        },
        "hash.js": {
          "version": "1.0.3",
-          "from": "hash.js@>=1.0.3 <2.0.0",
+          "from": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
          "dependencies": {
            "inherits": {
              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <3.0.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
            }
          }
@@ -248,57 +299,23 @@
    },
    "ripple-lib-transactionparser": {
      "version": "0.6.0",
-      "from": "ripple-lib-transactionparser@>=0.6.0 <0.7.0",
+      "from": "https://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.6.0.tgz",
      "resolved": "https://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.6.0.tgz"
    },
    "ws": {
-      "version": "0.7.2",
-      "from": "ws@>=0.7.1 <0.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-0.7.2.tgz",
+      "version": "1.0.1",
+      "from": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz",
      "dependencies": {
        "options": {
          "version": "0.0.6",
-          "from": "options@>=0.0.5",
+          "from": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
          "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
        },
        "ultron": {
          "version": "1.0.2",
-          "from": "ultron@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
-        },
-        "bufferutil": {
-          "version": "1.1.0",
-          "from": "bufferutil@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
-          "dependencies": {
-            "bindings": {
-              "version": "1.2.1",
-              "from": "bindings@>=1.2.0 <1.3.0",
-              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-            },
-            "nan": {
-              "version": "1.8.4",
-              "from": "nan@>=1.8.0 <1.9.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
-            }
-          }
-        },
-        "utf-8-validate": {
-          "version": "1.1.0",
-          "from": "utf-8-validate@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.1.0.tgz",
-          "dependencies": {
-            "bindings": {
-              "version": "1.2.1",
-              "from": "bindings@>=1.2.0 <1.3.0",
-              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-            },
-            "nan": {
-              "version": "1.8.4",
-              "from": "nan@>=1.8.0 <1.9.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
-            }
-          }
        }
      }
    }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ripple-lib",
-  "version": "0.15.1",
+  "version": "0.16.4",
  "license": "ISC",
  "description": "A JavaScript API for interacting with Ripple in Node.js and the browser",
  "files": [
@@ -20,13 +20,14 @@
    "babel-runtime": "^5.5.4",
    "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.0",
+    "ripple-binary-codec": "^0.1.1",
    "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",
@@ -65,7 +66,8 @@
    "test": "istanbul test _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"
+    "perf": "./scripts/perf_test.sh",
+    "start": "babel-node scripts/http.js"
  },
  "repository": {
    "type": "git",
--- a/scripts/checkeol.sh
+++ b/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
--- a/scripts/ci.sh
+++ b/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
@@ -34,6 +38,7 @@ unittest() {

 integrationtest() {
  mocha test/integration/integration-test.js
+  mocha test/integration/http-integration-test.js
 }

 doctest() {
@@ -46,6 +51,7 @@ doctest() {
 }

 oneNode() {
+  checkEOL
  doctest
  lint
  typecheck
@@ -56,7 +62,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
 }
@@ -64,7 +70,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
--- a/scripts/http.js
+++ b/scripts/http.js
@@ -0,0 +1,16 @@
+'use strict';
+
+const createHTTPServer = require('../src/index').createHTTPServer;
+const port = 5990;
+const serverUrl = 'wss://s1.ripple.com';
+
+
+function main() {
+  const server = createHTTPServer({server: serverUrl}, port);
+  server.start().then(() => {
+    console.log('Server started on port ' + String(port));
+  });
+}
+
+
+main();
--- a/scripts/publish
+++ b/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 ../..
--- a/scripts/publish_rc
+++ b/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 ../..
--- a/scripts/publish_to_bower
+++ b/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 ..
--- a/src/api.js
+++ b/src/api.js
@@ -44,9 +44,11 @@ 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 = common.generateAddressAPI;
+const generateAddress =
+  require('./offline/generate-address').generateAddressAPI;
 const computeLedgerHash = require('./offline/ledgerhash');
 const getLedger = require('./ledger/ledger');

@@ -84,8 +86,8 @@ class RippleAPI extends EventEmitter {
      this.connection.on('ledgerClosed', message => {
        this.emit('ledger', server.formatLedgerClose(message));
      });
-      this.connection.on('error', (type, info) => {
-        this.emit('error', type, info);
+      this.connection.on('error', (errorCode, errorMessage, data) => {
+        this.emit('error', errorCode, errorMessage, data);
      });
    } else {
      // use null object pattern to provide better error message if user
@@ -124,6 +126,7 @@ _.assign(RippleAPI.prototype, {
  prepareSuspendedPaymentCancellation,
  prepareSettings,
  sign,
+  combine,
  submit,

  generateAddress,
--- a/src/broadcast.js
+++ b/src/broadcast.js
@@ -37,7 +37,8 @@ class RippleAPIBroadcast extends RippleAPI {

    apis.forEach(api => {
      api.on('ledger', this.onLedgerEvent.bind(this));
-      api.on('error', (type, info) => this.emit('error', type, info));
+      api.on('error', (errorCode, errorMessage, data) =>
+        this.emit('error', errorCode, errorMessage, data));
    });
  }

--- a/src/common/connection.js
+++ b/src/common/connection.js
@@ -1,4 +1,5 @@
 'use strict';
+const _ = require('lodash');
 const {EventEmitter} = require('events');
 const WebSocket = require('ws');
 const parseURL = require('url').parse;
@@ -15,6 +16,7 @@ function isStreamMessageType(type) {
 class Connection extends EventEmitter {
  constructor(url, options = {}) {
    super();
+    this.setMaxListeners(Infinity);
    this._url = url;
    this._trace = options.trace;
    if (this._trace) {
@@ -25,6 +27,9 @@ class Connection extends EventEmitter {
    this._proxyAuthorization = options.proxyAuthorization;
    this._authorization = options.authorization;
    this._trustedCertificates = options.trustedCertificates;
+    this._key = options.key;
+    this._passphrase = options.passphrase;
+    this._certificate = options.certificate;
    this._timeout = options.timeout || (20 * 1000);
    this._isReady = false;
    this._ws = null;
@@ -33,6 +38,17 @@ class Connection extends EventEmitter {
    this._nextRequestID = 1;
  }

+  _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
  _parseMessage(message) {
    const data = JSON.parse(message);
@@ -43,14 +59,11 @@ 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) {
-      return ['error', data.error, data.error_message];  // e.g. slowDown
+      return ['error', data.error, data.error_message, data];  // e.g. slowDown
    }
    throw new ResponseFormatError('unrecognized message type: ' + data.type);
  }
@@ -63,7 +76,7 @@ class Connection extends EventEmitter {
    try {
      parameters = this._parseMessage(message);
    } catch (error) {
-      this.emit('error', 'badMessage', message);
+      this.emit('error', 'badMessage', error.message, message);
      return;
    }
    // we don't want this inside the try/catch or exceptions in listener
@@ -94,27 +107,28 @@ class Connection extends EventEmitter {
      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 => {
+      this._updateLedgerVersions(data);
      this._isReady = true;
      this.emit('connected');
    });
  }

-  _createWebSocket(url, proxyURL, proxyAuthorization, authorization,
-      trustedCertificates) {
+  _createWebSocket() {
    const options = {};
-    if (proxyURL !== undefined) {
-      const parsedURL = parseURL(url);
-      const proxyOptions = parseURL(proxyURL);
-      proxyOptions.secureEndpoint = (parsedURL.protocol === 'wss:');
-      proxyOptions.secureProxy = (proxyOptions.protocol === 'https:');
-      proxyOptions.auth = proxyAuthorization;
-      if (trustedCertificates) {
-        proxyOptions.ca = trustedCertificates;
-      }
+    if (this._proxyURL !== undefined) {
+      const parsedURL = parseURL(this._url);
+      const parsedProxyURL = parseURL(this._proxyURL);
+      const proxyOverrides = _.omit({
+        secureEndpoint: (parsedURL.protocol === 'wss:'),
+        secureProxy: (parsedProxyURL.protocol === 'https:'),
+        auth: this._proxyAuthorization,
+        ca: this._trustedCertificates,
+        key: this._key,
+        passphrase: this._passphrase,
+        cert: this._certificate
+      }, _.isUndefined);
+      const proxyOptions = _.assign({}, parsedProxyURL, proxyOverrides);
      let HttpsProxyAgent;
      try {
        HttpsProxyAgent = require('https-proxy-agent');
@@ -123,11 +137,22 @@ class Connection extends EventEmitter {
      }
      options.agent = new HttpsProxyAgent(proxyOptions);
    }
-    if (authorization !== undefined) {
-      const base64 = new Buffer(authorization).toString('base64');
+    if (this._authorization !== undefined) {
+      const base64 = new Buffer(this._authorization).toString('base64');
      options.headers = {Authorization: `Basic ${base64}`};
    }
-    return new WebSocket(url, options);
+    const optionsOverrides = _.omit({
+      ca: this._trustedCertificates,
+      key: this._key,
+      passphrase: this._passphrase,
+      cert: this._certificate
+    }, _.isUndefined);
+    const websocketOptions = _.assign({}, options, optionsOverrides);
+    const websocket = new WebSocket(this._url, websocketOptions);
+    // we will have a listener for each outstanding request,
+    // so we have to raise the limit (the default is 10)
+    websocket.setMaxListeners(Infinity);
+    return websocket;
  }

  connect() {
@@ -141,9 +166,13 @@ class Connection extends EventEmitter {
      } else if (this._state === WebSocket.CONNECTING) {
        this._ws.once('open', resolve);
      } else {
-        this._ws = this._createWebSocket(this._url, this._proxyURL,
-          this._proxyAuthorization, this._authorization,
-          this._trustedCertificates);
+        this._ws = this._createWebSocket();
+        // when an error causes the connection to close, the close event
+        // 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));
        this._ws.on('message', this._onMessage.bind(this));
        this._onUnexpectedCloseBound = this._onUnexpectedClose.bind(this);
        this._ws.once('close', this._onUnexpectedCloseBound);
--- a/src/common/schema-validator.js
+++ b/src/common/schema-validator.js
@@ -92,8 +92,10 @@ function loadSchemas() {
    require('./schemas/input/prepare-suspended-payment-cancellation.json'),
    require('./schemas/input/prepare-suspended-payment-execution.json'),
    require('./schemas/input/compute-ledger-hash'),
-    require('./schemas/input/sign'),
-    require('./schemas/input/submit')
+    require('./schemas/input/sign.json'),
+    require('./schemas/input/submit.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));
--- a/src/common/schemas/input/api-options.json
+++ b/src/common/schemas/input/api-options.json
@@ -42,6 +42,18 @@
        "type": "string",
        "description": "A PEM-formatted SSL certificate to trust when connecting to a proxy."
      }
+    },
+    "key": {
+      "type": "string",
+      "description": "A string containing the private key of the client in PEM format. (Can be an array of keys)."
+    },
+    "passphrase": {
+      "type": "string",
+      "description": "The passphrase for the private key of the client."
+    },
+    "certificate": {
+      "type": "string",
+      "description": "A string containing the certificate key of the client in PEM format. (Can be an array of certificates)."
    }
  },
  "additionalProperties": false
--- a/src/common/schemas/input/combine.json
+++ b/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"]
+}
--- a/src/common/schemas/input/generate-address.json
+++ b/src/common/schemas/input/generate-address.json
@@ -0,0 +1,29 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "generateAddressParameters",
+  "type": "object",
+  "properties": {
+    "options": {
+      "type": "object",
+      "description": "Options to control how the address and secret are generated.",
+      "properties": {
+        "entropy": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 255
+          },
+          "description": "The entropy to use to generate the seed."
+        },
+        "algorithm": {
+          "type": "string",
+          "enum": ["ecdsa-secp256k1", "ed25519"],
+          "description": "The digital signature algorithm to generate an address for. Can be `ecdsa-secp256k1` (default) or `ed25519`."
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false
+}
--- a/src/common/schemas/input/sign.json
+++ b/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,
--- a/src/common/schemas/objects/instructions.json
+++ b/src/common/schemas/objects/instructions.json
@@ -18,13 +18,21 @@
      "$ref": "value"
    },
    "maxLedgerVersion": {
-      "description": "The highest ledger version that the transaction can be included in.",
-      "$ref": "ledgerVersion"
+      "description": "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.",
+      "oneOf": [
+        {"$ref": "ledgerVersion"},
+        {"type": "null"}
+      ]
    },
    "maxLedgerVersionOffset": {
-      "description": "Offset from current legder version to highest ledger version that the transaction can be included in.",
+      "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,
--- a/src/common/schemas/objects/settings.json
+++ b/src/common/schemas/objects/settings.json
@@ -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
--- a/src/common/schemas/output/get-server-info.json
+++ b/src/common/schemas/output/get-server-info.json
@@ -83,7 +83,7 @@
          "description": "The time since the ledger was closed, in seconds."
        },
        "baseFeeXRP": {
-          "type": "number",
+          "$ref": "value",
          "description": "Base fee, in XRP. This may be represented in scientific notation such as 1e-05 for 0.00005."
        },
        "hash": {
@@ -91,13 +91,11 @@
          "description": "Unique hash for the ledger, as an uppercase hexadecimal string."
        },
        "reserveBaseXRP": {
-          "type": "integer",
-          "minimum": 0,
+          "$ref": "value",
          "description": "Minimum amount of XRP necessary for every account to keep in reserve."
        },
        "reserveIncrementXRP": {
-          "type": "integer",
-          "minimum": 0,
+          "$ref": "value",
          "description": "Amount of XRP added to the account reserve for each object an account is responsible for in the ledger."
        },
        "ledgerVersion": {
--- a/src/common/schemas/output/ledger-event.json
+++ b/src/common/schemas/output/ledger-event.json
@@ -23,7 +23,7 @@
    },
    "reserveBaseXRP": {
      "$ref": "value",
-      "description": "The minimum reserve, in drops of XRP, that is required for an account."
+      "description": "The minimum reserve, in XRP, that is required for an account."
    },
    "reserveIncrementXRP": {
      "$ref": "value",
--- a/src/common/schemas/output/prepare.json
+++ b/src/common/schemas/output/prepare.json
@@ -21,12 +21,15 @@
          "description": "The initiating account's sequence number for this transaction."
        },
        "maxLedgerVersion": {
-          "$ref": "ledgerVersion",
-          "description": "The highest ledger version that the transaction can be included in."
+          "oneOf": [
+            {"$ref": "ledgerVersion"},
+            {"type": "null"}
+          ],
+          "description": "The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum."
        }
      },
      "additionalProperties": false,
-      "required": ["fee", "sequence"]
+      "required": ["fee", "sequence", "maxLedgerVersion"]
    }
  },
  "additionalProperties": false,
--- a/src/common/serverinfo.js
+++ b/src/common/serverinfo.js
@@ -6,7 +6,7 @@ import type {Connection} from './connection';
 export type GetServerInfoResponse = {
  buildVersion: string,
  completeLedgers: string,
-  hostid: string,
+  hostID: string,
  ioLatencyMs: number,
  load?: {
    jobTypes: Array<Object>,
@@ -23,11 +23,11 @@ export type GetServerInfoResponse = {
  serverState: string,
  validatedLedger: {
    age: number,
-    baseFeeXrp: number,
+    baseFeeXRP: string,
    hash: string,
-    reserveBaseXrp: number,
-    reserveIncXrp: number,
-    seq: number
+    reserveBaseXRP: string,
+    reserveIncrementXRP: string,
+    ledgerVersion: number
  },
  validationQuorum: number
 }
@@ -49,6 +49,12 @@ function getServerInfo(connection: Connection): Promise<GetServerInfoResponse> {
      reserveIncXrp: 'reserveIncrementXRP',
      seq: 'ledgerVersion'
    });
+    info.validatedLedger.baseFeeXRP =
+      info.validatedLedger.baseFeeXRP.toString();
+    info.validatedLedger.reserveBaseXRP =
+      info.validatedLedger.reserveBaseXRP.toString();
+    info.validatedLedger.reserveIncrementXRP =
+      info.validatedLedger.reserveIncrementXRP.toString();
    return info;
  });
 }
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -2,8 +2,6 @@
 'use strict';
 const _ = require('lodash');
 const BigNumber = require('bignumber.js');
-const errors = require('./errors');
-const keypairs = require('ripple-keypairs');
 const {deriveKeypair} = require('ripple-keypairs');

 import type {Amount, RippledAmount} from './types.js';
@@ -37,21 +35,6 @@ function toRippledAmount(amount: Amount): RippledAmount {
  };
 }

-function generateAddress(options?: Object): Object {
-  const secret = keypairs.generateSeed(options);
-  const keypair = keypairs.deriveKeypair(secret);
-  const address = keypairs.deriveAddress(keypair.publicKey);
-  return {secret, address};
-}
-
-function generateAddressAPI(options?: Object): Object {
-  try {
-    return generateAddress(options);
-  } catch (error) {
-    throw new errors.UnexpectedError(error.message);
-  }
-}
-
 const FINDSNAKE = /([a-zA-Z]_[a-zA-Z])/g;
 function convertKeysFromSnakeCaseToCamelCase(obj: any): any {
  if (typeof obj === 'object') {
@@ -101,8 +84,6 @@ module.exports = {
  dropsToXrp,
  xrpToDrops,
  toRippledAmount,
-  generateAddress,
-  generateAddressAPI,
  convertKeysFromSnakeCaseToCamelCase,
  removeUndefined,
  rippleTimeToISO8601,
--- a/src/common/validate.js
+++ b/src/common/validate.js
@@ -47,8 +47,10 @@ 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'),
  apiOptions: _.partial(schemaValidate, 'api-options'),
  instructions: _.partial(schemaValidate, 'instructions')
 };
--- a/src/http.js
+++ b/src/http.js
@@ -0,0 +1,85 @@
+/* eslint-disable new-cap */
+'use strict';
+
+const assert = require('assert');
+const _ = require('lodash');
+const jayson = require('jayson');
+
+const RippleAPI = require('./api').RippleAPI;
+
+
+function createHTTPServer(options, httpPort) {
+  const rippleAPI = new RippleAPI(options);
+
+  const methodNames = _.filter(_.keys(RippleAPI.prototype), k => {
+    return typeof RippleAPI.prototype[k] === 'function'
+    && k !== 'connect'
+    && k !== 'disconnect'
+    && k !== 'constructor'
+    && k !== 'RippleAPI';
+  });
+
+  function applyPromiseWithCallback(fnName, callback, args_) {
+    try {
+      let args = args_;
+      if (!_.isArray(args_)) {
+        const fnParameters = jayson.Utils.getParameterNames(rippleAPI[fnName]);
+        args = fnParameters.map(name => args_[name]);
+        const defaultArgs = _.omit(args_, fnParameters);
+        assert(_.size(defaultArgs) <= 1,
+          'Function must have no more than one default argument');
+        if (_.size(defaultArgs) > 0) {
+          args.push(defaultArgs[_.keys(defaultArgs)[0]]);
+        }
+      }
+      Promise.resolve(rippleAPI[fnName].apply(rippleAPI, args))
+        .then(res => callback(null, res))
+        .catch(err => {
+          callback({code: 99, message: err.message, data: {name: err.name}});
+        });
+    } catch (err) {
+      callback({code: 99, message: err.message, data: {name: err.name}});
+    }
+  }
+
+  const methods = {};
+  _.forEach(methodNames, fn => {
+    methods[fn] = jayson.Method((args, cb) => {
+      applyPromiseWithCallback(fn, cb, args);
+    }, {collect: true});
+  });
+
+  const server = jayson.server(methods);
+  let httpServer = null;
+
+  return {
+    server: server,
+    start: function() {
+      if (httpServer !== null) {
+        return Promise.reject('Already started');
+      }
+      return new Promise((resolve) => {
+        rippleAPI.connect().then(() => {
+          httpServer = server.http();
+          httpServer.listen(httpPort, resolve);
+        });
+      });
+    },
+    stop: function() {
+      if (httpServer === null) {
+        return Promise.reject('Not started');
+      }
+      return new Promise((resolve) => {
+        rippleAPI.disconnect();
+        httpServer.close(() => {
+          httpServer = null;
+          resolve();
+        });
+      });
+    }
+  };
+}
+
+module.exports = {
+  createHTTPServer
+};
--- a/src/index.js
+++ b/src/index.js
@@ -2,5 +2,8 @@

 module.exports = {
  RippleAPI: require('./api').RippleAPI,
-  RippleAPIBroadcast: require('./broadcast').RippleAPIBroadcast
+  // Broadcast api is experimental
+  RippleAPIBroadcast: require('./broadcast').RippleAPIBroadcast,
+  // HTTP server is experimental
+  createHTTPServer: require('./http').createHTTPServer
 };
--- a/src/ledger/parse/account-trustline.js
+++ b/src/ledger/parse/account-trustline.js
@@ -24,8 +24,8 @@ function parseAccountTrustline(trustline: Trustline): AccountTrustline {
    limit: trustline.limit,
    currency: trustline.currency,
    counterparty: trustline.account,
-    qualityIn: trustline.quality_in || undefined,
-    qualityOut: trustline.quality_out || undefined,
+    qualityIn: utils.parseQuality(trustline.quality_in) || undefined,
+    qualityOut: utils.parseQuality(trustline.quality_out) || undefined,
    ripplingDisabled: trustline.no_ripple || undefined,
    frozen: trustline.freeze || undefined,
    authorized: trustline.authorized || undefined
--- a/src/ledger/parse/fields.js
+++ b/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;
 }

--- a/src/ledger/parse/settings.js
+++ b/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;
--- a/src/ledger/parse/transaction.js
+++ b/src/ledger/parse/transaction.js
@@ -22,7 +22,8 @@ function parseTransactionType(type) {
    SetRegularKey: 'settings',
    SuspendedPaymentCreate: 'suspendedPaymentCreation',
    SuspendedPaymentFinish: 'suspendedPaymentExecution',
-    SuspendedPaymentCancel: 'suspendedPaymentCancellation'
+    SuspendedPaymentCancel: 'suspendedPaymentCancellation',
+    SignerListSet: 'settings'
  };
  return mapping[type] || null;
 }
--- a/src/ledger/parse/trustline.js
+++ b/src/ledger/parse/trustline.js
@@ -3,7 +3,6 @@
 const assert = require('assert');
 const utils = require('./utils');
 const flags = utils.txFlags.TrustSet;
-const BigNumber = require('bignumber.js');

 function parseFlag(flagsValue, trueValue, falseValue) {
  if (flagsValue & trueValue) {
@@ -15,13 +14,6 @@ function parseFlag(flagsValue, trueValue, falseValue) {
  return undefined;
 }

-function parseQuality(quality?: number) {
-  if (typeof quality === 'number') {
-    return (new BigNumber(quality)).shift(-9).toNumber();
-  }
-  return undefined;
-}
-
 function parseTrustline(tx: Object): Object {
  assert(tx.TransactionType === 'TrustSet');

@@ -29,8 +21,8 @@ function parseTrustline(tx: Object): Object {
    limit: tx.LimitAmount.value,
    currency: tx.LimitAmount.currency,
    counterparty: tx.LimitAmount.issuer,
-    qualityIn: parseQuality(tx.QualityIn),
-    qualityOut: parseQuality(tx.QualityOut),
+    qualityIn: utils.parseQuality(tx.QualityIn),
+    qualityOut: utils.parseQuality(tx.QualityOut),
    ripplingDisabled: parseFlag(
      tx.Flags, flags.SetNoRipple, flags.ClearNoRipple),
    frozen: parseFlag(tx.Flags, flags.SetFreeze, flags.ClearFreeze),
--- a/src/ledger/parse/utils.js
+++ b/src/ledger/parse/utils.js
@@ -17,6 +17,13 @@ function adjustQualityForXRP(
    (new BigNumber(quality)).shift(shift).toString();
 }

+function parseQuality(quality: ?number) {
+  if (typeof quality === 'number') {
+    return (new BigNumber(quality)).shift(-9).toNumber();
+  }
+  return undefined;
+}
+
 function parseTimestamp(rippleTime: number): string | void {
  return rippleTime ? utils.common.rippleTimeToISO8601(rippleTime) : undefined;
 }
@@ -80,6 +87,7 @@ function parseMemos(tx: Object): ?Array<Object> {
 }

 module.exports = {
+  parseQuality,
  parseOutcome,
  parseMemos,
  hexToString,
--- a/src/ledger/transactions.js
+++ b/src/ledger/transactions.js
@@ -170,11 +170,11 @@ function getTransactions(address: string, options: TransactionsOptions = {}
      const ledgerVersion = tx.outcome.ledgerVersion;
      const bound = options.earliestFirst ?
        {minLedgerVersion: ledgerVersion} : {maxLedgerVersion: ledgerVersion};
-      const newOptions = _.assign(defaults, options, {startTx: tx}, bound);
+      const newOptions = _.assign({}, defaults, options, {startTx: tx}, bound);
      return getTransactionsInternal(this.connection, address, newOptions);
    });
  }
-  const newOptions = _.assign(defaults, options);
+  const newOptions = _.assign({}, defaults, options);
  return getTransactionsInternal(this.connection, address, newOptions);
 }

--- a/src/offline/generate-address.js
+++ b/src/offline/generate-address.js
@@ -0,0 +1,24 @@
+'use strict';
+const keypairs = require('ripple-keypairs');
+const common = require('../common');
+const {errors, validate} = common;
+
+function generateAddress(options?: Object): Object {
+  const secret = keypairs.generateSeed(options);
+  const keypair = keypairs.deriveKeypair(secret);
+  const address = keypairs.deriveAddress(keypair.publicKey);
+  return {secret, address};
+}
+
+function generateAddressAPI(options?: Object): Object {
+  validate.generateAddress({options});
+  try {
+    return generateAddress(options);
+  } catch (error) {
+    throw new errors.UnexpectedError(error.message);
+  }
+}
+
+module.exports = {
+  generateAddressAPI
+};
--- a/src/transaction/combine.js
+++ b/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;
--- a/src/transaction/payment.js
+++ b/src/transaction/payment.js
@@ -64,7 +64,7 @@ function createMaximalAmount(amount: Amount): Amount {
  const maxXRPValue = '100000000000';
  const maxIOUValue = '9999999999999999e80';
  const maxValue = amount.currency === 'XRP' ? maxXRPValue : maxIOUValue;
-  return _.assign(amount, {value: maxValue});
+  return _.assign({}, amount, {value: maxValue});
 }

 function createPaymentTransaction(address: string, paymentArgument: Payment
--- a/src/transaction/settings.js
+++ b/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> {
--- a/src/transaction/sign.js
+++ b/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,
--- a/src/transaction/submit.js
+++ b/src/transaction/submit.js
@@ -3,15 +3,7 @@
 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
@@ -23,7 +15,7 @@ function isImmediateRejection(engineResult: string): boolean {
  return _.startsWith(engineResult, 'tem') || _.startsWith(engineResult, 'tej');
 }

-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;
--- a/src/transaction/types.js
+++ b/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
+}
--- a/src/transaction/utils.js
+++ b/src/transaction/utils.js
@@ -10,7 +10,8 @@ function formatPrepareResponse(txJSON: Object): Object {
  const instructions = {
    fee: common.dropsToXrp(txJSON.Fee),
    sequence: txJSON.Sequence,
-    maxLedgerVersion: txJSON.LastLedgerSequence
+    maxLedgerVersion: txJSON.LastLedgerSequence === undefined ?
+      null : txJSON.LastLedgerSequence
  };
  return {
    txJSON: JSON.stringify(txJSON),
@@ -26,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> {
@@ -36,7 +41,9 @@ function prepareTransaction(txJSON: Object, api: Object,

  function prepareMaxLedgerVersion(): Promise<Object> {
    if (instructions.maxLedgerVersion !== undefined) {
+      if (instructions.maxLedgerVersion !== null) {
        txJSON.LastLedgerSequence = instructions.maxLedgerVersion;
+      }
      return Promise.resolve(txJSON);
    }
    const offset = instructions.maxLedgerVersionOffset !== undefined ?
@@ -48,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;
@@ -57,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;
    });
--- a/test/api-test.js
+++ b/test/api-test.js
@@ -14,6 +14,7 @@ const address = addresses.ACCOUNT;
 const utils = RippleAPI._PRIVATE.ledgerUtils;
 const ledgerClosed = require('./fixtures/rippled/ledger-close-newer');
 const schemaValidator = RippleAPI._PRIVATE.schemaValidator;
+assert.options.strict = true;

 function unused() {
 }
@@ -182,13 +183,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.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,
@@ -236,6 +244,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'
@@ -304,6 +329,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'));
@@ -318,6 +351,11 @@ describe('RippleAPI', function() {
    });
  });

+  it('combine', function() {
+    const combined = this.api.combine(requests.combine.setDomain);
+    checkResult(responses.combine.single, 'sign', combined);
+  });
+
  describe('RippleAPI', function() {

    it('getBalances', function() {
@@ -1247,7 +1285,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,
--- a/test/broadcast-api-test.js
+++ b/test/broadcast-api-test.js
@@ -42,7 +42,6 @@ describe('RippleAPIBroadcast', function() {
    this.mocks.forEach(mock => mock.socket.send(JSON.stringify(ledgerNext)));

    setTimeout(() => {
-      console.log('-- ledgerVersion', this.api.ledgerVersion);
      assert.strictEqual(gotLedger, 1);
      done();
    }, 50);
--- a/test/connection-test.js
+++ b/test/connection-test.js
@@ -7,6 +7,7 @@ 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');


 function unused() {
@@ -227,8 +228,9 @@ describe('Connection', function() {
  });

  it('invalid message id', function(done) {
-    this.api.on('error', (type, message) => {
-      assert.strictEqual(type, 'badMessage');
+    this.api.on('error', (errorCode, errorMessage, message) => {
+      assert.strictEqual(errorCode, 'badMessage');
+      assert.strictEqual(errorMessage, 'valid id not found in response');
      assert.strictEqual(message,
        '{"type":"response","id":"must be integer"}');
      done();
@@ -239,9 +241,10 @@ describe('Connection', function() {
  });

  it('propagate error message', function(done) {
-    this.api.on('error', (type, message) => {
-      assert.strictEqual(type, 'slowDown');
-      assert.strictEqual(message, 'slow down');
+    this.api.on('error', (errorCode, errorMessage, data) => {
+      assert.strictEqual(errorCode, 'slowDown');
+      assert.strictEqual(errorMessage, 'slow down');
+      assert.deepEqual(data, {error: 'slowDown', error_message: 'slow down'});
      done();
    });
    this.api.connection._onMessage(JSON.stringify({
@@ -250,12 +253,22 @@ describe('Connection', function() {
  });

  it('unrecognized message type', function(done) {
-    this.api.on('error', (type, message) => {
-      assert.strictEqual(type, 'badMessage');
+    this.api.on('error', (errorCode, errorMessage, message) => {
+      assert.strictEqual(errorCode, 'badMessage');
+      assert.strictEqual(errorMessage, 'unrecognized message type: unknown');
      assert.strictEqual(message, '{"type":"unknown"}');
      done();
    });

    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));
+  });
 });
--- a/test/fixtures/requests/combine.json
+++ b/test/fixtures/requests/combine.json
@@ -0,0 +1,2 @@
+[ "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1F1" ]
--- a/test/fixtures/requests/index.js
+++ b/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'),
@@ -61,5 +65,8 @@ module.exports = {
  computeLedgerHash: {
    header: require('./compute-ledger-hash'),
    transactions: require('./compute-ledger-hash-transactions')
+  },
+  combine: {
+    setDomain: require('./combine.json')
  }
 };
--- a/test/fixtures/requests/prepare-settings-signers.json
+++ b/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
+      }
+    ]
+  }
+}
--- a/test/fixtures/requests/sign-as.json
+++ b/test/fixtures/requests/sign-as.json
@@ -0,0 +1,8 @@
+{
+  "Account": "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
+  "Amount": "1000000000",
+  "Destination": "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
+  "Fee": "50",
+  "Sequence": 2,
+  "TransactionType": "Payment"
+}
--- a/test/fixtures/responses/combine.json
+++ b/test/fixtures/responses/combine.json
@@ -0,0 +1,4 @@
+{
+  "signedTransaction": "12000322800000002400000004201B000000116840000000000F42407300770B6578616D706C652E636F6D811407C532442A675C881BA1235354D4AB9D023243A6F3E01073210287AAAB8FBE8C4C4A47F6F1228C6E5123A7ED844BFE88A9B22C2F7CC34279EEAA74473045022100B09DDF23144595B5A9523B20E605E138DC6549F5CA7B5984D7C32B0E3469DF6B022018845CA6C203D4B6288C87DDA439134C83E7ADF8358BD41A8A9141A9B631419F8114517D9B9609229E0CDFE2428B586738C5B2E84D45E1E0107321026C784C1987F83BACBF02CD3E484AFC84ADE5CA6B36ED4DCA06D5BA233B9D382774473045022100E484F54FF909469FA2033E22EFF3DF8EDFE62217062680BB2F3EDF2F185074FE0220350DB29001C710F0450DAF466C5D819DC6D6A3340602DE9B6CB7DA8E17C90F798114FE9337B0574213FA5BCC0A319DBB4A7AC0CCA894E1F1",
+  "id": "8A3BFD2214B4C8271ED62648FCE9ADE4EE82EF01827CF7D1F7ED497549A368CC"
+}
--- a/test/fixtures/responses/get-server-info.json
+++ b/test/fixtures/responses/get-server-info.json
@@ -13,10 +13,10 @@
  "serverState": "full",
  "validatedLedger": {
    "age": 5,
-    "baseFeeXRP": 0.00001,
+    "baseFeeXRP": "0.00001",
    "hash": "4482DEE5362332F54A4036ED57EE1767C9F33CF7CE5A6670355C16CECE381D46",
-    "reserveBaseXRP": 20,
-    "reserveIncrementXRP": 5,
+    "reserveBaseXRP": "20",
+    "reserveIncrementXRP": "5",
    "ledgerVersion": 6595042
  },
  "validationQuorum": 3
--- a/test/fixtures/responses/get-trustlines-all.json
+++ b/test/fixtures/responses/get-trustlines-all.json
@@ -3,7 +3,8 @@
    "specification": {
      "limit": "0",
      "currency": "ASP",
-      "counterparty": "r3vi7mWxru9rJCxETCyA1CHvzL96eZWx5z"
+      "counterparty": "r3vi7mWxru9rJCxETCyA1CHvzL96eZWx5z",
+      "qualityIn": 1
    },
    "counterparty": {
      "limit": "10"
--- a/test/fixtures/responses/index.js
+++ b/test/fixtures/responses/index.js
@@ -71,8 +71,8 @@ module.exports = {
  },
  preparePayment: {
    normal: require('./prepare-payment.json'),
-    minAmountXRP: require('./prepare-payment-min-amont-xrp.json'),
-    minAmountXRPXRP: require('./prepare-payment-min-amont-xrp-xrp.json'),
+    minAmountXRP: require('./prepare-payment-min-amount-xrp.json'),
+    minAmountXRPXRP: require('./prepare-payment-min-amount-xrp-xrp.json'),
    allOptions: require('./prepare-payment-all-options.json'),
    noCounterparty: require('./prepare-payment-no-counterparty.json'),
    minAmount: require('./prepare-payment-min-amount.json')
@@ -81,12 +81,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')
+    signed: require('./prepare-settings-signed.json'),
+    noMaxLedgerVersion: require('./prepare-settings-no-maxledgerversion.json'),
+    signers: require('./prepare-settings-signers.json')
  },
  prepareSuspendedPaymentCreation: {
    normal: require('./prepare-suspended-payment-creation'),
@@ -107,7 +110,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')
--- a/test/fixtures/responses/prepare-payment-min-amount-xrp-xrp.json
+++ b/test/fixtures/responses/prepare-payment-min-amount-xrp-xrp.json
--- a/test/fixtures/responses/prepare-payment-min-amount-xrp.json
+++ b/test/fixtures/responses/prepare-payment-min-amount-xrp.json
@@ -1,5 +1,5 @@
 {
-  "txJSON": "{\"TransactionType\":\"Payment\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Destination\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"Amount\":\"100000000000000000\",\"Flags\":2147614720,\"SendMax\":{\"currency\":\"USD\",\"issuer\":\"rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM\",\"value\":\"0.01\"},\"DeliverMin\":\"100000000000000000\",\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
+  "txJSON": "{\"TransactionType\":\"Payment\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Destination\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"Amount\":\"100000000000000000\",\"Flags\":2147614720,\"SendMax\":{\"currency\":\"USD\",\"issuer\":\"rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM\",\"value\":\"0.01\"},\"DeliverMin\":\"10000\",\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
  "instructions": {
    "fee": "0.000012",
    "sequence": 23,
--- a/test/fixtures/responses/prepare-payment-min-amount.json
+++ b/test/fixtures/responses/prepare-payment-min-amount.json
@@ -1,5 +1,5 @@
 {
-  "txJSON": "{\"Flags\":2147614720,\"TransactionType\":\"Payment\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Destination\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\",\"Amount\":{\"value\":\"9999999999999999e80\",\"currency\":\"USD\",\"issuer\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\"},\"SendMax\":{\"value\":\"5\",\"currency\":\"USD\",\"issuer\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\"},\"DeliverMin\":{\"value\":\"9999999999999999e80\",\"currency\":\"USD\",\"issuer\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\"},\"Paths\":[[{\"account\":\"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B\"},{\"currency\":\"XRP\"},{\"issuer\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\",\"currency\":\"USD\"},{\"account\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\"},{\"account\":\"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn\"}],[{\"account\":\"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B\"},{\"currency\":\"XRP\"},{\"issuer\":\"rfsEoNBUBbvkf4jPcFe2u9CyaQagLVHGfP\",\"currency\":\"USD\"},{\"account\":\"rfsEoNBUBbvkf4jPcFe2u9CyaQagLVHGfP\"},{\"account\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\"}]],\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
+  "txJSON": "{\"Flags\":2147614720,\"TransactionType\":\"Payment\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Destination\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\",\"Amount\":{\"value\":\"9999999999999999e80\",\"currency\":\"USD\",\"issuer\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\"},\"SendMax\":{\"value\":\"5\",\"currency\":\"USD\",\"issuer\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\"},\"DeliverMin\":{\"value\":\"4.93463759481038\",\"currency\":\"USD\",\"issuer\":\"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX\"},\"Paths\":[[{\"account\":\"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B\"},{\"currency\":\"XRP\"},{\"issuer\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\",\"currency\":\"USD\"},{\"account\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\"},{\"account\":\"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn\"}],[{\"account\":\"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B\"},{\"currency\":\"XRP\"},{\"issuer\":\"rfsEoNBUBbvkf4jPcFe2u9CyaQagLVHGfP\",\"currency\":\"USD\"},{\"account\":\"rfsEoNBUBbvkf4jPcFe2u9CyaQagLVHGfP\"},{\"account\":\"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q\"}]],\"LastLedgerSequence\":8820051,\"Fee\":\"12\",\"Sequence\":23}",
  "instructions": {
    "fee": "0.000012",
    "sequence": 23,
--- a/test/fixtures/responses/prepare-settings-multisign.json
+++ b/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
+  }
+}
--- a/test/fixtures/responses/prepare-settings-no-maxledgerversion.json
+++ b/test/fixtures/responses/prepare-settings-no-maxledgerversion.json
@@ -0,0 +1,8 @@
+{
+  "txJSON": "{\"TransactionType\":\"AccountSet\",\"Account\":\"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59\",\"Memos\":[{\"Memo\":{\"MemoData\":\"7465787465642064617461\",\"MemoType\":\"74657374\",\"MemoFormat\":\"706C61696E2F74657874\"}}],\"Domain\":\"726970706C652E636F6D\",\"Flags\":2147483648,\"Fee\":\"12\",\"Sequence\":23}",
+  "instructions": {
+    "fee": "0.000012",
+    "sequence": 23,
+    "maxLedgerVersion": null
+  }
+}
--- a/test/fixtures/responses/prepare-settings-signers.json
+++ b/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
+  }
+}
--- a/test/fixtures/responses/sign-as.json
+++ b/test/fixtures/responses/sign-as.json
@@ -0,0 +1,4 @@
+{
+  "signedTransaction": "120000240000000261400000003B9ACA00684000000000000032730081142E244E6F20104E57C0C60BD823CB312BF10928C78314B5F762798A53D543A014CAF8B297CFF8F2F937E8F3E01073210330E7FC9D56BB25D6893BA3F317AE5BCF33B3291BD63DB32654A313222F7FD02074473045022100BB6FC77F26BC88587204CAA79B2230C420D7EC937B8AC3A0CF9B0BE988BAB0D002203BF86893BA3B764375FFFAD9D54A4AAEDABD07C4D72ADB9C1B20C10B4DD712898114B5F762798A53D543A014CAF8B297CFF8F2F937E8E1F1",
+  "id": "AB7632D7C07E591658635CED6A5DDE832B22CA066907CB131DEFAAA925B98185"
+}
--- a/test/fixtures/rippled/account-lines.js
+++ b/test/fixtures/rippled/account-lines.js
@@ -22,7 +22,7 @@ module.exports.normal = function(request, options = {}) {
        currency: 'ASP',
        limit: '0',
        limit_peer: '10',
-        quality_in: 0,
+        quality_in: 1000000000,
        quality_out: 0
      },
      {
--- a/test/integration/http-integration-test.js
+++ b/test/integration/http-integration-test.js
@@ -0,0 +1,193 @@
+/* eslint-disable max-nested-callbacks */
+'use strict';
+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 TIMEOUT = 20000;   // how long before each test case times out
+
+const serverUri = 'ws://127.0.0.1:6006';
+const apiOptions = {
+  server: serverUri
+};
+
+const httpPort = 3000;
+
+function createClient() {
+  return jayson.client.http({port: httpPort, hostname: 'localhost'});
+}
+
+const address = 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59';
+
+function makePositionalParams(params) {
+  return params.map(value => value[_.keys(value)[0]]);
+}
+
+function makeNamedParams(params) {
+  return _.reduce(params, _.assign, {});
+}
+
+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() {
+      return new Promise((resolve, reject) => {
+        client.request(methodName, params, id,
+          (err, result) => err ? reject(err) : resolve(testFunc(result)));
+      });
+    });
+  }
+
+  function createTest(name, params, testFunc, id) {
+    createTestInternal(name + ' - positional params', name,
+      makePositionalParams(params), testFunc, id);
+    createTestInternal(name + ' - named params', name,
+      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(() => {
+      this.client = createClient();
+      client = this.client;
+    });
+  });
+
+  afterEach(function() {
+    return server.stop();
+  });
+
+
+  createTest(
+    'getLedgerVersion',
+    [],
+    result => assert(_.isNumber(result.result))
+  );
+
+  createTest(
+    'getServerInfo',
+    [],
+    result => assert(_.isNumber(result.result.validatedLedger.ledgerVersion))
+  );
+
+  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);
+        });
+    });
+  });
+
+  it('getTransactions', function() {
+    const params = [{address: newWallet.address}, {
+      options: {
+        binary: true,
+        limit: 1
+      }
+    }];
+    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.domain},
+      {instructions: {
+        maxFee: '0.000012',
+        sequence: 23,
+        maxLedgerVersion: 8820051
+      }}
+    ],
+    result => {
+      const got = JSON.parse(result.result.txJSON);
+      const expected = JSON.parse(apiResponses.prepareSettings.flags.txJSON);
+      assert.deepEqual(got, expected);
+    }
+  );
+
+  createTest(
+    'sign',
+    [{txJSON: apiRequests.sign.normal.txJSON},
+    {secret: 'shsWGZcmZz6YsWWmcnpfr6fLTdtFV'}],
+    result => assert.deepEqual(result.result, apiResponses.sign.normal)
+  );
+
+  createTest(
+    'generateAddress',
+    [{options: {entropy: random()}}],
+    result => assert.deepEqual(result.result, apiResponses.generateAddress)
+  );
+
+  createTest(
+    'computeLedgerHash',
+    [{ledger: _.assign({}, apiResponses.getLedger.full,
+      {parentCloseTime: apiResponses.getLedger.full.closeTime})
+    }],
+    result => {
+      assert.strictEqual(result.result,
+        'E6DB7365949BF9814D76BCC730B01818EB9136A89DB224F3F9F5AAE4569D758E');
+    }
+  );
+
+  createTest(
+    'isConnected',
+    [],
+    result => assert(result.result)
+  );
+
+});
--- a/test/integration/integration-test.js
+++ b/test/integration/integration-test.js
@@ -9,73 +9,179 @@ const requests = require('../fixtures/requests');
 const RippleAPI = require('../../src').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
+const TIMEOUT = 10000;   // how long before each test case times out
 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...');
  });
 }

+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 +190,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 +246,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 +261,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 +339,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 +351,7 @@ describe('integration tests', function() {
      },
      counter: {
        currency: 'USD',
-        counterparty: 'rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q'
+        counterparty: masterAccount
      }
    };
    return this.api.getOrderbook(address, orderbook).then(book => {
@@ -272,11 +379,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 +396,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 +436,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;
+        });
+      });
+    });
+  });
+});
--- a/test/integration/rippled.cfg
+++ b/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
--- a/test/integration/utils.js
+++ b/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
+};
--- a/test/mock-rippled.js
+++ b/test/mock-rippled.js
@@ -249,6 +249,11 @@ module.exports = function(port) {
    }
  });

+  mock.on('request_submit_multisigned', function(request, conn) {
+    assert.strictEqual(request.command, 'submit_multisigned');
+    conn.send(createResponse(request, fixtures.submit.success));
+  });
+
  mock.on('request_account_lines', function(request, conn) {
    if (request.account === addresses.ACCOUNT) {
      conn.send(accountLinesResponse.normal(request));
Author	SHA1	Message	Date
Alan Cohen	0f4d957d14	Update version to 0.16.4	2016-01-04 19:48:59 -08:00
Alan Cohen	71a13224a1	Merge branch 'develop' into release * develop: Update ws to 1.0.1 run integration tests using standalone server Add multisignature support Add sample code to cancel all orders for a specified account Remove references to browser support add check for windows eol on commit removes windows eols from some files Fix error on ledger subscription message without validated_ledgers	2016-01-04 19:47:24 -08:00
Alan Cohen	8097ed60ba	Update version to 0.16.3	2016-01-04 19:45:47 -08:00
Alan Cohen	408bb74214	Merge pull request #682 from lumberj/update-ws Update ws to 1.0.1	2016-01-04 19:12:11 -08:00
Alan Cohen	9433b43873	Update ws to 1.0.1 Also, addresses remote memory disclosure vulnerability https://nodesecurity.io/advisories/67	2016-01-04 19:06:30 -08:00
Chris Clark	896bf48c79	Merge pull request #672 from darkdarkdragon/develop-RLJS-558 testing circleci standalone integration	2015-12-18 16:11:13 -08:00
Ivan Tivonenko	3dd21a7e11	run integration tests using standalone server	2015-12-19 02:04:05 +02:00
Chris Clark	ed79a04018	Merge pull request #679 from clark800/multisign Add multisignature support	2015-12-17 13:27:52 -08:00
Chris Clark	ebfe20defb	Add multisignature support	2015-12-17 11:45:08 -08:00
Chris Clark	28b148348d	Merge pull request #678 from clark800/cancel-all Add sample code to cancel all orders for a specified account	2015-12-16 12:05:09 -08:00
Chris Clark	fe099f2c8b	Add sample code to cancel all orders for a specified account	2015-12-16 11:40:39 -08:00
Chris Clark	107c8c9f0f	Merge pull request #677 from lumberj/no-browser Remove references to browser support	2015-12-16 11:35:33 -08:00
Alan Cohen	39e818b3e5	Remove references to browser support	2015-12-16 10:34:57 -08:00
Chris Clark	588ffa3d5c	Merge pull request #674 from darkdarkdragon/develop-eol add check for windows eol	2015-12-14 12:57:57 -08:00
Ivan Tivonenko	691e4dd114	add check for windows eol on commit removes windows eols from some files	2015-12-14 22:15:30 +02:00
Chris Clark	55bc42725f	Merge pull request #675 from clark800/fix-validated-ledgers Fix error on ledger subscription message without validated_ledgers	2015-12-14 11:30:35 -08:00
Chris Clark	cce55b9361	Fix error on ledger subscription message without validated_ledgers	2015-12-14 11:07:58 -08:00
Chris Clark	c23c6e4fc9	Bump version to 0.16.2	2015-12-10 14:41:45 -08:00
Chris Clark	afdd60efe8	Merge pull request #671 from clark800/bump-binary Bump ripple-binary-codec dependency version to 0.1.1 to fix issue wit…	2015-12-10 14:38:11 -08:00
Chris Clark	8f6ea573ff	Bump ripple-binary-codec dependency version to 0.1.1 to fix issue with computeLedgerHash for transactions with DeliverMin	2015-12-10 14:29:28 -08:00
Alan Cohen	3271b544ef	Bump version to 0.16.1	2015-12-09 16:51:26 -08:00
Alan Cohen	6e83130754	Merge pull request #669 from lumberj/fix-assertdiff FIX: Use assert not assert-diff	2015-12-09 16:49:36 -08:00
Alan Cohen	f6ebe32519	FIX: Use assert not assert-diff	2015-12-09 16:45:08 -08:00
Chris Clark	3caed3c761	Bump version to 0.16.0	2015-12-09 13:17:04 -08:00
Chris Clark	ce1c55427a	Merge pull request #668 from clark800/fix-ws-error BREAKING CHANGE: Change error event format and fix crash due to error event on websocket	2015-12-09 13:06:45 -08:00
Chris Clark	9cd72595f0	BREAKING CHANGE: Change error event format and fix crash due to error event on websocket	2015-12-09 12:56:45 -08:00
Chris Clark	ad1d3e135f	Merge pull request #663 from darkdarkdragon/develop-http-server http server example	2015-12-09 11:15:52 -08:00
Ivan Tivonenko	76866ab901	http server example allows to use both positional and named parameters	2015-12-09 21:00:47 +02:00
Chris Clark	20b647dfbf	Merge pull request #667 from clark800/fix-server-info BREAKING CHANGE: Fix types of XRP values in getServerInfo response	2015-12-07 17:03:09 -08:00
Chris Clark	99d08065e4	BREAKING CHANGE: Fix types of XRP values in getServerInfo response	2015-12-07 16:47:56 -08:00
Chris Clark	261fba3d21	Merge pull request #666 from clark800/fix-deliver-min Fix DeliverMin value when specifying minAmount	2015-12-04 15:35:30 -08:00
Chris Clark	e1d9de7b1f	Fix DeliverMin value when specifying minAmount	2015-12-04 15:18:03 -08:00
Chris Clark	391b2f3622	Merge pull request #665 from clark800/fix-quality Fix parsing of quality for getTrustlines	2015-12-04 13:55:46 -08:00
Chris Clark	86ff315ef2	Fix parsing of quality for getTrustlines	2015-12-04 13:40:59 -08:00
Chris Clark	8d8a850864	Merge pull request #662 from lumberj/doc-fix getFee returns a string not float	2015-12-02 13:32:11 -08:00
Alan Cohen	7bf2da6014	getFee returns a string not float > api.connect().then(() => api.getFee().then(fee => console.log(typeof fee))); > string	2015-12-02 13:17:35 -08:00
Chris Clark	7eae3ce709	Merge pull request #661 from clark800/client-cert Add support for client certificates	2015-11-30 16:48:52 -08:00
Chris Clark	5f5e48e414	Add support for client certificates	2015-11-30 16:26:27 -08:00
Chris Clark	4f6a37f7b1	Merge pull request #660 from clark800/null-max Allow setting maxLedgerVersion to null to specify no maximum	2015-11-30 16:13:41 -08:00
Chris Clark	82613e7e8b	Allow setting maxLedgerVersion to null to specify no maximum	2015-11-30 15:52:36 -08:00
Chris Clark	588aa382a1	Merge pull request #659 from clark800/doc-fixes Fix generateAddress docs and add error event listener to boilerplate	2015-11-30 15:32:02 -08:00
Chris Clark	809d981987	Fix generateAddress docs and add error event listener to boilerplate	2015-11-30 15:16:37 -08:00
Chris Clark	cfc21fde8c	Bump version to 0.15.2	2015-11-25 13:13:53 -08:00
Geert Weening	5c06ef547b	Merge pull request #658 from clark800/fix-proxy-auth Fix support for proxy credentials in proxy URL and fix error when the…	2015-11-25 13:11:42 -08:00
Chris Clark	0990ad4a6f	Fix support for proxy credentials in proxy URL and fix error when there are more than 10 outstanding requests	2015-11-25 12:53:50 -08:00