Release 1.1.0

Add DepositPreauth (#958 )
* Expose parseAccountFlags() and add docs * Add example snippet * Default to node v10 for nvm * Maintain existing behavior for getSettings * Increase max line length from 80 to 120 (ter-max-len)
2025-11-15 10:05:48 +00:00 · 2018-10-31 16:36:20 -07:00 · 2018-10-31 16:27:32 -07:00 · 2018-10-31 16:07:25 -07:00 · 2018-10-30 14:15:42 -07:00 · 2018-10-24 20:34:03 -07:00
135 changed files with 4544 additions and 1309 deletions
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v8
+v10
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
  - 6
  - 8
  - 9
+  - 10
 script:
  - yarn compile
  - yarn test
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,123 @@
 # ripple-lib Release History

+## 1.1.0 (2018-10-31)
+
+ Add support for Node.js v10 LTS (#964)
+ Add [DepositPreauth](https://developers.ripple.com/depositauth.html) ([#958](https://github.com/ripple/ripple-lib/pull/958))
+ In `FormattedTransactionType`, the `Outcome`'s `balanceChanges` property had
+  the wrong type. This is now fixed (#955)
+ Add/fix docs for: xrpToDrops, dropsToXrp, iso8601ToRippleTime, schemaValidator, isValidAddress, isValidSecret, deriveKeypair, deriveAddress
+
+The SHA-256 checksums for the browser version of this release can be found
+below.
+```
+% shasum -a 256 *
+e1d742092b3c0fcee97a875e18db4baeab3bbc82f08b96e883ee188c5f0cfb37  ripple-1.1.0-debug.js
+f28921f57a133678dcb3cb54c497626bd76b1f953d22d61f3ddca31c8947d552  ripple-1.1.0-min.js
+3696871a80c1102635699994adcaf00cdfdfcff5014fc2eba3d8f8d8437c8f91  ripple-1.1.0.js
+```
+
+## 1.0.2 (2018-10-16)
+
+ Fix #954: Exclude SendMax from all XRP to XRP payments (thanks @jefftrudeau)
+ TypeScript
+  + book_offers returns offers type OfferLedgerEntry (#951)
+  + Use `object` (#936)
+
+The SHA-256 checksums for the browser version of this release can be found
+below.
+```
+% shasum -a 256 * 
+2556fe17296e127ed44e7066e90a6175e2b164f00ca3c1aa7b1c554f31c688dd  ripple-1.0.2-debug.js
+e0342ea21eac32a1024c62034fba09c6f26dd3e7371b23ea1e153e03135cd590  ripple-1.0.2-min.js
+c7286c517497d018d02d09257e81172b61d36c8b9885a077af68e8133c3b3b9b  ripple-1.0.2.js
+```
+
+## 1.0.1 (2018-09-27)
+
+ Add address/secret/key validation and derivation methods ([#932](https://github.com/ripple/ripple-lib/pull/932))
+  + `isValidAddress(address: string) : boolean`: Checks if the specified string contains a valid address.
+  + `isValidSecret(secret: string): boolean`: Checks if the specified string contains a valid secret.
+  + `deriveKeypair(seed: string): {privateKey: string, publicKey: string}`: Derive a public and private key from a seed.
+  + `deriveAddress(publicKey: string): string`: Derive an XRP Ledger address from a public key.
+ To derive an address from a secret:
+  1. Derive the public key from the secret.
+  2. Derive the address from the public key.
+  + Example: `const address = api.deriveAddress(api.deriveKeypair(secret).publicKey)`
+ Update server regex to accommodate UDS (#944)
+ Include memos when parsing trustlines (#949)
+ Add remaining LedgerEntry types (#943)
+
+The SHA-256 checksums for the browser version of this release can be found
+below.
+```
+% shasum -a 256 *
+9b6408641ce83659afcd5765c256c35829a4fcb4c3244dc9ca6bf27c871a45c4  ripple-1.0.1-debug.js
+7ab2b69fe59c2d4a74638116e2ba3b387155eb2d23e48a01bbf7beb72911f898  ripple-1.0.1-min.js
+8bb4dcad9ce25a27003b1d73d71ddf41b8a5af02ece4ebbfeaff4aeb91f3b8c4  ripple-1.0.1.js
+```
+
+## 1.0.0 (2018-08-30)
+
+We are pleased to announce the release of `ripple-lib` version 1.0.0.
+
+This version features a range of changes and improvements that make the library
+more capable and flexible. It includes new methods for accessing rippled APIs,
+including subscriptions.
+
+When using this version with `rippled` for online functionality, we recommend
+using `rippled` version 1.0.1 or later.
+
+Here is a summary of the changes since `ripple-lib` version 0.22.0, which was
+the last non-beta version.
+
+### New Features
+
+ [Add `request()`, `hasNextPage()`, and `requestNextPage()` for accessing `rippled`
+  APIs](https://github.com/ripple/ripple-lib/blob/09541dae86bc859bf5928ac65b2645dfaaf7f8b1/docs/index.md#rippled-apis).
+ Add `prepareTransaction()` for preparing raw `txJSON`.
+ XRP amounts can be specified in drops. Also, `xrpToDrops()` and `dropsToXrp()`
+  are available to make conversions.
+ `getTransaction` responses can include a new `channelChanges` property that
+  describes the details of a payment channel.
+
+### Data Validation and Errors
+
+ [Amounts in drops and XRP are checked for
+  validity](https://github.com/ripple/ripple-lib/blob/develop/HISTORY.md#100-beta1-2018-05-24).
+ [A maximum fee is now
+  imposed](https://github.com/ripple/ripple-lib/blob/develop/HISTORY.md#100-beta2-2018-06-08). Exceeding it causes a `ValidationError` to be
+  thrown.
+ Errors are improved and more data validation was added.
+ Bug fix: `getPaths` now filters paths correctly and works correctly when the
+  destination currency is XRP.
+
+### Breaking Changes
+
+The following changes were introduced in 1.0.0.
+
+ `getTransaction()` and `getTransactions()`
+  + The `specification.destination.amount` field has been removed from the parsed transaction response.
+  + To determine the amount that a transaction delivered, use `outcome.deliveredAmount`.
+  + If you require the provisional requested `Amount` from the original transaction:
+    + Use `getTransaction`'s `includeRawTransaction` option, or
+    + Use `getTransactions`'s `includeRawTransactions` option, or
+    + Use the rippled APIs directly with `request`. For example, call the API methods `tx`, `account_tx`, etc.
+ `getLedger()` response object
+  + The `rawTransactions` field has been removed (for consistency with `getTransaction()` and `getTransactions()`).
+  + Instead, within each `transaction`, use the new `rawTransaction` JSON string.
+  + The `metaData` field has been renamed to `meta` for consistency with rippled's `tx` method.
+  + `ledger_index` has been added to each raw transaction.
+
+The SHA-256 checksums for the browser version of this release can be found
+below.
+```
+% shasum -a 256 *
+06e5efcb6846ad45dedfd85cfa2ef4bdeb608b15ccbfb60b872c995d97342426  ripple-1.0.0-debug.js
+cdb26b928a89ce228c727d1ff966df266eb46b2f76bd94f81cbeb0a9d75febf0  ripple-1.0.0-min.js
+f74ee804e8a945a994e4e3901a0a3eb52292fbdcbff61ed30cefb8ffbcba50c3  ripple-1.0.0.js
+```
+
 ## 1.0.0-beta.5 (2018-08-11)

 + [Fix a TypeScript error by importing the `Prepare` type](https://github.com/ripple/ripple-lib/commit/7cd517268bda5fe74b91dad02fedf8b51b7eae9b)
@@ -172,6 +290,9 @@ below.
 ## 0.19.0 (2018-03-02)

 + [Add support for Checks](https://github.com/ripple/ripple-lib/pull/853)
+  + **CheckCreate** adds a check entry to the ledger. The check is a promise from the source of the check that the destination of the check may cash the check and receive up to the SendMax specified on the check. The check may have an (optional) expiration, after which the check may no longer be cashed.
+  + **CheckCancel** removes the check from the ledger without transferring funds. Either the check's source or destination can cancel the check at any time. After a check has expired, any account can cancel the check.
+  + **CheckCash** is a request by the destination of the check to transfer a requested amount of funds, up to the check's SendMax, from the source to the destination. The destination may receive less than the SendMax due to transfer fees.
 + [Add support for the Deposit Authorization account root flag](https://github.com/ripple/ripple-lib/pull/852)
 + [Generate .ts.d TypeScript declaration files](https://github.com/ripple/ripple-lib/pull/851)
 + [Improve documentation of getTransactions params](https://github.com/ripple/ripple-lib/pull/856)
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@

 A JavaScript API for interacting with the XRP Ledger

-[![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)
-
 [![NPM](https://nodei.co/npm/ripple-lib.png)](https://www.npmjs.org/package/ripple-lib)

 ### Features
@@ -12,23 +10,27 @@ A JavaScript API for interacting with the XRP Ledger
 + Issue [rippled API](https://ripple.com/build/rippled-apis/) requests
 + Listen to events on the XRP Ledger (transaction, ledger, etc.)
 + Sign and submit transactions to the XRP Ledger
+ Type definitions for TypeScript

 ## Getting Started

 See also: [RippleAPI Beginners Guide](https://ripple.com/build/rippleapi-beginners-guide/)

-You can use `npm`, but we recommend using `yarn` for the added assurance provided by `yarn.lock`.
+### Requirements

-+ [Yarn Installation Instructions](https://yarnpkg.com/en/docs/install)
+ **[Node v10](https://nodejs.org/)** is recommended. Other versions may work but are not frequently tested.
+ **[Yarn](https://yarnpkg.com/)** is recommended. `npm` may work but we use `yarn.lock`.

-Install `ripple-lib`:
+### Install
+
+In an existing project (with `package.json`), install `ripple-lib`:
 ```
 $ yarn add ripple-lib
 ```

 Then see the [documentation](https://github.com/ripple/ripple-lib/blob/develop/docs/index.md) and [code samples](https://github.com/ripple/ripple-lib/tree/develop/docs/samples).

-### Mailing lists
+### Mailing Lists

 We have a low-traffic mailing list for announcements of new ripple-lib releases. (About 1 email per week)

@@ -56,11 +58,11 @@ Gulp will [output](./Gulpfile.js) the resulting JS files in `./build/`.

 For more details, see the `scripts` in `package.json`.

-## Running tests
+## Running Tests

 1. Clone the repository
 2. `cd` into the repository and install dependencies with `yarn install`
-3. `yarn test` or `yarn test --coverage` (`istanbul` will create coverage reports in `coverage/lcov-report/`)
+3. `yarn test`

 ## Generating Documentation

--- a/docs/index.md
+++ b/docs/index.md
@@ -58,6 +58,8 @@
  - [getAccountObjects](#getaccountobjects)
  - [getPaymentChannel](#getpaymentchannel)
  - [getLedger](#getledger)
+  - [parseAccountFlags](#parseaccountflags)
+  - [prepareTransaction](#preparetransaction)
  - [preparePayment](#preparepayment)
  - [prepareTrustline](#preparetrustline)
  - [prepareOrder](#prepareorder)
@@ -76,9 +78,19 @@
  - [combine](#combine)
  - [submit](#submit)
  - [generateAddress](#generateaddress)
+  - [isValidAddress](#isvalidaddress)
+  - [isValidSecret](#isvalidsecret)
+  - [deriveKeypair](#derivekeypair)
+  - [deriveAddress](#deriveaddress)
  - [signPaymentChannelClaim](#signpaymentchannelclaim)
  - [verifyPaymentChannelClaim](#verifypaymentchannelclaim)
  - [computeLedgerHash](#computeledgerhash)
+  - [xrpToDrops](#xrptodrops)
+  - [dropsToXrp](#dropstoxrp)
+  - [iso8601ToRippleTime](#iso8601torippletime)
+  - [txFlags](#txflags)
+  - [schemaValidator](#schemavalidator)
+  - [schemaValidate](#schemavalidate)
 - [API Events](#api-events)
  - [ledger](#ledger)
  - [error](#error)
@@ -156,7 +168,7 @@ maxFeeXRP | string | *Optional* Maximum fee to use with transactions, in XRP. Mu
 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://`.
+server | uri string | *Optional* URI for rippled websocket port to connect to. Must start with `wss://`, `ws://`, `wss+unix://`, or `ws+unix://`.
 timeout | integer | *Optional* Timeout in milliseconds before considering a request to have failed.
 trace | boolean | *Optional* If true, log rippled requests and responses to stdout.
 trustedCertificates | array\<string\> | *Optional* Array of PEM-formatted SSL certificates to trust when connecting to a proxy. This is useful if you want to use a self-signed certificate on the proxy server. Note: Each element must contain a single certificate; concatenated certificates are not valid.
@@ -363,7 +375,7 @@ source | object | The source of the funds to be sent.
 *source.* maxAmount | [laxAmount](#amount) | The maximum amount to send. (This field is exclusive with source.amount)
 destination | object | The destination of the funds to be sent.
 *destination.* address | [address](#address) | The address to receive at.
-*destination.* amount | [laxAmount](#amount) | An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field is exclusive with destination.minAmount).
+*destination.* amount | [laxAmount](#amount) | An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field cannot be used with `destination.minAmount`.)
 *destination.* tag | integer | *Optional* An arbitrary unsigned 32-bit integer that identifies a reason for payment or a non-Ripple account.
 *destination.* address | [address](#address) | The address to send to.
 *destination.* minAmount | [laxAmount](#amount) | The minimum amount to be delivered. (This field is exclusive with destination.amount)
@@ -448,12 +460,14 @@ direction | string | Equal to "buy" for buy orders and "sell" for sell orders.
 quantity | [amount](#amount) | The amount of currency to buy or sell.
 totalPrice | [amount](#amount) | The total price to be paid for the `quantity` to be bought or sold.
 expirationTime | date-time string | *Optional* Time after which the offer is no longer active, as an [ISO 8601 date-time](https://en.wikipedia.org/wiki/ISO_8601).
-fillOrKill | boolean | *Optional* Treat the offer as a [Fill or Kill order](http://en.wikipedia.org/wiki/Fill_or_kill). Only attempt to match existing offers in the ledger, and only do so if the entire quantity can be exchanged.
-immediateOrCancel | boolean | *Optional* Treat the offer as an [Immediate or Cancel order](http://en.wikipedia.org/wiki/Immediate_or_cancel). If enabled, the offer will never become a ledger node: it only attempts to match existing offers in the ledger.
+fillOrKill | boolean | *Optional* Treat the offer as a [Fill or Kill order](http://en.wikipedia.org/wiki/Fill_or_kill). Only attempt to match existing offers in the ledger, and only do so if the entire quantity can be exchanged. This cannot be used with `immediateOrCancel`.
+immediateOrCancel | boolean | *Optional* Treat the offer as an [Immediate or Cancel order](http://en.wikipedia.org/wiki/Immediate_or_cancel). If enabled, the offer will never become a ledger node: it only attempts to match existing offers in the ledger. This cannot be used with `fillOrKill`.
 memos | [memos](#transaction-memos) | *Optional* Array of memos to attach to the transaction.
 orderToReplace | [sequence](#account-sequence-number) | *Optional* The [account sequence number](#account-sequence-number) of an order to cancel before the new order is created, effectively replacing the old order.
 passive | boolean | *Optional* If enabled, the offer will not consume offers that exactly match it, and instead becomes an Offer node in the ledger. It will still consume offers that cross it.

+The following invalid flag combination causes a `ValidationError`: `immediateOrCancel` and `fillOrKill`. These fields are mutually exclusive, and cannot both be set at the same time.
+
 ### Example


@@ -761,11 +775,14 @@ ripple-lib relies on [rippled APIs](https://ripple.com/build/rippled-apis/) for
 * Use `hasNextPage()` to determine whether a response has more pages. This is true when the response includes a [`marker` field](https://ripple.com/build/rippled-apis/#markers-and-pagination).
 * Use `requestNextPage()` to request the next page of data.

-When using rippled APIs, [specify XRP amounts in drops](https://ripple.com/build/rippled-apis/#specifying-currency-amounts). 1 XRP = 1000000 drops.
+When using rippled APIs:
+* [Specify XRP amounts in drops](https://developers.ripple.com/basic-data-types.html#specifying-currency-amounts).
+* [Specify timestamps as the number of seconds since the "Ripple Epoch"](https://developers.ripple.com/basic-data-types.html#specifying-time).
+* Instead of `counterparty`, use `issuer`.

 ## Listening to streams

-The `rippled` server can push updates to your client when various events happen. Refer to [Subscriptions in the `rippled` API docs](https://ripple.com/build/rippled-apis/#subscriptions) for details.
+The `rippled` server can push updates to your client when various events happen. Refer to [Subscriptions in the `rippled` API docs](https://developers.ripple.com/subscription-methods.html) for details.

 Note that the `streams` parameter for generic streams takes an array. For example, to subscribe to the `validations` stream, use `{ streams: [ 'validations' ] }`.

@@ -1126,7 +1143,7 @@ return api.getLedgerVersion().then(ledgerVersion => {

 ## getTransaction

-`getTransaction(id: string, options: Object): Promise<Object>`
+`getTransaction(id: string, options: object): Promise<object>`

 Retrieves a transaction by its [Transaction ID](#transaction-id).

@@ -1134,8 +1151,9 @@ Retrieves a transaction by its [Transaction ID](#transaction-id).

 Name | Type | Description
 ---- | ---- | -----------
-id | [id](#transaction-id) | A hash of a transaction used to identify the transaction, represented in hexadecimal.
-options | object | *Optional* Options to limit the ledger versions to search.
+id | [transactionHash](#transaction-id) | A hash of a transaction used to identify the transaction, represented in hexadecimal.
+options | object | *Optional* Options to limit the ledger versions to search and/or to include raw transaction data.
+*options.* includeRawTransaction | object | *Optional* Include raw transaction data. For advanced users; exercise caution when interpreting this data. 
 *options.* maxLedgerVersion | integer | *Optional* The highest ledger version to search
 *options.* maxLedgerVersion | string | *Optional* The highest ledger version to search
 *options.* minLedgerVersion | integer | *Optional* The lowest ledger version to search.
@@ -1147,11 +1165,11 @@ This method returns a promise that resolves with a transaction object containing

 Name | Type | Description
 ---- | ---- | -----------
-id | [id](#transaction-id) | A hash of the transaction that can be used to identify it.
+id | [transactionHash](#transaction-id) | A hash of the transaction that can be used to identify it.
 address | [address](#address) | The address of the account that initiated the transaction.
 sequence | [sequence](#account-sequence-number) | The account sequence number of the transaction for the account that initiated it.
 type | [transactionType](#transaction-types) | The type of the transaction.
-specification | object | A specification that would produce the same outcome as this transaction. The structure of the specification depends on the value of the `type` field (see [Transaction Types](#transaction-types) for details). *Note:* This is **not** necessarily the same as the original specification.
+specification | object | A specification that would produce the same outcome as this transaction. *Exception:* For payment transactions, this omits the `destination.amount` field, to prevent misunderstanding. The structure of the specification depends on the value of the `type` field (see [Transaction Types](#transaction-types) for details). *Note:* This is **not** necessarily the same as the original specification.
 outcome | object | The outcome of the transaction (what effects it had).
 *outcome.* result | string | Result code returned by rippled. See [Transaction Results](https://ripple.com/build/transactions/#full-transaction-response-list) for a complete list.
 *outcome.* fee | [value](#value) | The XRP fee that was charged for the transaction.
@@ -1171,6 +1189,7 @@ outcome | object | The outcome of the transaction (what effects it had).
 *outcome.* channelChanges | object | *Optional* Properties reflecting the details of the payment channel.
 *outcome.* deliveredAmount | [amount](#amount) | *Optional* For payment transactions, it is impossible to reliably compute the actual delivered amount from the balanceChanges due to fixed precision. If the payment is not a partial payment and the transaction succeeded, the deliveredAmount should always be considered to be the amount specified in the transaction.
 *outcome.* timestamp | date-time string | *Optional* The timestamp when the transaction was validated. (May be missing when requesting transactions in binary mode.)
+rawTransaction | string | *Optional* The raw transaction data as a JSON string. For advanced users only; exercise caution when interpreting this data.

 ### Example

@@ -1197,11 +1216,7 @@ return api.getTransaction(id).then(transaction => {
      }
    },
    "destination": {
-      "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM",
-      "amount": {
-        "currency": "USD",
-        "value": "0.001"
-      }
+      "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
    },
    "paths": "[[{\"currency\":\"USD\",\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"type\":48,\"type_hex\":\"0000000000000030\"},{\"account\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"currency\":\"USD\",\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"type\":49,\"type_hex\":\"0000000000000031\"}]]"
  },
@@ -1280,7 +1295,7 @@ return api.getTransaction(id).then(transaction => {

 ## getTransactions

-`getTransactions(address: string, options: Object): Promise<Array<Object>>`
+`getTransactions(address: string, options: object): Promise<Array<object>>`

 Retrieves historical transactions of an account.

@@ -1294,6 +1309,7 @@ options | object | *Optional* Options to filter the resulting transactions.
 *options.* counterparty | [address](#address) | *Optional* If provided, only return transactions with this account as a counterparty to the transaction.
 *options.* earliestFirst | boolean | *Optional* If true, sort transactions so that the earliest ones come first. By default, the newest transactions will come first.
 *options.* excludeFailures | boolean | *Optional* If true, the result will omit transactions that did not succeed.
+*options.* includeRawTransactions | object | *Optional* Include raw transaction data. For advanced users; exercise caution when interpreting this data. 
 *options.* initiated | boolean | *Optional* If true, return only transactions initiated by the account specified by `address`. If false, return only transactions not initiated by the account specified by `address`.
 *options.* limit | integer | *Optional* If specified, return at most this many transactions.
 *options.* maxLedgerVersion | integer | *Optional* Return only transactions in this ledger version or lower.
@@ -1339,11 +1355,7 @@ return api.getTransactions(address).then(transaction => {
        }
      },
      "destination": {
-        "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM",
-        "amount": {
-          "currency": "USD",
-          "value": "0.001"
-        }
+        "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
      },
      "paths": "[[{\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"currency\":\"USD\"},{\"account\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"currency\":\"USD\"}]]"
    },
@@ -1436,11 +1448,7 @@ return api.getTransactions(address).then(transaction => {
        }
      },
      "destination": {
-        "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM",
-        "amount": {
-          "currency": "USD",
-          "value": "0.001"
-        }
+        "address": "rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"
      },
      "paths": "[[{\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"currency\":\"USD\"},{\"account\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"issuer\":\"rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo\",\"currency\":\"USD\"}]]"
    },
@@ -1519,7 +1527,7 @@ return api.getTransactions(address).then(transaction => {

 ## getTrustlines

-`getTrustlines(address: string, options: Object): Promise<Array<Object>>`
+`getTrustlines(address: string, options: object): Promise<Array<object>>`

 Returns trustlines for a specified account.

@@ -1664,7 +1672,7 @@ return api.getTrustlines(address).then(trustlines =>

 ## getBalances

-`getBalances(address: string, options: Object): Promise<Array<Object>>`
+`getBalances(address: string, options: object): Promise<Array<object>>`

 Returns balances for a specified account.

@@ -1831,7 +1839,7 @@ return api.getBalances(address).then(balances =>

 ## getBalanceSheet

-`getBalanceSheet(address: string, options: Object): Promise<Object>`
+`getBalanceSheet(address: string, options: object): Promise<object>`

 Returns aggregate balances by currency plus a breakdown of assets and obligations for a specified account.

@@ -1927,7 +1935,7 @@ return api.getBalanceSheet(address).then(balanceSheet =>

 ## getPaths

-`getPaths(pathfind: Object): Promise<Array<Object>>`
+`getPaths(pathfind: object): Promise<Array<object>>`

 Finds paths to send a payment. Paths are options for how to route a payment.

@@ -1960,7 +1968,7 @@ source | object | Properties of the source of the payment.
 *source.* maxAmount | [laxAmount](#amount) | The maximum amount to send. (This field is exclusive with source.amount)
 destination | object | Properties of the destination of the payment.
 *destination.* address | [address](#address) | The address to receive at.
-*destination.* amount | [laxAmount](#amount) | An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field is exclusive with destination.minAmount).
+*destination.* amount | [laxAmount](#amount) | An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field cannot be used with `destination.minAmount`.)
 *destination.* tag | integer | *Optional* An arbitrary unsigned 32-bit integer that identifies a reason for payment or a non-Ripple account.
 *destination.* address | [address](#address) | The address to send to.
 *destination.* minAmount | [laxAmount](#amount) | The minimum amount to be delivered. (This field is exclusive with destination.amount)
@@ -2049,7 +2057,7 @@ return api.getPaths(pathfind)

 ## getOrders

-`getOrders(address: string, options: Object): Promise<Array<Object>>`
+`getOrders(address: string, options: object): Promise<Array<object>>`

 Returns open orders for the specified account. Open orders are orders that have not yet been fully executed and are still in the order book.

@@ -2430,7 +2438,7 @@ return api.getOrders(address).then(orders =>

 ## getOrderbook

-`getOrderbook(address: string, orderbook: Object, options: Object): Promise<Object>`
+`getOrderbook(address: string, orderbook: object, options: object): Promise<object>`

 Returns open orders for the specified account. Open orders are orders that have not yet been fully executed and are still in the order book.

@@ -3534,7 +3542,7 @@ return api.getOrderbook(address, orderbook)

 ## getSettings

-`getSettings(address: string, options: Object): Promise<Object>`
+`getSettings(address: string, options: object): Promise<object>`

 Returns settings for the specified account. Note: For account data that is not modifiable by the user, see [getAccountInfo](#getaccountinfo).

@@ -3613,7 +3621,7 @@ return api.getSettings(address).then(settings =>

 ## getAccountInfo

-`getAccountInfo(address: string, options: Object): Promise<Object>`
+`getAccountInfo(address: string, options: object): Promise<object>`

 Returns information for the specified account. Note: For account data that is modifiable by the user, see [getSettings](#getsettings).

@@ -3986,7 +3994,7 @@ return api.getAccountObjects(address: address).then(objects =>

 ## getPaymentChannel

-`getPaymentChannel(id: string): Promise<Object>`
+`getPaymentChannel(id: string): Promise<object>`

 Returns specified payment channel.

@@ -4042,7 +4050,7 @@ return api.getPaymentChannel(channelId).then(channel =>

 ## getLedger

-`getLedger(options: Object): Promise<Object>`
+`getLedger(options: object): Promise<object>`

 Returns header information for the specified ledger (or the most recent validated ledger if no ledger is specified). Optionally, all the transactions that were validated in the ledger or the account state information can be returned with the ledger header.

@@ -4075,9 +4083,8 @@ parentCloseTime | date-time string | The time at which the previous ledger was c
 totalDrops | [value](#value) | Total number of drops (1/1,000,000th of an XRP) in the network, as a quoted integer. (This decreases as transaction fees cause XRP to be destroyed.)
 transactionHash | string | Hash of the transaction information included in this ledger.
 rawState | string | *Optional* A JSON string containing all state data for this ledger in rippled JSON format.
-rawTransactions | string | *Optional* A JSON string containing rippled format transaction JSON for all transactions that were validated in this ledger.
 stateHashes | array\<string\> | *Optional* An array of hashes of all state data in this ledger.
-transactionHashes | array\<[id](#transaction-id)\> | *Optional* An array of hashes of all transactions that were validated in this ledger.
+transactionHashes | array\<[transactionHash](#transaction-id)\> | *Optional* An array of hashes of all transactions that were validated in this ledger.
 transactions | array\<[getTransaction](#gettransaction)\> | *Optional* Array of all transactions that were validated in this ledger. Transactions are represented in the same format as the return value of [getTransaction](#gettransaction).

 ### Example
@@ -4104,9 +4111,103 @@ return api.getLedger()
 ```


+## parseAccountFlags
+
+`parseAccountFlags(Flags: number): object`
+
+Parse an `AccountRoot` object's [`Flags`](https://developers.ripple.com/accountroot.html#accountroot-flags).
+
+### Parameters
+
+This method takes one parameter, the AccountRoot `Flags` number to parse. Note that flags have different mappings on other types of objects or in transactions such as AccountSet.
+
+### Return Value
+
+This method returns an object with containing a key for each AccountRoot flag known to this version of RippleAPI. Each flag has a boolean value of `true` or `false`.
+
+### Example
+
+```javascript
+const account_info = await api.request('account_info', {account: 'rKsdkGhyZH6b2Zzd5hNnEqSv2wpznn4n6N'})
+const flags = api.parseAccountFlags(account_info.account_data.Flags)
+console.log(JSON.stringify(flags, null, 2))
+```
+
+```json
+{
+  "passwordSpent": false,
+  "requireDestinationTag": false,
+  "requireAuthorization": false,
+  "depositAuth": true,
+  "disallowIncomingXRP": false,
+  "disableMasterKey": false,
+  "noFreeze": false,
+  "globalFreeze": false,
+  "defaultRipple": false
+}
+```
+
+## prepareTransaction
+
+`prepareTransaction(address: string, transaction: object, instructions: object): Promise<object>`
+
+Prepare a transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).
+
+This method works with any of [the transaction types supported by rippled](https://developers.ripple.com/transaction-types.html).
+
+Notably, this is the preferred method for preparing a `DepositPreauth` transaction (added in rippled 1.1.0).
+
+### Parameters
+
+Name | Type | Description
+---- | ---- | -----------
+transaction | [transaction](https://developers.ripple.com/transaction-formats.html) | The specification (JSON) of the transaction to prepare. Set `Account` to the address of the account that is creating the transaction. You may omit auto-fillable fields like `Fee`, `Flags`, and `Sequence` to have them set automatically.
+instructions | [instructions](#transaction-instructions) | *Optional* Instructions for executing the transaction.
+
+### Return Value
+
+This method returns a promise that resolves with an object with the following structure:
+
+<aside class="notice">
+All "prepare*" methods have the same return type.
+</aside>
+
+Name | Type | Description
+---- | ---- | -----------
+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,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.
+*instructions.* maxLedgerVersion | string,null | The highest ledger version that the transaction can be included in. Set to `null` if there is no maximum.
+
+### Example
+
+```javascript
+async function preparedPreauth() {
+  const address = 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59';
+  return api.prepareTransaction({
+    TransactionType: 'DepositPreauth',
+    Account: address,
+    Authorize: 'rMyVso4p83khNyHdV1m1PggV9QNadCj8wM'
+  });
+}
+```
+
+```javascript
+{
+  txJSON: '{"TransactionType":"DepositPreauth","Account":"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59","Authorize":"rMyVso4p83khNyHdV1m1PggV9QNadCj8wM","Flags":2147483648,"LastLedgerSequence":13561714,"Fee":"12","Sequence":1}',
+  instructions: {
+    fee: '0.000012',
+    sequence: 1,
+    maxLedgerVersion: 13561714
+  }
+}
+```
+
 ## preparePayment

-`preparePayment(address: string, payment: Object, instructions: Object): Promise<Object>`
+`preparePayment(address: string, payment: object, instructions: object): Promise<object>`

 Prepare a payment transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4176,7 +4277,7 @@ return api.preparePayment(address, payment).then(prepared =>

 ## prepareTrustline

-`prepareTrustline(address: string, trustline: Object, instructions: Object): Promise<Object>`
+`prepareTrustline(address: string, trustline: object, instructions: object): Promise<object>`

 Prepare a trustline transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4244,7 +4345,7 @@ return api.prepareTrustline(address, trustline).then(prepared =>

 ## prepareOrder

-`prepareOrder(address: string, order: Object, instructions: Object): Promise<Object>`
+`prepareOrder(address: string, order: object, instructions: object): Promise<object>`

 Prepare an order transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4312,7 +4413,7 @@ return api.prepareOrder(address, order)

 ## prepareOrderCancellation

-`prepareOrderCancellation(address: string, orderCancellation: Object, instructions: Object): Promise<Object>`
+`prepareOrderCancellation(address: string, orderCancellation: object, instructions: object): Promise<object>`

 Prepare an order cancellation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4365,7 +4466,7 @@ return api.prepareOrderCancellation(address, orderCancellation)

 ## prepareSettings

-`prepareSettings(address: string, settings: Object, instructions: Object): Promise<Object>`
+`prepareSettings(address: string, settings: object, instructions: object): Promise<object>`

 Prepare a settings transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4429,7 +4530,7 @@ return api.prepareSettings(address, settings)

 ## prepareEscrowCreation

-`prepareEscrowCreation(address: string, escrowCreation: Object, instructions: Object): Promise<Object>`
+`prepareEscrowCreation(address: string, escrowCreation: object, instructions: object): Promise<object>`

 Prepare an escrow creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4441,6 +4542,12 @@ address | [address](#address) | The address of the account that is creating the
 escrowCreation | [escrowCreation](#escrow-creation) | The specification of the escrow creation to prepare.
 instructions | [instructions](#transaction-instructions) | *Optional* Instructions for executing the transaction

+This is a convenience method for generating the EscrowCreate JSON used by rippled, so the same restrictions apply.
+
+Field mapping: `allowCancelAfter` is equivalent to rippled's `CancelAfter`; `allowExecuteAfter` is equivalent to `FinishAfter`. At the `allowCancelAfter` time, the escrow is considered expired. This means that the funds can only be returned to the sender. At the `allowExecuteAfter` time, the escrow is permitted to be released to the recipient (if the `condition` is fulfilled).
+
+Note that `allowCancelAfter` must be chronologically later than `allowExecuteAfter`.
+
 ### Return Value

 This method returns a promise that resolves with an object with the following structure:
@@ -4487,7 +4594,7 @@ return api.prepareEscrowCreation(address, escrowCreation).then(prepared =>

 ## prepareEscrowCancellation

-`prepareEscrowCancellation(address: string, escrowCancellation: Object, instructions: Object): Promise<Object>`
+`prepareEscrowCancellation(address: string, escrowCancellation: object, instructions: object): Promise<object>`

 Prepare an escrow cancellation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4543,7 +4650,7 @@ return api.prepareEscrowCancellation(address, escrowCancellation).then(prepared

 ## prepareEscrowExecution

-`prepareEscrowExecution(address: string, escrowExecution: Object, instructions: Object): Promise<Object>`
+`prepareEscrowExecution(address: string, escrowExecution: object, instructions: object): Promise<object>`

 Prepare an escrow execution transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4601,7 +4708,7 @@ return api.prepareEscrowExecution(address, escrowExecution).then(prepared =>

 ## preparePaymentChannelCreate

-`preparePaymentChannelCreate(address: string, paymentChannelCreate: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelCreate(address: string, paymentChannelCreate: object, instructions: object): Promise<object>`

 Prepare a payment channel creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4659,7 +4766,7 @@ return api.preparePaymentChannelCreate(address, paymentChannelCreate).then(prepa

 ## preparePaymentChannelClaim

-`preparePaymentChannelClaim(address: string, paymentChannelClaim: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelClaim(address: string, paymentChannelClaim: object, instructions: object): Promise<object>`

 Prepare a payment channel claim transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4714,7 +4821,7 @@ return api.preparePaymentChannelClaim(address, paymentChannelClaim).then(prepare

 ## preparePaymentChannelFund

-`preparePaymentChannelFund(address: string, paymentChannelFund: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelFund(address: string, paymentChannelFund: object, instructions: object): Promise<object>`

 Prepare a payment channel fund transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4770,7 +4877,7 @@ return api.preparePaymentChannelFund(address, paymentChannelFund).then(prepared

 ## prepareCheckCreate

-`prepareCheckCreate(address: string, checkCreate: Object, instructions: Object): Promise<Object>`
+`prepareCheckCreate(address: string, checkCreate: object, instructions: object): Promise<object>`

 Prepare a Check creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4829,7 +4936,7 @@ return api.prepareCheckCreate(address, checkCreate).then(prepared =>

 ## prepareCheckCancel

-`prepareCheckCancel(address: string, checkCancel: Object, instructions: Object): Promise<Object>`
+`prepareCheckCancel(address: string, checkCancel: object, instructions: object): Promise<object>`

 Prepare a Check cancellation transaction. This cancels an unredeemed Check, removing it from the ledger without sending any money. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4884,7 +4991,7 @@ return api.prepareCheckCancel(address, checkCancel).then(prepared =>

 ## prepareCheckCash

-`prepareCheckCash(address: string, checkCash: Object, instructions: Object): Promise<Object>`
+`prepareCheckCash(address: string, checkCash: object, instructions: object): Promise<object>`

 Prepare a Check cashing transaction. This redeems a Check to receive up to the amount authorized by the corresponding CheckCreate transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -4944,12 +5051,16 @@ return api.prepareCheckCash(address, checkCash).then(prepared =>
 ## sign

 ```
-sign(txJSON: string, secret: string, options: Object): {signedTransaction: string, id: string}
-sign(txJSON: string, keypair: Object, options: Object): {signedTransaction: string, id: string}
+sign(txJSON: string, secret: string, options: object): {signedTransaction: string, id: string}
+sign(txJSON: string, keypair: object, options: object): {signedTransaction: string, id: string}
 ```

 Sign a prepared transaction. The signed transaction must subsequently be [submitted](#submit).

+This method can sign any of [the transaction types supported by ripple-binary-codec](https://github.com/ripple/ripple-binary-codec/blob/cfcde79c19c359e9a0466d7bc3dc9a3aef47bb99/src/enums/definitions.json#L1637). When a new transaction type is added to the XRP Ledger, it will be unrecognized until `ripple-binary-codec` is updated. If you try to sign an unrecognized transaction type, this method throws an error similar to the following:
+
+`Error: [TRANSACTION_TYPE] is not a valid name or ordinal for TransactionType`
+
 ### Parameters

 Name | Type | Description
@@ -4969,7 +5080,7 @@ 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.
+id | [transactionHash](#transaction-id) | The [Transaction ID](#transaction-id) of the signed transaction.

 ### Example

@@ -5008,7 +5119,7 @@ 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.
+id | [transactionHash](#transaction-id) | The [Transaction ID](#transaction-id) of the signed transaction.

 ### Example

@@ -5029,7 +5140,7 @@ return api.combine(signedTransactions);

 ## submit

-`submit(signedTransaction: string): Promise<Object>`
+`submit(signedTransaction: string): Promise<object>`

 Submits a signed transaction. The transaction is not guaranteed to succeed; it must be verified with [getTransaction](#gettransaction).

@@ -5103,6 +5214,88 @@ return api.generateAddress();
 ```


+## isValidAddress
+
+`isValidAddress(address: string): boolean`
+
+Checks if the specified string contains a valid address.
+
+### Parameters
+
+This method takes one parameter, the address to validate.
+
+### Return Value
+
+This method returns `true` if the address is valid and `false` if it is not.
+
+### Example
+
+```javascript
+return api.isValidAddress("address")
+```
+
+## isValidSecret
+
+`isValidSecret(secret: string): boolean`
+
+Checks if the specified string contains a valid secret.
+
+### Parameters
+
+This method takes one parameter, the secret which to validate.
+
+### Return Value
+
+This method returns `true` if the secret is valid and `false` if it is not.
+
+### Example
+
+```javascript
+return api.isValidSecret("secret")
+```
+
+## deriveKeypair
+
+`deriveKeypair(seed: string): {privateKey: string, publicKey: string}`
+
+Derive a public and private key from a seed.
+
+### Parameters
+
+This method takes one parameter, the seed from which to derive the public and private key.
+
+### Return Value
+
+This method returns an object containing the public and private components of the keypair corresponding to the seed.
+
+### Example
+
+```javascript
+var keypair = api.deriveKeypair(seed)
+var public_key = keypair.publicKey;
+var private_key = keypair.privateKey;
+```
+
+## deriveAddress
+
+`deriveAddress(publicKey: string): string`
+
+Derive an XRP Ledger address from a public key.
+
+### Parameters
+
+This method takes one parameter, the public key from which to derive the address.
+
+### Return Value
+
+This method returns a string corresponding to the address derived from the public key.
+
+### Example
+
+```javascript
+var address = api.deriveAddress(public_key);
+```
+
 ## signPaymentChannelClaim

 `signPaymentChannelClaim(channel: string, amount: string, privateKey: string): string`
@@ -5183,7 +5376,7 @@ true

 ## computeLedgerHash

-`computeLedgerHash(ledger: Object): string`
+`computeLedgerHash(ledger: object): string`

 Compute the hash of a ledger.

@@ -5208,9 +5401,8 @@ ledger | object | The ledger header to hash.
 *ledger.* totalDrops | [value](#value) | Total number of drops (1/1,000,000th of an XRP) in the network, as a quoted integer. (This decreases as transaction fees cause XRP to be destroyed.)
 *ledger.* transactionHash | string | Hash of the transaction information included in this ledger.
 *ledger.* rawState | string | *Optional* A JSON string containing all state data for this ledger in rippled JSON format.
-*ledger.* rawTransactions | string | *Optional* A JSON string containing rippled format transaction JSON for all transactions that were validated in this ledger.
 *ledger.* stateHashes | array\<string\> | *Optional* An array of hashes of all state data in this ledger.
-*ledger.* transactionHashes | array\<[id](#transaction-id)\> | *Optional* An array of hashes of all transactions that were validated in this ledger.
+*ledger.* transactionHashes | array\<[transactionHash](#transaction-id)\> | *Optional* An array of hashes of all transactions that were validated in this ledger.
 *ledger.* transactions | array\<[getTransaction](#gettransaction)\> | *Optional* Array of all transactions that were validated in this ledger. Transactions are represented in the same format as the return value of [getTransaction](#gettransaction).

 ### Return Value
@@ -5238,6 +5430,200 @@ return api.computeLedgerHash(ledger);
 "F4D865D83EB88C1A1911B9E90641919A1314F36E1B099F8E95FE3B7C77BE3349"
 ```

+## xrpToDrops
+
+`xrpToDrops(xrp: string | BigNumber): string`
+
+Converts an XRP amount to drops. 1 XRP = 1,000,000 drops, so 1 drop = 0.000001 XRP. This method is useful when converting amounts for use with the rippled API, which requires XRP amounts to be specified in drops.
+
+### Parameters
+
+`xrp`: A string or BigNumber representing an amount of XRP. If `xrp` is a string, it may start with `-`, must contain at least one number, and may contain up to one `.`. This method throws a `ValidationError` for invalid input.
+
+### Return Value
+
+A string representing an equivalent amount of drops.
+
+### Example
+
+```javascript
+return api.xrpToDrops('1');
+```
+
+```json
+'1000000'
+```
+
+## dropsToXrp
+
+`dropsToXrp(drops: string | BigNumber): string`
+
+Converts an amount of drops to XRP. 1 drop = 0.000001 XRP, so 1 XRP = 1,000,000 drops. This method is useful when converting amounts from the rippled API, which describes XRP amounts in drops.
+
+### Parameters
+
+`drops`: A string or BigNumber representing an amount of drops. If `drops` is a string, it may start with `-` and must contain at least one number. This method throws a `ValidationError` for invalid input.
+
+### Return Value
+
+A string representing an equivalent amount of XRP.
+
+### Example
+
+```javascript
+return api.dropsToXrp('1');
+```
+
+```json
+'0.000001'
+```
+
+## iso8601ToRippleTime
+
+`iso8601ToRippleTime(iso8601: string): number`
+
+This method parses a string representation of a date, and returns the number of seconds since the "Ripple Epoch" of January 1, 2000 (00:00 UTC).
+
+The Ripple Epoch is 946684800 seconds after the Unix Epoch.
+
+This method is useful for creating timestamps to use with the rippled APIs. The rippled APIs represent time as an unsigned integer of the number of seconds since the Ripple Epoch.
+
+### Parameters
+
+`iso8601`: A string representing a date and time. This string is parsed using JavaScript's `Date.parse()` method.
+
+### Return Value
+
+The number of seconds since the Ripple Epoch.
+
+### Example
+
+```javascript
+api.iso8601ToRippleTime('2017-02-17T15:04:57Z');
+```
+
+```json
+540659097
+```
+
+## txFlags
+
+`txFlags.TRANSACTION_TYPE.FLAG`
+
+This object provides constants for use when creating or interpreting transaction flags. Most transactions have a set of bit-flags that represent various options that affect how a transaction should behave. These options are represented as binary values that can be combined with bitwise-or operations to encode multiple flags at once.
+
+Most flags only have meaning for a specific transaction type. The same bitwise value may be reused for flags on different transaction types, so it is important to pay attention to the transaction type when setting and reading flags.
+
+Bits that are not defined as flags MUST be 0.
+
+### Global Flag
+
+Applies globally to all transactions.
+
+`txFlags.Universal.FullyCanonicalSig`: Require a fully-canonical signature. When preparing transactions, ripple-lib enables this flag for you.
+
+### Payment Flags
+
+`txFlags.Payment.NoRippleDirect`: Do not use the default path; only use specified paths. This is intended to force the transaction to take arbitrage opportunities. Most clients do not need this.
+
+`txFlags.Payment.PartialPayment`: If the specified destination amount cannot be sent without spending more than the source maxAmount, reduce the received amount instead of failing outright. See [Partial Payments](https://developers.ripple.com/partial-payments.html) for more details.
+
+`txFlags.Payment.LimitQuality`: Only take paths where all the conversions have an input:output ratio that is equal or better than the ratio of `destination.amount`:`source.maxAmount`. See [Limit Quality](https://developers.ripple.com/payment.html#limit-quality) for details.
+
+### OfferCreate Flags
+
+`txFlags.OfferCreate.Passive`: If enabled, the offer does not consume offers that exactly match it, and instead becomes an Offer object in the ledger. It still consumes offers that cross it.
+
+`txFlags.OfferCreate.ImmediateOrCancel`: Treat the offer as an Immediate or Cancel order. If enabled, the offer never becomes a ledger object: it only tries to match existing offers in the ledger.
+
+`txFlags.OfferCreate.FillOrKill`: Treat the offer as a Fill or Kill order.
+
+`txFlags.OfferCreate.Sell`: Treat the offer as a Sell order. With `order.direction = 'sell'`, exchange the entire `order.quantity`, even if it means obtaining more than the `order.totalPrice` amount in exchange. If using `prepareOrder`, ripple-lib sets this flag for you.
+
+### TrustSet Flags
+
+`txFlags.TrustSet.SetAuth`: Authorize the other party to hold issuances from this account. (No effect unless using the AccountSet.RequireAuth flag.) Cannot be unset.
+
+`txFlags.TrustSet.NoRipple`:  Obsolete.
+
+`txFlags.TrustSet.SetNoRipple`: Blocks [rippling](https://developers.ripple.com/rippling.html) between two trustlines of the same currency, if this flag is set on both.
+
+`txFlags.TrustSet.ClearNoRipple`: Clears the No-[Rippling](https://developers.ripple.com/rippling.html) flag.
+
+`txFlags.TrustSet.SetFreeze`: Freeze the trustline. A non-XRP currency can be frozen by the exchange or gateway that issued it. XRP cannot be frozen.
+
+`txFlags.TrustSet.ClearFreeze`: Unfreeze the trustline.
+
+### AccountSet Flags
+
+You can use the `prepareSettings` method to change your account flags. This method uses AccountSet flags internally.
+
+In the rippled API, Account Flags can be enabled and disabled with the SetFlag and ClearFlag parameters. See [AccountSet Flags](https://developers.ripple.com/accountset.html#accountset-flags).
+
+The AccountSet transaction type has some transaction flags, but their use is discouraged.
+
+* `txFlags.AccountSet.RequireDestTag`
+* `txFlags.AccountSet.OptionalDestTag`
+* `txFlags.AccountSet.RequireAuth`
+* `txFlags.AccountSet.OptionalAuth`
+* `txFlags.AccountSet.DisallowXRP`
+* `txFlags.AccountSet.AllowXRP`
+
+### PaymentChannelClaim Flags
+
+`txFlags.PaymentChannelClaim.Renew`: Clear the channel's Expiration time. (Expiration is different from the channel's immutable CancelAfter time.) Only the source address of the payment channel can use this flag.
+
+`txFlags.PaymentChannelClaim.Close`: Request to close the channel. Only the channel source and destination addresses can use this flag. This flag closes the channel immediately if it has no more XRP allocated to it after processing the current claim, or if the destination address uses it. If the source address uses this flag when the channel still holds XRP, this schedules the channel to close after SettleDelay seconds have passed. (Specifically, this sets the Expiration of the channel to the close time of the previous ledger plus the channel's SettleDelay time, unless the channel already has an earlier Expiration time.) If the destination address uses this flag when the channel still holds XRP, any XRP that remains after processing the claim is returned to the source address.
+
+### Other Transaction Types
+
+The remaining transaction types do not have any flags at this time.
+
+* OfferCancel
+* SetRegularKey
+* SignerListSet
+* EscrowCreate
+* EscrowFinish
+* EscrowCancel
+* PaymentChannelCreate
+* PaymentChannelFund
+
+## schemaValidator
+
+Unlike the rest of the ripple-lib API, schemaValidator is a static object on RippleAPI. It provides utility methods that do not use a server.
+
+## schemaValidate
+
+`RippleAPI.schemaValidator.schemaValidate(schemaName: string, object: any): void`
+
+This method checks an object for conformance to a specified schema. It does not return anything, but will throw a `ValidationError` if the object does not conform to the schema.
+
+### Example
+
+```javascript
+RippleAPI.schemaValidator.schemaValidate('sign', {
+    signedTransaction: '12000322800000002400000017201B0086955368400000000000000C732102F89EAEC7667B30F33D0687BBA86C3FE2A08CCA40A9186C5BDE2DAA6FA97A37D874473045022100BDE09A1F6670403F341C21A77CF35BA47E45CDE974096E1AA5FC39811D8269E702203D60291B9A27F1DCABA9CF5DED307B4F23223E0B6F156991DB601DFB9C41CE1C770A726970706C652E636F6D81145E7B112523F68D2F5E879DB4EAC51C6698A69304',
+    id: '02ACE87F1996E3A23690A5BB7F1774BF71CCBA68F79805831B42ABAD5913D6F4'
+})
+```
+
+```json
+undefined
+```
+
+If the object is valid (conforms to the schema), nothing is returned. Otherwise, `schemaValidate` throws an error:
+
+```javascript
+RippleAPI.schemaValidator.schemaValidate('sign', {
+    signedTransaction: '12000322800000002400000017201B0086955368400000000000000C732102F89EAEC7667B30F33D0687BBA86C3FE2A08CCA40A9186C5BDE2DAA6FA97A37D874473045022100BDE09A1F6670403F341C21A77CF35BA47E45CDE974096E1AA5FC39811D8269E702203D60291B9A27F1DCABA9CF5DED307B4F23223E0B6F156991DB601DFB9C41CE1C770A726970706C652E636F6D81145E7B112523F68D2F5E879DB4EAC51C6698A69304',
+    id: '123'
+})
+```
+
+```
+[ValidationError(instance.id does not match pattern "^[A-F0-9]{64}$")]
+```
+
 # API Events

 ## ledger
--- a/docs/src/basictypes.md.ejs
+++ b/docs/src/basictypes.md.ejs
@@ -52,4 +52,4 @@ A *lax lax amount* allows either or both the counterparty and value to be omitte

 A *balance* is an amount than can have a negative value.

-<%- renderSchema('objects/amount-base.json') %>
+<%- renderSchema('objects/amountbase.json') %>
--- a/docs/src/computeLedgerHash.md.ejs
+++ b/docs/src/computeLedgerHash.md.ejs
@@ -1,6 +1,6 @@
 ## computeLedgerHash

-`computeLedgerHash(ledger: Object): string`
+`computeLedgerHash(ledger: object): string`

 Compute the hash of a ledger.

--- a/docs/src/deriveAddress.md.ejs
+++ b/docs/src/deriveAddress.md.ejs
@@ -0,0 +1,19 @@
+## deriveAddress
+
+`deriveAddress(publicKey: string): string`
+
+Derive an XRP Ledger address from a public key.
+
+### Parameters
+
+This method takes one parameter, the public key from which to derive the address.
+
+### Return Value
+
+This method returns a string corresponding to the address derived from the public key.
+
+### Example
+
+```javascript
+var address = api.deriveAddress(public_key);
+```
--- a/docs/src/deriveKeypair.md.ejs
+++ b/docs/src/deriveKeypair.md.ejs
@@ -0,0 +1,21 @@
+## deriveKeypair
+
+`deriveKeypair(seed: string): {privateKey: string, publicKey: string}`
+
+Derive a public and private key from a seed.
+
+### Parameters
+
+This method takes one parameter, the seed from which to derive the public and private key.
+
+### Return Value
+
+This method returns an object containing the public and private components of the keypair corresponding to the seed.
+
+### Example
+
+```javascript
+var keypair = api.deriveKeypair(seed)
+var public_key = keypair.publicKey;
+var private_key = keypair.privateKey;
+```
--- a/docs/src/getAccountInfo.md.ejs
+++ b/docs/src/getAccountInfo.md.ejs
@@ -1,6 +1,6 @@
 ## getAccountInfo

-`getAccountInfo(address: string, options: Object): Promise<Object>`
+`getAccountInfo(address: string, options: object): Promise<object>`

 Returns information for the specified account. Note: For account data that is modifiable by the user, see [getSettings](#getsettings).

--- a/docs/src/getBalanceSheet.md.ejs
+++ b/docs/src/getBalanceSheet.md.ejs
@@ -1,6 +1,6 @@
 ## getBalanceSheet

-`getBalanceSheet(address: string, options: Object): Promise<Object>`
+`getBalanceSheet(address: string, options: object): Promise<object>`

 Returns aggregate balances by currency plus a breakdown of assets and obligations for a specified account.

--- a/docs/src/getBalances.md.ejs
+++ b/docs/src/getBalances.md.ejs
@@ -1,6 +1,6 @@
 ## getBalances

-`getBalances(address: string, options: Object): Promise<Array<Object>>`
+`getBalances(address: string, options: object): Promise<Array<object>>`

 Returns balances for a specified account.

--- a/docs/src/getLedger.md.ejs
+++ b/docs/src/getLedger.md.ejs
@@ -1,6 +1,6 @@
 ## getLedger

-`getLedger(options: Object): Promise<Object>`
+`getLedger(options: object): Promise<object>`

 Returns header information for the specified ledger (or the most recent validated ledger if no ledger is specified). Optionally, all the transactions that were validated in the ledger or the account state information can be returned with the ledger header.

--- a/docs/src/getOrderbook.md.ejs
+++ b/docs/src/getOrderbook.md.ejs
@@ -1,6 +1,6 @@
 ## getOrderbook

-`getOrderbook(address: string, orderbook: Object, options: Object): Promise<Object>`
+`getOrderbook(address: string, orderbook: object, options: object): Promise<object>`

 Returns open orders for the specified account. Open orders are orders that have not yet been fully executed and are still in the order book.

--- a/docs/src/getOrders.md.ejs
+++ b/docs/src/getOrders.md.ejs
@@ -1,6 +1,6 @@
 ## getOrders

-`getOrders(address: string, options: Object): Promise<Array<Object>>`
+`getOrders(address: string, options: object): Promise<Array<object>>`

 Returns open orders for the specified account. Open orders are orders that have not yet been fully executed and are still in the order book.

--- a/docs/src/getPaths.md.ejs
+++ b/docs/src/getPaths.md.ejs
@@ -1,6 +1,6 @@
 ## getPaths

-`getPaths(pathfind: Object): Promise<Array<Object>>`
+`getPaths(pathfind: object): Promise<Array<object>>`

 Finds paths to send a payment. Paths are options for how to route a payment.

--- a/docs/src/getPaymentChannel.md.ejs
+++ b/docs/src/getPaymentChannel.md.ejs
@@ -1,6 +1,6 @@
 ## getPaymentChannel

-`getPaymentChannel(id: string): Promise<Object>`
+`getPaymentChannel(id: string): Promise<object>`

 Returns specified payment channel.

--- a/docs/src/getSettings.md.ejs
+++ b/docs/src/getSettings.md.ejs
@@ -1,6 +1,6 @@
 ## getSettings

-`getSettings(address: string, options: Object): Promise<Object>`
+`getSettings(address: string, options: object): Promise<object>`

 Returns settings for the specified account. Note: For account data that is not modifiable by the user, see [getAccountInfo](#getaccountinfo).

--- a/docs/src/getTransaction.md.ejs
+++ b/docs/src/getTransaction.md.ejs
@@ -1,6 +1,6 @@
 ## getTransaction

-`getTransaction(id: string, options: Object): Promise<Object>`
+`getTransaction(id: string, options: object): Promise<object>`

 Retrieves a transaction by its [Transaction ID](#transaction-id).

--- a/docs/src/getTransactions.md.ejs
+++ b/docs/src/getTransactions.md.ejs
@@ -1,6 +1,6 @@
 ## getTransactions

-`getTransactions(address: string, options: Object): Promise<Array<Object>>`
+`getTransactions(address: string, options: object): Promise<Array<object>>`

 Retrieves historical transactions of an account.

--- a/docs/src/getTrustlines.md.ejs
+++ b/docs/src/getTrustlines.md.ejs
@@ -1,6 +1,6 @@
 ## getTrustlines

-`getTrustlines(address: string, options: Object): Promise<Array<Object>>`
+`getTrustlines(address: string, options: object): Promise<Array<object>>`

 Returns trustlines for a specified account.

--- a/docs/src/index.md.ejs
+++ b/docs/src/index.md.ejs
@@ -28,6 +28,8 @@
 <% include getAccountObjects.md.ejs %>
 <% include getPaymentChannel.md.ejs %>
 <% include getLedger.md.ejs %>
+<% include parseAccountFlags.md.ejs %>
+<% include prepareTransaction.md.ejs %>
 <% include preparePayment.md.ejs %>
 <% include prepareTrustline.md.ejs %>
 <% include prepareOrder.md.ejs %>
@@ -46,7 +48,15 @@
 <% include combine.md.ejs %>
 <% include submit.md.ejs %>
 <% include generateAddress.md.ejs %>
+<% include isValidAddress.md.ejs %>
+<% include isValidSecret.md.ejs %>
+<% include deriveKeypair.md.ejs %>
+<% include deriveAddress.md.ejs %>
 <% include signPaymentChannelClaim.md.ejs %>
 <% include verifyPaymentChannelClaim.md.ejs %>
 <% include computeLedgerHash.md.ejs %>
+<% include xrpToDropsAndDropsToXrp.md.ejs %>
+<% include iso8601ToRippleTime.md.ejs %>
+<% include txFlags.md.ejs %>
+<% include schemaValidator.md.ejs %>
 <% include events.md.ejs %>
--- a/docs/src/isValidAddress.md.ejs
+++ b/docs/src/isValidAddress.md.ejs
@@ -0,0 +1,19 @@
+## isValidAddress
+
+`isValidAddress(address: string): boolean`
+
+Checks if the specified string contains a valid address.
+
+### Parameters
+
+This method takes one parameter, the address to validate.
+
+### Return Value
+
+This method returns `true` if the address is valid and `false` if it is not.
+
+### Example
+
+```javascript
+return api.isValidAddress("address")
+```
--- a/docs/src/isValidSecret.md.ejs
+++ b/docs/src/isValidSecret.md.ejs
@@ -0,0 +1,19 @@
+## isValidSecret
+
+`isValidSecret(secret: string): boolean`
+
+Checks if the specified string contains a valid secret.
+
+### Parameters
+
+This method takes one parameter, the secret which to validate.
+
+### Return Value
+
+This method returns `true` if the secret is valid and `false` if it is not.
+
+### Example
+
+```javascript
+return api.isValidSecret("secret")
+```
--- a/docs/src/iso8601ToRippleTime.md.ejs
+++ b/docs/src/iso8601ToRippleTime.md.ejs
@@ -0,0 +1,27 @@
+## iso8601ToRippleTime
+
+`iso8601ToRippleTime(iso8601: string): number`
+
+This method parses a string representation of a date, and returns the number of seconds since the "Ripple Epoch" of January 1, 2000 (00:00 UTC).
+
+The Ripple Epoch is 946684800 seconds after the Unix Epoch.
+
+This method is useful for creating timestamps to use with the rippled APIs. The rippled APIs represent time as an unsigned integer of the number of seconds since the Ripple Epoch.
+
+### Parameters
+
+`iso8601`: A string representing a date and time. This string is parsed using JavaScript's `Date.parse()` method.
+
+### Return Value
+
+The number of seconds since the Ripple Epoch.
+
+### Example
+
+```javascript
+api.iso8601ToRippleTime('2017-02-17T15:04:57Z');
+```
+
+```json
+540659097
+```
--- a/docs/src/parseAccountFlags.md.ejs
+++ b/docs/src/parseAccountFlags.md.ejs
@@ -0,0 +1,35 @@
+## parseAccountFlags
+
+`parseAccountFlags(Flags: number): object`
+
+Parse an `AccountRoot` object's [`Flags`](https://developers.ripple.com/accountroot.html#accountroot-flags).
+
+### Parameters
+
+This method takes one parameter, the AccountRoot `Flags` number to parse. Note that flags have different mappings on other types of objects or in transactions such as AccountSet.
+
+### Return Value
+
+This method returns an object with containing a key for each AccountRoot flag known to this version of RippleAPI. Each flag has a boolean value of `true` or `false`.
+
+### Example
+
+```javascript
+const account_info = await api.request('account_info', {account: 'rKsdkGhyZH6b2Zzd5hNnEqSv2wpznn4n6N'})
+const flags = api.parseAccountFlags(account_info.account_data.Flags)
+console.log(JSON.stringify(flags, null, 2))
+```
+
+```json
+{
+  "passwordSpent": false,
+  "requireDestinationTag": false,
+  "requireAuthorization": false,
+  "depositAuth": true,
+  "disallowIncomingXRP": false,
+  "disableMasterKey": false,
+  "noFreeze": false,
+  "globalFreeze": false,
+  "defaultRipple": false
+}
+```
--- a/docs/src/prepareCheckCancel.md.ejs
+++ b/docs/src/prepareCheckCancel.md.ejs
@@ -1,6 +1,6 @@
 ## prepareCheckCancel

-`prepareCheckCancel(address: string, checkCancel: Object, instructions: Object): Promise<Object>`
+`prepareCheckCancel(address: string, checkCancel: object, instructions: object): Promise<object>`

 Prepare a Check cancellation transaction. This cancels an unredeemed Check, removing it from the ledger without sending any money. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareCheckCash.md.ejs
+++ b/docs/src/prepareCheckCash.md.ejs
@@ -1,6 +1,6 @@
 ## prepareCheckCash

-`prepareCheckCash(address: string, checkCash: Object, instructions: Object): Promise<Object>`
+`prepareCheckCash(address: string, checkCash: object, instructions: object): Promise<object>`

 Prepare a Check cashing transaction. This redeems a Check to receive up to the amount authorized by the corresponding CheckCreate transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareCheckCreate.md.ejs
+++ b/docs/src/prepareCheckCreate.md.ejs
@@ -1,6 +1,6 @@
 ## prepareCheckCreate

-`prepareCheckCreate(address: string, checkCreate: Object, instructions: Object): Promise<Object>`
+`prepareCheckCreate(address: string, checkCreate: object, instructions: object): Promise<object>`

 Prepare a Check creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareEscrowCancellation.md.ejs
+++ b/docs/src/prepareEscrowCancellation.md.ejs
@@ -1,6 +1,6 @@
 ## prepareEscrowCancellation

-`prepareEscrowCancellation(address: string, escrowCancellation: Object, instructions: Object): Promise<Object>`
+`prepareEscrowCancellation(address: string, escrowCancellation: object, instructions: object): Promise<object>`

 Prepare an escrow cancellation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareEscrowCreation.md.ejs
+++ b/docs/src/prepareEscrowCreation.md.ejs
@@ -1,6 +1,6 @@
 ## prepareEscrowCreation

-`prepareEscrowCreation(address: string, escrowCreation: Object, instructions: Object): Promise<Object>`
+`prepareEscrowCreation(address: string, escrowCreation: object, instructions: object): Promise<object>`

 Prepare an escrow creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

@@ -8,6 +8,12 @@ Prepare an escrow creation transaction. The prepared transaction must subsequent

 <%- renderSchema('input/prepare-escrow-creation.json') %>

+This is a convenience method for generating the EscrowCreate JSON used by rippled, so the same restrictions apply.
+
+Field mapping: `allowCancelAfter` is equivalent to rippled's `CancelAfter`; `allowExecuteAfter` is equivalent to `FinishAfter`. At the `allowCancelAfter` time, the escrow is considered expired. This means that the funds can only be returned to the sender. At the `allowExecuteAfter` time, the escrow is permitted to be released to the recipient (if the `condition` is fulfilled).
+
+Note that `allowCancelAfter` must be chronologically later than `allowExecuteAfter`.
+
 ### Return Value

 This method returns a promise that resolves with an object with the following structure:
--- a/docs/src/prepareEscrowExecution.md.ejs
+++ b/docs/src/prepareEscrowExecution.md.ejs
@@ -1,6 +1,6 @@
 ## prepareEscrowExecution

-`prepareEscrowExecution(address: string, escrowExecution: Object, instructions: Object): Promise<Object>`
+`prepareEscrowExecution(address: string, escrowExecution: object, instructions: object): Promise<object>`

 Prepare an escrow execution transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareOrder.md.ejs
+++ b/docs/src/prepareOrder.md.ejs
@@ -1,6 +1,6 @@
 ## prepareOrder

-`prepareOrder(address: string, order: Object, instructions: Object): Promise<Object>`
+`prepareOrder(address: string, order: object, instructions: object): Promise<object>`

 Prepare an order transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareOrderCancellation.md.ejs
+++ b/docs/src/prepareOrderCancellation.md.ejs
@@ -1,6 +1,6 @@
 ## prepareOrderCancellation

-`prepareOrderCancellation(address: string, orderCancellation: Object, instructions: Object): Promise<Object>`
+`prepareOrderCancellation(address: string, orderCancellation: object, instructions: object): Promise<object>`

 Prepare an order cancellation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/preparePayment.md.ejs
+++ b/docs/src/preparePayment.md.ejs
@@ -1,6 +1,6 @@
 ## preparePayment

-`preparePayment(address: string, payment: Object, instructions: Object): Promise<Object>`
+`preparePayment(address: string, payment: object, instructions: object): Promise<object>`

 Prepare a payment transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/preparePaymentChannelClaim.md.ejs
+++ b/docs/src/preparePaymentChannelClaim.md.ejs
@@ -1,6 +1,6 @@
 ## preparePaymentChannelClaim

-`preparePaymentChannelClaim(address: string, paymentChannelClaim: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelClaim(address: string, paymentChannelClaim: object, instructions: object): Promise<object>`

 Prepare a payment channel claim transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/preparePaymentChannelCreate.md.ejs
+++ b/docs/src/preparePaymentChannelCreate.md.ejs
@@ -1,6 +1,6 @@
 ## preparePaymentChannelCreate

-`preparePaymentChannelCreate(address: string, paymentChannelCreate: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelCreate(address: string, paymentChannelCreate: object, instructions: object): Promise<object>`

 Prepare a payment channel creation transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/preparePaymentChannelFund.md.ejs
+++ b/docs/src/preparePaymentChannelFund.md.ejs
@@ -1,6 +1,6 @@
 ## preparePaymentChannelFund

-`preparePaymentChannelFund(address: string, paymentChannelFund: Object, instructions: Object): Promise<Object>`
+`preparePaymentChannelFund(address: string, paymentChannelFund: object, instructions: object): Promise<object>`

 Prepare a payment channel fund transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareSettings.md.ejs
+++ b/docs/src/prepareSettings.md.ejs
@@ -1,6 +1,6 @@
 ## prepareSettings

-`prepareSettings(address: string, settings: Object, instructions: Object): Promise<Object>`
+`prepareSettings(address: string, settings: object, instructions: object): Promise<object>`

 Prepare a settings transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/prepareTransaction.md.ejs
+++ b/docs/src/prepareTransaction.md.ejs
@@ -0,0 +1,50 @@
+## prepareTransaction
+
+`prepareTransaction(address: string, transaction: object, instructions: object): Promise<object>`
+
+Prepare a transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).
+
+This method works with any of [the transaction types supported by rippled](https://developers.ripple.com/transaction-types.html).
+
+Notably, this is the preferred method for preparing a `DepositPreauth` transaction (added in rippled 1.1.0).
+
+### Parameters
+
+Name | Type | Description
+---- | ---- | -----------
+transaction | [transaction](https://developers.ripple.com/transaction-formats.html) | The specification (JSON) of the transaction to prepare. Set `Account` to the address of the account that is creating the transaction. You may omit auto-fillable fields like `Fee`, `Flags`, and `Sequence` to have them set automatically.
+instructions | [instructions](#transaction-instructions) | *Optional* Instructions for executing the transaction.
+
+### Return Value
+
+This method returns a promise that resolves with an object with the following structure:
+
+<aside class="notice">
+All "prepare*" methods have the same return type.
+</aside>
+
+<%- renderSchema("output/prepare.json") %>
+
+### Example
+
+```javascript
+async function preparedPreauth() {
+  const address = 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59';
+  return api.prepareTransaction({
+    TransactionType: 'DepositPreauth',
+    Account: address,
+    Authorize: 'rMyVso4p83khNyHdV1m1PggV9QNadCj8wM'
+  });
+}
+```
+
+```javascript
+{
+  txJSON: '{"TransactionType":"DepositPreauth","Account":"r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59","Authorize":"rMyVso4p83khNyHdV1m1PggV9QNadCj8wM","Flags":2147483648,"LastLedgerSequence":13561714,"Fee":"12","Sequence":1}',
+  instructions: {
+    fee: '0.000012',
+    sequence: 1,
+    maxLedgerVersion: 13561714
+  }
+}
+```
--- a/docs/src/prepareTrustline.md.ejs
+++ b/docs/src/prepareTrustline.md.ejs
@@ -1,6 +1,6 @@
 ## prepareTrustline

-`prepareTrustline(address: string, trustline: Object, instructions: Object): Promise<Object>`
+`prepareTrustline(address: string, trustline: object, instructions: object): Promise<object>`

 Prepare a trustline transaction. The prepared transaction must subsequently be [signed](#sign) and [submitted](#submit).

--- a/docs/src/rippledAPIs.md.ejs
+++ b/docs/src/rippledAPIs.md.ejs
@@ -5,11 +5,14 @@ ripple-lib relies on [rippled APIs](https://ripple.com/build/rippled-apis/) for
 * Use `hasNextPage()` to determine whether a response has more pages. This is true when the response includes a [`marker` field](https://ripple.com/build/rippled-apis/#markers-and-pagination).
 * Use `requestNextPage()` to request the next page of data.

-When using rippled APIs, [specify XRP amounts in drops](https://ripple.com/build/rippled-apis/#specifying-currency-amounts). 1 XRP = 1000000 drops.
+When using rippled APIs:
+* [Specify XRP amounts in drops](https://developers.ripple.com/basic-data-types.html#specifying-currency-amounts).
+* [Specify timestamps as the number of seconds since the "Ripple Epoch"](https://developers.ripple.com/basic-data-types.html#specifying-time).
+* Instead of `counterparty`, use `issuer`.

 ## Listening to streams

-The `rippled` server can push updates to your client when various events happen. Refer to [Subscriptions in the `rippled` API docs](https://ripple.com/build/rippled-apis/#subscriptions) for details.
+The `rippled` server can push updates to your client when various events happen. Refer to [Subscriptions in the `rippled` API docs](https://developers.ripple.com/subscription-methods.html) for details.

 Note that the `streams` parameter for generic streams takes an array. For example, to subscribe to the `validations` stream, use `{ streams: [ 'validations' ] }`.

--- a/docs/src/schemaValidator.md.ejs
+++ b/docs/src/schemaValidator.md.ejs
@@ -0,0 +1,35 @@
+## schemaValidator
+
+Unlike the rest of the ripple-lib API, schemaValidator is a static object on RippleAPI. It provides utility methods that do not use a server.
+
+## schemaValidate
+
+`RippleAPI.schemaValidator.schemaValidate(schemaName: string, object: any): void`
+
+This method checks an object for conformance to a specified schema. It does not return anything, but will throw a `ValidationError` if the object does not conform to the schema.
+
+### Example
+
+```javascript
+RippleAPI.schemaValidator.schemaValidate('sign', {
+    signedTransaction: '12000322800000002400000017201B0086955368400000000000000C732102F89EAEC7667B30F33D0687BBA86C3FE2A08CCA40A9186C5BDE2DAA6FA97A37D874473045022100BDE09A1F6670403F341C21A77CF35BA47E45CDE974096E1AA5FC39811D8269E702203D60291B9A27F1DCABA9CF5DED307B4F23223E0B6F156991DB601DFB9C41CE1C770A726970706C652E636F6D81145E7B112523F68D2F5E879DB4EAC51C6698A69304',
+    id: '02ACE87F1996E3A23690A5BB7F1774BF71CCBA68F79805831B42ABAD5913D6F4'
+})
+```
+
+```json
+undefined
+```
+
+If the object is valid (conforms to the schema), nothing is returned. Otherwise, `schemaValidate` throws an error:
+
+```javascript
+RippleAPI.schemaValidator.schemaValidate('sign', {
+    signedTransaction: '12000322800000002400000017201B0086955368400000000000000C732102F89EAEC7667B30F33D0687BBA86C3FE2A08CCA40A9186C5BDE2DAA6FA97A37D874473045022100BDE09A1F6670403F341C21A77CF35BA47E45CDE974096E1AA5FC39811D8269E702203D60291B9A27F1DCABA9CF5DED307B4F23223E0B6F156991DB601DFB9C41CE1C770A726970706C652E636F6D81145E7B112523F68D2F5E879DB4EAC51C6698A69304',
+    id: '123'
+})
+```
+
+```
+[ValidationError(instance.id does not match pattern "^[A-F0-9]{64}$")]
+```
--- a/docs/src/sign.md.ejs
+++ b/docs/src/sign.md.ejs
@@ -1,12 +1,16 @@
 ## sign

 ```
-sign(txJSON: string, secret: string, options: Object): {signedTransaction: string, id: string}
-sign(txJSON: string, keypair: Object, options: Object): {signedTransaction: string, id: string}
+sign(txJSON: string, secret: string, options: object): {signedTransaction: string, id: string}
+sign(txJSON: string, keypair: object, options: object): {signedTransaction: string, id: string}
 ```

 Sign a prepared transaction. The signed transaction must subsequently be [submitted](#submit).

+This method can sign any of [the transaction types supported by ripple-binary-codec](https://github.com/ripple/ripple-binary-codec/blob/cfcde79c19c359e9a0466d7bc3dc9a3aef47bb99/src/enums/definitions.json#L1637). When a new transaction type is added to the XRP Ledger, it will be unrecognized until `ripple-binary-codec` is updated. If you try to sign an unrecognized transaction type, this method throws an error similar to the following:
+
+`Error: [TRANSACTION_TYPE] is not a valid name or ordinal for TransactionType`
+
 ### Parameters

 <%- renderSchema("input/sign.json") %>
--- a/docs/src/specifications.md.ejs
+++ b/docs/src/specifications.md.ejs
@@ -28,6 +28,8 @@ See [Transaction Types](#transaction-types) for a description.

 <%- renderSchema('specifications/order.json') %>

+The following invalid flag combination causes a `ValidationError`: `immediateOrCancel` and `fillOrKill`. These fields are mutually exclusive, and cannot both be set at the same time.
+
 ### Example

 <%- renderFixture('requests/prepare-order.json') %>
--- a/docs/src/submit.md.ejs
+++ b/docs/src/submit.md.ejs
@@ -1,6 +1,6 @@
 ## submit

-`submit(signedTransaction: string): Promise<Object>`
+`submit(signedTransaction: string): Promise<object>`

 Submits a signed transaction. The transaction is not guaranteed to succeed; it must be verified with [getTransaction](#gettransaction).

--- a/docs/src/txFlags.md.ejs
+++ b/docs/src/txFlags.md.ejs
@@ -0,0 +1,81 @@
+## txFlags
+
+`txFlags.TRANSACTION_TYPE.FLAG`
+
+This object provides constants for use when creating or interpreting transaction flags. Most transactions have a set of bit-flags that represent various options that affect how a transaction should behave. These options are represented as binary values that can be combined with bitwise-or operations to encode multiple flags at once.
+
+Most flags only have meaning for a specific transaction type. The same bitwise value may be reused for flags on different transaction types, so it is important to pay attention to the transaction type when setting and reading flags.
+
+Bits that are not defined as flags MUST be 0.
+
+### Global Flag
+
+Applies globally to all transactions.
+
+`txFlags.Universal.FullyCanonicalSig`: Require a fully-canonical signature. When preparing transactions, ripple-lib enables this flag for you.
+
+### Payment Flags
+
+`txFlags.Payment.NoRippleDirect`: Do not use the default path; only use specified paths. This is intended to force the transaction to take arbitrage opportunities. Most clients do not need this.
+
+`txFlags.Payment.PartialPayment`: If the specified destination amount cannot be sent without spending more than the source maxAmount, reduce the received amount instead of failing outright. See [Partial Payments](https://developers.ripple.com/partial-payments.html) for more details.
+
+`txFlags.Payment.LimitQuality`: Only take paths where all the conversions have an input:output ratio that is equal or better than the ratio of `destination.amount`:`source.maxAmount`. See [Limit Quality](https://developers.ripple.com/payment.html#limit-quality) for details.
+
+### OfferCreate Flags
+
+`txFlags.OfferCreate.Passive`: If enabled, the offer does not consume offers that exactly match it, and instead becomes an Offer object in the ledger. It still consumes offers that cross it.
+
+`txFlags.OfferCreate.ImmediateOrCancel`: Treat the offer as an Immediate or Cancel order. If enabled, the offer never becomes a ledger object: it only tries to match existing offers in the ledger.
+
+`txFlags.OfferCreate.FillOrKill`: Treat the offer as a Fill or Kill order.
+
+`txFlags.OfferCreate.Sell`: Treat the offer as a Sell order. With `order.direction = 'sell'`, exchange the entire `order.quantity`, even if it means obtaining more than the `order.totalPrice` amount in exchange. If using `prepareOrder`, ripple-lib sets this flag for you.
+
+### TrustSet Flags
+
+`txFlags.TrustSet.SetAuth`: Authorize the other party to hold issuances from this account. (No effect unless using the AccountSet.RequireAuth flag.) Cannot be unset.
+
+`txFlags.TrustSet.NoRipple`:  Obsolete.
+
+`txFlags.TrustSet.SetNoRipple`: Blocks [rippling](https://developers.ripple.com/rippling.html) between two trustlines of the same currency, if this flag is set on both.
+
+`txFlags.TrustSet.ClearNoRipple`: Clears the No-[Rippling](https://developers.ripple.com/rippling.html) flag.
+
+`txFlags.TrustSet.SetFreeze`: Freeze the trustline. A non-XRP currency can be frozen by the exchange or gateway that issued it. XRP cannot be frozen.
+
+`txFlags.TrustSet.ClearFreeze`: Unfreeze the trustline.
+
+### AccountSet Flags
+
+You can use the `prepareSettings` method to change your account flags. This method uses AccountSet flags internally.
+
+In the rippled API, Account Flags can be enabled and disabled with the SetFlag and ClearFlag parameters. See [AccountSet Flags](https://developers.ripple.com/accountset.html#accountset-flags).
+
+The AccountSet transaction type has some transaction flags, but their use is discouraged.
+
+* `txFlags.AccountSet.RequireDestTag`
+* `txFlags.AccountSet.OptionalDestTag`
+* `txFlags.AccountSet.RequireAuth`
+* `txFlags.AccountSet.OptionalAuth`
+* `txFlags.AccountSet.DisallowXRP`
+* `txFlags.AccountSet.AllowXRP`
+
+### PaymentChannelClaim Flags
+
+`txFlags.PaymentChannelClaim.Renew`: Clear the channel's Expiration time. (Expiration is different from the channel's immutable CancelAfter time.) Only the source address of the payment channel can use this flag.
+
+`txFlags.PaymentChannelClaim.Close`: Request to close the channel. Only the channel source and destination addresses can use this flag. This flag closes the channel immediately if it has no more XRP allocated to it after processing the current claim, or if the destination address uses it. If the source address uses this flag when the channel still holds XRP, this schedules the channel to close after SettleDelay seconds have passed. (Specifically, this sets the Expiration of the channel to the close time of the previous ledger plus the channel's SettleDelay time, unless the channel already has an earlier Expiration time.) If the destination address uses this flag when the channel still holds XRP, any XRP that remains after processing the claim is returned to the source address.
+
+### Other Transaction Types
+
+The remaining transaction types do not have any flags at this time.
+
+* OfferCancel
+* SetRegularKey
+* SignerListSet
+* EscrowCreate
+* EscrowFinish
+* EscrowCancel
+* PaymentChannelCreate
+* PaymentChannelFund
--- a/docs/src/xrpToDropsAndDropsToXrp.md.ejs
+++ b/docs/src/xrpToDropsAndDropsToXrp.md.ejs
@@ -0,0 +1,47 @@
+## xrpToDrops
+
+`xrpToDrops(xrp: string | BigNumber): string`
+
+Converts an XRP amount to drops. 1 XRP = 1,000,000 drops, so 1 drop = 0.000001 XRP. This method is useful when converting amounts for use with the rippled API, which requires XRP amounts to be specified in drops.
+
+### Parameters
+
+`xrp`: A string or BigNumber representing an amount of XRP. If `xrp` is a string, it may start with `-`, must contain at least one number, and may contain up to one `.`. This method throws a `ValidationError` for invalid input.
+
+### Return Value
+
+A string representing an equivalent amount of drops.
+
+### Example
+
+```javascript
+return api.xrpToDrops('1');
+```
+
+```json
+'1000000'
+```
+
+## dropsToXrp
+
+`dropsToXrp(drops: string | BigNumber): string`
+
+Converts an amount of drops to XRP. 1 drop = 0.000001 XRP, so 1 XRP = 1,000,000 drops. This method is useful when converting amounts from the rippled API, which describes XRP amounts in drops.
+
+### Parameters
+
+`drops`: A string or BigNumber representing an amount of drops. If `drops` is a string, it may start with `-` and must contain at least one number. This method throws a `ValidationError` for invalid input.
+
+### Return Value
+
+A string representing an equivalent amount of XRP.
+
+### Example
+
+```javascript
+return api.dropsToXrp('1');
+```
+
+```json
+'0.000001'
+```
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ripple-lib",
-  "version": "1.0.0-beta.5",
+  "version": "1.1.0",
  "license": "ISC",
  "description": "A JavaScript API for interacting with Ripple in Node.js and the browser",
  "files": [
@@ -23,7 +23,7 @@
    "jsonschema": "1.2.2",
    "lodash": "^4.17.4",
    "ripple-address-codec": "^2.0.1",
-    "ripple-binary-codec": "^0.1.13",
+    "ripple-binary-codec": "0.2.0",
    "ripple-hashes": "^0.3.1",
    "ripple-keypairs": "^0.10.1",
    "ripple-lib-transactionparser": "0.7.1",
@@ -55,7 +55,7 @@
    "tslint-eslint-rules": "^4.1.1",
    "typescript": "2.9.2",
    "uglifyjs-webpack-plugin": "^1.1.4",
-    "webpack": "^3.10.0",
+    "webpack": "3.12.0",
    "yargs": "^8.0.2"
  },
  "scripts": {
--- a/snippets/parseAccountFlags.js
+++ b/snippets/parseAccountFlags.js
@@ -0,0 +1,11 @@
+const RippleAPI = require('../dist/npm').RippleAPI
+const api = new RippleAPI({server: 'wss://s.altnet.rippletest.net:51233'})
+
+parseAccountFlags()
+
+async function parseAccountFlags() {
+  await api.connect()
+  const account_info = await api.request('account_info', {account: 'rKsdkGhyZH6b2Zzd5hNnEqSv2wpznn4n6N'})
+  const flags = api.parseAccountFlags(account_info.account_data.Flags)
+  console.log(JSON.stringify(flags, null, 2))
+}
--- a/src/api.ts
+++ b/src/api.ts
@@ -23,7 +23,7 @@ import getBalanceSheet from './ledger/balance-sheet'
 import getPaths from './ledger/pathfind'
 import getOrders from './ledger/orders'
 import getOrderbook from './ledger/orderbook'
-import getSettings from './ledger/settings'
+import {getSettings, parseAccountFlags} from './ledger/settings'
 import getAccountInfo from './ledger/accountinfo'
 import getAccountObjects from './ledger/accountobjects'
 import getPaymentChannel from './ledger/payment-channel'
@@ -45,6 +45,7 @@ import sign from './transaction/sign'
 import combine from './transaction/combine'
 import submit from './transaction/submit'
 import {generateAddressAPI} from './offline/generate-address'
+import {deriveKeypair, deriveAddress} from './offline/derive'
 import computeLedgerHash from './offline/ledgerhash'
 import signPaymentChannelClaim from './offline/sign-payment-channel-claim'
 import verifyPaymentChannelClaim from './offline/verify-payment-channel-claim'
@@ -301,6 +302,7 @@ class RippleAPI extends EventEmitter {
  getAccountObjects = getAccountObjects
  getPaymentChannel = getPaymentChannel
  getLedger = getLedger
+  parseAccountFlags = parseAccountFlags

  preparePayment = preparePayment
  prepareTrustline = prepareTrustline
@@ -321,6 +323,8 @@ class RippleAPI extends EventEmitter {
  submit = submit

  generateAddress = generateAddressAPI
+  deriveKeypair = deriveKeypair
+  deriveAddress = deriveAddress
  computeLedgerHash = computeLedgerHash
  signPaymentChannelClaim = signPaymentChannelClaim
  verifyPaymentChannelClaim = verifyPaymentChannelClaim
@@ -330,6 +334,9 @@ class RippleAPI extends EventEmitter {
  dropsToXrp = dropsToXrp
  iso8601ToRippleTime = iso8601ToRippleTime
  txFlags = txFlags
+
+  isValidAddress = schemaValidator.isValidAddress
+  isValidSecret = schemaValidator.isValidSecret
 }

 export {
--- a/src/common/browser-hacks.ts
+++ b/src/common/browser-hacks.ts
@@ -6,7 +6,7 @@ function setPrototypeOf(object, prototype) {
    object.__proto__ = prototype
 }

-function getConstructorName(object: Object): string {
+function getConstructorName(object: object): string {
  // hack for internet explorer
  if (!object.constructor.name) {
    return object.constructor.toString().match(/^function\s+([^(]*)/)![1]
--- a/src/common/errors.ts
+++ b/src/common/errors.ts
@@ -70,7 +70,7 @@ class MissingLedgerHistoryError extends RippleError {

 class PendingLedgerVersionError extends RippleError {
  constructor(message?: string) {
-    super(message || 'maxLedgerVersion is greater than server\'s most recent ' +
+    super(message || 'maxLedgerVersion is greater than server\'s most recent' +
      ' validated ledger')
  }
 }
--- a/src/common/schema-validator.ts
+++ b/src/common/schema-validator.ts
@@ -9,13 +9,13 @@ function loadSchemas() {
  // listed explicitly for webpack (instead of scanning schemas directory)
  const schemas = [
    require('./schemas/objects/tx-json.json'),
-    require('./schemas/objects/tx-type.json'),
+    require('./schemas/objects/transaction-type.json'),
    require('./schemas/objects/hash128.json'),
    require('./schemas/objects/hash256.json'),
    require('./schemas/objects/sequence.json'),
    require('./schemas/objects/signature.json'),
    require('./schemas/objects/issue.json'),
-    require('./schemas/objects/ledgerversion.json'),
+    require('./schemas/objects/ledger-version.json'),
    require('./schemas/objects/max-adjustment.json'),
    require('./schemas/objects/memo.json'),
    require('./schemas/objects/memos.json'),
@@ -31,21 +31,23 @@ function loadSchemas() {
    require('./schemas/objects/min-adjustment.json'),
    require('./schemas/objects/source-exact-adjustment.json'),
    require('./schemas/objects/destination-exact-adjustment.json'),
-    require('./schemas/objects/tx-hash.json'),
+    require('./schemas/objects/destination-address-tag.json'),
+    require('./schemas/objects/transaction-hash.json'),
    require('./schemas/objects/address.json'),
    require('./schemas/objects/adjustment.json'),
    require('./schemas/objects/quality.json'),
    require('./schemas/objects/amount.json'),
-    require('./schemas/objects/amount-base.json'),
+    require('./schemas/objects/amountbase.json'),
    require('./schemas/objects/balance.json'),
    require('./schemas/objects/blob.json'),
    require('./schemas/objects/currency.json'),
    require('./schemas/objects/signed-value.json'),
    require('./schemas/objects/orderbook.json'),
    require('./schemas/objects/instructions.json'),
-    require('./schemas/objects/settings.json'),
+    require('./schemas/objects/settings-plus-memos.json'),
    require('./schemas/specifications/settings.json'),
    require('./schemas/specifications/payment.json'),
+    require('./schemas/specifications/get-payment.json'),
    require('./schemas/specifications/escrow-cancellation.json'),
    require('./schemas/specifications/order-cancellation.json'),
    require('./schemas/specifications/order.json'),
@@ -158,5 +160,6 @@ function schemaValidate(schemaName: string, object: any): void {

 export {
  schemaValidate,
-  isValidSecret
+  isValidSecret,
+  isValidAddress
 }
--- a/src/common/schemas/input/api-options.json
+++ b/src/common/schemas/input/api-options.json
@@ -18,9 +18,9 @@
    },
    "server": {
      "type": "string",
-      "description": "URI for rippled websocket port to connect to. Must start with `wss://` or `ws://`.",
+      "description": "URI for rippled websocket port to connect to. Must start with `wss://`, `ws://`, `wss+unix://`, or `ws+unix://`.",
      "format": "uri",
-      "pattern": "^wss?://"
+      "pattern": "^(wss?|wss?\\+unix)://"
    },
    "proxy": {
      "format": "uri",
--- a/src/common/schemas/input/get-transaction.json
+++ b/src/common/schemas/input/get-transaction.json
@@ -4,9 +4,9 @@
  "description": "Parameters for getTransaction",
  "type": "object",
  "properties": {
-    "id": {"$ref": "id"},
+    "id": {"$ref": "transactionHash"},
    "options": {
-      "description": "Options to limit the ledger versions to search.",
+      "description": "Options to limit the ledger versions to search and/or to include raw transaction data.",
      "properties": {
        "minLedgerVersion": {
          "$ref": "ledgerVersion",
@@ -15,6 +15,9 @@
        "maxLedgerVersion": {
          "$ref": "ledgerVersion",
          "description": "The highest ledger version to search"
+        },
+        "includeRawTransaction": {
+          "description": "Include raw transaction data. For advanced users; exercise caution when interpreting this data. "
        }
      },
      "additionalProperties": false
--- a/src/common/schemas/input/get-transactions.json
+++ b/src/common/schemas/input/get-transactions.json
@@ -49,6 +49,9 @@
          "items": {"$ref": "transactionType"},
          "description": "Only return transactions of the specified [Transaction Types](#transaction-types)."
        },
+        "includeRawTransactions": {
+          "description": "Include raw transaction data. For advanced users; exercise caution when interpreting this data. "
+        },
        "binary": {
          "type": "boolean",
          "description": "If true, the transactions will be sent from the server in a condensed binary format rather than JSON."
--- a/src/common/schemas/objects/amount.json
+++ b/src/common/schemas/objects/amount.json
@@ -2,7 +2,7 @@
  "$schema": "http://json-schema.org/draft-04/schema#",
  "title": "amount",
  "link": "amount",
-  "description": "An Amount on the Ripple Protocol",
+  "description": "An Amount on the XRP Ledger",
  "allOf": [
    {"$ref": "amountbase"},
    {"required": ["value"]}
--- a/src/common/schemas/objects/amount-base.json
+++ b/src/common/schemas/objects/amount-base.json
--- a/src/common/schemas/objects/destination-address-tag.json
+++ b/src/common/schemas/objects/destination-address-tag.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "destinationAddressTag",
+  "description": "A destination address and optional tag, with no amount included. When parsing an incoming transaction, the original specification's amount is hidden to prevent misinterpretation. For the amount that the transaction delivered, see `outcome.deliveredAmount`.",
+  "type": "object",
+  "properties": {
+    "address": {
+      "$ref": "address",
+      "description": "The address to receive at."
+    },
+    "tag": {"$ref": "tag"}
+  },
+  "required": ["address"],
+  "additionalProperties": false
+}
--- a/src/common/schemas/objects/destination-exact-adjustment.json
+++ b/src/common/schemas/objects/destination-exact-adjustment.json
@@ -9,7 +9,7 @@
    },
    "amount": {
      "$ref": "laxAmount",
-      "description": "An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field is exclusive with destination.minAmount)."
+      "description": "An exact amount to deliver to the recipient. If the counterparty is not specified, amounts with any counterparty may be used. (This field cannot be used with `destination.minAmount`.)"
    },
    "tag": {"$ref": "tag"}
  },
--- a/src/common/schemas/objects/ledger-version.json
+++ b/src/common/schemas/objects/ledger-version.json
--- a/src/common/schemas/objects/settings-plus-memos.json
+++ b/src/common/schemas/objects/settings-plus-memos.json
--- a/src/common/schemas/objects/transaction-hash.json
+++ b/src/common/schemas/objects/transaction-hash.json
@@ -1,6 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "id",
+  "title": "transactionHash",
  "link": "transaction-id",
  "description": "A hash of a transaction used to identify the transaction, represented in hexadecimal.",
  "type": "string",
--- a/src/common/schemas/objects/transaction-type.json
+++ b/src/common/schemas/objects/transaction-type.json
--- a/src/common/schemas/output/get-ledger.json
+++ b/src/common/schemas/output/get-ledger.json
@@ -55,15 +55,11 @@
        "description": "A transaction in the same format as the return value of [getTransaction](#gettransaction)."
      }
    },
-    "rawTransactions": {
-      "type": "string",
-      "description": "A JSON string containing rippled format transaction JSON for all transactions that were validated in this ledger."
-    },
    "transactionHashes": {
      "description": "An array of hashes of all transactions that were validated in this ledger.",
      "type": "array",
      "items": {
-        "$ref": "id"
+        "$ref": "transactionHash"
      }
    },
    "rawState": {
--- a/src/common/schemas/output/get-transaction.json
+++ b/src/common/schemas/output/get-transaction.json
@@ -1,20 +1,21 @@
 {
  "$schema": "http://json-schema.org/draft-04/schema#",
  "title": "getTransaction",
+  "description": "getTransaction response",
  "link": "gettransaction",
  "properties": {
    "type": {
      "$ref": "transactionType"
    },
    "specification": {
-      "description": "A specification that would produce the same outcome as this transaction. The structure of the specification depends on the value of the `type` field (see [Transaction Types](#transaction-types) for details). *Note:* This is **not** necessarily the same as the original specification."
+      "description": "A specification that would produce the same outcome as this transaction. *Exception:* For payment transactions, this omits the `destination.amount` field, to prevent misunderstanding. The structure of the specification depends on the value of the `type` field (see [Transaction Types](#transaction-types) for details). *Note:* This is **not** necessarily the same as the original specification."
    },
    "outcome": {
      "$ref": "outcome",
      "description": "The outcome of the transaction (what effects it had)."
    },
    "id": {
-      "$ref": "id",
+      "$ref": "transactionHash",
      "description": "A hash of the transaction that can be used to identify it."
    },
    "address": {
@@ -24,6 +25,10 @@
    "sequence": {
      "$ref": "sequence",
      "description": "The account sequence number of the transaction for the account that initiated it."
+    },
+    "rawTransaction": {
+      "description": "The raw transaction data as a JSON string. For advanced users only; exercise caution when interpreting this data.",
+      "type": "string"
    }
  },
  "required": [
@@ -44,7 +49,7 @@
          ]
        },
        "specification": {
-          "$ref": "payment"
+          "$ref": "getPayment"
        }
      }
    },
--- a/src/common/schemas/output/sign.json
+++ b/src/common/schemas/output/sign.json
@@ -9,7 +9,7 @@
      "description": "The signed transaction represented as an uppercase hexadecimal string."
    },
    "id": {
-      "$ref": "id",
+      "$ref": "transactionHash",
      "description": "The [Transaction ID](#transaction-id) of the signed transaction."
    }
  },
--- a/src/common/schemas/specifications/get-payment.json
+++ b/src/common/schemas/specifications/get-payment.json
@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "getPayment",
+  "description": "A specification of a payment in a response for getTransaction or getTransactions.",
+  "type": "object",
+  "properties": {
+    "source": {
+      "$ref": "sourceAdjustment",
+      "description": "The source of the funds to be sent."
+    },
+    "destination": {
+      "$ref": "destinationAddressTag",
+      "description": "The destination of the funds to be sent. Since this is a payment response, the amount is not shown here. For the amount that the transaction delivered, see `outcome.deliveredAmount`."
+    },
+    "paths": {
+      "type": "string",
+      "description": "The paths of trustlines and orders to use in executing the payment."
+    },
+    "memos": {"$ref": "memos"},
+    "invoiceID": {
+      "description": "A 256-bit hash that can be used to identify a particular payment.",
+      "$ref": "hash256"
+    },
+    "allowPartialPayment": {
+      "description": "If true, this payment should proceed even if the whole amount cannot be delivered due to a lack of liquidity or a lack of funds in the source account.",
+      "type": "boolean"
+    },
+    "noDirectRipple": {
+      "description": "If true and paths are specified, the sender would like the XRP Ledger to disregard any direct paths from the source account to the destination account. This may be used to take advantage of an arbitrage opportunity or by gateways wishing to issue balances from a hot wallet to a user who has mistakenly set a trustline directly to the hot wallet.",
+      "type": "boolean"
+    },
+    "limitQuality": {
+      "description": "Only take paths where all the conversions have an input:output ratio that is equal or better than the ratio of destination.amount:source.maxAmount.",
+      "type": "boolean"
+    }
+  },
+  "required": ["source", "destination"],
+  "additionalProperties": false
+}
--- a/src/common/schemas/specifications/order.json
+++ b/src/common/schemas/specifications/order.json
@@ -19,11 +19,11 @@
    },
    "immediateOrCancel": {
      "type": "boolean",
-      "description": "Treat the offer as an [Immediate or Cancel order](http://en.wikipedia.org/wiki/Immediate_or_cancel). If enabled, the offer will never become a ledger node: it only attempts to match existing offers in the ledger."
+      "description": "Treat the offer as an [Immediate or Cancel order](http://en.wikipedia.org/wiki/Immediate_or_cancel). If enabled, the offer will never become a ledger node: it only attempts to match existing offers in the ledger. This cannot be used with `fillOrKill`."
    },
    "fillOrKill": {
      "type": "boolean",
-      "description": "Treat the offer as a [Fill or Kill order](http://en.wikipedia.org/wiki/Fill_or_kill). Only attempt to match existing offers in the ledger, and only do so if the entire quantity can be exchanged."
+      "description": "Treat the offer as a [Fill or Kill order](http://en.wikipedia.org/wiki/Fill_or_kill). Only attempt to match existing offers in the ledger, and only do so if the entire quantity can be exchanged. This cannot be used with `immediateOrCancel`."
    },
    "passive": {
      "description": "If enabled, the offer will not consume offers that exactly match it, and instead becomes an Offer node in the ledger. It will still consume offers that cross it.",
--- a/src/common/serverinfo.ts
+++ b/src/common/serverinfo.ts
@@ -9,7 +9,7 @@ export type GetServerInfoResponse = {
  hostID: string,
  ioLatencyMs: number,
  load?: {
-    jobTypes: Array<Object>,
+    jobTypes: Array<object>,
    threads: number
  },
  lastClose: {
--- a/src/common/txflags.ts
+++ b/src/common/txflags.ts
@@ -1,5 +1,3 @@
-
-
 const txFlags = {
  // Universal flags can apply to any transaction type
  Universal: {
--- a/src/common/types/commands/account_objects.ts
+++ b/src/common/types/commands/account_objects.ts
@@ -1,4 +1,9 @@
-import {CheckLedgerEntry} from '../objects'
+import {
+  CheckLedgerEntry, RippleStateLedgerEntry,
+  OfferLedgerEntry, SignerListLedgerEntry,
+  EscrowLedgerEntry, PayChannelLedgerEntry,
+  DepositPreauthLedgerEntry
+} from '../objects'

 export interface GetAccountObjectsOptions {
  type?: string | (
@@ -44,7 +49,16 @@ export interface AccountObjectsResponse {
  account: string,

  // Array of objects owned by this account.
-  account_objects: CheckLedgerEntry | object,
+  // from the getAccountObjects section of the dev center
+  account_objects: Array<
+    CheckLedgerEntry |
+    RippleStateLedgerEntry |
+    OfferLedgerEntry |
+    SignerListLedgerEntry |
+    EscrowLedgerEntry |
+    PayChannelLedgerEntry |
+    DepositPreauthLedgerEntry
+  >,

  // (May be omitted) The identifying hash of the ledger
  // that was used to generate this response.
--- a/src/common/types/commands/book_offers.ts
+++ b/src/common/types/commands/book_offers.ts
@@ -1,7 +1,7 @@
 import {
  TakerRequestAmount,
  RippledAmount,
-  OfferCreateTransaction
+  OfferLedgerEntry
 } from '../objects'

 export interface BookOffersRequest {
@@ -22,7 +22,7 @@ export interface BookOffersResponse {
  marker?: any
 }

-export interface BookOffer extends OfferCreateTransaction {
+export interface BookOffer extends OfferLedgerEntry {
  quality?: string
  owner_funds?: string,
  taker_gets_funded?: RippledAmount,
--- a/src/common/types/objects/ledger_entries.ts
+++ b/src/common/types/objects/ledger_entries.ts
@@ -1,4 +1,5 @@
 import {SignerEntry} from './index'
+import {Amount, RippledAmount} from './amounts'

 export interface AccountRootLedgerEntry {
  LedgerEntryType: 'AccountRoot',
@@ -44,6 +45,87 @@ export interface CheckLedgerEntry {
  SourceTag: number
 }

+export interface DepositPreauthLedgerEntry {
+  LedgerEntryType: 'DepositPreauth',
+  Account: string,
+  Authorize: string,
+  OwnerNode: string,
+  PreviousTxnID: string,
+  PreviousTxnLgrSeq: number
+}
+
+export interface DirectoryNodeLedgerEntry {
+  LedgerEntryType: 'DirectoryNode',
+  Flags: number,
+  RootIndex: string,
+  Indexes: string[],
+  IndexNext?: number,
+  IndexPrevious?: number
+}
+
+export interface OfferDirectoryNodeLedgerEntry
+       extends DirectoryNodeLedgerEntry {
+  TakerPaysCurrency: string,
+  TakerPaysIssuer: string,
+  TakerGetsCurrency: string,
+  TakerGetsIssuer: string,
+  ExchangeRate?: number // DEPRECATED
+}
+
+export interface OwnerDirectoryNodeLedgerEntry
+  extends DirectoryNodeLedgerEntry {
+  Owner: string,
+}
+
+export interface EscrowLedgerEntry {
+  LedgerEntryType: 'Escrow',
+  Account: string,
+  Destination: string,
+  Amount: string,
+  Condition?: string,
+  CancelAfter?: number,
+  FinishAfter?: number,
+  Flags: number,
+  SourceTag?: number,
+  DestinationTag?: number,
+  OwnerNode: string,
+  DestinationNode?: string,
+  PreviousTxnID: string,
+  PreviousTxnLgrSeq: number
+}
+
+export interface FeeSettingsLedgerEntry {
+  LedgerEntryType: 'FeeSettings',
+  BaseFee: string,
+  ReferenceFeeUnits: number,
+  ReserveBase: number,
+  ReserveIncrement: number,
+  Flags: number
+}
+
+export interface LedgerHashesLedgerEntry {
+  LedgerEntryType: 'LedgerHashes',
+  Hashes: string[],
+  Flags: number,
+  FirstLedgerSequence?: number, // DEPRECATED
+  LastLedgerSequence?: number
+}
+
+export interface OfferLedgerEntry {
+  LedgerEntryType: 'Offer',
+  Flags: number,
+  Account: string,
+  Sequence: number,
+  TakerPays: RippledAmount,
+  TakerGets: RippledAmount,
+  BookDirectory: string,
+  BookNode: string,
+  OwnerNode: string,
+  PreviousTxnID: string,
+  PreviousTxnLgrSeq: number,
+  Expiration?: number
+}
+
 export interface PayChannelLedgerEntry {
  LedgerEntryType: 'PayChannel',
  Sequence: number,
@@ -63,6 +145,22 @@ export interface PayChannelLedgerEntry {
  index: string
 }

+export interface RippleStateLedgerEntry {
+  LedgerEntryType: 'RippleState',
+  Flags: number,
+  Balance: Amount,
+  LowLimit: Amount,
+  HighLimit: Amount,
+  PreviousTxnID: string,
+  PreviousTxnLgrSeq: number,
+  LowNode?: string,
+  HighNode?: string,
+  LowQualityIn?: number,
+  LowQualityOut?: number,
+  HighQualityIn?: number,
+  HighQualityOut?: number
+}
+
 export interface SignerListLedgerEntry {
  LedgerEntryType: 'SignerList',
  OwnerNode: string,
@@ -73,11 +171,19 @@ export interface SignerListLedgerEntry {
  PreviousTxnLgrSeq: number
 }

-// TODO: Add the other ledger entry types, then remove the `any` fallback
 // see https://ripple.com/build/ledger-format/#ledger-object-types
 export type LedgerEntry =
  AccountRootLedgerEntry |
  AmendmentsLedgerEntry |
+  CheckLedgerEntry |
+  DepositPreauthLedgerEntry |
+  DirectoryNodeLedgerEntry |
+  OfferDirectoryNodeLedgerEntry |
+  OwnerDirectoryNodeLedgerEntry |
+  EscrowLedgerEntry |
+  FeeSettingsLedgerEntry |
+  LedgerHashesLedgerEntry |
+  OfferLedgerEntry |
  PayChannelLedgerEntry |
-  SignerListLedgerEntry |
-  any
+  RippleStateLedgerEntry |
+  SignerListLedgerEntry
--- a/src/common/types/objects/settings.ts
+++ b/src/common/types/objects/settings.ts
@@ -11,20 +11,21 @@ export type Signers = {
 }

 export type FormattedSettings = {
-  passwordSpent?: boolean,
-  requireDestinationTag?: boolean,
-  requireAuthorization?: boolean,
-  disallowIncomingXRP?: boolean,
-  disableMasterKey?: boolean,
-  enableTransactionIDTracking?: boolean,
-  noFreeze?: boolean,
-  globalFreeze?: boolean,
  defaultRipple?: boolean,
-  emailHash?: string|null,
-  messageKey?: string,
+  depositAuth?: boolean,
+  disableMasterKey?: boolean,
+  disallowIncomingXRP?: boolean,
  domain?: string,
-  transferRate?: number|null,
+  emailHash?: string|null,
+  enableTransactionIDTracking?: boolean,
+  globalFreeze?: boolean,
+  memos?: Memo[],
+  messageKey?: string,
+  noFreeze?: boolean,
+  passwordSpent?: boolean,
  regularKey?: string,
+  requireAuthorization?: boolean,
+  requireDestinationTag?: boolean,
  signers?: Signers,
-  memos?: Memo[]
+  transferRate?: number|null
 }
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -133,7 +133,7 @@ function rippleToUnixTimestamp(rpepoch: number): number {

 /**
 * @param {Number|Date} timestamp (ms since unix epoch)
- * @return {Number} seconds since ripple epoch ( 1/1/2000 GMT)
+ * @return {Number} seconds since ripple epoch (1/1/2000 GMT)
 */
 function unixToRippleTimestamp(timestamp: number): number {
  return Math.round(timestamp / 1000) - 0x386D4380
@@ -143,6 +143,10 @@ function rippleTimeToISO8601(rippleTime: number): string {
  return new Date(rippleToUnixTimestamp(rippleTime)).toISOString()
 }

+/**
+ * @param {string} iso8601 international standard date format
+ * @return {number} seconds since ripple epoch (1/1/2000 GMT)
+ */
 function iso8601ToRippleTime(iso8601: string): number {
  return unixToRippleTimestamp(Date.parse(iso8601))
 }
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,8 @@
-
-
 export {RippleAPI} from './api'
+
+export {
+    FormattedTransactionType
+} from './transaction/types'
+
 // Broadcast api is experimental
 export {RippleAPIBroadcast} from './broadcast'
--- a/src/ledger/ledger.ts
+++ b/src/ledger/ledger.ts
@@ -25,5 +25,4 @@ async function getLedger(
  return parseLedger(response.ledger)
 }

-
 export default getLedger
--- a/src/ledger/parse/cancellation.ts
+++ b/src/ledger/parse/cancellation.ts
@@ -1,6 +1,6 @@
 import * as assert from 'assert'

-function parseOrderCancellation(tx: any): Object {
+function parseOrderCancellation(tx: any): object {
  assert(tx.TransactionType === 'OfferCancel')
  return {
    orderSequence: tx.OfferSequence
--- a/src/ledger/parse/deposit-preauth.ts
+++ b/src/ledger/parse/deposit-preauth.ts
@@ -0,0 +1,21 @@
+import * as assert from 'assert'
+import {removeUndefined} from '../../common'
+
+export type FormattedDepositPreauth = {
+  // account (address) of the sender to preauthorize
+  authorize: string,
+
+  // account (address) of the sender whose preauthorization should be revoked
+  unauthorize: string
+}
+
+function parseDepositPreauth(tx: any): FormattedDepositPreauth {
+  assert(tx.TransactionType === 'DepositPreauth')
+
+  return removeUndefined({
+    authorize: tx.Authorize,
+    unauthorize: tx.Unauthorize
+  })
+}
+
+export default parseDepositPreauth
--- a/src/ledger/parse/escrow-cancellation.ts
+++ b/src/ledger/parse/escrow-cancellation.ts
@@ -2,7 +2,7 @@ import * as assert from 'assert'
 import {parseMemos} from './utils'
 import {removeUndefined} from '../../common'

-function parseEscrowCancellation(tx: any): Object {
+function parseEscrowCancellation(tx: any): object {
  assert(tx.TransactionType === 'EscrowCancel')

  return removeUndefined({
--- a/src/ledger/parse/escrow-creation.ts
+++ b/src/ledger/parse/escrow-creation.ts
@@ -3,7 +3,7 @@ import parseAmount from './amount'
 import {parseTimestamp, parseMemos} from './utils'
 import {removeUndefined} from '../../common'

-function parseEscrowCreation(tx: any): Object {
+function parseEscrowCreation(tx: any): object {
  assert(tx.TransactionType === 'EscrowCreate')

  return removeUndefined({
--- a/src/ledger/parse/escrow-execution.ts
+++ b/src/ledger/parse/escrow-execution.ts
@@ -2,7 +2,7 @@ import * as assert from 'assert'
 import {parseMemos} from './utils'
 import {removeUndefined} from '../../common'

-function parseEscrowExecution(tx: any): Object {
+function parseEscrowExecution(tx: any): object {
  assert(tx.TransactionType === 'EscrowFinish')

  return removeUndefined({
--- a/src/ledger/parse/fields.ts
+++ b/src/ledger/parse/fields.ts
@@ -13,7 +13,7 @@ function parseField(info, value) {
  return value
 }

-function parseFields(data: any): Object {
+function parseFields(data: any): object {
  const settings: any = {}
  for (const fieldName in AccountFields) {
    const fieldValue = data[fieldName]
--- a/src/ledger/parse/ledger.ts
+++ b/src/ledger/parse/ledger.ts
@@ -17,19 +17,19 @@ export type FormattedLedger = {
  parentCloseTime: string,
  totalDrops: string,
  transactionHash: string,
-  transactions?: Array<Object>,
-  rawTransactions?: string,
+  transactions?: Array<object>,
  transactionHashes?: Array<string>,
  rawState?: string,
  stateHashes?: Array<string>
 }

 function parseTransactionWrapper(ledgerVersion, tx) {
+  // renames metaData to meta and adds ledger_index
  const transaction = _.assign({}, _.omit(tx, 'metaData'), {
    meta: tx.metaData,
    ledger_index: ledgerVersion
  })
-  const result = parseTransaction(transaction)
+  const result = parseTransaction(transaction, true)
  if (!result.outcome.ledgerVersion) {
    result.outcome.ledgerVersion = ledgerVersion
  }
@@ -45,8 +45,7 @@ function parseTransactions(transactions, ledgerVersion) {
  }
  return {
    transactions: _.map(transactions,
-      _.partial(parseTransactionWrapper, ledgerVersion)),
-    rawTransactions: JSON.stringify(transactions)
+      _.partial(parseTransactionWrapper, ledgerVersion))
  }
 }

@@ -62,19 +61,20 @@ function parseState(state) {

 export function parseLedger(ledger: Ledger): FormattedLedger {
  const ledgerVersion = parseInt(ledger.ledger_index || ledger.seqNum, 10)
-  return removeUndefined(Object.assign({
-    stateHash: ledger.account_hash,
-    closeTime: rippleTimeToISO8601(ledger.close_time),
-    closeTimeResolution: ledger.close_time_resolution,
-    closeFlags: ledger.close_flags,
-    ledgerHash: ledger.hash || ledger.ledger_hash,
-    ledgerVersion: ledgerVersion,
-    parentLedgerHash: ledger.parent_hash,
-    parentCloseTime: rippleTimeToISO8601(ledger.parent_close_time),
-    totalDrops: ledger.total_coins || ledger.totalCoins,
-    transactionHash: ledger.transaction_hash
-  },
-  parseTransactions(ledger.transactions, ledgerVersion),
-  parseState(ledger.accountState)
+  return removeUndefined(Object.assign(
+    {
+      stateHash: ledger.account_hash,
+      closeTime: rippleTimeToISO8601(ledger.close_time),
+      closeTimeResolution: ledger.close_time_resolution,
+      closeFlags: ledger.close_flags,
+      ledgerHash: ledger.hash || ledger.ledger_hash,
+      ledgerVersion: ledgerVersion,
+      parentLedgerHash: ledger.parent_hash,
+      parentCloseTime: rippleTimeToISO8601(ledger.parent_close_time),
+      totalDrops: ledger.total_coins || ledger.totalCoins,
+      transactionHash: ledger.transaction_hash
+    },
+    parseTransactions(ledger.transactions, ledgerVersion),
+    parseState(ledger.accountState)
  ))
 }
--- a/src/ledger/parse/pathfind.ts
+++ b/src/ledger/parse/pathfind.ts
@@ -14,7 +14,7 @@ function removeAnyCounterpartyEncoding(address: string, amount: Amount) {
 }

 function createAdjustment(
-    address: string, adjustmentWithoutAddress: Object): any {
+    address: string, adjustmentWithoutAddress: object): any {
  const amountKey = _.keys(adjustmentWithoutAddress)[0]
  const amount = adjustmentWithoutAddress[amountKey]
  return _.set({address: address}, amountKey,
--- a/src/ledger/parse/payment-channel-claim.ts
+++ b/src/ledger/parse/payment-channel-claim.ts
@@ -3,7 +3,7 @@ import {removeUndefined, txFlags} from '../../common'
 import parseAmount from './amount'
 const claimFlags = txFlags.PaymentChannelClaim

-function parsePaymentChannelClaim(tx: any): Object {
+function parsePaymentChannelClaim(tx: any): object {
  assert(tx.TransactionType === 'PaymentChannelClaim')

  return removeUndefined({
--- a/src/ledger/parse/payment-channel-create.ts
+++ b/src/ledger/parse/payment-channel-create.ts
@@ -3,7 +3,7 @@ import {parseTimestamp} from './utils'
 import {removeUndefined} from '../../common'
 import parseAmount from './amount'

-function parsePaymentChannelCreate(tx: any): Object {
+function parsePaymentChannelCreate(tx: any): object {
  assert(tx.TransactionType === 'PaymentChannelCreate')

  return removeUndefined({
--- a/src/ledger/parse/payment-channel-fund.ts
+++ b/src/ledger/parse/payment-channel-fund.ts
@@ -3,7 +3,7 @@ import {parseTimestamp} from './utils'
 import {removeUndefined} from '../../common'
 import parseAmount from './amount'

-function parsePaymentChannelFund(tx: any): Object {
+function parsePaymentChannelFund(tx: any): object {
  assert(tx.TransactionType === 'PaymentChannelFund')

  return removeUndefined({
--- a/src/ledger/parse/payment.ts
+++ b/src/ledger/parse/payment.ts
@@ -17,7 +17,8 @@ function removeGenericCounterparty(amount, address) {
    _.omit(amount, 'counterparty') : amount
 }

-function parsePayment(tx: any): Object {
+// Payment specification
+function parsePayment(tx: any): object {
  assert(tx.TransactionType === 'Payment')

  const source = {
@@ -27,10 +28,13 @@ function parsePayment(tx: any): Object {
    tag: tx.SourceTag
  }

-  const destination = {
+  const destination: {
+    address: string,
+    tag: number | undefined
+  } = {
    address: tx.Destination,
-    amount: removeGenericCounterparty(parseAmount(tx.Amount), tx.Destination),
    tag: tx.DestinationTag
+    // Notice that `amount` is omitted to prevent misinterpretation
  }

  return removeUndefined({
--- a/src/ledger/parse/transaction.ts
+++ b/src/ledger/parse/transaction.ts
@@ -1,4 +1,3 @@
-import * as assert from 'assert'
 import {parseOutcome} from './utils'
 import {removeUndefined} from '../../common'
 import parsePayment from './payment'
@@ -12,6 +11,7 @@ import parseEscrowCancellation from './escrow-cancellation'
 import parseCheckCreate from './check-create'
 import parseCheckCash from './check-cash'
 import parseCheckCancel from './check-cancel'
+import parseDepositPreauth from './deposit-preauth'
 import parsePaymentChannelCreate from './payment-channel-create'
 import parsePaymentChannelFund from './payment-channel-fund'
 import parsePaymentChannelClaim from './payment-channel-claim'
@@ -19,30 +19,34 @@ import parseFeeUpdate from './fee-update'
 import parseAmendment from './amendment'

 function parseTransactionType(type) {
+  // Ordering matches https://developers.ripple.com/transaction-types.html
  const mapping = {
-    Payment: 'payment',
-    TrustSet: 'trustline',
-    OfferCreate: 'order',
-    OfferCancel: 'orderCancellation',
    AccountSet: 'settings',
-    SetRegularKey: 'settings',
+    CheckCancel: 'checkCancel',
+    CheckCash: 'checkCash',
+    CheckCreate: 'checkCreate',
+    DepositPreauth: 'depositPreauth',
+    EscrowCancel: 'escrowCancellation',
    EscrowCreate: 'escrowCreation',
    EscrowFinish: 'escrowExecution',
-    EscrowCancel: 'escrowCancellation',
-    CheckCreate: 'checkCreate',
-    CheckCash: 'checkCash',
-    CheckCancel: 'checkCancel',
+    OfferCancel: 'orderCancellation',
+    OfferCreate: 'order',
+    Payment: 'payment',
+    PaymentChannelClaim: 'paymentChannelClaim',
    PaymentChannelCreate: 'paymentChannelCreate',
    PaymentChannelFund: 'paymentChannelFund',
-    PaymentChannelClaim: 'paymentChannelClaim',
+    SetRegularKey: 'settings',
    SignerListSet: 'settings',
-    SetFee: 'feeUpdate', // pseudo-transaction
-    EnableAmendment: 'amendment' // pseudo-transaction
+    TrustSet: 'trustline',
+
+    EnableAmendment: 'amendment', // pseudo-transaction
+    SetFee: 'feeUpdate' // pseudo-transaction
  }
  return mapping[type] || null
 }

-function parseTransaction(tx: any): any {
+// includeRawTransaction: undefined by default (getTransaction)
+function parseTransaction(tx: any, includeRawTransaction: boolean): any {
  const type = parseTransactionType(tx.TransactionType)
  const mapping = {
    'payment': parsePayment,
@@ -56,6 +60,7 @@ function parseTransaction(tx: any): any {
    'checkCreate': parseCheckCreate,
    'checkCash': parseCheckCash,
    'checkCancel': parseCheckCancel,
+    'depositPreauth': parseDepositPreauth,
    'paymentChannelCreate': parsePaymentChannelCreate,
    'paymentChannelFund': parsePaymentChannelFund,
    'paymentChannelClaim': parsePaymentChannelClaim,
@@ -63,8 +68,15 @@ function parseTransaction(tx: any): any {
    'amendment': parseAmendment
  }
  const parser: Function = mapping[type]
-  assert(parser !== undefined, 'Unrecognized transaction type')
-  const specification = parser(tx)
+
+  const specification = parser ? parser(tx) : {
+    UNAVAILABLE: 'Unrecognized transaction type.',
+    SEE_RAW_TRANSACTION: 'Since this type is unrecognized, `rawTransaction` is included in this response.'
+  }
+  if (!parser) {
+    includeRawTransaction = true
+  }
+
  const outcome = parseOutcome(tx)
  return removeUndefined({
    type: type,
@@ -72,7 +84,8 @@ function parseTransaction(tx: any): any {
    sequence: tx.Sequence,
    id: tx.hash,
    specification: removeUndefined(specification),
-    outcome: outcome ? removeUndefined(outcome) : undefined
+    outcome: outcome ? removeUndefined(outcome) : undefined,
+    rawTransaction: includeRawTransaction ? JSON.stringify(tx) : undefined
  })
 }

--- a/src/ledger/parse/trustline.ts
+++ b/src/ledger/parse/trustline.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert'
-import {parseQuality} from './utils'
+import {parseQuality, parseMemos} from './utils'
 import {txFlags, removeUndefined} from '../../common'
 const flags = txFlags.TrustSet

@@ -13,13 +13,14 @@ function parseFlag(flagsValue, trueValue, falseValue) {
  return undefined
 }

-function parseTrustline(tx: any): Object {
+function parseTrustline(tx: any): object {
  assert(tx.TransactionType === 'TrustSet')

  return removeUndefined({
    limit: tx.LimitAmount.value,
    currency: tx.LimitAmount.currency,
    counterparty: tx.LimitAmount.issuer,
+    memos: parseMemos(tx),
    qualityIn: parseQuality(tx.QualityIn),
    qualityOut: parseQuality(tx.QualityOut),
    ripplingDisabled: parseFlag(
--- a/src/ledger/pathfind.ts
+++ b/src/ledger/pathfind.ts
@@ -1,7 +1,13 @@
 import * as _ from 'lodash'
 import BigNumber from 'bignumber.js'
 import {getXRPBalance, renameCounterpartyToIssuer} from './utils'
-import {validate, toRippledAmount, errors} from '../common'
+import {
+  validate,
+  toRippledAmount,
+  errors,
+  xrpToDrops,
+  dropsToXrp
+} from '../common'
 import {Connection} from '../common'
 import parsePathfind from './parse/pathfind'
 import {RippledAmount, Amount} from '../common/types/objects'
@@ -23,7 +29,11 @@ function addParams(request: PathFindRequest, result: RippledPathsResponse
 function requestPathFind(connection: Connection, pathfind: PathFind
 ): Promise<RippledPathsResponse> {
  const destinationAmount: Amount = _.assign(
-    {value: '-1'},
+    {
+      // This is converted back to drops by toRippledAmount()
+      value: pathfind.destination.amount.currency === 'XRP' ?
+        dropsToXrp('-1') : '-1'
+    },
    pathfind.destination.amount
  )
  const request: PathFindRequest = {
@@ -95,13 +105,21 @@ function filterSourceFundsLowPaths(pathfind: PathFind,
 ): RippledPathsResponse {
  if (pathfind.source.amount &&
      pathfind.destination.amount.value === undefined && paths.alternatives) {
-    paths.alternatives = _.filter(paths.alternatives, alt =>
-        !!alt.source_amount &&
-        !!pathfind.source.amount &&
-        // TODO: Returns false when alt.source_amount is a string. Fix?
-        typeof alt.source_amount !== 'string' &&
-        new BigNumber(alt.source_amount.value).eq(pathfind.source.amount.value)
-    )
+    paths.alternatives = _.filter(paths.alternatives, alt => {
+      if (!alt.source_amount) {
+        return false
+      }
+      const pathfindSourceAmountValue = new BigNumber(
+        pathfind.source.amount.currency === 'XRP' ?
+        xrpToDrops(pathfind.source.amount.value) :
+        pathfind.source.amount.value)
+      const altSourceAmountValue = new BigNumber(
+        typeof alt.source_amount === 'string' ?
+        alt.source_amount :
+        alt.source_amount.value
+      )
+      return altSourceAmountValue.eq(pathfindSourceAmountValue)
+    })
  }
  return paths
 }
--- a/src/ledger/settings.ts
+++ b/src/ledger/settings.ts
@@ -10,11 +10,17 @@ export type SettingsOptions = {
  ledgerVersion?: number
 }

-function parseFlags(value) {
+export function parseAccountFlags(
+    value: number,
+    options: {excludeFalse?: boolean} = {}) {
  const settings = {}
  for (const flagName in AccountFlags) {
    if (value & AccountFlags[flagName]) {
      settings[flagName] = true
+    } else {
+      if (!options.excludeFalse) {
+        settings[flagName] = false
+      }
    }
  }
  return settings
@@ -22,12 +28,12 @@ function parseFlags(value) {

 function formatSettings(response: AccountInfoResponse) {
  const data = response.account_data
-  const parsedFlags = parseFlags(data.Flags)
+  const parsedFlags = parseAccountFlags(data.Flags, {excludeFalse: true})
  const parsedFields = parseFields(data)
  return _.assign({}, parsedFlags, parsedFields)
 }

-async function getSettings(
+export async function getSettings(
  this: RippleAPI, address: string, options: SettingsOptions = {}
 ): Promise<FormattedSettings> {
  // 1. Validate
@@ -41,5 +47,3 @@ async function getSettings(
  // 3. Return Formatted Response
  return formatSettings(response)
 }
-
-export default getSettings
--- a/src/ledger/transaction.ts
+++ b/src/ledger/transaction.ts
@@ -7,7 +7,8 @@ import {FormattedTransactionType} from '../transaction/types'

 export type TransactionOptions = {
  minLedgerVersion?: number,
-  maxLedgerVersion?: number
+  maxLedgerVersion?: number,
+  includeRawTransaction?: boolean
 }
 type TransactionResponse = FormattedTransactionType & {
    hash: string,
@@ -83,9 +84,9 @@ function convertError(connection: Connection, options: TransactionOptions,
 function formatResponse(options: TransactionOptions, tx: TransactionResponse
 ): FormattedTransactionType {
  if (tx.validated !== true || !isTransactionInRange(tx, options)) {
-  throw new errors.NotFoundError('Transaction not found')
+    throw new errors.NotFoundError('Transaction not found')
  }
-  return parseTransaction(tx)
+  return parseTransaction(tx, options.includeRawTransaction)
 }

 async function getTransaction(id: string, options: TransactionOptions = {}
--- a/src/ledger/transactions.ts
+++ b/src/ledger/transactions.ts
@@ -18,6 +18,7 @@ export type TransactionsOptions = {
  initiated?: boolean,
  counterparty?: string,
  types?: Array<string>,
+  includeRawTransactions?: boolean,
  binary?: boolean,
  startTx?: FormattedTransactionType
 }
@@ -35,11 +36,11 @@ function parseBinaryTransaction(transaction) {
  }
 }

-function parseAccountTxTransaction(tx) {
+function parseAccountTxTransaction(tx, includeRawTransaction: boolean) {
  const _tx = tx.tx_blob ? parseBinaryTransaction(tx) : tx
  // rippled uses a different response format for 'account_tx' than 'tx'
  return parseTransaction(_.assign({}, _tx.tx,
-    {meta: _tx.meta, validated: _tx.validated}))
+    {meta: _tx.meta, validated: _tx.validated}), includeRawTransaction)
 }

 function counterpartyFilter(filters, tx: FormattedTransactionType) {
@@ -87,11 +88,13 @@ function orderFilter(
 function formatPartialResponse(address: string,
  options: TransactionsOptions, data
 ) {
+  const parse = tx =>
+    parseAccountTxTransaction(tx, options.includeRawTransactions)
  return {
    marker: data.marker,
    results: data.transactions
      .filter(tx => tx.validated)
-      .map(parseAccountTxTransaction)
+      .map(parse)
      .filter(_.partial(transactionFilter, address, options))
      .filter(_.partial(orderFilter, options))
  }
--- a/src/ledger/utils.ts
+++ b/src/ledger/utils.ts
@@ -106,7 +106,7 @@ function isPendingLedgerVersion(connection: Connection,
 }

 function ensureLedgerVersion(options: any
-): Promise<Object> {
+): Promise<object> {
  if (Boolean(options) && options.ledgerVersion !== undefined &&
    options.ledgerVersion !== null
  ) {
--- a/src/offline/derive.ts
+++ b/src/offline/derive.ts
@@ -0,0 +1,7 @@
+import {deriveKeypair, deriveAddress} from 'ripple-keypairs'
+
+export {
+  deriveKeypair,
+  deriveAddress
+}
+
--- a/src/offline/generate-address.ts
+++ b/src/offline/generate-address.ts
@@ -2,14 +2,14 @@ import keypairs = require('ripple-keypairs')
 import * as common from '../common'
 const {errors, validate} = common

-function generateAddress(options?: Object): Object {
+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 {
+function generateAddressAPI(options?: object): object {
  validate.generateAddress({options})
  try {
    return generateAddress(options)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elliot Lee	50a7320886	Release 1.1.0	2018-10-31 16:36:20 -07:00
Elliot Lee	418987476e	Add DepositPreauth (#958 ) * Expose parseAccountFlags() and add docs * Add example snippet * Default to node v10 for nvm * Maintain existing behavior for getSettings * Increase max line length from 80 to 120 (ter-max-len)	2018-10-31 16:27:32 -07:00
Elliot Lee	89e4ff328c	Apply formatting to book-offers fixture	2018-10-31 16:07:25 -07:00
Elliot Lee	04bf49cb43	Support node 10 (#964 ) * Update webpack from 3.11.0 to 3.12.0 and upath from 1.0.4 to 1.1.0 * Run: yarn upgrade gulp * See https://github.com/gulpjs/gulp/issues/2162 * Update README * Travis: test node 10	2018-10-30 14:15:42 -07:00
Elliot Lee	1c017df2a3	Merge pull request #955 from jcperkins12/feature/balanceChanges-TypeCorrection Type balanceChanges should be array of changes not array with one change	2018-10-24 20:34:03 -07:00
Elliot Lee	5fed1f08e4	Document xrpToDrops, dropsToXrp, iso8601ToRippleTime, schemaValidator, and more The following methods are available directly under the RippleAPI object, not under schemaValidator: isValidAddress, isValidSecret, deriveKeypair, deriveAddress	2018-10-18 01:16:50 -07:00
Elliot Lee	82c349c8c4	HISTORY: List Check transaction types Transaction types that were added in 0.19.0	2018-10-17 16:22:48 -07:00
Elliot Lee	0f7af6a4e9	Add depositAuth to FormattedSettings type	2018-10-17 15:58:52 -07:00
Elliot Lee	8db1791ed2	README: Remove obsolete badges	2018-10-16 12:48:48 -07:00
Elliot Lee	a29ec1b8c7	Release 1.0.2	2018-10-16 12:28:24 -07:00
Elliot Lee	232a760a58	yarn: Add integrity hashes to yarn.lock Added in yarn v1.10.0, see https://github.com/yarnpkg/yarn/pull/5042	2018-10-16 12:24:15 -07:00
Elliot Lee	f4ad04d334	Exclude SendMax from XRP to XRP payments (#957 ) Fix #954	2018-10-16 12:21:29 -07:00
Cory Perkins	8dfec20871	Changed type of balanceChanges made to an account from an array of one change to an array of 1 change to and array of records with the type of a blanceChange	2018-10-10 12:21:16 -05:00
Cory Perkins	64745017e9	book_offers returns offers type OfferLedgerEntry (#951 ) * rippled-api function book_offers returns offers in the format of OfferLedgerEntry not OfferCreateTransaction * updated type of account_objects	2018-10-02 02:14:17 -07:00
Elliot Lee	37edede728	Use `object` instead of `Object` (#936 )	2018-10-02 02:13:28 -07:00
Elliot Lee	f785605db8	Release 1.0.1	2018-09-27 19:01:38 -07:00
Elliot Lee	01ad30ab07	Fix typos in ledger_entries.ts	2018-09-19 14:24:02 -07:00
Cory Perkins	e08d507462	Add remaining LedgerEntry types (#943 ) * Replaced the union with 'any' in the LedgerEntry type * Added DepositPreauthLedgerEntry (new in rippled 1.1.0)	2018-09-19 14:21:52 -07:00
wudanjs	4c23bd5ad3	Include memos when parsing trustlines (#949 )	2018-09-19 14:17:38 -07:00
Scott M Sunarto	b15abd5376	Update server regex to accommodate UDS (#944 )	2018-09-18 11:47:46 -07:00
Elliot Lee	79971f906b	Update release notes	2018-09-11 18:45:52 -07:00
Elliot Lee	9eec98778f	Expose validation methods (#932 ) Merge branch 'movitto-expose_validation_methods' into develop	2018-09-11 18:33:55 -07:00
Elliot Lee	dcd0e14142	Add test of deriveKeypair with ed25519 secret	2018-09-11 18:33:07 -07:00
Elliot Lee	cfcbc9aab7	Update checksums for 1.0.0	2018-09-10 14:52:14 -07:00
Mo Morsi	a80de5658a	Move deriveKeypair and deriveAddress to offline module	2018-09-09 09:39:25 -04:00
Mo Morsi	34215eb309	Add docs for newly exposed API methods	2018-09-09 09:39:25 -04:00
Mo Morsi	9458005d7f	Add tests for newly exposed API methods	2018-09-09 09:39:25 -04:00
Mo Morsi	5f36df0172	Expose deriveKeypair, deriveAddress, isValidAddress, and isValidSecret to the public API	2018-09-09 09:39:25 -04:00
Elliot Lee	3ff4929a49	Fix PendingLedgerVersionError message and export FormattedTransactionType (#941 )	2018-09-04 18:31:24 -07:00
Elliot Lee	4bea69d647	Release 1.0.0	2018-08-30 14:30:57 -07:00
Elliot Lee	09541dae86	docs: rippled APIs use `issuer`	2018-08-30 14:12:45 -07:00
Elliot Lee	bcbcc53c87	No `--coverage' option anymore with nyc See https://github.com/istanbuljs/nyc	2018-08-30 13:41:52 -07:00
Elliot Lee	76f120bec9	Merge branch 'getLedger-includeRawTransaction-2' into develop	2018-08-30 13:30:18 -07:00
Elliot Lee	f8bf28876d	if statements must be braced	2018-08-30 13:29:50 -07:00
wilsonianb	b03795df09	Add hidden computeTreeHashes option	2018-08-30 13:29:50 -07:00
Elliot Lee	dbe20d6574	getLedger: include raw transaction with each transaction computeLedgerHash: support new getLedger response by using rawTransaction BREAKING CHANGES: * Remove the `rawTransactions` field and replace it with a new `rawTransaction` field in each transaction. * Rename the `metaData` field (in each raw transaction) to `meta` (for consistency with rippled's `tx` method). * Add `ledger_index` to each raw transaction.	2018-08-30 13:28:52 -07:00
Elliot Lee	0550fab73e	Update escrowCreation error message and docs (#934 ) Fix #933	2018-08-29 19:03:33 -07:00
Elliot Lee	3f2d9d198e	computeLedgerHash - add requireRawTransactions option	2018-08-28 17:31:12 -07:00
Elliot Lee	b9c953fce6	Fix getPaths (#930 ) * getPaths: * Filter paths correctly * Use correct value when XRP is the destination currency	2018-08-23 17:37:02 -07:00
Elliot Lee	181cfd69de	Prevent 'amount' from being misinterpreted (#924 ) The 'amount' field should almost never be used. With partial payments, the field can show an amount that is significantly less than the amount that the transaction actually delivered. This change sets amount to 0 XRP when it may be misleading. This change omits the `amount` when parsing payment transactions. See `HISTORY.md` for recommended alternatives.	2018-08-23 16:17:23 -07:00
Elliot Lee	569766b8f8	Rename json schemas (#931 ) Rename files for consistency with their titles: * Rename amount-base to amountbase * Rename tx-hash to transaction-hash * Rename id to transactionHash * Rename objects/settings.json to objects/settings-plus-memos.json * Rename ledgerversion to ledger-version	2018-08-22 14:41:41 -07:00
Elliot Lee	53a232ebdc	Update docs	2018-08-14 20:05:50 -07:00
Elliot Lee	4c9a2ff538	Improve Order docs. Fix #776	2018-08-14 19:27:50 -07:00